Ticket #3884: 0001-resolved-shorthand-ipv4-addresses-for-getaddrinfo-vi.patch

src/kits/network/netresolv/inet/inet_pton.c

@@ -63 +63 @@
  */
 int
 inet_pton(int af, const char *src, void *dst)
-{
-
+{       
     switch (af) {
     case AF_INET:
         return (inet_pton4(src, dst, 1));
@@ -162 +161 @@
      * the number of parts specified.
      */
     n = pp - parts + 1;
-    /* inet_pton() takes dotted-quad only.  it does not take shorthand. */
-    if (pton && n != 4)
-        return (0);
+    
+    /* inet_pton() takes dotted-quad only.  It does not take shorthand. To disable them uncomment the 
+       the 2 lines that follow  */
+
+    /*if (pton && n != 4)
+        return (0);*/
+    
     switch (n) {
 
     case 0:

new file src/tests/kits/net/netresolv/inet/inet_pton.c

@@ +1 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <string.h>
+#include <assert.h>
+
+int main(int argc, char *argv[])
+{   
+    char* afi4 = "AF_INET";
+    char* afi6 = "AF_INET6";
+    int af = -1;
+    int rt = 0;
+    char buf1[INET6_ADDRSTRLEN];
+    char buf2[INET6_ADDRSTRLEN];
+
+    if(argc < 3){
+        printf("usuage: %s <address_family> <ip_address>\n", argv[0]);
+        exit(EXIT_FAILURE);
+    }
+
+    if(strcasecmp(afi4, argv[1])==0) af = AF_INET;
+    else if(strcasecmp(afi6, argv[1])==0) af = AF_INET6;
+    else{
+        printf("invalid address family: must either be AF_INET or AF_INET6\n");
+        exit(EXIT_FAILURE);
+    }
+
+    rt = inet_pton(af, argv[2], buf1);
+    if(rt==0){
+        printf("invalid ip address\n");
+        exit(EXIT_FAILURE);
+    }
+    else if(rt < 0){
+        perror("inet_pton");
+        exit(EXIT_FAILURE);
+    }
+
+    // the following assertion should hold if there isn't a problem with either of inet_pton and inet_ntop
+    assert(inet_ntop(af, buf1, buf2, INET6_ADDRSTRLEN)!=NULL);
+
+    // The two must be "semantically" similar
+    // Not exactly similar since ipv6 addresses can be abbreviated (use of "::")
+    // There also exists multiple classes for ipv4 addresses (a, a.b, a.b.c and a.b.c.d)
+    printf("input to inet_pton: %s\n", argv[2]);
+    printf("output of inet_ntop: %s\n", buf2);
+
+    return EXIT_SUCCESS;
+}