ib_acme.c: Support IPv6 addressing in resolve_ip

Signed-off-by: Hal Rosenstock <hal@mellanox.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/src/acme.c b/src/acme.c
index ec1d3d21bf67ed4e585d31ca32c6c41ef9372fba..5ba5c0ac4077a6c2146cede0c6b965ad76636731 100644 (file)
--- a/src/acme.c
+++ b/src/acme.c
@@ -476,29 +476,52 @@ static int resolve_ip(struct ibv_path_record *path)
 {
        struct ibv_path_data *paths;
        struct sockaddr_in src, dest;
+       struct sockaddr_in6 src6, dest6;
        struct sockaddr *saddr;
        int ret, count;
+       int is_ipv6_src, is_ipv6_dest;
 
        if (src_addr) {
+               is_ipv6_src = 0;
                src.sin_family = AF_INET;
                ret = inet_pton(AF_INET, src_addr, &src.sin_addr);
                if (ret <= 0) {
-                       printf("inet_pton error on source address (%s): 0x%x\n", src_addr, ret);
-                       return -1;
+                       src6.sin6_family = AF_INET6;
+                       ret = inet_pton(AF_INET6, src_addr, &src6.sin6_addr);
+                       if (ret <= 0) {
+                               printf("inet_pton error on source address (%s): 0x%x\n", src_addr, ret);
+                               return -1;
+                       }
+                       is_ipv6_src = 1;
                }
-               saddr = (struct sockaddr *) &src;
+               if (is_ipv6_src)
+                       saddr = (struct sockaddr *) &src6;
+               else
+                       saddr = (struct sockaddr *) &src;
        } else {
                saddr = NULL;
        }
 
+       is_ipv6_dest = 0;
        dest.sin_family = AF_INET;
        ret = inet_pton(AF_INET, dest_addr, &dest.sin_addr);
        if (ret <= 0) {
-               printf("inet_pton error on destination address (%s): 0x%x\n", dest_addr, ret);
+               dest6.sin6_family = AF_INET6;
+               ret = inet_pton(AF_INET6, dest_addr, &dest6.sin6_addr);
+               if (ret <= 0) {
+                       printf("inet_pton error on destination address (%s): 0x%x\n", dest_addr, ret);
+                       return -1;
+               }
+               is_ipv6_dest = 1;
+       }
+
+       if (src_addr && is_ipv6_src != is_ipv6_dest) {
+               printf("source and destination address families don't match\n");
                return -1;
        }
 
-       ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest,
+       ret = ib_acm_resolve_ip(saddr,
+               (is_ipv6_dest ? (struct sockaddr *) &dest6 : (struct sockaddr *) &dest),
                &paths, &count, get_resolve_flags());
        if (ret) {
                printf("ib_acm_resolve_ip failed: %s\n", strerror(errno));