ctdb-daemon: Rename struct ctdb_control_gratious_arp to ctdb_addr_info_old

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

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 7d0039663e56010627a142c7bb2efb9b36fb136c..dc3098924b39febe114fd72bac577a6c013efe1d 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3133,22 +3133,20 @@ int ctdb_ctrl_killtcp(struct ctdb_context *ctdb,
 /*
   send a gratious arp
  */
-int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb, 
-                     struct timeval timeout, 
-                     uint32_t destnode,
-                     ctdb_sock_addr *addr,
-                     const char *ifname)
+int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb,
+                          struct timeval timeout, uint32_t destnode,
+                          ctdb_sock_addr *addr, const char *ifname)
 {
        TDB_DATA data;
        int32_t res;
        int ret, len;
-       struct ctdb_control_gratious_arp *gratious_arp;
+       struct ctdb_addr_info_old *gratious_arp;
        TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
 
 
        len = strlen(ifname)+1;
-       gratious_arp = talloc_size(tmp_ctx, 
-               offsetof(struct ctdb_control_gratious_arp, iface) + len);
+       gratious_arp = talloc_size(tmp_ctx,
+               offsetof(struct ctdb_addr_info_old, iface) + len);
        CTDB_NO_MEMORY(ctdb, gratious_arp);
 
        gratious_arp->addr = *addr;
@@ -3156,7 +3154,7 @@ int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb,
        memcpy(&gratious_arp->iface[0], ifname, len);
 
 
-       data.dsize = offsetof(struct ctdb_control_gratious_arp, iface) + len;
+       data.dsize = offsetof(struct ctdb_addr_info_old, iface) + len;
        data.dptr  = (unsigned char *)gratious_arp;
 
        ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_SEND_GRATIOUS_ARP, 0, data, NULL,

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 2efd71a30e907c8559520de2ae6bff827d955c4a..b235f4622a5885bfa9f9912626d02dc6485c22aa 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -921,7 +921,7 @@ enum ctdb_runstate {
 
 /*
   struct holding a ctdb_sock_addr and an interface name,
-  used to add/remove public addresses
+  used to add/remove public addresses and grat arp
  */
 struct ctdb_addr_info_old {
        ctdb_sock_addr addr;
@@ -930,17 +930,6 @@ struct ctdb_addr_info_old {
        char iface[1];
 };
 
-/*
-  struct holding a ctdb_sock_addr and an interface name,
-  used for send_gratious_arp
- */
-struct ctdb_control_gratious_arp {
-       ctdb_sock_addr addr;
-       uint32_t mask;
-       uint32_t len;
-       char iface[1];
-};
-
 /*
   structure used for CTDB_SRVID_NODE_FLAGS_CHANGED
  */

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index da20ef0dd21be3b25d5387d608274f61b8ec6315..7f72116f2d0245d0074832a05e7809eae842c52d 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -3981,24 +3981,24 @@ static void send_gratious_arp(struct tevent_context *ev,
  */
 int32_t ctdb_control_send_gratious_arp(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-       struct ctdb_control_gratious_arp *gratious_arp = (struct ctdb_control_gratious_arp *)indata.dptr;
+       struct ctdb_addr_info_old *gratious_arp = (struct ctdb_addr_info_old *)indata.dptr;
        struct control_gratious_arp *arp;
 
        /* verify the size of indata */
-       if (indata.dsize < offsetof(struct ctdb_control_gratious_arp, iface)) {
+       if (indata.dsize < offsetof(struct ctdb_addr_info_old, iface)) {
                DEBUG(DEBUG_ERR,(__location__ " Too small indata to hold a ctdb_control_gratious_arp structure. Got %u require %u bytes\n", 
                                 (unsigned)indata.dsize, 
-                                (unsigned)offsetof(struct ctdb_control_gratious_arp, iface)));
+                                (unsigned)offsetof(struct ctdb_addr_info_old, iface)));
                return -1;
        }
        if (indata.dsize != 
-               ( offsetof(struct ctdb_control_gratious_arp, iface)
+               ( offsetof(struct ctdb_addr_info_old, iface)
                + gratious_arp->len ) ){
 
                DEBUG(DEBUG_ERR,(__location__ " Wrong size of indata. Was %u bytes "
                        "but should be %u bytes\n", 
                         (unsigned)indata.dsize, 
-                        (unsigned)(offsetof(struct ctdb_control_gratious_arp, iface)+gratious_arp->len)));
+                        (unsigned)(offsetof(struct ctdb_addr_info_old, iface)+gratious_arp->len)));
                return -1;
        }