proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 22:23:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hasso Tepper

Browse Source 
http://hasso.linux.ee/zebra/ht-ifrmap-14042003.patch
Allows to extract.pl to pickup "route-map xxx in/out dev" commands for vtysh
(ripngd). As lib/if_rmap.[c|h] are used in ripngd only, I moved them to the
ripngd/ directory.
This commit is contained in:
paul 2003-04-19 15:54:03 +00:00
parent 73ffb25bec
commit 41ce926cb4
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.am
View File

@ -10,7 +10,7 @@ libzebra_a_SOURCES = \
print_version.c checksum.c vector.c linklist.c vty.c command.c \ print_version.c checksum.c vector.c linklist.c vty.c command.c \
sockunion.c prefix.c thread.c if.c memory.c buffer.c table.c hash.c \ sockunion.c prefix.c thread.c if.c memory.c buffer.c table.c hash.c \
filter.c routemap.c distribute.c stream.c str.c log.c plist.c \ filter.c routemap.c distribute.c stream.c str.c log.c plist.c \
zclient.c sockopt.c smux.c md5.c if_rmap.c keychain.c zclient.c sockopt.c smux.c md5.c keychain.c
libzebra_a_DEPENDENCIES = @LIB_REGEX@ libzebra_a_DEPENDENCIES = @LIB_REGEX@
@ -20,7 +20,7 @@ noinst_HEADERS = \
buffer.h command.h filter.h getopt.h hash.h if.h linklist.h log.h \ buffer.h command.h filter.h getopt.h hash.h if.h linklist.h log.h \
memory.h network.h prefix.h routemap.h distribute.h sockunion.h \ memory.h network.h prefix.h routemap.h distribute.h sockunion.h \
str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \ str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \
plist.h zclient.h sockopt.h smux.h md5-gnu.h if_rmap.h keychain.h plist.h zclient.h sockopt.h smux.h md5-gnu.h keychain.h
EXTRA_DIST = regex.c regex-gnu.h EXTRA_DIST = regex.c regex-gnu.h

4
ripngd/Makefile.am
View File

@ -9,10 +9,10 @@ sbin_PROGRAMS = ripngd
libripng_a_SOURCES = \ libripng_a_SOURCES = \
ripng_interface.c ripngd.c ripng_zebra.c ripng_route.c ripng_debug.c \ ripng_interface.c ripngd.c ripng_zebra.c ripng_route.c ripng_debug.c \
ripng_routemap.c ripng_routemap.c ripng_ifrmap.c
noinst_HEADERS = \ noinst_HEADERS = \
ripng_debug.h ripng_route.h ripngd.h ripng_debug.h ripng_route.h ripngd.h ripng_ifrmap.h
ripngd_SOURCES = \ ripngd_SOURCES = \
ripng_main.c $(libripng_a_SOURCES) ripng_main.c $(libripng_a_SOURCES)

8
lib/if_rmap.c → ripngd/ripng_ifrmap.c
View File

@ -25,7 +25,7 @@
#include "command.h" #include "command.h"
#include "memory.h" #include "memory.h"
#include "if.h" #include "if.h"
#include "if_rmap.h" #include "ripng_ifrmap.h"
struct hash *ifrmaphash; struct hash *ifrmaphash;
@ -296,10 +296,10 @@ if_rmap_reset ()
} }
void void
if_rmap_init (int node) if_rmap_init (void)
{ {
ifrmaphash = hash_create (if_rmap_hash_make, if_rmap_hash_cmp); ifrmaphash = hash_create (if_rmap_hash_make, if_rmap_hash_cmp);
install_element (node, &if_rmap_cmd); install_element (RIPNG_NODE, &if_rmap_cmd);
install_element (node, &no_if_rmap_cmd); install_element (RIPNG_NODE, &no_if_rmap_cmd);
} }

2
lib/if_rmap.h → ripngd/ripng_ifrmap.h
View File

@ -37,7 +37,7 @@ struct if_rmap
char *routemap[IF_RMAP_MAX]; char *routemap[IF_RMAP_MAX];
}; };
void if_rmap_init (int); void if_rmap_init (void);
void if_rmap_reset (void); void if_rmap_reset (void);
void if_rmap_hook_add (void (*) (struct if_rmap *)); void if_rmap_hook_add (void (*) (struct if_rmap *));
void if_rmap_hook_delete (void (*) (struct if_rmap *)); void if_rmap_hook_delete (void (*) (struct if_rmap *));

6
ripngd/ripngd.c
View File

@ -37,11 +37,11 @@
#include "distribute.h" #include "distribute.h"
#include "plist.h" #include "plist.h"
#include "routemap.h" #include "routemap.h"
#include "if_rmap.h"
#include "ripngd/ripngd.h" #include "ripngd/ripngd.h"
#include "ripngd/ripng_route.h" #include "ripngd/ripng_route.h"
#include "ripngd/ripng_debug.h" #include "ripngd/ripng_debug.h"
#include "ripngd/ripng_ifrmap.h"
#define min(a, b) ((a) < (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b))
@ -535,7 +535,7 @@ ripng_route_process (struct rte *rte, struct sockaddr_in6 *from,
int ret; int ret;
struct ripng_info newinfo; struct ripng_info newinfo;
memset (&rinfo, 0, sizeof (struct ripng_info)); memset (&newinfo, 0, sizeof (struct ripng_info));
newinfo.metric = rte->metric; newinfo.metric = rte->metric;
ret = route_map_apply (ri->routemap[RIPNG_FILTER_IN], ret = route_map_apply (ri->routemap[RIPNG_FILTER_IN],
@ -2520,7 +2520,7 @@ ripng_init ()
route_map_add_hook (ripng_routemap_update); route_map_add_hook (ripng_routemap_update);
route_map_delete_hook (ripng_routemap_update); route_map_delete_hook (ripng_routemap_update);
if_rmap_init (RIPNG_NODE); if_rmap_init ();
if_rmap_hook_add (ripng_if_rmap_update); if_rmap_hook_add (ripng_if_rmap_update);
if_rmap_hook_delete (ripng_if_rmap_update); if_rmap_hook_delete (ripng_if_rmap_update);
} }