Implements ancillary data on NetBSD.

With the couple LOCAL_CREDS/SCM_CREDS, in this system we get all the
infos needed (included the process id).
Closes GH-8700.

Author: devnexen

NEWS

@@ -70,6 +70,7 @@ PHP                                                                        NEWS
   . Added TCP_KEEPALIVE, TCP_KEEPIDLE, TCP_KEEPINTVL, TCP_KEEPCNT socket
     options. (David Carlier)
   . Added ancillary data support for FreeBSD. (David Carlier)
+  . Added ancillary data support for NetBSD. (David Carlier)
 
 - Sodium:
   . Added sodium_crypto_stream_xchacha20_xor_ic(). (Scott)

UPGRADING

@@ -248,6 +248,7 @@ PHP 8.2 UPGRADE NOTES
   . TCP_NOTSENT_LOWAT
   . LOCAL_CREDS_PERSISTENT (FreeBSD)
   . SCM_CREDS2 (FreeBSD)
+  . LOCAL_CREDS (NetBSD)
 
 ========================================
 11. Changes to INI File Handling

ext/sockets/conversions.c

@@ -435,7 +435,7 @@ static void from_zval_write_sa_family(const zval *arr_value, char *field, ser_co
 	memcpy(field, &ival, sizeof(ival));
 }
 
-#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT)
+#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT) || defined(LOCAL_CREDS)
 static void from_zval_write_pid_t(const zval *arr_value, char *field, ser_context *ctx)
 {
 	zend_long lval;
@@ -522,7 +522,7 @@ static void to_zval_read_uint32(const char *data, zval *zv, res_context *ctx)
 	ZVAL_LONG(zv, (zend_long)ival);
 }
 #endif
-#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT)
+#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT) || defined(LOCAL_CREDS)
 static void to_zval_read_pid_t(const char *data, zval *zv, res_context *ctx)
 {
 	pid_t ival;
@@ -1302,13 +1302,18 @@ void to_zval_read_in6_pktinfo(const char *data, zval *zv, res_context *ctx)
 #endif
 
 /* CONVERSIONS for struct ucred */
-#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT)
+#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT) || defined(LOCAL_CREDS)
 static const field_descriptor descriptors_ucred[] = {
 #if defined(LOCAL_CREDS_PERSISTENT)
 		{"pid", sizeof("pid"), 1, offsetof(struct sockcred2, sc_pid), from_zval_write_pid_t, to_zval_read_pid_t},
 		{"uid", sizeof("uid"), 1, offsetof(struct sockcred2, sc_euid), from_zval_write_uid_t, to_zval_read_uid_t},
 		/* the type gid_t is the same as uid_t: */
 		{"gid", sizeof("gid"), 1, offsetof(struct sockcred2, sc_egid), from_zval_write_uid_t, to_zval_read_uid_t},
+#elif defined(LOCAL_CREDS)
+		{"pid", sizeof("pid"), 1, offsetof(struct sockcred, sc_pid), from_zval_write_pid_t, to_zval_read_pid_t},
+		{"uid", sizeof("uid"), 1, offsetof(struct sockcred, sc_euid), from_zval_write_uid_t, to_zval_read_uid_t},
+		/* the type gid_t is the same as uid_t: */
+		{"gid", sizeof("gid"), 1, offsetof(struct sockcred, sc_egid), from_zval_write_uid_t, to_zval_read_uid_t},
 #elif defined(ANC_CREDS_CMSGCRED)
 		{"pid", sizeof("pid"), 1, offsetof(struct cmsgcred, cmcred_pid), from_zval_write_pid_t, to_zval_read_pid_t},
 		{"uid", sizeof("uid"), 1, offsetof(struct cmsgcred, cmcred_uid), from_zval_write_uid_t, to_zval_read_uid_t},

ext/sockets/conversions.h

@@ -6,7 +6,7 @@
 #ifndef PHP_WIN32
 # include <netinet/in.h>
 # include <sys/socket.h>
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__NetBSD__)
 #  include <sys/un.h>
 # endif
 #else
@@ -54,7 +54,7 @@ void from_zval_write_in6_pktinfo(const zval *container, char *in6_pktinfo_c, ser
 void to_zval_read_in6_pktinfo(const char *data, zval *zv, res_context *ctx);
 #endif
 
-#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT)
+#if defined(SO_PASSCRED) || defined(LOCAL_CREDS_PERSISTENT) || defined(LOCAL_CREDS)
 void from_zval_write_ucred(const zval *container, char *ucred_c, ser_context *ctx);
 void to_zval_read_ucred(const char *data, zval *zv, res_context *ctx);
 #endif

ext/sockets/sendrecvmsg.c

@@ -134,9 +134,12 @@ static void init_ancillary_registry(void)
 #endif
 #endif
 
-#ifdef LOCAL_CREDS_PERSISTENT
+#if defined(LOCAL_CREDS_PERSISTENT)
 	PUT_ENTRY(SOCKCRED2SIZE(1), 1, 0, from_zval_write_ucred,
 			to_zval_read_ucred, SOL_SOCKET, SCM_CREDS2);
+#elif defined(LOCAL_CREDS)
+	PUT_ENTRY(SOCKCREDSIZE(1), 1, 0, from_zval_write_ucred,
+			to_zval_read_ucred, SOL_SOCKET, SCM_CREDS);
 #endif
 
 #ifdef SCM_RIGHTS
@@ -457,9 +460,12 @@ void php_socket_sendrecvmsg_init(INIT_FUNC_ARGS)
 #endif
 	REGISTER_LONG_CONSTANT("SO_PASSCRED",			SO_PASSCRED,		CONST_CS | CONST_PERSISTENT);
 #endif
-#ifdef LOCAL_CREDS_PERSISTENT
+#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