diff options
Diffstat (limited to 'zebra')
-rw-r--r-- | zebra/connected.c | 4 | ||||
-rw-r--r-- | zebra/if_proc.c | 2 | ||||
-rw-r--r-- | zebra/interface.c | 2 | ||||
-rw-r--r-- | zebra/irdp_packet.c | 6 | ||||
-rw-r--r-- | zebra/kernel_socket.c | 8 | ||||
-rw-r--r-- | zebra/main.c | 4 | ||||
-rw-r--r-- | zebra/rt_ioctl.c | 2 | ||||
-rw-r--r-- | zebra/rt_netlink.c | 2 | ||||
-rw-r--r-- | zebra/rtadv.c | 6 | ||||
-rw-r--r-- | zebra/test_main.c | 6 | ||||
-rw-r--r-- | zebra/zebra_rib.c | 20 | ||||
-rw-r--r-- | zebra/zebra_routemap.c | 10 | ||||
-rw-r--r-- | zebra/zebra_snmp.c | 6 | ||||
-rw-r--r-- | zebra/zebra_vty.c | 2 | ||||
-rw-r--r-- | zebra/zserv.c | 16 |
15 files changed, 48 insertions, 48 deletions
diff --git a/zebra/connected.c b/zebra/connected.c index 4802f2ba..c4f87f4c 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -36,7 +36,7 @@ #include "zebra/interface.h" #include "zebra/connected.h" extern struct zebra_t zebrad; - + /* communicate the withdrawal of a connected address */ static void connected_withdraw (struct connected *ifc) @@ -96,7 +96,7 @@ connected_announce (struct interface *ifp, struct connected *ifc) #endif } } - + /* If same interface address is already exist... */ struct connected * connected_check (struct interface *ifp, struct prefix *p) diff --git a/zebra/if_proc.c b/zebra/if_proc.c index 3aec530b..2dbc4726 100644 --- a/zebra/if_proc.c +++ b/zebra/if_proc.c @@ -198,7 +198,7 @@ interface_list_proc () fclose(fp); return 0; } - + #if defined(HAVE_IPV6) && defined(HAVE_PROC_NET_IF_INET6) #ifndef _PATH_PROC_NET_IF_INET6 diff --git a/zebra/interface.c b/zebra/interface.c index 155ee029..7e1d3dd8 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1206,7 +1206,7 @@ ALIAS (no_bandwidth_if, NO_STR "Set bandwidth informational parameter\n" "Bandwidth in kilobits\n") - + static int ip_address_install (struct vty *vty, struct interface *ifp, const char *addr_str, const char *peer_str, diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 50525043..0d31050c 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -184,7 +184,7 @@ parse_irdp_packet(char *p, inet_ntoa (src)); } } - + static int irdp_recvmsg (int sock, u_char *buf, int size, int *ifindex) { @@ -222,7 +222,7 @@ irdp_recvmsg (int sock, u_char *buf, int size, int *ifindex) return ret; } - + int irdp_read_raw(struct thread *r) { struct interface *ifp; @@ -264,7 +264,7 @@ int irdp_read_raw(struct thread *r) return ret; } - + void send_packet(struct interface *ifp, struct stream *s, diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 37b2ae23..3dbeb98b 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -252,7 +252,7 @@ af_check (int family) #endif /* HAVE_IPV6 */ return 0; } - + /* Dump routing table flag for debug purpose. */ static void rtm_flag_dump (int flag) @@ -557,7 +557,7 @@ ifm_read (struct if_msghdr *ifm) return 0; } - + /* Address read from struct ifa_msghdr. */ static void ifam_read_mesg (struct ifa_msghdr *ifm, @@ -751,7 +751,7 @@ ifam_read (struct ifa_msghdr *ifam) return 0; } - + /* Interface function for reading kernel routing table information. */ static int rtm_read_mesg (struct rt_msghdr *rtm, @@ -1128,7 +1128,7 @@ rtm_write (int message, return ZEBRA_ERR_NOERROR; } - + #include "thread.h" #include "zebra/zserv.h" diff --git a/zebra/main.c b/zebra/main.c index 523b1911..d7f2a108 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -151,7 +151,7 @@ usage (char *progname, int status) exit (status); } - + /* SIGHUP handler. */ static void sighup (void) @@ -203,7 +203,7 @@ struct quagga_signal_t zebra_signals[] = .handler = &sigint, }, }; - + /* Main startup routine. */ int main (int argc, char **argv) diff --git a/zebra/rt_ioctl.c b/zebra/rt_ioctl.c index 404a7c69..e175d1e2 100644 --- a/zebra/rt_ioctl.c +++ b/zebra/rt_ioctl.c @@ -332,7 +332,7 @@ kernel_delete_ipv4 (struct prefix *p, struct rib *rib) { return kernel_ioctl_ipv4 (SIOCDELRT, p, rib, AF_INET); } - + #ifdef HAVE_IPV6 /* Below is hack for GNU libc definition and Linux 2.1.X header. */ diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 6a802f69..452ea642 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1848,7 +1848,7 @@ kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate, dest->prefixlen, gate, index, flags, table); } #endif /* HAVE_IPV6 */ - + /* Interface address modification. */ static int netlink_address (int cmd, int family, struct interface *ifp, diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 91d7b324..21ca6da9 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -66,7 +66,7 @@ static void rtadv_event (enum rtadv_event, int); static int if_join_all_router (int, struct interface *); static int if_leave_all_router (int, struct interface *); - + /* Structure which hold status of router advertisement. */ struct rtadv { @@ -80,7 +80,7 @@ struct rtadv }; struct rtadv *rtadv = NULL; - + static struct rtadv * rtadv_new (void) { @@ -580,7 +580,7 @@ rtadv_make_socket (void) return sock; } - + static struct rtadv_prefix * rtadv_prefix_new (void) { diff --git a/zebra/test_main.c b/zebra/test_main.c index c6951729..f98bb419 100644 --- a/zebra/test_main.c +++ b/zebra/test_main.c @@ -103,7 +103,7 @@ usage (char *progname, int status) exit (status); } - + static unsigned int test_ifindex = 0; /* testrib commands */ @@ -149,7 +149,7 @@ test_cmd_init (void) { install_element (INTERFACE_NODE, &test_interface_state_cmd); } - + /* SIGHUP handler. */ static void sighup (void) @@ -195,7 +195,7 @@ struct quagga_signal_t zebra_signals[] = .handler = &sigint, }, }; - + /* Main startup routine. */ int main (int argc, char **argv) diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 8835ef37..dc7e1ca1 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -71,7 +71,7 @@ static const struct [ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 95}, /* no entry/default: 150 */ }; - + /* Vector for routing table. */ static vector vrf_vector; @@ -176,7 +176,7 @@ vrf_static_table (afi_t afi, safi_t safi, u_int32_t id) return vrf->stable[afi][safi]; } - + /* * nexthop_type_to_str */ @@ -1090,7 +1090,7 @@ nexthop_active_update (struct route_node *rn, struct rib *rib, int set) return rib->nexthop_active_num; } - + static void rib_install_kernel (struct route_node *rn, struct rib *rib) @@ -2283,7 +2283,7 @@ rib_delete_ipv4 (int type, int flags, struct prefix_ipv4 *p, route_unlock_node (rn); return 0; } - + /* Install static route into rib. */ static void static_install_ipv4 (struct prefix *p, struct static_ipv4 *si) @@ -2596,7 +2596,7 @@ static_delete_ipv4 (struct prefix *p, struct in_addr *gate, const char *ifname, return 1; } - + #ifdef HAVE_IPV6 static int rib_bogus_ipv6 (int type, struct prefix_ipv6 *p, @@ -2857,7 +2857,7 @@ rib_delete_ipv6 (int type, int flags, struct prefix_ipv6 *p, route_unlock_node (rn); return 0; } - + /* Install static route into rib. */ static void static_install_ipv6 (struct prefix *p, struct static_ipv6 *si) @@ -3155,7 +3155,7 @@ static_delete_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate, return 1; } #endif /* HAVE_IPV6 */ - + /* RIB update function. */ void rib_update (void) @@ -3176,7 +3176,7 @@ rib_update (void) rib_queue_add (&zebrad, rn); } - + /* Remove all routes which comes from non main table. */ static void rib_weed_table (struct route_table *table) @@ -3205,7 +3205,7 @@ rib_weed_tables (void) rib_weed_table (vrf_table (AFI_IP, SAFI_UNICAST, 0)); rib_weed_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0)); } - + /* Delete self installed routes after zebra is relaunched. */ static void rib_sweep_table (struct route_table *table) @@ -3301,7 +3301,7 @@ rib_close (void) rib_close_table (vrf_table (AFI_IP, SAFI_UNICAST, 0)); rib_close_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0)); } - + /* Routing information base initialize. */ void rib_init (void) diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 39c7e1bf..b0dca088 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -123,7 +123,7 @@ zebra_route_set_delete (struct vty *vty, struct route_map_index *index, return CMD_SUCCESS; } - + /* `match interface IFNAME' */ /* Match function return 1 if match is success else return zero. */ static route_map_result_t @@ -467,7 +467,7 @@ static struct route_map_rule_cmd route_match_ip_next_hop_cmd = route_match_ip_next_hop_compile, route_match_ip_next_hop_free }; - + /* `match ip next-hop prefix-list PREFIX_LIST' */ static route_map_result_t @@ -525,7 +525,7 @@ static struct route_map_rule_cmd route_match_ip_next_hop_prefix_list_cmd = route_match_ip_next_hop_prefix_list_compile, route_match_ip_next_hop_prefix_list_free }; - + /* `match ip address IP_ACCESS_LIST' */ /* Match function should return 1 if match is success else return @@ -571,7 +571,7 @@ static struct route_map_rule_cmd route_match_ip_address_cmd = route_match_ip_address_compile, route_match_ip_address_free }; - + /* `match ip address prefix-list PREFIX_LIST' */ static route_map_result_t @@ -612,7 +612,7 @@ static struct route_map_rule_cmd route_match_ip_address_prefix_list_cmd = route_match_ip_address_prefix_list_free }; - + /* `set src A.B.C.D' */ /* Set src. */ diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index e06e1443..f0d3e7e5 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -34,7 +34,7 @@ #include "zebra/rib.h" #include "zebra/zserv.h" - + #define IPFWMIB 1,3,6,1,2,1,4,24 /* ipForwardTable */ @@ -78,7 +78,7 @@ #define ROWSTATUS ASN_INTEGER #define IPADDRESS ASN_IPADDRESS #define OBJECTIDENTIFIER ASN_OBJECT_ID - + extern struct zebra_t zebrad; oid ipfw_oid [] = { IPFWMIB }; @@ -130,7 +130,7 @@ struct variable zebra_variables[] = {IPCIDRROUTESTATUS, ROWSTATUS, RONLY, ipCidrTable, 3, {4, 1, 16}} }; - + static u_char * ipFwNumber (struct variable *v, oid objid[], size_t *objid_len, int exact, size_t *val_len, WriteMethod **write_method) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index f4946f46..baa60db9 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1210,7 +1210,7 @@ DEFUN (show_ip_mroute, return CMD_SUCCESS; } - + #ifdef HAVE_IPV6 /* General fucntion for IPv6 static route. */ static int diff --git a/zebra/zserv.c b/zebra/zserv.c index 55ac6e4f..ca17c2c6 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -42,7 +42,7 @@ #include "zebra/redistribute.h" #include "zebra/debug.h" #include "zebra/ipforward.h" - + /* Event list of zebra. */ enum event { ZEBRA_SERV, ZEBRA_READ, ZEBRA_WRITE }; @@ -51,7 +51,7 @@ extern struct zebra_t zebrad; static void zebra_event (enum event event, int sock, struct zserv *client); extern struct zebra_privs_t zserv_privs; - + static void zebra_client_close (struct zserv *client); static int @@ -661,7 +661,7 @@ zsend_ipv4_import_lookup (struct zserv *client, struct prefix_ipv4 *p) return zebra_server_send_message(client); } - + /* Router-id is updated. Send ZEBRA_ROUTER_ID_ADD to client. */ int zsend_router_id_update (struct zserv *client, struct prefix *p) @@ -690,7 +690,7 @@ zsend_router_id_update (struct zserv *client, struct prefix *p) return zebra_server_send_message(client); } - + /* Register zebra server interface information. Send current all interface and address information. */ static int @@ -1539,7 +1539,7 @@ zebra_serv_un (const char *path) zebra_event (ZEBRA_SERV, sock, NULL); } - + static void zebra_event (enum event event, int sock, struct zserv *client) @@ -1558,7 +1558,7 @@ zebra_event (enum event event, int sock, struct zserv *client) break; } } - + /* Display default rtm_table for all clients. */ DEFUN (show_table, show_table_cmd, @@ -1658,7 +1658,7 @@ static struct cmd_node table_node = "", /* This node has no interface. */ 1 }; - + /* Only display ip forwarding is enabled or not. */ DEFUN (show_ip_forwarding, show_ip_forwarding_cmd, @@ -1779,7 +1779,7 @@ static struct cmd_node forwarding_node = 1 }; - + /* Initialisation of zebra and installation of commands. */ void zebra_init (void) |