Changeset 456

Timestamp:

11/13/06 13:13:12 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/cherokee/server-protected.h (modified) (1 diff)
• cherokee/trunk/cherokee/server.c (modified) (6 diffs)
• cherokee/trunk/cherokee/socket.h (modified) (3 diffs)
• cherokee/trunk/configure.in (modified) (1 diff)

cherokee/trunk/cherokee/server-protected.h

@@ -135 +135 @@
-        unsigned short             port_tls;
-        cherokee_boolean_t         tls_enabled;
+        cherokee_buffer_t          unix_socket;
-
-        /* Server name

cherokee/trunk/cherokee/server.c

@@ -106 +106 @@
-        cherokee_socket_init (&n->socket_tls);
-
+        cherokee_buffer_init (&n->unix_socket);
+
-        n->ipv6            = true;
-        n->fdpoll_method   = cherokee_poll_UNSET;
@@ -325 +327 @@
-        /* File descriptors
-         */
+        cherokee_buffer_mrproper (&srv->unix_socket);
+
-        cherokee_socket_close (&srv->socket);
-        cherokee_socket_mrproper (&srv->socket);
@@ -546 +550 @@
-
-static ret_t
+initialize_server_socket_unix (cherokee_server_t *srv, cherokee_socket_t *sock, unsigned short port)
+{
+#ifndef AF_LOCAL
+        return ret_no_sys;
+#else
+        ret_t ret;
+
+        /* Create the socket, and set its properties
+         */
+        ret = cherokee_socket_set_client (sock, AF_LOCAL);
+        if (ret != ret_ok) return ret;
+
+        /* Bind the socket
+         */
+        ret = cherokee_socket_bind (sock, port, &srv->listen_to);
+        if (ret != ret_ok) return ret;
+        
+        return ret_ok;
+#endif
+}
+
+static ret_t
-print_banner (cherokee_server_t *srv)
-{
@@ -645 +671 @@
-        /* Initialize the socket
-         */
+        ret = ret_not_found;
+
+#ifdef AF_LOCAL
+        if (! cherokee_buffer_is_empty (&srv->unix_socket)) {
+                ret = initialize_server_socket_unix (srv, socket, port);                
+        }
+#endif
+
-#ifdef HAVE_IPV6
-
+ && (ret != ret_ok)
-                ret = initialize_server_socket6 (srv, socket, port);
-        }
@@ -653 +687 @@
-#endif
-
-(srv->ipv6 == false) || (ret != ret_ok)
+ret != ret_ok
-                ret = initialize_server_socket4 (srv, socket, port);
-        }
-
-        if (ret != ret_ok) {
-
-
+
+
+
+
+
+
-                return ret_error;
-        }
@@ -1307 +1345 @@
-        } else if (equal_buf_str (&conf->key, "keepalive_max_requests")) {
-                srv->keepalive_max = atoi (conf->val.buf);
+
+        } else if (equal_buf_str (&conf->key, "unix_socket")) {
+                cherokee_buffer_clean (&srv->unix_socket);
+                cherokee_buffer_add_buffer (&srv->unix_socket, &conf->val);
-
-        } else if (equal_buf_str (&conf->key, "panic_action")) {

cherokee/trunk/cherokee/socket.h

@@ -63 +63 @@
-# include <openssl/rand.h>
-#endif
-
-
-#include "buffer.h"
@@ -79 +78 @@
-#endif
-
+#ifndef AF_LOCAL
+# define AF_LOCAL AF_UNIX
+#endif
+
-
-/* Socket status
@@ -143 +146 @@
-#define SOCKET(s)              ((cherokee_socket_t *)(s))
-#define SOCKET_FD(s)           (SOCKET(s)->socket)
+#define SOCKET_AF(s)           (SOCKET(s)->client_addr.sa.sa_family)
+#define SOCKET_STATUS(s)       (SOCKET(s)->status)
+
-#define SOCKET_ADDR(s)         (SOCKET(s)->client_addr)
-
-
+
-#define SOCKET_ADDR_IPv4(s)    ((struct sockaddr_in  *) &SOCKET_ADDR(s))
-#define SOCKET_ADDR_IPv6(s)    ((struct sockaddr_in6 *) &SOCKET_ADDR(s))
-#define SOCKET_STATUS(s)       (SOCKET(s)->status)
-
-#define SOCKET_SIN_PORT(s)     (SOCKET(s)->client_addr.sa_in.sin_port)

cherokee/trunk/configure.in

@@ -251 +251 @@
-AC_SEARCH_LIBS(setsockopt, socket)
-
-
-dnl
-dnl Check for fd events inspect functions