Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

zebra: handle iptable list of interfaces

Browse source 
Upon reception of an iptable_add or iptable_del, a list of interface
indexes may be passed in the zapi interface. The list is converted in
interface name so that it is ready to be passed to be programmed to the
underlying system.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2018-04-25 18:34:27 +02:00
parent 25d760c551
commit f80ec7e3d6
3 changed files with 55 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zebra/zapi_msg.c
View file

@ -2929,6 +2929,7 @@ static inline void zread_iptable(ZAPI_HANDLER_ARGS)
memset(&zpi, 0, sizeof(zpi));
zpi.interface_name_list = list_new();
zpi.sock = client->sock;
zpi.vrf_id = zvrf->vrf->vrf_id;
STREAM_GETL(s, zpi.unique);
@ -2937,6 +2938,8 @@ static inline void zread_iptable(ZAPI_HANDLER_ARGS)
STREAM_GETL(s, zpi.action);
STREAM_GETL(s, zpi.fwmark);
STREAM_GET(&zpi.ipset_name, s, ZEBRA_IPSET_NAME_SIZE);
STREAM_GETL(s, zpi.nb_interface);
zebra_pbr_iptable_update_interfacelist(s, &zpi);
if (hdr->command == ZEBRA_IPTABLE_ADD)
zebra_pbr_add_iptable(zvrf->zns, &zpi);

49
zebra/zebra_pbr.c
View file

@ -23,10 +23,16 @@
#include <jhash.h>
#include <hash.h>
#include <memory.h>
#include "zebra/zebra_pbr.h"
#include "zebra/rt.h"
#include "zebra/zapi_msg.h"
#include "zebra/zebra_memory.h"
#include "zebra_pbr.h"
/* definitions */
DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list")
/* definitions */
static const struct message ipset_type_msg[] = {
@ -246,9 +252,17 @@ int zebra_pbr_ipset_entry_hash_equal(const void *arg1, const void *arg2)
void zebra_pbr_iptable_free(void *arg)
{
struct zebra_pbr_iptable *iptable;
struct listnode *node, *nnode;
char *name;
iptable = (struct zebra_pbr_iptable *)arg;
for (ALL_LIST_ELEMENTS(iptable->interface_name_list,
node, nnode, name)) {
XFREE(MTYPE_PBR_IPTABLE_IFNAME, name);
list_delete_node(iptable->interface_name_list,
node);
}
XFREE(MTYPE_TMP, iptable);
}
@ -548,16 +562,26 @@ void zebra_pbr_add_iptable(struct zebra_ns *zns,
void zebra_pbr_del_iptable(struct zebra_ns *zns,
struct zebra_pbr_iptable *iptable)
{
struct zebra_pbr_ipset_entry *lookup;
struct zebra_pbr_iptable *lookup;
lookup = hash_lookup(zns->iptable_hash, iptable);
/* TODO:
* - call netlink layer
* - detach from iptable list
*/
if (lookup)
if (lookup) {
struct listnode *node, *nnode;
char *name;
hash_release(zns->iptable_hash, lookup);
for (ALL_LIST_ELEMENTS(iptable->interface_name_list,
node, nnode, name)) {
XFREE(MTYPE_PBR_IPTABLE_IFNAME, name);
list_delete_node(iptable->interface_name_list,
node);
}
XFREE(MTYPE_TMP, lookup);
else
} else
zlog_warn("%s: IPTable being deleted we know nothing about",
__PRETTY_FUNCTION__);
}
@ -882,3 +906,22 @@ void zebra_pbr_show_iptable(struct vty *vty)
hash_walk(zns->iptable_hash, zebra_pbr_show_iptable_walkcb,
&env);
}
void zebra_pbr_iptable_update_interfacelist(struct stream *s,
struct zebra_pbr_iptable *zpi)
{
uint32_t i = 0, index;
struct interface *ifp;
char *name;
for (i = 0; i < zpi->nb_interface; i++) {
STREAM_GETL(s, index);
ifp = if_lookup_by_index(index, zpi->vrf_id);
if (!ifp)
continue;
name = XSTRDUP(MTYPE_PBR_IPTABLE_IFNAME, ifp->name);
listnode_add(zpi->interface_name_list, name);
}
stream_failure:
return;
}

6
zebra/zebra_pbr.h
View file

@ -131,6 +131,10 @@ struct zebra_pbr_iptable {
uint32_t action;
uint32_t nb_interface;
struct list *interface_name_list;
char ipset_name[ZEBRA_IPSET_NAME_SIZE];
};
@ -219,5 +223,7 @@ extern int zebra_pbr_iptable_hash_equal(const void *arg1, const void *arg2);
extern void zebra_pbr_init(void);
extern void zebra_pbr_show_ipset_list(struct vty *vty, char *ipsetname);
extern void zebra_pbr_show_iptable(struct vty *vty);
extern void zebra_pbr_iptable_update_interfacelist(struct stream *s,
struct zebra_pbr_iptable *zpi);
#endif /* _ZEBRA_PBR_H */