diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ripngd/ripng_zebra.c | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'ripngd/ripng_zebra.c')
| -rw-r--r-- | ripngd/ripng_zebra.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index 1f9bee0c..62185c0a 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -89,7 +89,7 @@ ripng_zebra_ipv6_delete (struct prefix_ipv6 *p, struct in6_addr *nexthop, } /* Zebra route add and delete treatment. */ -int +static int ripng_zebra_read_ipv6 (int command, struct zclient *zclient, zebra_size_t length) { @@ -143,12 +143,12 @@ ripng_zebra_read_ipv6 (int command, struct zclient *zclient, } void -ripng_zclient_reset () +ripng_zclient_reset (void) { zclient_reset (zclient); } -int +static int ripng_redistribute_unset (int type) { if (! zclient->redist[type]) @@ -170,14 +170,14 @@ ripng_redistribute_check (int type) return (zclient->redist[type]); } -void +static void ripng_redistribute_metric_set (int type, int metric) { ripng->route_map[type].metric_config = 1; ripng->route_map[type].metric = metric; } -int +static int ripng_redistribute_metric_unset (int type) { ripng->route_map[type].metric_config = 0; @@ -185,7 +185,7 @@ ripng_redistribute_metric_unset (int type) return 0; } -void +static void ripng_redistribute_routemap_set (int type, const char *name) { if (ripng->route_map[type].name) @@ -195,7 +195,7 @@ ripng_redistribute_routemap_set (int type, const char *name) ripng->route_map[type].map = route_map_lookup_by_name (name); } -void +static void ripng_redistribute_routemap_unset (int type) { if (ripng->route_map[type].name) @@ -520,7 +520,7 @@ ripng_redistribute_write (struct vty *vty, int config_mode) } /* RIPng configuration write function. */ -int +static int zebra_config_write (struct vty *vty) { if (! zclient->enable) |