proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 13:51:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vrrpd: interface support

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-12-03 22:29:02 +00:00
parent 0ae3b19ca6
commit a8144d7fc8
6 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vrrpd/vrrp.c
View File

@ -149,6 +149,7 @@ static int vrrp_socket(struct vrrp_vrouter *vr)
{ {
struct ip_mreqn req; struct ip_mreqn req;
int ret; int ret;
struct connected *c;
vr->sock = socket(AF_INET, SOCK_RAW, IPPROTO_VRRP); vr->sock = socket(AF_INET, SOCK_RAW, IPPROTO_VRRP);
@ -159,7 +160,10 @@ static int vrrp_socket(struct vrrp_vrouter *vr)
/* Join the multicast group.*/ /* Join the multicast group.*/
/* FIXME: Use first address on the interface and for imr_interface */ /* FIXME: Use first address on the interface and for imr_interface */
struct connected *c = listhead(vr->ifp->connected)->data; if (!listcount(vr->ifp->connected))
return -1;
c = listhead(vr->ifp->connected)->data;
struct in_addr v4 = c->address->u.prefix4; struct in_addr v4 = c->address->u.prefix4;
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
@ -277,10 +281,14 @@ static int vrrp_master_down_timer_expire(struct thread *thread)
* vr * vr
* Virtual Router on which to apply Startup event * Virtual Router on which to apply Startup event
*/ */
static void vrrp_startup(struct vrrp_vrouter *vr) static int vrrp_startup(struct vrrp_vrouter *vr)
{ {
/* Create socket */ /* Create socket */
vrrp_socket(vr); int ret = vrrp_socket(vr);
if (ret < 0) {
zlog_warn("Cannot create VRRP socket\n");
return ret;
}
/* Schedule listener */ /* Schedule listener */
/* ... */ /* ... */
@ -301,14 +309,17 @@ static void vrrp_startup(struct vrrp_vrouter *vr)
&vr->t_master_down_timer); &vr->t_master_down_timer);
vrrp_change_state(vr, VRRP_STATE_BACKUP); vrrp_change_state(vr, VRRP_STATE_BACKUP);
} }
return 0;
} }
static void vrrp_shutdown(struct vrrp_vrouter *vr) static int vrrp_shutdown(struct vrrp_vrouter *vr)
{ {
/* NOTHING */ /* NOTHING */
return 0;
} }
static void (*vrrp_event_handlers[])(struct vrrp_vrouter *vr) = { static int (*vrrp_event_handlers[])(struct vrrp_vrouter *vr) = {
[VRRP_EVENT_STARTUP] = vrrp_startup, [VRRP_EVENT_STARTUP] = vrrp_startup,
[VRRP_EVENT_SHUTDOWN] = vrrp_shutdown, [VRRP_EVENT_SHUTDOWN] = vrrp_shutdown,
}; };
@ -322,9 +333,9 @@ static void (*vrrp_event_handlers[])(struct vrrp_vrouter *vr) = {
* event * event
* The event to spawn * The event to spawn
*/ */
void vrrp_event(struct vrrp_vrouter *vr, int event) int vrrp_event(struct vrrp_vrouter *vr, int event)
{ {
vrrp_event_handlers[event](vr); return vrrp_event_handlers[event](vr);
} }

3
vrrpd/vrrp.h
View File

@ -135,7 +135,6 @@ struct vrrp_vrouter {
#define VRRP_EVENT_SHUTDOWN 2 #define VRRP_EVENT_SHUTDOWN 2
DECLARE_HOOK(vrrp_change_state_hook, (struct vrrp_vrouter *vr, int to), (vr, to)); DECLARE_HOOK(vrrp_change_state_hook, (struct vrrp_vrouter *vr, int to), (vr, to));
void vrrp_event(struct vrrp_vrouter *vr, int event);
/* End state machine */ /* End state machine */
@ -157,6 +156,6 @@ struct vrrp_vrouter *vrrp_lookup(uint8_t vrid);
/* /*
* Trigger VRRP event * Trigger VRRP event
*/ */
void vrrp_event(struct vrrp_vrouter *vr, int event); int vrrp_event(struct vrrp_vrouter *vr, int event);
#endif /* _VRRP_H */ #endif /* _VRRP_H */

2
vrrpd/vrrp_main.c
View File

@ -31,6 +31,7 @@
#include "vrf.h" #include "vrf.h"
#include "nexthop.h" #include "nexthop.h"
#include "filter.h" #include "filter.h"
#include "if.h"
#include "vrrp.h" #include "vrrp.h"
#include "vrrp_zebra.h" #include "vrrp_zebra.h"
@ -98,6 +99,7 @@ struct quagga_signal_t vrrp_signals[] = {
}; };
static const struct frr_yang_module_info *vrrp_yang_modules[] = { static const struct frr_yang_module_info *vrrp_yang_modules[] = {
&frr_interface_info,
}; };
#define VRRP_VTY_PORT 2617 #define VRRP_VTY_PORT 2617

7
vrrpd/vrrp_vty.c
View File

@ -61,7 +61,11 @@ DEFUN(vrrp_vrid,
vrid = strtoul(argv[idx]->arg, NULL, 10); vrid = strtoul(argv[idx]->arg, NULL, 10);
struct vrrp_vrouter *vr = vrrp_vrouter_create(ifp, vrid); struct vrrp_vrouter *vr = vrrp_vrouter_create(ifp, vrid);
vrrp_event(vr, VRRP_EVENT_STARTUP); int ret = vrrp_event(vr, VRRP_EVENT_STARTUP);
if (ret < 0) {
vty_out(vty, "%% Failed to start VRRP instance\n");
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -76,5 +80,6 @@ void vrrp_vty_init(void)
install_node(&interface_node, NULL); install_node(&interface_node, NULL);
if_cmd_init(); if_cmd_init();
install_element(VIEW_NODE, &show_debugging_vrrpd_cmd); install_element(VIEW_NODE, &show_debugging_vrrpd_cmd);
install_element(ENABLE_NODE, &show_debugging_vrrpd_cmd);
install_element(INTERFACE_NODE, &vrrp_vrid_cmd); install_element(INTERFACE_NODE, &vrrp_vrid_cmd);
} }

1
vtysh/vtysh.c
View File

@ -137,6 +137,7 @@ struct vtysh_client vtysh_client[] = {
{.fd = -1, .name = "pbrd", .flag = VTYSH_PBRD, .next = NULL}, {.fd = -1, .name = "pbrd", .flag = VTYSH_PBRD, .next = NULL},
{.fd = -1, .name = "staticd", .flag = VTYSH_STATICD, .next = NULL}, {.fd = -1, .name = "staticd", .flag = VTYSH_STATICD, .next = NULL},
{.fd = -1, .name = "bfdd", .flag = VTYSH_BFDD, .next = NULL}, {.fd = -1, .name = "bfdd", .flag = VTYSH_BFDD, .next = NULL},
{.fd = -1, .name = "vrrpd", .flag = VTYSH_VRRPD, .next = NULL},
}; };
enum vtysh_write_integrated vtysh_write_integrated = enum vtysh_write_integrated vtysh_write_integrated =

4
vtysh/vtysh.h
View File

@ -51,9 +51,9 @@ DECLARE_MGROUP(MVTYSH)
/* watchfrr is not in ALL since library CLI functions should not be /* watchfrr is not in ALL since library CLI functions should not be
* run on it (logging & co. should stay in a fixed/frozen config, and * run on it (logging & co. should stay in a fixed/frozen config, and
* things like prefix lists are not even initialised) */ * things like prefix lists are not even initialised) */
#define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_SHARPD|VTYSH_PBRD|VTYSH_STATICD|VTYSH_BFDD|VTYSH_FABRICD #define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_SHARPD|VTYSH_PBRD|VTYSH_STATICD|VTYSH_BFDD|VTYSH_FABRICD|VTYSH_VRRPD
#define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_SHARPD|VTYSH_FABRICD #define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_SHARPD|VTYSH_FABRICD
#define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_PBRD|VTYSH_FABRICD #define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_PBRD|VTYSH_FABRICD|VTYSH_VRRPD
#define VTYSH_NS VTYSH_ZEBRA #define VTYSH_NS VTYSH_ZEBRA
#define VTYSH_VRF VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_STATICD #define VTYSH_VRF VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_STATICD
#define VTYSH_KEYS VTYSH_RIPD|VTYSH_EIGRPD #define VTYSH_KEYS VTYSH_RIPD|VTYSH_EIGRPD