proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 02:39:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6635 from Niral-Networks/niral_dev_vrf_isis

Browse Source 
ISIS VRF: Added vrf_socket and new param in isisd privileges.
This commit is contained in:
Renato Westphal 2020-06-26 22:23:40 -03:00 committed by GitHub
commit 28aac9c2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
isisd/isis_main.c
View File

@ -66,7 +66,7 @@
#define FABRICD_VTY_PORT 2618 #define FABRICD_VTY_PORT 2618
/* isisd privileges */ /* isisd privileges */
zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND}; zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN};
struct zebra_privs_t isisd_privs = { struct zebra_privs_t isisd_privs = {
#if defined(FRR_USER) #if defined(FRR_USER)

13
isisd/isis_pfpacket.c
View File

@ -32,6 +32,7 @@
#include "stream.h" #include "stream.h"
#include "if.h" #include "if.h"
#include "lib_errors.h" #include "lib_errors.h"
#include "vrf.h"
#include "isisd/isis_constants.h" #include "isisd/isis_constants.h"
#include "isisd/isis_common.h" #include "isisd/isis_common.h"
@ -121,8 +122,18 @@ static int open_packet_socket(struct isis_circuit *circuit)
{ {
struct sockaddr_ll s_addr; struct sockaddr_ll s_addr;
int fd, retval = ISIS_OK; int fd, retval = ISIS_OK;
struct vrf *vrf = NULL;
vrf = vrf_lookup_by_id(circuit->interface->vrf_id);
if (vrf == NULL) {
zlog_warn("open_packet_socket(): failed to find vrf node");
return ISIS_WARNING;
}
fd = vrf_socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL),
circuit->interface->vrf_id, vrf->name);
fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL));
if (fd < 0) { if (fd < 0) {
zlog_warn("open_packet_socket(): socket() failed %s", zlog_warn("open_packet_socket(): socket() failed %s",
safe_strerror(errno)); safe_strerror(errno));