summaryrefslogtreecommitdiffstats
path: root/proto
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-08-27 19:01:04 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2009-08-27 19:01:04 +0200
commit05198c12f48c9d4a65ee6d1d4117bd8067a71131 (patch)
tree1e2ad34f41df5cec921ea7f4757a4ce3012aa34f /proto
parent949bd34e81ee99370decdabefa51c9c11ffe915b (diff)
downloadbird-05198c12f48c9d4a65ee6d1d4117bd8067a71131.tar
bird-05198c12f48c9d4a65ee6d1d4117bd8067a71131.zip
Some cleanups.
Diffstat (limited to 'proto')
-rw-r--r--proto/bgp/attrs.c3
-rw-r--r--proto/bgp/packets.c2
-rw-r--r--proto/ospf/ospf.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index bf976a6..831ada5 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1131,6 +1131,8 @@ as4_aggregator_valid(struct adata *aggr)
if ((a[0] == 0) || (a[1] == 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;
byte *z, *attr_start;
byte seen[256/8];
- eattr *e;
ea_list *ea;
struct adata *ad;
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index ae4906e..49c2add 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -488,7 +488,6 @@ bgp_parse_capabilities(struct bgp_conn *conn, byte *opt, int len)
{
struct bgp_proto *p = conn->bgp;
int cl;
- u32 as;
while (len > 0)
{
@@ -570,7 +569,6 @@ bgp_rx_open(struct bgp_conn *conn, byte *pkt, int len)
{
struct bgp_conn *other;
struct bgp_proto *p = conn->bgp;
- struct bgp_config *cf = p->cf;
unsigned hold;
u16 base_as;
u32 id;
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index 2279089..7f0ee54 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -603,6 +603,8 @@ void schedule_net_lsa(struct ospf_iface *ifa);
void ospf_sh_neigh(struct proto *p, char *iff);
void ospf_sh(struct proto *p);
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_METRIC2 EA_CODE(EAP_OSPF, 1)