X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=php_psi.h;h=de06fc304eca0ab4eb083160e3b6bb9e87d4da09;hp=71b554e3937ca33ba61bc4d6bcbec02ec6069678;hb=aa338e1f515a21d83284c83d780d2dc075192c4d;hpb=5ec2f9ac17f56aee266dc78b4bf657f2cf0910b1 diff --git a/php_psi.h b/php_psi.h index 71b554e..de06fc3 100644 --- a/php_psi.h +++ b/php_psi.h @@ -26,6 +26,8 @@ #ifndef PHP_PSI_H #define PHP_PSI_H +#include "php.h" + extern zend_module_entry psi_module_entry; #define phpext_psi_ptr &psi_module_entry @@ -45,7 +47,53 @@ extern zend_module_entry psi_module_entry; static inline int psi_check_env(const char *var) { char *set = getenv(var); - return (set && *set && '0' != *set); + return (set && *set && (*set != '0' || set[1])); +} + +#include +#include "php_network.h" + +static inline int psi_fdopen(const char *desc) +{ + int fd = -1; + + if (desc) { + char *addr = strstr(desc, "://"); + + if (addr) { + addr += 3; + } + if (addr && *addr) { + struct sockaddr_storage sa = {0}; + socklen_t ss = 0; + int rc = php_network_parse_network_address_with_port(addr, + strlen(addr), (struct sockaddr *) &sa, &ss); + + if (SUCCESS == rc) { + int styp = strncmp(desc, "udp:", 4) + ? SOCK_STREAM + : SOCK_DGRAM; + int sfam = sa.ss_family == AF_INET6 + ? ((struct sockaddr_in6 *) &sa)->sin6_family + : ((struct sockaddr_in *) &sa)->sin_family; + + fd = socket(sfam, styp, 0); + + if (fd > 0 && 0 != connect(fd, (struct sockaddr *) &sa, ss)) { + perror(desc); + close(fd); + fd = -1; + } + } + } else if (!strcmp(desc, "stdout")) { + fd = STDOUT_FILENO; + } else if (!strcmp(desc, "stderr")) { + fd = STDERR_FILENO; + } else if (!(fd = atoi(desc)) || -1 == fcntl(fd, F_GETFD)) { + fd = open(desc, O_WRONLY|O_APPEND|O_CREAT|O_CLOEXEC, 0664); + } + } + return fd; } typedef struct psi_object { @@ -73,7 +121,12 @@ ZEND_BEGIN_MODULE_GLOBALS(psi) char *engine; char *directory; char *search_path; + struct psi_context_ops *ops; struct psi_context *context; + struct { + struct psi_plist *decls; + struct psi_plist *vars; + } blacklist; ZEND_END_MODULE_GLOBALS(psi); ZEND_EXTERN_MODULE_GLOBALS(psi);