vrrp_exec.c : use vrrp_adv_addr_to_str()
This commit is contained in:
parent
7a26ce75c0
commit
7ccf2f1a85
15
vrrp_exec.c
15
vrrp_exec.c
|
@ -39,6 +39,7 @@
|
||||||
* 1 IPv6 = 45 bytes in a string format
|
* 1 IPv6 = 45 bytes in a string format
|
||||||
*/
|
*/
|
||||||
#define SCRIPT_ARG_MAX INET6_ADDRSTRLEN * NI_MAXHOST
|
#define SCRIPT_ARG_MAX INET6_ADDRSTRLEN * NI_MAXHOST
|
||||||
|
#define ADDRSTRLEN INET6_ADDRSTRLEN
|
||||||
#define SCRIPT_NARGS 10
|
#define SCRIPT_NARGS 10
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -81,7 +82,6 @@ static int vrrp_build_args(const char *scriptname, char **argv,
|
||||||
|
|
||||||
/* serialize vipaddrs
|
/* serialize vipaddrs
|
||||||
* ip0,ip1,...,ipn */
|
* ip0,ip1,...,ipn */
|
||||||
//argv[7] = '\0';
|
|
||||||
int argv_ips = SCRIPT_NARGS - 2;
|
int argv_ips = SCRIPT_NARGS - 2;
|
||||||
memset(argv[argv_ips], 0, strlen(argv[argv_ips]));
|
memset(argv[argv_ips], 0, strlen(argv[argv_ips]));
|
||||||
int plen = 0;
|
int plen = 0;
|
||||||
|
@ -91,19 +91,10 @@ static int vrrp_build_args(const char *scriptname, char **argv,
|
||||||
if (plen != 0)
|
if (plen != 0)
|
||||||
argv[argv_ips][plen] = ',';
|
argv[argv_ips][plen] = ',';
|
||||||
|
|
||||||
if (vnet->family == AF_INET)
|
char straddr[ADDRSTRLEN];
|
||||||
snprintf(argv[argv_ips] + strlen(argv[argv_ips]),
|
snprintf(argv[argv_ips] + strlen(argv[argv_ips]),
|
||||||
SCRIPT_ARG_MAX - plen + 1, "%s",
|
SCRIPT_ARG_MAX - plen + 1, "%s",
|
||||||
inet_ntoa(vip_ptr->ip_addr));
|
vnet->ipx_to_str(&vip_ptr->ipx, straddr));
|
||||||
|
|
||||||
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));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* the last elmt must be NULL */
|
/* the last elmt must be NULL */
|
||||||
|
|
Loading…
Reference in a new issue