inet_aton() should do DNS lookup only if arg isn't a dotted-quad
[p5sagit/p5-mst-13.2.git] / ext / Socket / Socket.xs
index 1f32dab..cefcb24 100644 (file)
@@ -7,6 +7,9 @@
 #  include <sys/types.h>
 # endif
 #include <sys/socket.h>
+#ifdef I_SYS_UN
+#include <sys/un.h>
+#endif
 # ifdef I_NETINET_IN
 #  include <netinet/in.h>
 # endif
 #ifndef INADDR_NONE
 #define INADDR_NONE    0xffffffff
 #endif /* INADDR_NONE */
+#ifndef INADDR_BROADCAST
+#define INADDR_BROADCAST       0xffffffff
+#endif /* INADDR_BROADCAST */
 #ifndef INADDR_LOOPBACK
 #define INADDR_LOOPBACK         0x7F000001
 #endif /* INADDR_LOOPBACK */
 
+#ifndef HAS_INET_ATON
+
+/* 
+ * Check whether "cp" is a valid ascii representation
+ * of an Internet address and convert to a binary address.
+ * Returns 1 if the address is valid, 0 if not.
+ * This replaces inet_addr, the return value from which
+ * cannot distinguish between failure and a local broadcast address.
+ */
+static int
+my_inet_aton(register const char *cp, struct in_addr *addr)
+{
+       register U32 val;
+       register int base;
+       register char c;
+       int nparts;
+       const char *s;
+       unsigned int parts[4];
+       register unsigned int *pp = parts;
+
+       if (!cp)
+               return 0;
+       for (;;) {
+               /*
+                * Collect number up to ``.''.
+                * Values are specified as for C:
+                * 0x=hex, 0=octal, other=decimal.
+                */
+               val = 0; base = 10;
+               if (*cp == '0') {
+                       if (*++cp == 'x' || *cp == 'X')
+                               base = 16, cp++;
+                       else
+                               base = 8;
+               }
+               while ((c = *cp) != '\0') {
+                       if (isDIGIT(c)) {
+                               val = (val * base) + (c - '0');
+                               cp++;
+                               continue;
+                       }
+                       if (base == 16 && (s=strchr(hexdigit,c))) {
+                               val = (val << 4) + 
+                                       ((s - hexdigit) & 15);
+                               cp++;
+                               continue;
+                       }
+                       break;
+               }
+               if (*cp == '.') {
+                       /*
+                        * Internet format:
+                        *      a.b.c.d
+                        *      a.b.c   (with c treated as 16-bits)
+                        *      a.b     (with b treated as 24 bits)
+                        */
+                       if (pp >= parts + 3 || val > 0xff)
+                               return 0;
+                       *pp++ = val, cp++;
+               } else
+                       break;
+       }
+       /*
+        * Check for trailing characters.
+        */
+       if (*cp && !isSPACE(*cp))
+               return 0;
+       /*
+        * Concoct the address according to
+        * the number of parts specified.
+        */
+       nparts = pp - parts + 1;        /* force to an int for switch() */
+       switch (nparts) {
+
+       case 1:                         /* a -- 32 bits */
+               break;
+
+       case 2:                         /* a.b -- 8.24 bits */
+               if (val > 0xffffff)
+                       return 0;
+               val |= parts[0] << 24;
+               break;
+
+       case 3:                         /* a.b.c -- 8.8.16 bits */
+               if (val > 0xffff)
+                       return 0;
+               val |= (parts[0] << 24) | (parts[1] << 16);
+               break;
+
+       case 4:                         /* a.b.c.d -- 8.8.8.8 bits */
+               if (val > 0xff)
+                       return 0;
+               val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+               break;
+       }
+       addr->s_addr = htonl(val);
+       return 1;
+}
+
+#undef inet_aton
+#define inet_aton my_inet_aton
+
+#endif /* ! HAS_INET_ATON */
+
 
 static int
-not_here(s)
-char *s;
+not_here(char *s)
 {
     croak("Socket::%s not implemented on this architecture", s);
     return -1;
 }
 
 static double
-constant(name, arg)
-char *name;
-int arg;
+constant(char *name, int arg)
 {
     errno = 0;
     switch (*name) {
@@ -216,8 +323,14 @@ int arg;
     case 'L':
        break;
     case 'M':
+       if (strEQ(name, "MSG_CTRUNC"))
+#if defined(MSG_CTRUNC) || defined(HAS_GNULIBC) /* XXX it's an enum */
+           return MSG_CTRUNC;
+#else
+           goto not_there;
+#endif
        if (strEQ(name, "MSG_DONTROUTE"))
-#ifdef MSG_DONTROUTE
+#if defined(MSG_DONTROUTE) || defined(HAS_GNULIBC) /* XXX it's an enum */
            return MSG_DONTROUTE;
 #else
            goto not_there;
@@ -229,17 +342,23 @@ int arg;
            goto not_there;
 #endif
        if (strEQ(name, "MSG_OOB"))
-#ifdef MSG_OOB
+#if defined(MSG_OOB) || defined(HAS_GNULIBC) /* XXX it's an enum */
            return MSG_OOB;
 #else
            goto not_there;
 #endif
        if (strEQ(name, "MSG_PEEK"))
-#ifdef MSG_PEEK
+#if defined(MSG_PEEK) || defined(HAS_GNULIBC) /* XXX it's an enum */
            return MSG_PEEK;
 #else
            goto not_there;
 #endif
+       if (strEQ(name, "MSG_PROXY"))
+#if defined(MSG_PROXY) || defined(HAS_GNULIBC) /* XXX it's an enum */
+           return MSG_PROXY;
+#else
+           goto not_there;
+#endif
        break;
     case 'N':
        break;
@@ -592,15 +711,15 @@ inet_aton(host)
        {
        struct in_addr ip_address;
        struct hostent * phe;
+       int ok = inet_aton(host, &ip_address);
 
-       if (phe = gethostbyname(host)) {
+       if (!ok && (phe = gethostbyname(host))) {
                Copy( phe->h_addr, &ip_address, phe->h_length, char );
-       } else {
-               ip_address.s_addr = inet_addr(host);
+               ok = 1;
        }
 
        ST(0) = sv_newmortal();
-       if(ip_address.s_addr != INADDR_NONE) {
+       if (ok) {
                sv_setpvn( ST(0), (char *)&ip_address, sizeof ip_address );
        }
        }
@@ -627,16 +746,70 @@ inet_ntoa(ip_address_sv)
        }
 
 void
-pack_sockaddr_in(family,port,ip_address)
-       short   family
-       short   port
+pack_sockaddr_un(pathname)
+       char *  pathname
+       CODE:
+       {
+#ifdef I_SYS_UN
+       struct sockaddr_un sun_ad; /* fear using sun */
+       STRLEN len;
+       Zero( &sun_ad, sizeof sun_ad, char );
+       sun_ad.sun_family = AF_UNIX;
+       len = strlen(pathname);
+       if (len > sizeof(sun_ad.sun_path))
+           len = sizeof(sun_ad.sun_path);
+       Copy( pathname, sun_ad.sun_path, len, char );
+       ST(0) = sv_2mortal(newSVpv((char *)&sun_ad, sizeof sun_ad));
+#else
+       ST(0) = (SV *) not_here("pack_sockaddr_un");
+#endif
+       
+       }
+
+void
+unpack_sockaddr_un(sun_sv)
+       SV *    sun_sv
+       CODE:
+       {
+#ifdef I_SYS_UN
+       struct sockaddr_un addr;
+       STRLEN sockaddrlen;
+       char * sun_ad = SvPV(sun_sv,sockaddrlen);
+       char * e;
+
+       if (sockaddrlen != sizeof(addr)) {
+           croak("Bad arg length for %s, length is %d, should be %d",
+                       "Socket::unpack_sockaddr_un",
+                       sockaddrlen, sizeof(addr));
+       }
+
+       Copy( sun_ad, &addr, sizeof addr, char );
+
+       if ( addr.sun_family != AF_UNIX ) {
+           croak("Bad address family for %s, got %d, should be %d",
+                       "Socket::unpack_sockaddr_un",
+                       addr.sun_family,
+                       AF_UNIX);
+       }
+       e = addr.sun_path;
+       while (*e && e < addr.sun_path + sizeof addr.sun_path)
+           ++e;
+       ST(0) = sv_2mortal(newSVpv(addr.sun_path, e - addr.sun_path));
+#else
+       ST(0) = (SV *) not_here("unpack_sockaddr_un");
+#endif
+       }
+
+void
+pack_sockaddr_in(port,ip_address)
+       unsigned short  port
        char *  ip_address
        CODE:
        {
        struct sockaddr_in sin;
 
        Zero( &sin, sizeof sin, char );
-       sin.sin_family = family;
+       sin.sin_family = AF_INET;
        sin.sin_port = htons(port);
        Copy( ip_address, &sin.sin_addr, sizeof sin.sin_addr, char );
 
@@ -650,8 +823,7 @@ unpack_sockaddr_in(sin_sv)
        {
        STRLEN sockaddrlen;
        struct sockaddr_in addr;
-       short   family;
-       short   port;
+       unsigned short  port;
        struct in_addr  ip_address;
        char *  sin = SvPV(sin_sv,sockaddrlen);
        if (sockaddrlen != sizeof(addr)) {
@@ -659,15 +831,18 @@ unpack_sockaddr_in(sin_sv)
                        "Socket::unpack_sockaddr_in",
                        sockaddrlen, sizeof(addr));
        }
-
        Copy( sin, &addr,sizeof addr, char );
-       family = addr.sin_family;
+       if ( addr.sin_family != AF_INET ) {
+           croak("Bad address family for %s, got %d, should be %d",
+                       "Socket::unpack_sockaddr_in",
+                       addr.sin_family,
+                       AF_INET);
+       } 
        port = ntohs(addr.sin_port);
        ip_address = addr.sin_addr;
 
-       EXTEND(sp, 3);
-       PUSHs(sv_2mortal(newSViv(family)));
-       PUSHs(sv_2mortal(newSViv(port)));
+       EXTEND(SP, 2);
+       PUSHs(sv_2mortal(newSViv((IV) port)));
        PUSHs(sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address)));
        }
 
@@ -697,3 +872,12 @@ INADDR_NONE()
        ip_address.s_addr = htonl(INADDR_NONE);
        ST(0) = sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address));
        }
+
+void
+INADDR_BROADCAST()
+       CODE:
+       {
+       struct in_addr  ip_address;
+       ip_address.s_addr = htonl(INADDR_BROADCAST);
+       ST(0) = sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address));
+       }