Minor cleanups.

diff --git a/nest/rt-table.c b/nest/rt-table.c
index bb0ee4c88a9b13beb3b94a1dcbf76720bf79274f..fdc767e7d89127ceb2e216d5d0b065122d59e4f0 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -799,10 +799,7 @@ void
 rte_dump(rte *e)
 {
   net *n = e->net;
-  if (n)
-    debug("%-1I/%2d ", n->n.prefix, n->n.pxlen);
-  else
-    debug("??? ");
+  debug("%-1I/%2d ", n->n.prefix, n->n.pxlen);
   debug("KF=%02x PF=%02x pref=%d lm=%d ", n->n.flags, e->pflags, e->pref, now-e->lastmod);
   rta_dump(e->attrs);
   if (e->attrs->proto->proto->dump_attrs)

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 168025d0aaa45191cedf6ca0df134cfb99b4cd3f..cfa37fb5d2e944082882408ea0354ed084404082 100644 (file)
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -1031,9 +1031,6 @@ bgp_do_rx_update(struct bgp_conn *conn,
              if (n = net_find(p->p.table, prefix, pxlen))
                rte_update(p->p.table, n, &p->p, &p->p, NULL);
            }
-
-         if (bgp_apply_limits(p) < 0)
-           goto done;
        }
     }
 

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index b41c3f8ddd29e3a6d0d5a7c4cbca350b82ea69e1..281296a50a0450a762380fca5f1aea26396a6844 100644 (file)
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -624,7 +624,6 @@ rip_dump(struct proto *p)
   int i;
   node *w;
   struct rip_interface *rif;
-  i = 0;
 
   CHK_MAGIC;
   WALK_LIST( w, P->connections ) {
@@ -995,8 +994,8 @@ static int
 rip_get_attr(eattr *a, byte *buf, int buflen UNUSED)
 {
   switch (a->id) {
-  case EA_RIP_METRIC: buf += 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_METRIC: bsprintf( buf, "metric: %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;
   }
 }

diff --git a/sysdep/linux/sysio.h b/sysdep/linux/sysio.h
index 705a20ae9798863e11dfbfc232f0f4e0936f762f..90b3ebd9b4e4d74456a000d8513aa7be1d0144d0 100644 (file)
--- a/sysdep/linux/sysio.h
+++ b/sysdep/linux/sysio.h
@@ -301,7 +301,7 @@ sk_set_min_ttl6(sock *s, int ttl)
     if (errno == ENOPROTOOPT)
       log(L_ERR "Kernel does not support IPv6 TTL security");
     else
-      log(L_ERR "sk_set_min_ttl4: setsockopt: %m");
+      log(L_ERR "sk_set_min_ttl6: setsockopt: %m");
 
     return -1;
   }