From eae66741eceec687d4e7360b098612e65a23f1c1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 27 May 2007 15:47:43 +1000 Subject: [PATCH] send on the right socket! (This used to be ctdb commit 2a5253a9da4d0144f4e96d9b8f6ac636849d146a) --- ctdb/takeover/ctdb_takeover.c | 4 ++-- ctdb/takeover/system.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctdb/takeover/ctdb_takeover.c b/ctdb/takeover/ctdb_takeover.c index 220cd56ae7f..92376e9e3f5 100644 --- a/ctdb/takeover/ctdb_takeover.c +++ b/ctdb/takeover/ctdb_takeover.c @@ -68,9 +68,9 @@ static void ctdb_control_send_arp(struct event_context *ev, struct timed_event * for (tcp=arp->tcp_list;tcp;tcp=tcp->next) { DEBUG(0,("sending tcp tickle ack for %u->%s:%u\n", - (unsigned)tcp->daddr.sin_port, + (unsigned)ntohs(tcp->daddr.sin_port), inet_ntoa(tcp->saddr.sin_addr), - (unsigned)tcp->saddr.sin_port)); + (unsigned)ntohs(tcp->saddr.sin_port))); ret = ctdb_sys_send_ack(&tcp->daddr, &tcp->saddr); if (ret != 0) { DEBUG(0,(__location__ " Failed to send tcp tickle ack for %s\n", diff --git a/ctdb/takeover/system.c b/ctdb/takeover/system.c index b16b96343b4..71df1ee3dd1 100644 --- a/ctdb/takeover/system.c +++ b/ctdb/takeover/system.c @@ -197,7 +197,7 @@ int ctdb_sys_send_ack(const struct sockaddr_in *dest, pkt.tcp.ack = 1; pkt.tcp.check = 0; - ret = sendto(3, &pkt, sizeof(pkt), 0, dest, sizeof(*dest)); + ret = sendto(s, &pkt, sizeof(pkt), 0, dest, sizeof(*dest)); if (ret != 0) { DEBUG(0,(__location__ " failed sendto (%s)\n", strerror(errno))); } -- 2.47.3