empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(natstr, add, getrejects, putreject): Simplify rejections storage.

Browse source 
The space savings of nibble storage are not worth the hassle,
especially for xdump.

(nat_ca): New selector rejects.
This commit is contained in:
Markus Armbruster 2006-05-18 18:43:38 +00:00
parent af9c94d06f
commit 6844c94b4a
4 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib/common/nat.c
View file

@ -107,14 +107,7 @@ getrel(struct natstr *np, natid them)
int
getrejects(natid them, struct natstr *np)
{
int ind;
int shift;
int reject;
ind = them / 4;
shift = 12 - ((them - ((them / 4) << 2)) * 4);
reject = (np->nat_rejects[ind] >> shift) & 0x0f;
return reject;
return np->nat_rejects[them];
}
void
@ -144,19 +137,10 @@ putrel(struct natstr *np, natid them, int relate)
void
putreject(struct natstr *np, natid them, int how, int what)
{
int shift;
int newrej;
int ind;
what &= 0x0f;
ind = them / 4;
shift = 12 - ((them - ((them / 4) << 2)) * 4);
newrej = np->nat_rejects[ind];
if (how)
newrej |= (what << shift);
np->nat_rejects[them] |= what;
else
newrej &= ~(what << shift);
np->nat_rejects[ind] = newrej;
np->nat_rejects[them] &= what;
}
void