evolix/uvrrpd
21
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

vrrp_exec.c : use vrrp_adv_addr_to_str()

Browse source
This commit is contained in:
Arnaud Andre 2015-09-12 13:32:05 +02:00
parent 7a26ce75c0
commit 7ccf2f1a85
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vrrp_exec.c
View file

@ -39,6 +39,7 @@
* 1 IPv6 = 45 bytes in a string format
*/
#define SCRIPT_ARG_MAX INET6_ADDRSTRLEN * NI_MAXHOST
#define ADDRSTRLEN INET6_ADDRSTRLEN
#define SCRIPT_NARGS 10
/**
@ -81,7 +82,6 @@ static int vrrp_build_args(const char *scriptname, char **argv,
/* serialize vipaddrs
* ip0,ip1,...,ipn */
//argv[7] = '\0';
int argv_ips = SCRIPT_NARGS - 2;
memset(argv[argv_ips], 0, strlen(argv[argv_ips]));
int plen = 0;
@ -91,19 +91,10 @@ static int vrrp_build_args(const char *scriptname, char **argv,
if (plen != 0)
argv[argv_ips][plen] = ',';
if (vnet->family == AF_INET)
snprintf(argv[argv_ips] + strlen(argv[argv_ips]),
SCRIPT_ARG_MAX - plen + 1, "%s",
inet_ntoa(vip_ptr->ip_addr));
if (vnet->family == AF_INET6) {
char straddr[INET6_ADDRSTRLEN];
snprintf(argv[argv_ips] + strlen(argv[argv_ips]),
SCRIPT_ARG_MAX - plen + 1, "%s",
inet_ntop(AF_INET6, &vip_ptr->ip_addr6,
straddr, INET6_ADDRSTRLEN));
}
char straddr[ADDRSTRLEN];
snprintf(argv[argv_ips] + strlen(argv[argv_ips]),
SCRIPT_ARG_MAX - plen + 1, "%s",
vnet->ipx_to_str(&vip_ptr->ipx, straddr));
}
/* the last elmt must be NULL */