diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2008-06-04 15:13:00 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2008-06-04 15:13:00 +1000 |
| commit | 7d39ac131b520f309bc7b6ff05eac7be58a32f86 (patch) | |
| tree | 0f51fb02d4bee59d811d13447c037f7ba71d6942 /ctdb/client | |
| parent | 1c88f422d54798d22d1f933d04e82dc97cfdfdaf (diff) | |
| download | samba-7d39ac131b520f309bc7b6ff05eac7be58a32f86.tar.gz samba-7d39ac131b520f309bc7b6ff05eac7be58a32f86.tar.xz samba-7d39ac131b520f309bc7b6ff05eac7be58a32f86.zip | |
convert handling of gratious arps and their controls and helpers to
use the ctdb_sock_addr structure so tehy work for both ipv4 and ipv6
(This used to be ctdb commit 86d6f53512d358ff68b58dac737ffa7576c3cce6)
Diffstat (limited to 'ctdb/client')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 04befd05cb..fd9003d107 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -2385,27 +2385,27 @@ int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, - struct sockaddr_in *sin, + ctdb_sock_addr *addr, const char *ifname) { TDB_DATA data; int32_t res; int ret, len; - struct ctdb_control_ip_iface *gratious_arp; + struct ctdb_control_gratious_arp *gratious_arp; TALLOC_CTX *tmp_ctx = talloc_new(ctdb); len = strlen(ifname)+1; gratious_arp = talloc_size(tmp_ctx, - offsetof(struct ctdb_control_ip_iface, iface) + len); + offsetof(struct ctdb_control_gratious_arp, iface) + len); CTDB_NO_MEMORY(ctdb, gratious_arp); - gratious_arp->sin = *sin; + gratious_arp->addr = *addr; gratious_arp->len = len; memcpy(&gratious_arp->iface[0], ifname, len); - data.dsize = offsetof(struct ctdb_control_ip_iface, iface) + len; + data.dsize = offsetof(struct ctdb_control_gratious_arp, iface) + len; data.dptr = (unsigned char *)gratious_arp; ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_SEND_GRATIOUS_ARP, 0, data, NULL, |