support for php5.6.30

[php-ancillary.git] / php-ancillary.c

diff --git a/php-ancillary.c b/php-ancillary.c
index f069bff..b79a92a 100644 (file)
--- a/php-ancillary.c
+++ b/php-ancillary.c
@@ -1,6 +1,27 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#ifndef _XPG4_2 /* Solaris sucks */
+# define _XPG4_2
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <assert.h>
+#if defined(__FreeBSD__)
+# include <sys/param.h> /* FreeBSD sucks */
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+
 #include "php.h"
 #include <php5/main/php_network.h>
 #include <php5/ext/standard/file.h>
@@ -15,13 +36,126 @@
  
 extern zend_module_entry ancillary_module_entry;
 #define phpext_ancillary_ptr &ancillary_module_entry
+
+int
+ancil_recv_fds_with_buffer(int sock, int *fds, unsigned n_fds, void *buffer)
+{
+    struct msghdr msghdr;
+    char nothing;
+    struct iovec nothing_ptr;
+    struct cmsghdr *cmsg;
+    int i;
+
+    nothing_ptr.iov_base = &nothing;
+    nothing_ptr.iov_len = 1;
+    msghdr.msg_name = NULL;
+    msghdr.msg_namelen = 0;
+    msghdr.msg_iov = &nothing_ptr;
+    msghdr.msg_iovlen = 1;
+    msghdr.msg_flags = 0;
+    msghdr.msg_control = buffer;
+    msghdr.msg_controllen = sizeof(struct cmsghdr) + sizeof(int) * n_fds;
+    cmsg = CMSG_FIRSTHDR(&msghdr);
+    cmsg->cmsg_len = msghdr.msg_controllen;
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    for(i = 0; i < n_fds; i++)
+       ((int *)CMSG_DATA(cmsg))[i] = -1;
+    
+    if(recvmsg(sock, &msghdr, 0) < 0)
+       return(-1);
+    for(i = 0; i < n_fds; i++)
+       fds[i] = ((int *)CMSG_DATA(cmsg))[i];
+    n_fds = (cmsg->cmsg_len - sizeof(struct cmsghdr)) / sizeof(int);
+    return(n_fds);
+}
+
+int
+ancil_recv_fds_with_buffer_ext(int sock, int *fds, unsigned n_fds, void *buffer, char *headers, int hsize)
+{
+    struct msghdr msghdr;
+    char nothing;
+    struct iovec nothing_ptr;
+    struct cmsghdr *cmsg;
+    int i, mop_len;
+
+    nothing_ptr.iov_base = &nothing;
+    nothing_ptr.iov_len = 1;
+    msghdr.msg_name = NULL;
+    msghdr.msg_namelen = 0;
+    msghdr.msg_iov = &nothing_ptr;
+    msghdr.msg_iovlen = 1;
+    msghdr.msg_flags = 0;
+    msghdr.msg_control = buffer;
+    msghdr.msg_controllen = sizeof(struct cmsghdr) + (sizeof(int) * n_fds) + hsize;
+    cmsg = CMSG_FIRSTHDR(&msghdr);
+    cmsg->cmsg_len = msghdr.msg_controllen;
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    for(i = 0; i < n_fds; i++)
+       ((int *)CMSG_DATA(cmsg))[i] = -1;
+    if((mop_len = recvmsg(sock, &msghdr, 0)) < 0)
+       return(-1);
+
+    if (0 == 1) {
+        int mop_fd;
+        char mop_bf[512];
+
+        mop_fd = open("/tmp/fd_recv.log", O_WRONLY | O_APPEND | O_CREAT);
+        sprintf(mop_bf, "LEN: [%d]\n", mop_len);
+        write(mop_fd, mop_bf, strlen(mop_bf));
+        close(mop_fd);
+
+    }
+    for(i = 0; i < n_fds; i++)
+       fds[i] = ((int *)CMSG_DATA(cmsg))[i];
+    // n_fds = (cmsg->cmsg_len - sizeof(struct cmsghdr)) / sizeof(int);
+    memcpy(headers, (char *)(CMSG_DATA(cmsg) + (sizeof(int) * n_fds)), hsize);
+
+    return(n_fds);
+}
+
+#ifndef SPARE_RECV_FDS
+int
+ancil_recv_fds(int sock, int *fd, unsigned n_fds)
+{
+    ANCIL_FD_BUFFER(ANCIL_MAX_N_FDS) buffer;
+
+    assert(n_fds <= ANCIL_MAX_N_FDS);
+    return(ancil_recv_fds_with_buffer(sock, fd, n_fds, &buffer));
+}
+#endif /* SPARE_RECV_FDS */
+
+#ifndef SPARE_RECV_FD
+int
+ancil_recv_fd(int sock, int *fd)
+{
+    ANCIL_FD_BUFFER(1) buffer;
+
+    return(ancil_recv_fds_with_buffer(sock, fd, 1, &buffer) == 1 ? 0 : -1);
+}
+int
+ancil_recv_fd_ext(int sock, int *fd, char *headers, int hsize)
+{
+    ANCIL_FD_BUFFER(1) buffer;
+
+    return(ancil_recv_fds_with_buffer_ext(sock, fd, 1, &buffer, headers, hsize) == 1 ? 0 : -1);
+}
+#endif /* SPARE_RECV_FD */
+
  
 // declaration of a custom mop_function()
 PHP_FUNCTION(ancillary_getstream);
  
 // list of custom PHP functions provided by this extension
 // set {NULL, NULL, NULL} as the last record to mark the end of list
-static function_entry ancillary_getstream[] = {
+static
+#if ZEND_MODULE_API_NO >= 20131226
+ zend_function_entry
+#elif ZEND_MODULE_API_NO >= 20010901
+ function_entry
+#endif
+ ancillary_getstream[] = {
     PHP_FE(ancillary_getstream, NULL)
     {NULL, NULL, NULL}
 };
@@ -108,10 +242,14 @@ PHP_FUNCTION(ancillary_getstream)
     }
     shutdown(fd_out[1], SHUT_RDWR);
     close(fd_out[1]);
+    write(1, "HEADERS[", 8);
+    write(1, headers, curpos);
+    headers[curpos] = '\0';
+    write(1, "]\n", 2);
     ZVAL_STRING(zheaders, headers, 1);
     free(headers);
 
-    {
+    if (0 == 1) {
         int fh;
 
         if ((fh = open("/tmp/out_php-anc.txt", O_WRONLY | O_CREAT | O_APPEND)) > -1) {
@@ -135,7 +273,7 @@ PHP_FUNCTION(ancillary_getstream)
 
     if (stream == NULL)        {
         pefree(sock, 0);
-        return NULL;
+        return;
     }
     php_stream_to_zval(stream, return_value);
 }