1
0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00

Merge branch 'dev' into ospf3

Conflicts:

	proto/ospf/lsreq.c
	proto/ospf/lsupd.c
	proto/ospf/rt.c
This commit is contained in:
Ondrej Zajicek
2009-12-14 20:37:32 +01:00
20 changed files with 478 additions and 87 deletions

View File

@@ -731,7 +731,7 @@ interpret(struct f_inst *what)
case P('a','f'): /* Get first ASN from AS PATH */
ONEARG;
if (v1.type != T_PATH)
runtime( "AS Path expected" );
runtime( "AS path expected" );
as = 0;
as_path_get_first(v1.val.ad, &as);
@@ -942,6 +942,8 @@ i_same(struct f_inst *f1, struct f_inst *f2)
case P('i','M'): TWOARGS; break;
case P('A','p'): TWOARGS; break;
case P('C','a'): TWOARGS; break;
case P('a','f'):
case P('a','l'): ONEARG; break;
default:
bug( "Unknown instruction %d in same (%c)", f1->code, f1->code & 0xff);
}