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

Some cleanups.

Browse source
This commit is contained in:
Ondrej Zajicek 2009-08-27 19:01:04 +02:00
parent 949bd34e81
commit 05198c12f4
6 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
filter/filter.h
View file

@ -81,10 +81,13 @@ struct rte;
int f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struct linpool *tmp_pool, int flags); int f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struct linpool *tmp_pool, int flags);
int f_eval_int(struct f_inst *expr); int f_eval_int(struct f_inst *expr);
u32 f_eval_asn(struct f_inst *expr);
char *filter_name(struct filter *filter); char *filter_name(struct filter *filter);
int filter_same(struct filter *new, struct filter *old); int filter_same(struct filter *new, struct filter *old);
int i_same(struct f_inst *f1, struct f_inst *f2); int i_same(struct f_inst *f1, struct f_inst *f2);
void f_prefix_get_bounds(struct f_prefix *px, int *l, int *h);
int val_compare(struct f_val v1, struct f_val v2); int val_compare(struct f_val v1, struct f_val v2);
void val_print(struct f_val v); void val_print(struct f_val v);

4
filter/trie.c
View file

@ -70,6 +70,7 @@
*/ */
#include "nest/bird.h" #include "nest/bird.h"
#include "lib/string.h"
#include "conf/conf.h" #include "conf/conf.h"
#include "filter/filter.h" #include "filter/filter.h"
@ -177,7 +178,6 @@ trie_add_prefix(struct f_trie *t, struct f_prefix *px)
{ {
int l, h; int l, h;
int plen = px->len & LEN_MASK; int plen = px->len & LEN_MASK;
ip_addr pmask = ipa_mkmask(plen);
/* 'l' and 'h' are lower and upper bounds on accepted /* 'l' and 'h' are lower and upper bounds on accepted
prefix lengths, both inclusive. 0 <= l, h <= 32 */ prefix lengths, both inclusive. 0 <= l, h <= 32 */
@ -272,7 +272,7 @@ static int
trie_node_print(struct f_trie_node *t, char *buf, int blen) trie_node_print(struct f_trie_node *t, char *buf, int blen)
{ {
if (t == NULL) if (t == NULL)
return; return 0;
int old_blen = blen; int old_blen = blen;
int wb = 0; // bsnprintf(buf, blen, "%I/%d accept %I\n", t->addr, t->plen, t->accept); int wb = 0; // bsnprintf(buf, blen, "%I/%d accept %I\n", t->addr, t->plen, t->accept);

3
nest/a-path.c
View file

@ -13,6 +13,7 @@
#include "lib/resource.h" #include "lib/resource.h"
#include "lib/unaligned.h" #include "lib/unaligned.h"
#include "lib/string.h" #include "lib/string.h"
#include "filter/filter.h"
/* Global AS4 support, shared by all BGP instances. /* Global AS4 support, shared by all BGP instances.
@ -304,7 +305,7 @@ parse_path(struct adata *path, struct pm_pos *pos)
u8 *p = path->data; u8 *p = path->data;
u8 *q = p + path->length; u8 *q = p + path->length;
struct pm_pos *opos = pos; struct pm_pos *opos = pos;
int i, j, len; int i, len;
while (p < q) while (p < q)

3
proto/bgp/attrs.c
View file

@ -1131,6 +1131,8 @@ as4_aggregator_valid(struct adata *aggr)
if ((a[0] == 0) || (a[1] == 0)) if ((a[0] == 0) || (a[1] == 0))
return 0; return 0;
return 1;
} }
@ -1245,7 +1247,6 @@ bgp_decode_attrs(struct bgp_conn *conn, byte *attr, unsigned int len, struct lin
int errcode; int errcode;
byte *z, *attr_start; byte *z, *attr_start;
byte seen[256/8]; byte seen[256/8];
eattr *e;
ea_list *ea; ea_list *ea;
struct adata *ad; struct adata *ad;

2
proto/bgp/packets.c
View file

@ -488,7 +488,6 @@ bgp_parse_capabilities(struct bgp_conn *conn, byte *opt, int len)
{ {
struct bgp_proto *p = conn->bgp; struct bgp_proto *p = conn->bgp;
int cl; int cl;
u32 as;
while (len > 0) while (len > 0)
{ {
@ -570,7 +569,6 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, int len)
{ {
struct bgp_conn *other; struct bgp_conn *other;
struct bgp_proto *p = conn->bgp; struct bgp_proto *p = conn->bgp;
struct bgp_config *cf = p->cf;
unsigned hold; unsigned hold;
u16 base_as; u16 base_as;
u32 id; u32 id;

2
proto/ospf/ospf.h
View file

@ -603,6 +603,8 @@ void schedule_net_lsa(struct ospf_iface *ifa);
void ospf_sh_neigh(struct proto *p, char *iff); void ospf_sh_neigh(struct proto *p, char *iff);
void ospf_sh(struct proto *p); void ospf_sh(struct proto *p);
void ospf_sh_iface(struct proto *p, char *iff); void ospf_sh_iface(struct proto *p, char *iff);
void ospf_sh_state(struct proto *p, int verbose);
#define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0) #define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0)
#define EA_OSPF_METRIC2 EA_CODE(EAP_OSPF, 1) #define EA_OSPF_METRIC2 EA_CODE(EAP_OSPF, 1)