2005-06-28 Paul Jakma <paul.jakma@sun.com>
* (global) The great bgpd extern and static'ification.
* bgp_routemap.c: remove unused ROUTE_MATCH_ASPATH_OLD code
(route_set_metric_compile) fix u_int32_t to ULONG_MAX comparison
warnings.
* bgp_route.h: (bgp_process, bgp_withdraw, bgp_update) export these
used by various files which had their own private declarations,
in the case of mplsvpn - incorrect.
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index 0fb5ed8..f5bb5f4 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -87,7 +87,7 @@
struct thread *t_bgp_dump_routes;
/* Some define for BGP packet dump. */
-FILE *
+static FILE *
bgp_dump_open_file (struct bgp_dump *bgp_dump)
{
int ret;
@@ -131,10 +131,10 @@
return bgp_dump->fp;
}
-int
+static int
bgp_dump_interval_add (struct bgp_dump *bgp_dump, int interval)
{
- int bgp_dump_interval_func (struct thread *);
+ static int bgp_dump_interval_func (struct thread *t);
int interval2, secs_into_day;
time_t t;
struct tm *tm;
@@ -166,7 +166,7 @@
}
/* Dump common header. */
-void
+static void
bgp_dump_header (struct stream *obuf, int type, int subtype)
{
time_t now;
@@ -182,13 +182,13 @@
stream_putl (obuf, 0); /* len */
}
-void
+static void
bgp_dump_set_size (struct stream *s, int type)
{
stream_putl_at (s, 8, stream_get_endp (s) - BGP_DUMP_HEADER_SIZE);
}
-void
+static void
bgp_dump_routes_entry (struct prefix *p, struct bgp_info *info, int afi,
int type, unsigned int seq)
{
@@ -295,7 +295,7 @@
}
/* Runs under child process. */
-void
+static void
bgp_dump_routes_func (int afi)
{
struct stream *obuf;
@@ -322,7 +322,7 @@
bgp_dump_routes_entry (&rn->p, info, afi, MSG_TABLE_DUMP, seq++);
}
-int
+static int
bgp_dump_interval_func (struct thread *t)
{
struct bgp_dump *bgp_dump;
@@ -353,7 +353,7 @@
}
/* Dump common information. */
-void
+static void
bgp_dump_common (struct stream *obuf, struct peer *peer)
{
char empty[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
@@ -420,7 +420,7 @@
fflush (bgp_dump_all.fp);
}
-void
+static void
bgp_dump_packet_func (struct bgp_dump *bgp_dump, struct peer *peer,
struct stream *packet)
{
@@ -461,7 +461,7 @@
bgp_dump_packet_func (&bgp_dump_updates, peer, packet);
}
-unsigned int
+static unsigned int
bgp_dump_parse_time (const char *str)
{
int i;
@@ -508,7 +508,7 @@
return total + time;
}
-int
+static int
bgp_dump_set (struct vty *vty, struct bgp_dump *bgp_dump, int type,
const char *path, const char *interval_str)
{
@@ -553,7 +553,7 @@
return CMD_SUCCESS;
}
-int
+static int
bgp_dump_unset (struct vty *vty, struct bgp_dump *bgp_dump)
{
/* Set file name. */
@@ -725,7 +725,7 @@
}
#endif
-int
+static int
config_write_bgp_dump (struct vty *vty)
{
if (bgp_dump_all.filename)
@@ -763,7 +763,7 @@
/* Initialize BGP packet dump functionality. */
void
-bgp_dump_init ()
+bgp_dump_init (void)
{
memset (&bgp_dump_all, 0, sizeof (struct bgp_dump));
memset (&bgp_dump_updates, 0, sizeof (struct bgp_dump));