Declare ext/sockets constants in stubs

ext/sockets/php_sockets.h

@@ -136,4 +136,273 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
 # define ss_family __ss_family
 #endif
 
+#ifndef MSG_EOF
+#ifdef MSG_FIN
+#define MSG_EOF MSG_FIN
+#endif
+#endif
+
+#ifndef MSG_WAITALL
+#ifdef LINUX
+#define MSG_WAITALL 0x00000100
+#else
+#define MSG_WAITALL 0x00000000
+#endif
+#endif
+
+#define PHP_NORMAL_READ 0x0001
+#define PHP_BINARY_READ 0x0002
+
+#ifdef WIN32
+#define PHP_SOCKET_EINTR WSAEINTR
+#elif defined(EINTR)
+#define PHP_SOCKET_EINTR EINTR
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EBADF WSAEBADF
+#elif defined(EBADF)
+#define PHP_SOCKET_EBADF EBADF
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EACCES WSAEACCES
+#elif defined(EACCES)
+#define PHP_SOCKET_EACCES EACCES
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EFAULT WSAEFAULT
+#elif defined(EFAULT)
+#define PHP_SOCKET_EFAULT EFAULT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EINVAL WSAEINVAL
+#elif defined(EINVAL)
+#define PHP_SOCKET_EINVAL EINVAL
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EMFILE WSAEMFILE
+#elif defined(EMFILE)
+#define PHP_SOCKET_ENFILE EMFILE
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
+#elif defined(EWOULDBLOCK)
+#define PHP_SOCKET_EWOULDBLOCK EWOULDBLOCK
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EINPROGRESS WSAEINPROGRESS
+#elif defined(EINPROGRESS)
+#define PHP_SOCKET_EINPROGRESS EINPROGRESS
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EALREADY WSAEALREADY
+#elif defined(EALREADY)
+#define PHP_SOCKET_EALREADY EALREADY
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENOTSOCK WSAENOTSOCK
+#elif defined(ENOTSOCK)
+#define PHP_SOCKET_ENOTSOCK ENOTSOCK
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EDESTADDRREQ WSAEDESTADDRREQ
+#elif defined(EDESTADDRREQ)
+#define PHP_SOCKET_EDESTADDRREQ EDESTADDRREQ
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EMSGSIZE WSAEMSGSIZE
+#elif defined(EMSGSIZE)
+#define PHP_SOCKET_EMSGSIZE EMSGSIZE
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EPROTOTYPE WSAEPROTOTYPE
+#elif defined(EPROTOTYPE)
+#define PHP_SOCKET_EPROTOTYPE EPROTOTYPE
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENOPROTOOPT WSAENOPROTOOPT
+#elif defined(ENOPROTOOPT)
+#define PHP_SOCKET_ENOPROTOOPT ENOPROTOOPT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EPROTONOSUPPORT WSAEPROTONOSUPPORT
+#elif defined(EPROTONOSUPPORT)
+#define PHP_SOCKET_EPROTONOSUPPORT EPROTONOSUPPORT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+#elif defined(ESOCKTNOSUPPORT)
+#define PHP_SOCKET_ESOCKTNOSUPPORT ESOCKTNOSUPPORT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EOPNOTSUPP WSAEOPNOTSUPP
+#elif defined(EOPNOTSUPP)
+#define PHP_SOCKET_EOPNOTSUPP EOPNOTSUPP
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EPFNOSUPPORT WSAEPFNOSUPPORT
+#elif defined(EOPNOTSUPP)
+#define PHP_SOCKET_EPFNOSUPPORT EPFNOSUPPORT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EAFNOSUPPORT WSAEAFNOSUPPORT
+#elif defined(EAFNOSUPPORT)
+#define PHP_SOCKET_EAFNOSUPPORT EAFNOSUPPORT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EADDRINUSE WSAEADDRINUSE
+#elif defined(EADDRINUSE)
+#define PHP_SOCKET_EADDRINUSE EADDRINUSE
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#elif defined(EADDRNOTAVAIL)
+#define PHP_SOCKET_EADDRNOTAVAIL EADDRNOTAVAIL
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENETDOWN WSAENETDOWN
+#elif defined(ENETDOWN)
+#define PHP_SOCKET_ENETDOWN ENETDOWN
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENETUNREACH WSAENETUNREACH
+#elif defined(ENETUNREACH)
+#define PHP_SOCKET_ENETUNREACH ENETUNREACH
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENETRESET WSAENETRESET
+#elif defined(WSAENETRESET)
+#define PHP_SOCKET_ENETRESET ENETUNREACH
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ECONNABORTED WSAECONNABORTED
+#elif defined(ECONNABORTED)
+#define PHP_SOCKET_ECONNABORTED ECONNABORTED
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ECONNRESET WSAECONNABORTED
+#elif defined(ECONNABORTED)
+#define PHP_SOCKET_ECONNRESET ECONNABORTED
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENOBUFS WSAENOBUFS
+#elif defined(ENOBUFS)
+#define PHP_SOCKET_ENOBUFS ENOBUFS
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EISCONN WSAEISCONN
+#elif defined(EISCONN)
+#define PHP_SOCKET_EISCONN EISCONN
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENOTCONN WSAENOTCONN
+#elif defined(ENOTCONN)
+#define PHP_SOCKET_ENOTCONN ENOTCONN
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ESHUTDOWN WSAESHUTDOWN
+#elif defined(EISCONN)
+#define PHP_SOCKET_ESHUTDOWN ESHUTDOWN
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
+#elif defined(EISCONN)
+#define PHP_SOCKET_ETOOMANYREFS ETOOMANYREFS
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
+#elif defined(ETOOMANYREFS)
+#define PHP_SOCKET_ETOOMANYREFS ETOOMANYREFS
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ETIMEDOUT WSAETIMEDOUT
+#elif defined(ETIMEDOUT)
+#define PHP_SOCKET_ETIMEDOUT ETIMEDOUT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ECONNREFUSED WSAECONNREFUSED
+#elif defined(ECONNREFUSED)
+#define PHP_SOCKET_ECONNREFUSED ECONNREFUSED
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ELOOP WSAELOOP
+#elif defined(ELOOP)
+#define PHP_SOCKET_ELOOP ELOOP
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENAMETOOLONG WSAENAMETOOLONG
+#elif defined(ENAMETOOLONG)
+#define PHP_SOCKET_ENAMETOOLONG ENAMETOOLONG
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EHOSTDOWN WSAEHOSTDOWN
+#elif defined(EHOSTDOWN)
+#define PHP_SOCKET_EHOSTDOWN EHOSTDOWN
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EHOSTUNREACH WSAEHOSTUNREACH
+#elif defined(EHOSTUNREACH)
+#define PHP_SOCKET_EHOSTUNREACH EHOSTUNREACH
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_ENOTEMPTY WSAENOTEMPTY
+#elif defined(ENOTEMPTY)
+#define PHP_SOCKET_ENOTEMPTY ENOTEMPTY
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EUSERS WSAEUSERS
+#elif defined(EUSERS)
+#define PHP_SOCKET_EUSERS EUSERS
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EDQUOT WSAEDQUOT
+#elif defined(EDQUOT)
+#define PHP_SOCKET_EDQUOT EDQUOT
+#endif
+
+#ifdef WIN32
+#define PHP_SOCKET_EREMOTE WSAEREMOTE
+#elif defined(EREMOTE)
+#define PHP_SOCKET_EREMOTE EREMOTE
+#endif
+
 #endif

ext/sockets/sendrecvmsg.c

@@ -35,8 +35,6 @@
 #ifdef PHP_WIN32
 #include "windows_common.h"
 #include <Mswsock.h>
-#define IPV6_RECVPKTINFO	IPV6_PKTINFO
-#define IPV6_RECVHOPLIMIT	IPV6_HOPLIMIT
 #define msghdr _WSAMSG
 
 static GUID WSARecvMsg_GUID = WSAID_WSARECVMSG;
@@ -424,50 +422,6 @@ int php_do_getsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname,
 
 void php_socket_sendrecvmsg_init(INIT_FUNC_ARGS)
 {
-	/* IPv6 ancillary data */
-#if defined(IPV6_RECVPKTINFO) && HAVE_IPV6
-	REGISTER_LONG_CONSTANT("IPV6_RECVPKTINFO",		IPV6_RECVPKTINFO,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_PKTINFO",          IPV6_PKTINFO,       CONST_CS | CONST_PERSISTENT);
-#endif
-#if defined(IPV6_RECVHOPLIMIT) && HAVE_IPV6
-	REGISTER_LONG_CONSTANT("IPV6_RECVHOPLIMIT",		IPV6_RECVHOPLIMIT,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_HOPLIMIT",         IPV6_HOPLIMIT,      CONST_CS | CONST_PERSISTENT);
-#endif
-	/* would require some effort:
-	REGISTER_LONG_CONSTANT("IPV6_RECVRTHDR",		IPV6_RECVRTHDR,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_RECVHOPOPTS",		IPV6_RECVHOPOPTS,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_RECVDSTOPTS",		IPV6_RECVDSTOPTS,	CONST_CS | CONST_PERSISTENT);
-	*/
-#if defined(IPV6_RECVTCLASS) && HAVE_IPV6
-	REGISTER_LONG_CONSTANT("IPV6_RECVTCLASS",		IPV6_RECVTCLASS,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_TCLASS",			IPV6_TCLASS,		CONST_CS | CONST_PERSISTENT);
-#endif
-
-	/*
-	REGISTER_LONG_CONSTANT("IPV6_RTHDR",			IPV6_RTHDR,			CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_HOPOPTS",			IPV6_HOPOPTS,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("IPV6_DSTOPTS",			IPV6_DSTOPTS,		CONST_CS | CONST_PERSISTENT);
-	*/
-
-#ifdef SCM_RIGHTS
-	REGISTER_LONG_CONSTANT("SCM_RIGHTS",			SCM_RIGHTS,			CONST_CS | CONST_PERSISTENT);
-#endif
-#ifdef SO_PASSCRED
-#ifdef SCM_CREDENTIALS
-	REGISTER_LONG_CONSTANT("SCM_CREDENTIALS",		SCM_CREDENTIALS,	CONST_CS | CONST_PERSISTENT);
-#else
-	REGISTER_LONG_CONSTANT("SCM_CREDS",		SCM_CREDS,	CONST_CS | CONST_PERSISTENT);
-#endif
-	REGISTER_LONG_CONSTANT("SO_PASSCRED",			SO_PASSCRED,		CONST_CS | CONST_PERSISTENT);
-#endif
-#if defined(LOCAL_CREDS_PERSISTENT)
-	REGISTER_LONG_CONSTANT("SCM_CREDS2",			SCM_CREDS2,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("LOCAL_CREDS_PERSISTENT",	LOCAL_CREDS_PERSISTENT,	CONST_CS | CONST_PERSISTENT);
-#elif defined(LOCAL_CREDS)
-	REGISTER_LONG_CONSTANT("SCM_CREDS",			SCM_CREDS,		CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("LOCAL_CREDS",			LOCAL_CREDS,	        CONST_CS | CONST_PERSISTENT);
-#endif
-
 #ifdef ZTS
 	ancillary_mutex = tsrm_mutex_alloc();
 #endif

ext/sockets/sendrecvmsg.h

@@ -6,6 +6,11 @@
 
 /* for sockets.c */
 
+#ifdef PHP_WIN32
+#define IPV6_RECVPKTINFO	IPV6_PKTINFO
+#define IPV6_RECVHOPLIMIT	IPV6_HOPLIMIT
+#endif
+
 void php_socket_sendrecvmsg_init(INIT_FUNC_ARGS);
 void php_socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS);