This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
fix various compiler warnings from XS code
[perl5.git] / ext / Socket / Socket.xs
index 378824f..dcf6715 100644 (file)
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
+#include <stddef.h>
+
 #ifndef VMS
 # ifdef I_SYS_TYPES
 #  include <sys/types.h>
 # endif
-#include <sys/socket.h>
-#ifdef I_SYS_UN
-#include <sys/un.h>
-#endif
-# ifdef I_NETINET_IN
+# if !defined(ultrix) /* Avoid double definition. */
+#   include <sys/socket.h>
+# endif
+# if defined(USE_SOCKS) && defined(I_SOCKS)
+#   include <socks.h>
+# endif
+# ifdef MPE
+#  define PF_INET AF_INET
+#  define PF_UNIX AF_UNIX
+#  define SOCK_RAW 3
+# endif
+# ifdef I_SYS_UN
+#  include <sys/un.h>
+# endif
+/* XXX Configure test for <netinet/in_systm.h needed XXX */
+# if defined(NeXT) || defined(__NeXT__)
+#  include <netinet/in_systm.h>
+# endif
+# if defined(__sgi) && !defined(AF_LINK) && defined(PF_LINK) && PF_LINK == AF_LNK
+#  undef PF_LINK
+# endif
+# if defined(I_NETINET_IN) || defined(__ultrix__)
 #  include <netinet/in.h>
 # endif
-#include <netdb.h>
-#include <arpa/inet.h>
+# ifdef I_NETDB
+#  if !defined(ultrix)  /* Avoid double definition. */
+#   include <netdb.h>
+#  endif
+# endif
+# ifdef I_ARPA_INET
+#  include <arpa/inet.h>
+# endif
+# ifdef I_NETINET_TCP
+#  include <netinet/tcp.h>
+# endif
 #else
-#include "sockadapt.h"
+# include "sockadapt.h"
+#endif
+
+#ifdef NETWARE
+NETDB_DEFINE_CONTEXT
+NETINET_DEFINE_CONTEXT
+#endif
+
+#ifdef I_SYSUIO
+# include <sys/uio.h>
 #endif
 
 #ifndef AF_NBS
-#undef PF_NBS
+# undef PF_NBS
 #endif
 
 #ifndef AF_X25
-#undef PF_X25
+# undef PF_X25
 #endif
 
 #ifndef INADDR_NONE
-#define INADDR_NONE    0xffffffff
+# define INADDR_NONE   0xffffffff
 #endif /* INADDR_NONE */
+#ifndef INADDR_BROADCAST
+# define INADDR_BROADCAST      0xffffffff
+#endif /* INADDR_BROADCAST */
 #ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK         0x7F000001
+# 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
-not_here(s)
-char *s;
+my_inet_aton(register const char *cp, struct in_addr *addr)
 {
-    croak("Socket::%s not implemented on this architecture", s);
-    return -1;
+       dTHX;
+       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 || !*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(PL_hexdigit,c))) {
+                               val = (val << 4) +
+                                       ((s - PL_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;
 }
 
-static double
-constant(name, arg)
-char *name;
-int arg;
+#undef inet_aton
+#define inet_aton my_inet_aton
+
+#endif /* ! HAS_INET_ATON */
+
+
+static int
+not_here(const char *s)
 {
-    errno = 0;
-    switch (*name) {
-    case 'A':
-       if (strEQ(name, "AF_802"))
-#ifdef AF_802
-           return AF_802;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_APPLETALK"))
-#ifdef AF_APPLETALK
-           return AF_APPLETALK;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_CCITT"))
-#ifdef AF_CCITT
-           return AF_CCITT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_CHAOS"))
-#ifdef AF_CHAOS
-           return AF_CHAOS;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_DATAKIT"))
-#ifdef AF_DATAKIT
-           return AF_DATAKIT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_DECnet"))
-#ifdef AF_DECnet
-           return AF_DECnet;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_DLI"))
-#ifdef AF_DLI
-           return AF_DLI;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_ECMA"))
-#ifdef AF_ECMA
-           return AF_ECMA;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_GOSIP"))
-#ifdef AF_GOSIP
-           return AF_GOSIP;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_HYLINK"))
-#ifdef AF_HYLINK
-           return AF_HYLINK;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_IMPLINK"))
-#ifdef AF_IMPLINK
-           return AF_IMPLINK;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_INET"))
-#ifdef AF_INET
-           return AF_INET;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_LAT"))
-#ifdef AF_LAT
-           return AF_LAT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_MAX"))
-#ifdef AF_MAX
-           return AF_MAX;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_NBS"))
-#ifdef AF_NBS
-           return AF_NBS;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_NIT"))
-#ifdef AF_NIT
-           return AF_NIT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_NS"))
-#ifdef AF_NS
-           return AF_NS;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_OSI"))
-#ifdef AF_OSI
-           return AF_OSI;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_OSINET"))
-#ifdef AF_OSINET
-           return AF_OSINET;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_PUP"))
-#ifdef AF_PUP
-           return AF_PUP;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_SNA"))
-#ifdef AF_SNA
-           return AF_SNA;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_UNIX"))
-#ifdef AF_UNIX
-           return AF_UNIX;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_UNSPEC"))
-#ifdef AF_UNSPEC
-           return AF_UNSPEC;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "AF_X25"))
-#ifdef AF_X25
-           return AF_X25;
-#else
-           goto not_there;
-#endif
-       break;
-    case 'B':
-       break;
-    case 'C':
-       break;
-    case 'D':
-       break;
-    case 'E':
-       break;
-    case 'F':
-       break;
-    case 'G':
-       break;
-    case 'H':
-       break;
-    case 'I':
-       break;
-    case 'J':
-       break;
-    case 'K':
-       break;
-    case 'L':
-       break;
-    case 'M':
-       if (strEQ(name, "MSG_DONTROUTE"))
-#ifdef MSG_DONTROUTE
-           return MSG_DONTROUTE;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "MSG_MAXIOVLEN"))
-#ifdef MSG_MAXIOVLEN
-           return MSG_MAXIOVLEN;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "MSG_OOB"))
-#ifdef MSG_OOB
-           return MSG_OOB;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "MSG_PEEK"))
-#ifdef MSG_PEEK
-           return MSG_PEEK;
-#else
-           goto not_there;
-#endif
-       break;
-    case 'N':
-       break;
-    case 'O':
-       break;
-    case 'P':
-       if (strEQ(name, "PF_802"))
-#ifdef PF_802
-           return PF_802;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_APPLETALK"))
-#ifdef PF_APPLETALK
-           return PF_APPLETALK;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_CCITT"))
-#ifdef PF_CCITT
-           return PF_CCITT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_CHAOS"))
-#ifdef PF_CHAOS
-           return PF_CHAOS;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_DATAKIT"))
-#ifdef PF_DATAKIT
-           return PF_DATAKIT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_DECnet"))
-#ifdef PF_DECnet
-           return PF_DECnet;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_DLI"))
-#ifdef PF_DLI
-           return PF_DLI;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_ECMA"))
-#ifdef PF_ECMA
-           return PF_ECMA;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_GOSIP"))
-#ifdef PF_GOSIP
-           return PF_GOSIP;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_HYLINK"))
-#ifdef PF_HYLINK
-           return PF_HYLINK;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_IMPLINK"))
-#ifdef PF_IMPLINK
-           return PF_IMPLINK;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_INET"))
-#ifdef PF_INET
-           return PF_INET;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_LAT"))
-#ifdef PF_LAT
-           return PF_LAT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_MAX"))
-#ifdef PF_MAX
-           return PF_MAX;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_NBS"))
-#ifdef PF_NBS
-           return PF_NBS;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_NIT"))
-#ifdef PF_NIT
-           return PF_NIT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_NS"))
-#ifdef PF_NS
-           return PF_NS;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_OSI"))
-#ifdef PF_OSI
-           return PF_OSI;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_OSINET"))
-#ifdef PF_OSINET
-           return PF_OSINET;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_PUP"))
-#ifdef PF_PUP
-           return PF_PUP;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_SNA"))
-#ifdef PF_SNA
-           return PF_SNA;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_UNIX"))
-#ifdef PF_UNIX
-           return PF_UNIX;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_UNSPEC"))
-#ifdef PF_UNSPEC
-           return PF_UNSPEC;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "PF_X25"))
-#ifdef PF_X25
-           return PF_X25;
-#else
-           goto not_there;
-#endif
-       break;
-    case 'Q':
-       break;
-    case 'R':
-       break;
-    case 'S':
-       if (strEQ(name, "SOCK_DGRAM"))
-#ifdef SOCK_DGRAM
-           return SOCK_DGRAM;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SOCK_RAW"))
-#ifdef SOCK_RAW
-           return SOCK_RAW;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SOCK_RDM"))
-#ifdef SOCK_RDM
-           return SOCK_RDM;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SOCK_SEQPACKET"))
-#ifdef SOCK_SEQPACKET
-           return SOCK_SEQPACKET;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SOCK_STREAM"))
-#ifdef SOCK_STREAM
-           return SOCK_STREAM;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SOL_SOCKET"))
-#ifdef SOL_SOCKET
-           return SOL_SOCKET;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SOMAXCONN"))
-#ifdef SOMAXCONN
-           return SOMAXCONN;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_ACCEPTCONN"))
-#ifdef SO_ACCEPTCONN
-           return SO_ACCEPTCONN;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_BROADCAST"))
-#ifdef SO_BROADCAST
-           return SO_BROADCAST;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_DEBUG"))
-#ifdef SO_DEBUG
-           return SO_DEBUG;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_DONTLINGER"))
-#ifdef SO_DONTLINGER
-           return SO_DONTLINGER;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_DONTROUTE"))
-#ifdef SO_DONTROUTE
-           return SO_DONTROUTE;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_ERROR"))
-#ifdef SO_ERROR
-           return SO_ERROR;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_KEEPALIVE"))
-#ifdef SO_KEEPALIVE
-           return SO_KEEPALIVE;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_LINGER"))
-#ifdef SO_LINGER
-           return SO_LINGER;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_OOBINLINE"))
-#ifdef SO_OOBINLINE
-           return SO_OOBINLINE;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_RCVBUF"))
-#ifdef SO_RCVBUF
-           return SO_RCVBUF;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_RCVLOWAT"))
-#ifdef SO_RCVLOWAT
-           return SO_RCVLOWAT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_RCVTIMEO"))
-#ifdef SO_RCVTIMEO
-           return SO_RCVTIMEO;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_REUSEADDR"))
-#ifdef SO_REUSEADDR
-           return SO_REUSEADDR;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_REUSEPORT"))
-#ifdef SO_REUSEPORT
-           return SO_REUSEPORT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_SNDBUF"))
-#ifdef SO_SNDBUF
-           return SO_SNDBUF;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_SNDLOWAT"))
-#ifdef SO_SNDLOWAT
-           return SO_SNDLOWAT;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_SNDTIMEO"))
-#ifdef SO_SNDTIMEO
-           return SO_SNDTIMEO;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_TYPE"))
-#ifdef SO_TYPE
-           return SO_TYPE;
-#else
-           goto not_there;
-#endif
-       if (strEQ(name, "SO_USELOOPBACK"))
-#ifdef SO_USELOOPBACK
-           return SO_USELOOPBACK;
-#else
-           goto not_there;
-#endif
-       break;
-    case 'T':
-       break;
-    case 'U':
-       break;
-    case 'V':
-       break;
-    case 'W':
-       break;
-    case 'X':
-       break;
-    case 'Y':
-       break;
-    case 'Z':
-       break;
-    }
-    errno = EINVAL;
-    return 0;
-
-not_there:
-    errno = ENOENT;
-    return 0;
+    croak("Socket::%s not implemented on this architecture", s);
+    return -1;
 }
 
+#define PERL_IN_ADDR_S_ADDR_SIZE 4
 
-MODULE = Socket                PACKAGE = Socket
+/*
+* Bad assumptions possible here.
+*
+* Bad Assumption 1: struct in_addr has no other fields
+* than the s_addr (which is the field we care about
+* in here, really). However, we can be fed either 4-byte
+* addresses (from pack("N", ...), or va.b.c.d, or ...),
+* or full struct in_addrs (from e.g. pack_sockaddr_in()),
+* which may or may not be 4 bytes in size.
+*
+* Bad Assumption 2: the s_addr field is a simple type
+* (such as an int, u_int32_t).  It can be a bit field,
+* in which case using & (address-of) on it or taking sizeof()
+* wouldn't go over too well.  (Those are not attempted
+* now but in case someone thinks to change the below code
+* to use addr.s_addr instead of addr, you have been warned.)
+*
+* Bad Assumption 3: the s_addr is the first field in
+* an in_addr, or that its bytes are the first bytes in
+* an in_addr.
+*
+* These bad assumptions are wrong in UNICOS which has
+* struct in_addr { struct { u_long  st_addr:32; } s_da };
+* #define s_addr s_da.st_addr
+* and u_long is 64 bits.
+*
+* --jhi */
 
-double
-constant(name,arg)
-       char *          name
-       int             arg
+#include "const-c.inc"
+
+MODULE = Socket                PACKAGE = Socket
 
+INCLUDE: const-xs.inc
 
 void
 inet_aton(host)
@@ -595,18 +231,18 @@ inet_aton(host)
        {
        struct in_addr ip_address;
        struct hostent * phe;
+       int ok = (*host != '\0') && inet_aton(host, &ip_address);
 
-       if (phe = gethostbyname(host)) {
+       if (!ok && (phe = gethostbyname(host)) &&
+                       phe->h_addrtype == AF_INET && phe->h_length == 4) {
                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 );
        }
-       }
 
 void
 inet_ntoa(ip_address_sv)
@@ -615,31 +251,99 @@ inet_ntoa(ip_address_sv)
        {
        STRLEN addrlen;
        struct in_addr addr;
-       char * addr_str;
-       char * ip_address = SvPV(ip_address_sv,addrlen);
-       if (addrlen != sizeof(addr)) {
-           croak("Bad arg length for %s, length is %d, should be %d",
-                       "Socket::inet_ntoa",
-                       addrlen, sizeof(addr));
+       char * ip_address;
+       if (DO_UTF8(ip_address_sv) && !sv_utf8_downgrade(ip_address_sv, 1))
+            croak("Wide character in %s", "Socket::inet_ntoa");
+       ip_address = SvPVbyte(ip_address_sv, addrlen);
+       if (addrlen == sizeof(addr) || addrlen == 4)
+               addr.s_addr =
+                   (ip_address[0] & 0xFF) << 24 |
+                   (ip_address[1] & 0xFF) << 16 |
+                   (ip_address[2] & 0xFF) <<  8 |
+                   (ip_address[3] & 0xFF);
+       else
+               croak("Bad arg length for %s, length is %d, should be %d",
+                     "Socket::inet_ntoa",
+                     addrlen, sizeof(addr));
+       /* We could use inet_ntoa() but that is broken
+        * in HP-UX + GCC + 64bitint (returns "0.0.0.0"),
+        * so let's use this sprintf() workaround everywhere.
+        * This is also more threadsafe than using inet_ntoa(). */
+       ST(0) = sv_2mortal(Perl_newSVpvf(aTHX_ "%d.%d.%d.%d", /* IPv6? */
+                                        ((addr.s_addr >> 24) & 0xFF),
+                                        ((addr.s_addr >> 16) & 0xFF),
+                                        ((addr.s_addr >>  8) & 0xFF),
+                                        ( addr.s_addr        & 0xFF)));
        }
 
-       Copy( ip_address, &addr, sizeof addr, char );
-       addr_str = inet_ntoa(addr);
-
-       ST(0) = sv_2mortal(newSVpv(addr_str, strlen(addr_str)));
+void
+sockaddr_family(sockaddr)
+       SV *    sockaddr
+       PREINIT:
+       STRLEN sockaddr_len;
+       char *sockaddr_pv = SvPVbyte(sockaddr, sockaddr_len);
+       CODE:
+       if (sockaddr_len < offsetof(struct sockaddr, sa_data)) {
+           croak("Bad arg length for %s, length is %d, should be at least %d",
+                 "Socket::sockaddr_family", sockaddr_len,
+                 offsetof(struct sockaddr, sa_data));
        }
+       ST(0) = sv_2mortal(newSViv(((struct sockaddr*)sockaddr_pv)->sa_family));
 
 void
 pack_sockaddr_un(pathname)
-       char *  pathname
+       SV *    pathname
        CODE:
        {
 #ifdef I_SYS_UN
        struct sockaddr_un sun_ad; /* fear using sun */
+       STRLEN len;
+       char * pathname_pv;
+       int addr_len;
+
        Zero( &sun_ad, sizeof sun_ad, char );
        sun_ad.sun_family = AF_UNIX;
-       Copy( pathname, sun_ad.sun_path, sizeof sun_ad.sun_path, char );
-       ST(0) = sv_2mortal(newSVpv((char *)&sun_ad, sizeof sun_ad));
+       pathname_pv = SvPV(pathname,len);
+       if (len > sizeof(sun_ad.sun_path))
+           len = sizeof(sun_ad.sun_path);
+#  ifdef OS2   /* Name should start with \socket\ and contain backslashes! */
+       {
+           int off;
+           char *s, *e;
+
+           if (pathname_pv[0] != '/' && pathname_pv[0] != '\\')
+               croak("Relative UNIX domain socket name '%s' unsupported",
+                       pathname_pv);
+           else if (len < 8
+                    || pathname_pv[7] != '/' && pathname_pv[7] != '\\'
+                    || !strnicmp(pathname_pv + 1, "socket", 6))
+               off = 7;
+           else
+               off = 0;                /* Preserve names starting with \socket\ */
+           Copy( "\\socket", sun_ad.sun_path, off, char);
+           Copy( pathname_pv, sun_ad.sun_path + off, len, char );
+
+           s = sun_ad.sun_path + off - 1;
+           e = s + len + 1;
+           while (++s < e)
+               if (*s = '/')
+                   *s = '\\';
+       }
+#  else        /* !( defined OS2 ) */
+       Copy( pathname_pv, sun_ad.sun_path, len, char );
+#  endif
+       if (0) not_here("dummy");
+       if (len > 1 && sun_ad.sun_path[0] == '\0') {
+               /* Linux-style abstract-namespace socket.
+                * The name is not a file name, but an array of arbitrary
+                * character, starting with \0 and possibly including \0s,
+                * therefore the length of the structure must denote the
+                * end of that character array */
+               addr_len = (char *)&(sun_ad.sun_path) - (char *)&sun_ad + len;
+       } else {
+               addr_len = sizeof sun_ad;
+       }
+       ST(0) = newSVpvn_flags((char *)&sun_ad, addr_len, SVs_TEMP);
 #else
        ST(0) = (SV *) not_here("pack_sockaddr_un");
 #endif
@@ -649,18 +353,22 @@ pack_sockaddr_un(pathname)
 void
 unpack_sockaddr_un(sun_sv)
        SV *    sun_sv
-       PPCODE:
+       CODE:
        {
 #ifdef I_SYS_UN
-       STRLEN sockaddrlen;
        struct sockaddr_un addr;
-       char *  sun_ad = SvPV(sun_sv,sockaddrlen);
-
+       STRLEN sockaddrlen;
+       char * sun_ad = SvPVbyte(sun_sv,sockaddrlen);
+       int addr_len;
+#   ifndef __linux__
+       /* On Linux sockaddrlen on sockets returned by accept, recvfrom,
+          getpeername and getsockname is not equal to sizeof(addr). */
        if (sockaddrlen != sizeof(addr)) {
            croak("Bad arg length for %s, length is %d, should be %d",
                        "Socket::unpack_sockaddr_un",
                        sockaddrlen, sizeof(addr));
        }
+#   endif
 
        Copy( sun_ad, &addr, sizeof addr, char );
 
@@ -669,27 +377,51 @@ unpack_sockaddr_un(sun_sv)
                        "Socket::unpack_sockaddr_un",
                        addr.sun_family,
                        AF_UNIX);
-       } 
-       ST(0) = sv_2mortal(newSVpv(addr.sun_path, strlen(addr.sun_path)));
+       }
+
+       if (addr.sun_path[0] == '\0') {
+               /* Linux-style abstract socket address begins with a nul
+                * and can contain nuls. */
+               addr_len = (char *)&addr - (char *)&(addr.sun_path) + sockaddrlen;
+       } else {
+               for (addr_len = 0; addr.sun_path[addr_len]
+                    && addr_len < (int)sizeof(addr.sun_path); addr_len++);
+       }
+
+       ST(0) = newSVpvn_flags(addr.sun_path, addr_len, SVs_TEMP);
 #else
        ST(0) = (SV *) not_here("unpack_sockaddr_un");
 #endif
        }
 
 void
-pack_sockaddr_in(port,ip_address)
+pack_sockaddr_in(port, ip_address_sv)
        unsigned short  port
-       char *  ip_address
+       SV *    ip_address_sv
        CODE:
        {
        struct sockaddr_in sin;
-
+       struct in_addr addr;
+       STRLEN addrlen;
+       char * ip_address;
+       if (DO_UTF8(ip_address_sv) && !sv_utf8_downgrade(ip_address_sv, 1))
+            croak("Wide character in %s", "Socket::pack_sockaddr_in");
+       ip_address = SvPVbyte(ip_address_sv, addrlen);
+       if (addrlen == sizeof(addr) || addrlen == 4)
+               addr.s_addr =
+                   (ip_address[0] & 0xFF) << 24 |
+                   (ip_address[1] & 0xFF) << 16 |
+                   (ip_address[2] & 0xFF) <<  8 |
+                   (ip_address[3] & 0xFF);
+       else
+               croak("Bad arg length for %s, length is %d, should be %d",
+                     "Socket::pack_sockaddr_in",
+                     addrlen, sizeof(addr));
        Zero( &sin, sizeof sin, char );
        sin.sin_family = AF_INET;
        sin.sin_port = htons(port);
-       Copy( ip_address, &sin.sin_addr, sizeof sin.sin_addr, char );
-
-       ST(0) = sv_2mortal(newSVpv((char *)&sin, sizeof sin));
+       sin.sin_addr.s_addr = htonl(addr.s_addr);
+       ST(0) = newSVpvn_flags((char *)&sin, sizeof (sin), SVs_TEMP);
        }
 
 void
@@ -700,8 +432,8 @@ unpack_sockaddr_in(sin_sv)
        STRLEN sockaddrlen;
        struct sockaddr_in addr;
        unsigned short  port;
-       struct in_addr  ip_address;
-       char *  sin = SvPV(sin_sv,sockaddrlen);
+       struct in_addr  ip_address;
+       char *  sin = SvPVbyte(sin_sv,sockaddrlen);
        if (sockaddrlen != sizeof(addr)) {
            croak("Bad arg length for %s, length is %d, should be %d",
                        "Socket::unpack_sockaddr_in",
@@ -713,38 +445,147 @@ unpack_sockaddr_in(sin_sv)
                        "Socket::unpack_sockaddr_in",
                        addr.sin_family,
                        AF_INET);
-       } 
+       }
        port = ntohs(addr.sin_port);
        ip_address = addr.sin_addr;
 
-       EXTEND(sp, 2);
+       EXTEND(SP, 2);
        PUSHs(sv_2mortal(newSViv((IV) port)));
-       PUSHs(sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address)));
+       PUSHs(newSVpvn_flags((char *)&ip_address, sizeof(ip_address), SVs_TEMP));
        }
 
 void
-INADDR_ANY()
+pack_sockaddr_in6(port, sin6_addr, scope_id=0, flowinfo=0)
+       unsigned short  port
+       SV *    sin6_addr
+       unsigned long   scope_id
+       unsigned long   flowinfo
        CODE:
        {
-       struct in_addr  ip_address;
-       ip_address.s_addr = htonl(INADDR_ANY);
-       ST(0) = sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address ));
+#ifdef AF_INET6
+       struct sockaddr_in6 sin6;
+       char * addrbytes;
+       STRLEN addrlen;
+       if (DO_UTF8(sin6_addr) && !sv_utf8_downgrade(sin6_addr, 1))
+           croak("Wide character in %s", "Socket::pack_sockaddr_in6");
+       addrbytes = SvPVbyte(sin6_addr, addrlen);
+       if(addrlen != sizeof(sin6.sin6_addr))
+           croak("Bad arg length %s, length is %d, should be %d",
+                 "Socket::pack_sockaddr_in6", addrlen, sizeof(sin6.sin6_addr));
+       Zero(&sin6, sizeof(sin6), char);
+       sin6.sin6_family = AF_INET6;
+       sin6.sin6_port = htons(port);
+       sin6.sin6_flowinfo = htonl(flowinfo);
+       Copy(addrbytes, &sin6.sin6_addr, sizeof(sin6.sin6_addr), char);
+       sin6.sin6_scope_id = scope_id;
+       ST(0) = newSVpvn_flags((char *)&sin6, sizeof(sin6), SVs_TEMP);
+#else
+       ST(0) = (SV*)not_here("pack_sockaddr_in6");
+#endif
        }
 
 void
-INADDR_LOOPBACK()
-       CODE:
+unpack_sockaddr_in6(sin6_sv)
+       SV *    sin6_sv
+       PPCODE:
        {
-       struct in_addr  ip_address;
-       ip_address.s_addr = htonl(INADDR_LOOPBACK);
-       ST(0) = sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address));
+#ifdef AF_INET6
+       STRLEN addrlen;
+       struct sockaddr_in6 sin6;
+       char * addrbytes = SvPVbyte(sin6_sv, addrlen);
+       if (addrlen != sizeof(sin6))
+           croak("Bad arg length for %s, length is %d, should be %d",
+                   "Socket::unpack_sockaddr_in6",
+                   addrlen, sizeof(sin6));
+       Copy(addrbytes, &sin6, sizeof(sin6), char);
+       if(sin6.sin6_family != AF_INET6)
+           croak("Bad address family for %s, got %d, should be %d",
+                   "Socket::unpack_sockaddr_in6",
+                   sin6.sin6_family, AF_INET6);
+       EXTEND(SP, 4);
+       mPUSHi(ntohs(sin6.sin6_port));
+       mPUSHp((char *)&sin6.sin6_addr, sizeof(sin6.sin6_addr));
+       mPUSHi(sin6.sin6_scope_id);
+       mPUSHi(ntohl(sin6.sin6_flowinfo));
+#else
+       ST(0) = (SV*)not_here("pack_sockaddr_in6");
+#endif
        }
 
 void
-INADDR_NONE()
-       CODE:
-       {
-       struct in_addr  ip_address;
-       ip_address.s_addr = htonl(INADDR_NONE);
-       ST(0) = sv_2mortal(newSVpv((char *)&ip_address,sizeof ip_address));
-       }
+inet_ntop(af, ip_address_sv)
+        int     af
+        SV *    ip_address_sv
+        CODE:
+#ifdef HAS_INETNTOP
+       STRLEN addrlen, struct_size;
+#ifdef AF_INET6
+       struct in6_addr addr;
+       char str[INET6_ADDRSTRLEN];
+#else
+       struct in_addr addr;
+       char str[INET_ADDRSTRLEN];
+#endif
+       char *ip_address = SvPV(ip_address_sv, addrlen);
+
+       struct_size = sizeof(addr);
+
+       if(af != AF_INET
+#ifdef AF_INET6
+           && af != AF_INET6
+#endif
+         ) {
+           croak("Bad address family for %s, got %d, should be"
+#ifdef AF_INET6
+              " either AF_INET or AF_INET6",
+#else
+              " AF_INET",
+#endif
+               "Socket::inet_ntop",
+               af);
+        }
+
+       Copy( ip_address, &addr, sizeof addr, char );
+       inet_ntop(af, &addr, str, sizeof str);
+
+       ST(0) = newSVpvn_flags(str, strlen(str), SVs_TEMP);
+#else
+        ST(0) = (SV *)not_here("inet_ntop");
+#endif
+
+void
+inet_pton(af, host)
+        int           af
+        const char *  host
+        CODE:
+#ifdef HAS_INETPTON
+        int ok;
+#ifdef AF_INET6
+       struct in6_addr ip_address;
+#else
+       struct in_addr ip_address;
+#endif
+
+       if(af != AF_INET
+#ifdef AF_INET6
+               && af != AF_INET6
+#endif
+         ) {
+               croak("Bad address family for %s, got %d, should be"
+#ifdef AF_INET6
+                       " either AF_INET or AF_INET6",
+#else
+                       " AF_INET",
+#endif
+                        "Socket::inet_pton",
+                        af);
+        }
+        ok = (*host != '\0') && inet_pton(af, host, &ip_address);
+
+        ST(0) = sv_newmortal();
+        if (ok) {
+                sv_setpvn( ST(0), (char *)&ip_address, sizeof(ip_address) );
+        }
+#else
+        ST(0) = (SV *)not_here("inet_pton");
+#endif