X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FSocket%2FSocket.xs;h=d844775e4f1fa24263c55d8a58d8519b719db575;hb=2bad225e044a6e3cf063675adbf900894460d1ee;hp=1c3c239b3e997338402dd67ac498fa9de10292d0;hpb=2a84dff3ea9dbc3670690c13c0f8f55f391c41cc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Socket/Socket.xs b/ext/Socket/Socket.xs
index 1c3c239..d844775 100644
--- a/ext/Socket/Socket.xs
+++ b/ext/Socket/Socket.xs
@@ -3,6 +3,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#include <stddef.h>
+
 #ifndef VMS
 # ifdef I_SYS_TYPES
 #  include <sys/types.h>
@@ -209,11 +211,11 @@ not_here(char *s)
 *
 * --jhi */
 
-#include "constants.c"
+#include "const-c.inc"
 
 MODULE = Socket		PACKAGE = Socket
 
-INCLUDE: constants.xs
+INCLUDE: const-xs.inc
 
 void
 inet_aton(host)
@@ -248,7 +250,7 @@ inet_ntoa(ip_address_sv)
 	char * ip_address;
 	if (DO_UTF8(ip_address_sv) && !sv_utf8_downgrade(ip_address_sv, 1))
 	     croak("Wide character in Socket::inet_ntoa");
-	ip_address = SvPV(ip_address_sv, addrlen);
+	ip_address = SvPVbyte(ip_address_sv, addrlen);
 	if (addrlen == sizeof(addr) || addrlen == 4)
 	        addr.s_addr =
 		    (ip_address[0] & 0xFF) << 24 |
@@ -261,8 +263,9 @@ inet_ntoa(ip_address_sv)
 		      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. */
-	New(1138, addr_str, 4 * 3 + 3 + 1, char);
+	 * so let's use this sprintf() workaround everywhere.
+	 * This is also more threadsafe than using inet_ntoa(). */
+	New(1138, addr_str, 4 * 3 + 3 + 1, char); /* IPv6? */
 	sprintf(addr_str, "%d.%d.%d.%d",
 		((addr.s_addr >> 24) & 0xFF),
 		((addr.s_addr >> 16) & 0xFF),
@@ -277,7 +280,7 @@ sockaddr_family(sockaddr)
 	SV *	sockaddr
 	PREINIT:
 	STRLEN sockaddr_len;
-	char *sockaddr_pv = SvPV(sockaddr, 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",
@@ -341,7 +344,7 @@ unpack_sockaddr_un(sun_sv)
 #ifdef I_SYS_UN
 	struct sockaddr_un addr;
 	STRLEN sockaddrlen;
-	char * sun_ad = SvPV(sun_sv,sockaddrlen);
+	char * sun_ad = SvPVbyte(sun_sv,sockaddrlen);
 	char * e;
 #   ifndef __linux__
 	/* On Linux sockaddrlen on sockets returned by accept, recvfrom,
@@ -382,7 +385,7 @@ pack_sockaddr_in(port, ip_address_sv)
 	char * ip_address;
 	if (DO_UTF8(ip_address_sv) && !sv_utf8_downgrade(ip_address_sv, 1))
 	     croak("Wide character in Socket::pack_sockaddr_in");
-	ip_address = SvPV(ip_address_sv, addrlen);
+	ip_address = SvPVbyte(ip_address_sv, addrlen);
 	if (addrlen == sizeof(addr) || addrlen == 4)
 	        addr.s_addr =
 		    (ip_address[0] & 0xFF) << 24 |
@@ -409,7 +412,7 @@ unpack_sockaddr_in(sin_sv)
 	struct sockaddr_in addr;
 	unsigned short	port;
 	struct in_addr  ip_address;
-	char *	sin = SvPV(sin_sv,sockaddrlen);
+	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",