d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bitcount32() from sys/systm.h instead of my own.

Browse Source
This commit is contained in:
Gleb Smirnoff 2006-10-11 10:47:44 +00:00
parent 43d8847e0b
commit b7e405bd4a
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/netgraph/netflow/netflow.c
View File

@ -223,19 +223,6 @@ ng_netflow_copyinfo(priv_p priv, struct ng_netflow_info *i)
memcpy((void *)i, (void *)&priv->info, sizeof(priv->info)); memcpy((void *)i, (void *)&priv->info, sizeof(priv->info));
} }
/* Calculate number of bits in netmask */
#define g21 0x55555555ul /* = 0101_0101_0101_0101_0101_0101_0101_0101 */
#define g22 0x33333333ul /* = 0011_0011_0011_0011_0011_0011_0011_0011 */
#define g23 0x0f0f0f0ful /* = 0000_1111_0000_1111_0000_1111_0000_1111 */
static __inline u_char
bit_count(uint32_t v)
{
v = (v & g21) + ((v >> 1) & g21);
v = (v & g22) + ((v >> 2) & g22);
v = (v + (v >> 4)) & g23;
return (v + (v >> 8) + (v >> 16) + (v >> 24)) & 0x3f;
}
/* /*
* Insert a record into defined slot. * Insert a record into defined slot.
* *
@ -295,8 +282,8 @@ hash_insert(priv_p priv, struct flow_hash_entry *hsh, struct flow_rec *r,
((struct sockaddr_in *)(rt->rt_gateway))->sin_addr; ((struct sockaddr_in *)(rt->rt_gateway))->sin_addr;
if (rt_mask(rt)) if (rt_mask(rt))
fle->f.dst_mask = fle->f.dst_mask = bitcount32(((struct sockaddr_in *)
bit_count(((struct sockaddr_in *)rt_mask(rt))->sin_addr.s_addr); rt_mask(rt))->sin_addr.s_addr);
else if (rt->rt_flags & RTF_HOST) else if (rt->rt_flags & RTF_HOST)
/* Give up. We can't determine mask :( */ /* Give up. We can't determine mask :( */
fle->f.dst_mask = 32; fle->f.dst_mask = 32;
@ -316,8 +303,8 @@ hash_insert(priv_p priv, struct flow_hash_entry *hsh, struct flow_rec *r,
struct rtentry *rt = ro.ro_rt; struct rtentry *rt = ro.ro_rt;
if (rt_mask(rt)) if (rt_mask(rt))
fle->f.src_mask = fle->f.src_mask = bitcount32(((struct sockaddr_in *)
bit_count(((struct sockaddr_in *)rt_mask(rt))->sin_addr.s_addr); rt_mask(rt))->sin_addr.s_addr);
else if (rt->rt_flags & RTF_HOST) else if (rt->rt_flags & RTF_HOST)
/* Give up. We can't determine mask :( */ /* Give up. We can't determine mask :( */
fle->f.src_mask = 32; fle->f.src_mask = 32;