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

Minor cleanups.

Browse source
This commit is contained in:
Ondrej Zajicek 2012-05-04 23:05:47 +02:00
parent 95616c8202
commit 47c447c42e
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nest/rt-table.c
View file

@ -799,10 +799,7 @@ void
rte_dump(rte *e) rte_dump(rte *e)
{ {
net *n = e->net; net *n = e->net;
if (n)
debug("%-1I/%2d ", n->n.prefix, n->n.pxlen); debug("%-1I/%2d ", n->n.prefix, n->n.pxlen);
else
debug("??? ");
debug("KF=%02x PF=%02x pref=%d lm=%d ", n->n.flags, e->pflags, e->pref, now-e->lastmod); debug("KF=%02x PF=%02x pref=%d lm=%d ", n->n.flags, e->pflags, e->pref, now-e->lastmod);
rta_dump(e->attrs); rta_dump(e->attrs);
if (e->attrs->proto->proto->dump_attrs) if (e->attrs->proto->proto->dump_attrs)

3
proto/bgp/packets.c
View file

@ -1031,9 +1031,6 @@ bgp_do_rx_update(struct bgp_conn *conn,
if (n = net_find(p->p.table, prefix, pxlen)) if (n = net_find(p->p.table, prefix, pxlen))
rte_update(p->p.table, n, &p->p, &p->p, NULL); rte_update(p->p.table, n, &p->p, &p->p, NULL);
} }
if (bgp_apply_limits(p) < 0)
goto done;
} }
} }

5
proto/rip/rip.c
View file

@ -624,7 +624,6 @@ rip_dump(struct proto *p)
int i; int i;
node *w; node *w;
struct rip_interface *rif; struct rip_interface *rif;
i = 0;
CHK_MAGIC; CHK_MAGIC;
WALK_LIST( w, P->connections ) { WALK_LIST( w, P->connections ) {
@ -995,8 +994,8 @@ static int
rip_get_attr(eattr *a, byte *buf, int buflen UNUSED) rip_get_attr(eattr *a, byte *buf, int buflen UNUSED)
{ {
switch (a->id) { switch (a->id) {
case EA_RIP_METRIC: buf += bsprintf( buf, "metric: %d", a->u.data ); return GA_FULL; case EA_RIP_METRIC: bsprintf( buf, "metric: %d", a->u.data ); return GA_FULL;
case EA_RIP_TAG: buf += bsprintf( buf, "tag: %d", a->u.data ); return GA_FULL; case EA_RIP_TAG: bsprintf( buf, "tag: %d", a->u.data ); return GA_FULL;
default: return GA_UNKNOWN; default: return GA_UNKNOWN;
} }
} }

2
sysdep/linux/sysio.h
View file

@ -301,7 +301,7 @@ sk_set_min_ttl6(sock *s, int ttl)
if (errno == ENOPROTOOPT) if (errno == ENOPROTOOPT)
log(L_ERR "Kernel does not support IPv6 TTL security"); log(L_ERR "Kernel does not support IPv6 TTL security");
else else
log(L_ERR "sk_set_min_ttl4: setsockopt: %m"); log(L_ERR "sk_set_min_ttl6: setsockopt: %m");
return -1; return -1;
} }