summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-12-17 13:14:28 +0300
committerDenis Ovsienko <infrastation@yandex.ru>2009-12-17 13:14:28 +0300
commitda88ea82acd70adf3bab641b2300ee24319da422 (patch)
tree81151de47e55067c4b7d9cd718c0e6c8ab07aa50
parent2c2397059d4d4177ed4636c08aa476a138425dc8 (diff)
bgpd: code cleanup
* bgpd/bgp_aspath.c * ashash: only used in one file, make static * aspath_count_numas(): dead code, sayonara * bgpd/bgpd.c * peer_nsf_stop(): only used in one file, make static * bgpd/bgp_packet.h * bgp_capability_receive(): add missing prototype for a global function
-rw-r--r--bgpd/bgp_aspath.c18
-rw-r--r--bgpd/bgp_aspath.h1
-rw-r--r--bgpd/bgp_packet.h2
-rw-r--r--bgpd/bgpd.c2
-rw-r--r--bgpd/bgpd.h2
5 files changed, 4 insertions, 21 deletions
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index 3c8032f8..a9602d90 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -86,7 +86,7 @@ struct assegment_header
};
/* Hash for aspath. This is the top level structure of AS path. */
-struct hash *ashash;
+static struct hash *ashash;
/* Stream for SNMP. See aspath_snmp_pathseg */
static struct stream *snmp_stream;
@@ -501,22 +501,6 @@ aspath_has_as4 (struct aspath *aspath)
return 0;
}
-/* Return number of as numbers in in path */
-unsigned int
-aspath_count_numas (struct aspath *aspath)
-{
- struct assegment *seg = aspath->segments;
- unsigned int num;
-
- num=0;
- while (seg)
- {
- num += seg->length;
- seg = seg->next;
- }
- return num;
-}
-
/* Convert aspath structure to string expression. */
static char *
aspath_make_str_count (struct aspath *as)
diff --git a/bgpd/bgp_aspath.h b/bgpd/bgp_aspath.h
index 9854d186..b8a5dfab 100644
--- a/bgpd/bgp_aspath.h
+++ b/bgpd/bgp_aspath.h
@@ -99,7 +99,6 @@ extern size_t aspath_put (struct stream *, struct aspath *, int);
extern struct aspath *aspath_reconcile_as4 (struct aspath *, struct aspath *);
extern unsigned int aspath_has_as4 (struct aspath *);
-extern unsigned int aspath_count_numas (struct aspath *);
/* For SNMP BGP4PATHATTRASPATHSEGMENT, might be useful for debug */
extern u_char *aspath_snmp_pathseg (struct aspath *, size_t *);
diff --git a/bgpd/bgp_packet.h b/bgpd/bgp_packet.h
index 85d64072..8f0ebe31 100644
--- a/bgpd/bgp_packet.h
+++ b/bgpd/bgp_packet.h
@@ -52,4 +52,6 @@ extern void bgp_default_update_send (struct peer *, struct attr *,
afi_t, safi_t, struct peer *);
extern void bgp_default_withdraw_send (struct peer *, afi_t, safi_t);
+extern int bgp_capability_receive (struct peer *, bgp_size_t);
+
#endif /* _QUAGGA_BGP_PACKET_H */
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index b34f996b..cf3a6b42 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1129,7 +1129,7 @@ peer_deactivate (struct peer *peer, afi_t afi, safi_t safi)
return 0;
}
-void
+static void
peer_nsf_stop (struct peer *peer)
{
afi_t afi;
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index e8b8ef5a..f4ce8985 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -952,6 +952,4 @@ extern int peer_maximum_prefix_unset (struct peer *, afi_t, safi_t);
extern int peer_clear (struct peer *);
extern int peer_clear_soft (struct peer *, afi_t, safi_t, enum bgp_clear_type);
-extern void peer_nsf_stop (struct peer *);
-
#endif /* _QUAGGA_BGPD_H */