diff options
author | Matthieu Boutier <boutier@pps.jussieu.fr> | 2012-01-06 23:09:23 +0100 |
---|---|---|
committer | Paul Jakma <paul@quagga.net> | 2012-03-25 17:06:52 +0100 |
commit | 089082b5d51c41a4498edb6a3f495ade0d517e73 (patch) | |
tree | af876f1c7fcbd3077ffcce8c76e031c226b654cf | |
parent | 5734509c0545ebd95a5b8e3f22a911c1a39ffa1b (diff) |
babeld: clean kernel_zebra (old functions, fields...).
-rw-r--r-- | babeld/kernel.h | 13 | ||||
-rw-r--r-- | babeld/kernel_zebra.c | 60 |
2 files changed, 0 insertions, 73 deletions
diff --git a/babeld/kernel.h b/babeld/kernel.h index d9d650dc..e8c8f9b7 100644 --- a/babeld/kernel.h +++ b/babeld/kernel.h @@ -55,28 +55,15 @@ struct kernel_route { #define ROUTE_ADD 1 #define ROUTE_MODIFY 2 -#define CHANGE_LINK (1 << 0) -#define CHANGE_ROUTE (1 << 1) -#define CHANGE_ADDR (1 << 2) - extern int export_table, import_table; -int kernel_setup(int setup); -int kernel_setup_socket(int setup); -int kernel_setup_interface(int setup, struct interface *interface); int kernel_interface_operational(struct interface *interface); -int kernel_interface_ipv4(struct interface *interface, - unsigned char *addr_r); int kernel_interface_mtu(struct interface *interface); int kernel_interface_wireless(struct interface *interface); int kernel_route(int operation, const unsigned char *dest, unsigned short plen, const unsigned char *gate, int ifindex, unsigned int metric, const unsigned char *newgate, int newifindex, unsigned int newmetric); -int kernel_routes(struct kernel_route *routes, int maxroutes); -int kernel_callback(int (*fn)(int, void*), void *closure); -int kernel_addresses(struct interface *interface, int ll, - struct kernel_route *routes, int maxroutes); int if_eui64(char *ifname, int ifindex, unsigned char *eui); int gettime(struct timeval *tv); int read_random_bytes(void *buf, size_t len); diff --git a/babeld/kernel_zebra.c b/babeld/kernel_zebra.c index 0fecb527..82f03e43 100644 --- a/babeld/kernel_zebra.c +++ b/babeld/kernel_zebra.c @@ -80,28 +80,6 @@ kernel_route_delete_v6(const unsigned char *pref, unsigned short plen, const unsigned char *newgate, int newifindex, unsigned int newmetric); - -int export_table = -1, import_table = -1; /* just for compatibility */ - -int -kernel_setup(int setup) -{ - return 0; -} - -/* get a connection with zebra client, at all costs */ -int -kernel_setup_socket(int setup) -{ - return -1; -} - -int -kernel_setup_interface(int setup, struct interface *interface) -{ - return 1; -} - int kernel_interface_operational(struct interface *interface) { @@ -109,13 +87,6 @@ kernel_interface_operational(struct interface *interface) } int -kernel_interface_ipv4(struct interface *interface, unsigned char *addr_r) -{ - assert(0); /* function not used */ - return -1; -} - -int kernel_interface_mtu(struct interface *interface) { return MIN(interface->mtu, interface->mtu6); @@ -127,10 +98,6 @@ kernel_interface_wireless(struct interface *interface) return 0; } -extern int -zapi_ipv6_route (u_char cmd, struct zclient *zclient, - struct prefix_ipv6 *p, struct zapi_ipv6 *api); - int kernel_route(int operation, const unsigned char *pref, unsigned short plen, const unsigned char *gate, int ifindex, unsigned int metric, @@ -401,33 +368,6 @@ kernel_route_delete_v6(const unsigned char *pref, unsigned short plen, } int -kernel_routes(struct kernel_route *routes, int maxroutes) -{ - fprintf(stderr, "\tkernel_routes --- not implemented\n"); - return 0; -} - -int -kernel_callback(int (*fn)(int, void*), void *closure) -{ - struct thread thread; - fprintf(stderr, "\tkernel_callback\n"); - /* do a little work on threads */ - if (thread_fetch(master, &thread) != NULL) { - thread_call (&thread); - } - return 0; -} - -int -kernel_addresses(struct interface *interface, int ll, - struct kernel_route *routes, int maxroutes) -{ - fprintf(stderr, "\tkernel_addresses --- not implemented\n"); - return 0; -} - -int if_eui64(char *ifname, int ifindex, unsigned char *eui) { struct interface *ifp = if_lookup_by_index(ifindex); |