ext/sockets: follow-up on AF_PACKET support.

Back to the drawing board due to UAF with previous version.

This reverts commit cc11606.

Author: devnexen

ext/sockets/config.m4

@@ -5,7 +5,7 @@ PHP_ARG_ENABLE([sockets],
 
 if test "$PHP_SOCKETS" != "no"; then
   AC_CHECK_FUNCS([hstrerror if_nametoindex if_indextoname sockatmark])
-  AC_CHECK_HEADERS([sys/sockio.h linux/filter.h linux/if_packet.h linux/if_ether.h])
+  AC_CHECK_HEADERS([sys/sockio.h linux/filter.h linux/if_packet.h linux/if_ether.h netinet/ether.h])
   AC_DEFINE([HAVE_SOCKETS], [1],
     [Define to 1 if the PHP extension 'sockets' is available.])
 

ext/sockets/php_sockets.h

@@ -77,6 +77,15 @@ typedef struct {
 
 extern PHP_SOCKETS_API zend_class_entry *socket_ce;
 
+#ifdef AF_PACKET
+extern PHP_SOCKETS_API zend_class_entry *packet_ce;
+extern PHP_SOCKETS_API zend_class_entry *ethinfopacket_ce;
+extern PHP_SOCKETS_API zend_class_entry *tcppacket_ce;
+extern PHP_SOCKETS_API zend_class_entry *udppacket_ce;
+extern PHP_SOCKETS_API zend_class_entry *ipv4packet_ce;
+extern PHP_SOCKETS_API zend_class_entry *ipv6packet_ce;
+#endif
+
 static inline php_socket *socket_from_obj(zend_object *obj) {
 	return (php_socket *)((char *)(obj) - XtOffsetOf(php_socket, std));
 }