make the function to canonicalize a sockaddr structure public

diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 53e5d87df89f8d7e511f523b4190de8e2f6f5e7e..792ff3c79d287d9b7db6599d01a7772135c9c6a2 100644 (file)
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -505,7 +505,7 @@ bool parse_ip_mask(const char *str, ctdb_sock_addr *addr, unsigned *mask)
 /*
    This is used to canonicalize a ctdb_sock_addr structure.
 */
-static void canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip)
+void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip)
 {
        char prefix[12] = { 0,0,0,0,0,0,0,0,0,0,0xff,0xff };
 
@@ -527,8 +527,8 @@ bool ctdb_same_ip(const ctdb_sock_addr *tip1, const ctdb_sock_addr *tip2)
 {
        ctdb_sock_addr ip1, ip2;
 
-       canonicalize_ip(tip1, &ip1);
-       canonicalize_ip(tip2, &ip2);
+       ctdb_canonicalize_ip(tip1, &ip1);
+       ctdb_canonicalize_ip(tip2, &ip2);
        
        if (ip1.sa.sa_family != ip2.sa.sa_family) {
                return false;

diff --git a/include/ctdb.h b/include/ctdb.h
index c6f257433b34f5b87d7a843687d3d2d5e42e27fc..d43ab507070b3fd4a8a393ebeeebe12a970051d2 100644 (file)
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -566,5 +566,4 @@ int ctdb_transaction_store(struct ctdb_transaction_handle *h,
                           TDB_DATA key, TDB_DATA data);
 int ctdb_transaction_commit(struct ctdb_transaction_handle *h);
 
-
 #endif

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index f73f9ef963f55fe6d389f394bc78d1498d44e5d3..8834ec4d52c685201d601c6f705eee2056a2f54a 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1376,5 +1376,7 @@ int32_t ctdb_control_trans2_error(struct ctdb_context *ctdb,
                                  struct ctdb_req_control *c);
 
 char *ctdb_addr_to_str(ctdb_sock_addr *addr);
+void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip);
+
 
 #endif