ctdb-daemon: Rename struct ctdb_control_tcp_addr to ctdb_connection

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 94b80f3a0d24713c0d9d898370d21ff2f185f2e0..36bc3852da4cb3952c274aadd0a61c9cfea49280 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -808,9 +808,9 @@ struct ctdb_uptime {
        struct timeval last_recovery_finished;
 };
 
-struct ctdb_control_tcp_addr {
+struct ctdb_connection {
        ctdb_sock_addr src;
-       ctdb_sock_addr dest;
+       ctdb_sock_addr dst;
 };
 
 struct ctdb_ban_time {

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 802289f31ced733e3e5debcf25c72c8defe0a8b3..b87f9d9df6cb507b83182014cd1b8b808115eb30 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -375,7 +375,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_get_public_ips(ctdb, c, outdata);
 
        case CTDB_CONTROL_TCP_CLIENT:
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_tcp_addr));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_connection));
                return ctdb_control_tcp_client(ctdb, client_id, indata);
 
        case CTDB_CONTROL_STARTUP: 

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 4f1211c1770fd9ab80a8a6526f66b95757752c91..353877175e6c5ebd6de81b853cef903826bf7ade 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -2813,7 +2813,7 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
                                TDB_DATA indata)
 {
        struct ctdb_client *client = reqid_find(ctdb->idr, client_id, struct ctdb_client);
-       struct ctdb_control_tcp_addr *tcp_sock = NULL;
+       struct ctdb_connection *tcp_sock = NULL;
        struct ctdb_tcp_list *tcp;
        struct ctdb_tcp_connection t;
        int ret;
@@ -2827,15 +2827,15 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
                return 0;
        }
 
-       tcp_sock = (struct ctdb_control_tcp_addr *)indata.dptr;
+       tcp_sock = (struct ctdb_connection *)indata.dptr;
 
        addr = tcp_sock->src;
        ctdb_canonicalize_ip(&addr,  &tcp_sock->src);
-       addr = tcp_sock->dest;
-       ctdb_canonicalize_ip(&addr, &tcp_sock->dest);
+       addr = tcp_sock->dst;
+       ctdb_canonicalize_ip(&addr, &tcp_sock->dst);
 
        ZERO_STRUCT(addr);
-       memcpy(&addr, &tcp_sock->dest, sizeof(addr));
+       memcpy(&addr, &tcp_sock->dst, sizeof(addr));
        vnn = find_public_ip_vnn(ctdb, &addr);
        if (vnn == NULL) {
                switch (addr.sa.sa_family) {
@@ -2877,12 +2877,12 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
        CTDB_NO_MEMORY(ctdb, tcp);
 
        tcp->connection.src_addr = tcp_sock->src;
-       tcp->connection.dst_addr = tcp_sock->dest;
+       tcp->connection.dst_addr = tcp_sock->dst;
 
        DLIST_ADD(client->tcp_list, tcp);
 
        t.src_addr = tcp_sock->src;
-       t.dst_addr = tcp_sock->dest;
+       t.dst_addr = tcp_sock->dst;
 
        data.dptr = (uint8_t *)&t;
        data.dsize = sizeof(t);
@@ -2890,13 +2890,13 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
        switch (addr.sa.sa_family) {
        case AF_INET:
                DEBUG(DEBUG_INFO,("registered tcp client for %u->%s:%u (client_id %u pid %u)\n",
-                       (unsigned)ntohs(tcp_sock->dest.ip.sin_port), 
+                       (unsigned)ntohs(tcp_sock->dst.ip.sin_port),
                        ctdb_addr_to_str(&tcp_sock->src),
                        (unsigned)ntohs(tcp_sock->src.ip.sin_port), client_id, client->pid));
                break;
        case AF_INET6:
                DEBUG(DEBUG_INFO,("registered tcp client for %u->%s:%u (client_id %u pid %u)\n",
-                       (unsigned)ntohs(tcp_sock->dest.ip6.sin6_port), 
+                       (unsigned)ntohs(tcp_sock->dst.ip6.sin6_port),
                        ctdb_addr_to_str(&tcp_sock->src),
                        (unsigned)ntohs(tcp_sock->src.ip6.sin6_port), client_id, client->pid));
                break;

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 92858fce72590b18b75c87b50d23ca9545b40388..04f6f2f0aacfec993936d7746dc255c3ebd12105 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1186,7 +1186,7 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
                                 void *private_data),
                       void *private_data)
 {
-       struct ctdb_control_tcp_addr p;
+       struct ctdb_connection p;
        TDB_DATA data = { .dptr = (uint8_t *)&p, .dsize = sizeof(p) };
        int ret;
        struct sockaddr_storage client;
@@ -1201,11 +1201,11 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
 
        switch (client.ss_family) {
        case AF_INET:
-               memcpy(&p.dest.ip, &server, sizeof(p.dest.ip));
+               memcpy(&p.dst.ip, &server, sizeof(p.dst.ip));
                memcpy(&p.src.ip, &client, sizeof(p.src.ip));
                break;
        case AF_INET6:
-               memcpy(&p.dest.ip6, &server, sizeof(p.dest.ip6));
+               memcpy(&p.dst.ip6, &server, sizeof(p.dst.ip6));
                memcpy(&p.src.ip6, &client, sizeof(p.src.ip6));
                break;
        default: