Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Aesthetical tweaks (asterisk spells `asterisk' etc.)

Browse source
This commit is contained in:
Martin Mares 2000-04-17 11:22:24 +00:00
parent 159fa4cea9
commit 4b03f64b34
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
nest/a-path.c
View file

@ -19,7 +19,8 @@ as_path_prepend(struct linpool *pool, struct adata *olda, int as)
{ {
struct adata *newa; struct adata *newa;
if (olda->length && olda->data[0] == 2 && olda->data[1] < 255) /* Starting with sequence => just prepend the AS number */ if (olda->length && olda->data[0] == AS_PATH_SEQUENCE &&
olda->data[1] < 255) /* Starting with sequence => just prepend the AS number */
{ {
newa = lp_alloc(pool, sizeof(struct adata) + olda->length + 2); newa = lp_alloc(pool, sizeof(struct adata) + olda->length + 2);
newa->length = olda->length + 2; newa->length = olda->length + 2;
@ -90,37 +91,40 @@ as_path_getlen(struct adata *path)
u8 *q = p+path->length; u8 *q = p+path->length;
int len; int len;
while (p<q) { while (p<q)
switch (*p++) { {
case 1: len = *p++; res++; p += 2*len; break; switch (*p++)
case 2: len = *p++; res+=len; p += 2*len; break; {
default: bug("This should not be in path"); case AS_PATH_SET: len = *p++; res++; p += 2*len; break;
case AS_PATH_SEQUENCE: len = *p++; res+=len; p += 2*len; break;
default: bug("as_path_getlen: Invalid path segment");
}
} }
}
return res; return res;
} }
#define MASK_PLUS do { mask = mask->next; if (!mask) return next == q; \ #define MASK_PLUS do { mask = mask->next; if (!mask) return next == q; \
asterix = (mask->val == PM_ANY); \ asterisk = (mask->val == PM_ANY); \
if (asterix) { mask = mask->next; if (!mask) { return 1; } } \ if (asterisk) { mask = mask->next; if (!mask) { return 1; } } \
} while(0) } while(0)
int int
as_path_match(struct adata *path, struct f_path_mask *mask) as_path_match(struct adata *path, struct f_path_mask *mask)
{ {
int i; int i;
int asterix = 0; int asterisk = 0;
u8 *p = path->data; u8 *p = path->data;
u8 *q = p+path->length; u8 *q = p+path->length;
int len; int len;
u8 *next; u8 *next;
asterix = (mask->val == PM_ANY); asterisk = (mask->val == PM_ANY);
if (asterix) { mask = mask->next; if (!mask) { return 1; } } if (asterisk)
{ mask = mask->next; if (!mask) return 1; }
while (p<q) { while (p<q) {
switch (*p++) { switch (*p++) {
case 1: /* This is a set */ case AS_PATH_SET:
len = *p++; len = *p++;
{ {
u8 *p_save = p; u8 *p_save = p;
@ -128,30 +132,30 @@ as_path_match(struct adata *path, struct f_path_mask *mask)
retry: retry:
p = p_save; p = p_save;
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
if (asterix && (get_u16(p) == mask->val)) { if (asterisk && (get_u16(p) == mask->val)) {
MASK_PLUS; MASK_PLUS;
goto retry; goto retry;
} }
if (!asterix && (get_u16(p) == mask->val)) { if (!asterisk && (get_u16(p) == mask->val)) {
p = next; p = next;
MASK_PLUS; MASK_PLUS;
goto okay; goto okay;
} }
p+=2; p+=2;
} }
if (!asterix) if (!asterisk)
return 0; return 0;
okay: okay:
} }
break; break;
case 2: /* This is a sequence */ case AS_PATH_SEQUENCE:
len = *p++; len = *p++;
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
next = p+2; next = p+2;
if (asterix && (get_u16(p) == mask->val)) if (asterisk && (get_u16(p) == mask->val))
MASK_PLUS; MASK_PLUS;
else if (!asterix) { else if (!asterisk) {
if (get_u16(p) != mask->val) if (get_u16(p) != mask->val)
return 0; return 0;
MASK_PLUS; MASK_PLUS;
@ -161,7 +165,7 @@ as_path_match(struct adata *path, struct f_path_mask *mask)
break; break;
default: default:
bug("This should not be in path"); bug("as_path_match: Invalid path component");
} }
} }
return 0; return 0;