diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2019-04-24 11:10:27 +0200 | 
|---|---|---|
| committer | Philippe Guibert <philippe.guibert@6wind.com> | 2019-05-07 16:01:47 +0200 | 
| commit | f21536d2f0bc7ef8ab2207a04eba2accd55b9254 (patch) | |
| tree | 872c5fdd7217b62e4d759b73dba594e6a0a662e2 /bfdd/bfd_packet.c | |
| parent | c3771c91faa628a556ac19acbc8329806dbbba12 (diff) | |
bfd: add bfdd_privs to the bglobal structure
this structure contains the bfdd_privs structure in charge of the
privilege settings. The initialisation has moved a bit, in order that
the preinit settings are done.
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Diffstat (limited to 'bfdd/bfd_packet.c')
| -rw-r--r-- | bfdd/bfd_packet.c | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c index 58ae5bb4f1..8edba05d12 100644 --- a/bfdd/bfd_packet.c +++ b/bfdd/bfd_packet.c @@ -883,7 +883,7 @@ int bp_udp_shop(vrf_id_t vrf_id)  {  	int sd; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		sd = vrf_socket(AF_INET, SOCK_DGRAM, PF_UNSPEC, vrf_id, NULL);  	}  	if (sd == -1) @@ -898,7 +898,7 @@ int bp_udp_mhop(vrf_id_t vrf_id)  {  	int sd; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		sd = vrf_socket(AF_INET, SOCK_DGRAM, PF_UNSPEC, vrf_id, NULL);  	}  	if (sd == -1) @@ -923,7 +923,7 @@ int bp_peer_socket(const struct bfd_session *bs)  	    && bs->key.vrfname[0])  		device_to_bind = (const char *)bs->key.vrfname; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		sd = vrf_socket(AF_INET, SOCK_DGRAM, PF_UNSPEC,  				bs->vrf->vrf_id, device_to_bind);  	} @@ -990,7 +990,7 @@ int bp_peer_socketv6(const struct bfd_session *bs)  	    && bs->key.vrfname[0])  		device_to_bind = (const char *)bs->key.vrfname; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		sd = vrf_socket(AF_INET6, SOCK_DGRAM, PF_UNSPEC,  				bs->vrf->vrf_id, device_to_bind);  	} @@ -1110,7 +1110,7 @@ int bp_udp6_shop(vrf_id_t vrf_id)  {  	int sd; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		sd = vrf_socket(AF_INET6, SOCK_DGRAM, PF_UNSPEC, vrf_id, NULL);  	}  	if (sd == -1) @@ -1126,7 +1126,7 @@ int bp_udp6_mhop(vrf_id_t vrf_id)  {  	int sd; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		sd = vrf_socket(AF_INET6, SOCK_DGRAM, PF_UNSPEC, vrf_id, NULL);  	}  	if (sd == -1) @@ -1142,7 +1142,7 @@ int bp_echo_socket(vrf_id_t vrf_id)  {  	int s; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		s = vrf_socket(AF_INET, SOCK_DGRAM, 0, vrf_id, NULL);  	}  	if (s == -1) @@ -1158,7 +1158,7 @@ int bp_echov6_socket(vrf_id_t vrf_id)  {  	int s; -	frr_elevate_privs(&bfdd_privs) { +	frr_elevate_privs(&bglobal.bfdd_privs) {  		s = vrf_socket(AF_INET6, SOCK_DGRAM, 0, vrf_id, NULL);  	}  	if (s == -1)  | 
