0
@@ -18,7 +18,7 @@
0
   opts.separator ""
0
   opts.separator "Server options:"
0
 
0
-  opts.on("-h", "--host HOST", "listen on HOST (default: 0.0.0.0)")      { |host| options[:hort] = host }
0
+  opts.on("-s", "--socket SOCKET", "listen on socket")                   { |socket| options[:socket] = socket }
0
   opts.on("-p", "--port PORT", "use PORT (default: 3000)")               { |port| options[:port] = port }
0
   opts.on("-e", "--env ENV", "Rails environment (default: development)") { |env| options[:env] = env }
0
   opts.on("-c", "--chdir PATH", "Rails root dir (default: current dir)") { |dir| options[:root] = dir }

0
@@ -60,18 +60,19 @@
0
     end
0
     
0
     def initialize(app, options={})
0
-      @host = options[:host] || '0.0.0.0'
0
+      #@host = options[:host] || '0.0.0.0'
0
+      @socket = options[:socket]
0
       @port = (options[:port] || 4001).to_i
0
       pid_file = options[:pid_file]
0
       log_file = options[:log_file]
0
       @timeout =  options[:timeout]
0
-
0
+      
0
       if options[:daemonize]
0
         change_privilege options[:user], options[:group] if options[:user] && options[:group]
0
         daemonize
0
       end
0
       @app = app
0
-      init(@host, @port)
0
+      init
0
     end
0
     
0
     def process_client(client)
0
@@ -100,7 +101,16 @@
0
     
0
     def start
0
       trap('INT')  { @running = false }
0
-      listen
0
+      
0
+      if @socket
0
+        listen_on_socket(@socket) or raise "Problem listening on socket #{@socket}"
0
+        puts "Listening on socket #{@socket}"
0
+      else
0
+        listen_on_port(@port) or raise "Problem listening on port #{@port}"
0
+        puts "Listening on port #{@port}"
0
+      end
0
+      @waiting_clients = []
0
+      
0
       @running = true
0
       while process_connections and @running
0
         unless @waiting_clients.empty?

0
@@ -6,6 +6,8 @@
0
 #include <fcntl.h>
0
 #include <sys/types.h>
0
 #include <arpa/inet.h>
0
+#include <netinet/tcp.h>
0
+#include <sys/un.h>
0
 #include <netdb.h>
0
 
0
 #include <stdio.h>
0
@@ -27,6 +29,9 @@
0
 #define min(a,b) (a < b ? a : b)
0
 #define ramp(a) (a > 0 ? a : 0)
0
 
0
+static int server_socket(const int port);
0
+static int server_socket_unix(const char *path, int access_mask);
0
+
0
 #define env_add(client, field,flen,value,vlen)                              \
0
   client->env_fields[client->env_size] = field;                             \
0
   client->env_field_lengths[client->env_size] = flen;                       \
0
@@ -147,14 +152,14 @@
0
     return;
0
   
0
   /* Set the env variables */
0
-  env_add_const(client, EBB_SERVER_NAME
0
-                      , server->address
0
-                      , strlen(server->address)
0
-                      );
0
-  env_add_const(client, EBB_SERVER_PORT
0
-                      , server->port
0
-                      , strlen(server->port)
0
-                      );
0
+  // env_add_const(client, EBB_SERVER_NAME
0
+  //                     , server->address
0
+  //                     , strlen(server->address)
0
+  //                     );
0
+  // env_add_const(client, EBB_SERVER_PORT
0
+  //                     , server->port
0
+  //                     , strlen(server->port)
0
+  //                     );
0
   server->request_cb(client, server->request_cb_data);
0
 }
0
 
0
0
0
@@ -309,20 +314,18 @@
0
   ebb_server *server = (ebb_server*)(watcher->data);
0
   assert(server->open);
0
   assert(server->loop == loop);
0
-  assert(server->request_watcher == watcher);
0
+  assert(&server->request_watcher == watcher);
0
   
0
   if(EV_ERROR & revents) {
0
     ebb_info("on_request() got error event, closing server.");
0
     ebb_server_unlisten(server);
0
     return;
0
   }
0
-  
0
   /* Now we're going to initialize the client 
0
    * and set up her callbacks for read and write
0
    * the client won't get passed back to the user, however,
0
    * until the request is complete and parsed.
0
    */
0
-  
0
   int i;
0
   ebb_client *client;
0
   /* Get next availible peer */
0
@@ -352,7 +355,7 @@
0
   int flags = fcntl(client->fd, F_GETFL, 0);
0
   assert(0 <= fcntl(client->fd, F_SETFL, flags | O_NONBLOCK));
0
   
0
-  /* INITIALIZE inline http_parser */
0
+  /* INITIALIZE  http_parser */
0
   http_parser_init(&(client->parser));
0
   client->parser.data = client;
0
   client->parser.http_field     = http_field_cb;
0
0
0
0
0
@@ -390,45 +393,22 @@
0
   return server;
0
 }
0
 
0
+
0
 void ebb_server_init( ebb_server *server
0
                     , struct ev_loop *loop
0
-                    , char *address
0
-                    , int port
0
                     , ebb_request_cb request_cb
0
                     , void *request_cb_data
0
                     )
0
 {
0
-  /* SETUP SOCKET STUFF */
0
-  server->fd = socket(PF_INET, SOCK_STREAM, 0);
0
-  int r = fcntl(server->fd, F_SETFL, O_NONBLOCK);
0
-  assert(r >= 0);
0
-  
0
   int i;
0
   for(i=0; i < EBB_MAX_CLIENTS; i++)
0
     server->clients[i].write_buffer = g_string_new("");
0
   
0
-  int flags = 1;
0
-  r = setsockopt(server->fd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
0
-  assert(r >= 0);
0
-  server->sockaddr.sin_family = AF_INET;
0
-  server->sockaddr.sin_port = htons(port);
0
-  server->address = strdup(address); /* TODO: use looked up address? */
0
-  server->port = malloc(sizeof(char)*8); /* for easy access to the port */
0
-  sprintf(server->port, "%d", port);
0
-  server->dns_info = gethostbyname(address);
0
-  if (!(server->dns_info && server->dns_info->h_addr)) {
0
-    ebb_error("Could not look up hostname %s", address);
0
-    goto error;
0
-  }
0
-  memmove( &(server->sockaddr.sin_addr)
0
-         , server->dns_info->h_addr
0
-         , sizeof(struct in_addr)
0
-         );
0
-  
0
   server->request_cb = request_cb;
0
   server->request_cb_data = request_cb_data;
0
   server->loop = loop;
0
   server->open = FALSE;
0
+  server->fd = -1;
0
   return;
0
 error:
0
   ebb_server_free(server);
0
@@ -445,10 +425,8 @@
0
     g_string_free(server->clients[i].write_buffer, TRUE);
0
   if(server->port)
0
     free(server->port);
0
-  if(server->address)
0
-    free(server->address);
0
-  if(server->dns_info)
0
-    free(server->dns_info);
0
+  if(server->socketpath)
0
+    free(server->socketpath);
0
   free(server);
0
 }
0
 
0
@@ -461,14 +439,9 @@
0
     ebb_client *client;
0
     for(i=0; i < EBB_MAX_CLIENTS; i++)
0
       ebb_client_close(client);
0
-    
0
-    if(server->request_watcher) {
0
-      ev_io_stop(server->loop, server->request_watcher);
0
-      free(server->request_watcher);
0
-      server->request_watcher = NULL;
0
-    }
0
-    
0
-    close(server->fd);
0
+    ev_io_stop(server->loop, &server->request_watcher);
0
+    if(server->fd > 0)
0
+      close(server->fd);
0
     server->open = FALSE;
0
   }
0
 }
0
0
0
@@ -476,28 +449,41 @@
0
 
0
 void ebb_server_listen(ebb_server *server)
0
 {
0
-  int r = bind( server->fd
0
-              , (struct sockaddr*)&(server->sockaddr)
0
-              , sizeof(server->sockaddr)
0
-              );
0
-  if(r < 0) {
0
-    ebb_error("Failed to bind to %s %s", server->address, server->port);
0
-    ebb_server_unlisten(server);
0
-    return;
0
-  }
0
-  r = listen(server->fd, EBB_MAX_CLIENTS);
0
+  int r = listen(server->fd, EBB_MAX_CLIENTS);
0
   assert(r >= 0);
0
   assert(server->open == FALSE);
0
   server->open = TRUE;
0
   
0
-  server->request_watcher = g_new0(ev_io, 1);
0
-  server->request_watcher->data = server;
0
-  
0
-  ev_init (server->request_watcher, on_request);
0
-  ev_io_set (server->request_watcher, server->fd, EV_READ | EV_ERROR);
0
-  ev_io_start (server->loop, server->request_watcher);
0
+  server->request_watcher.data = server;
0
+  ev_init (&server->request_watcher, on_request);
0
+  ev_io_set (&server->request_watcher, server->fd, EV_READ | EV_ERROR);
0
+  ev_io_start (server->loop, &server->request_watcher);
0
 }
0
 
0
+
0
+int ebb_server_listen_on_port(ebb_server *server, const int port)
0
+{
0
+  int fd = server_socket(port);
0
+  if(fd < 0) return 0;
0
+  server->port = malloc(sizeof(char)*8); /* for easy access to the port */
0
+  sprintf(server->port, "%d", port);
0
+  server->fd = fd;
0
+  ebb_server_listen(server);
0
+  return fd;
0
+}
0
+
0
+
0
+int ebb_server_listen_on_socket(ebb_server *server, const char *socketpath)
0
+{
0
+  int fd = server_socket_unix(socketpath, 0x700);
0
+  if(fd < 0) return 0;
0
+  server->socketpath = strdup(socketpath);
0
+  server->fd = fd;
0
+  ebb_server_listen(server);
0
+  return fd;
0
+}
0
+
0
+
0
 void ebb_client_close(ebb_client *client)
0
 {
0
   if(client->open) {
0
@@ -525,6 +511,7 @@
0
   }
0
 }
0
 
0
+
0
 void ebb_on_writable( struct ev_loop *loop
0
                     , ev_io *watcher
0
                     , int revents
0
@@ -564,6 +551,7 @@
0
     ebb_client_close(client);
0
 }
0
 
0
+
0
 void ebb_client_write(ebb_client *client, const char *data, int length)
0
 {
0
   g_string_append_len(client->write_buffer, data, length);
0
@@ -584,6 +572,7 @@
0
   ev_io_start(client->server->loop, &(client->write_watcher));
0
 }
0
 
0
+
0
 /* pass an allocated buffer and the length to read. this function will try to
0
  * fill the buffer with that length of data read from the body of the request.
0
  * the return value says how much was actually written.
0
@@ -607,5 +596,116 @@
0
     client->nread_from_body += read;
0
     return read;
0
   }
0
+}
0
+
0
+/* The following socket creation routines are modified and stolen from memcached */
0
+
0
+static int server_socket(const int port) {
0
+    int sfd;
0
+    struct linger ling = {0, 0};
0
+    struct sockaddr_in addr;
0
+    int flags =1;
0
+    
0
+    if ((sfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
0
+        perror("socket()");
0
+        return -1;
0
+    }
0
+    
0
+    if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 ||
0
+        fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) {
0
+        perror("setting O_NONBLOCK");
0
+        close(sfd);
0
+        return -1;
0
+    }
0
+    
0
+    flags = 1;
0
+    setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
0
+    setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
0
+    setsockopt(sfd, SOL_SOCKET, SO_LINGER, (void *)&ling, sizeof(ling));
0
+    setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, (void *)&flags, sizeof(flags));
0
+    
0
+    /*
0
+     * the memset call clears nonstandard fields in some impementations
0
+     * that otherwise mess things up.
0
+     */
0
+    memset(&addr, 0, sizeof(addr));
0
+    
0
+    addr.sin_family = AF_INET;
0
+    addr.sin_port = htons(port);
0
+    addr.sin_addr.s_addr = htonl(INADDR_ANY);
0
+    
0
+    if (bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
0
+        perror("bind()");
0
+        close(sfd);
0
+        return -1;
0
+    }
0
+    if (listen(sfd, EBB_MAX_CLIENTS) == -1) {
0
+        perror("listen()");
0
+        close(sfd);
0
+        return -1;
0
+    }
0
+    return sfd;
0
+}
0
+
0
+
0
+static int server_socket_unix(const char *path, int access_mask) {
0
+    int sfd;
0
+    struct linger ling = {0, 0};
0
+    struct sockaddr_un addr;
0
+    struct stat tstat;
0
+    int flags =1;
0
+    int old_umask;
0
+
0
+    if (!path) {
0
+        return -1;
0
+    }
0
+    
0
+    if ((sfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
0
+        perror("socket()");
0
+        return -1;
0
+    }
0
+    
0
+    if ((flags = fcntl(sfd, F_GETFL, 0)) < 0 ||
0
+        fcntl(sfd, F_SETFL, flags | O_NONBLOCK) < 0) {
0
+        perror("setting O_NONBLOCK");
0
+        close(sfd);
0
+        return -1;
0
+    }
0
+    
0
+    /*
0
+     * Clean up a previous socket file if we left it around
0
+     */
0
+    if (lstat(path, &tstat) == 0) {
0
+        if (S_ISSOCK(tstat.st_mode))
0
+            unlink(path);
0
+    }
0
+
0
+    flags = 1;
0
+    setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
0
+    setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
0
+    setsockopt(sfd, SOL_SOCKET, SO_LINGER, (void *)&ling, sizeof(ling));
0
+
0
+    /*
0
+     * the memset call clears nonstandard fields in some impementations
0
+     * that otherwise mess things up.
0
+     */
0
+    memset(&addr, 0, sizeof(addr));
0
+
0
+    addr.sun_family = AF_UNIX;
0
+    strcpy(addr.sun_path, path);
0
+    old_umask=umask( ~(access_mask&0777));
0
+    if (bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
0
+        perror("bind()");
0
+        close(sfd);
0
+        umask(old_umask);
0
+        return -1;
0
+    }
0
+    umask(old_umask);
0
+    if (listen(sfd, 1024) == -1) {
0
+        perror("listen()");
0
+        close(sfd);
0
+        return -1;
0
+    }
0
+    return sfd;
0
 }

0
@@ -94,32 +94,25 @@
0
 typedef void (*ebb_request_cb)(ebb_client*, void*);
0
 
0
 ebb_server* ebb_server_alloc();
0
+void ebb_server_free(ebb_server*);
0
 void ebb_server_init( ebb_server *server
0
                     , struct ev_loop *loop
0
-                    , char *address
0
-                    , int port
0
                     , ebb_request_cb request_cb
0
                     , void *request_cb_data
0
                     );
0
-void ebb_server_free(ebb_server*);
0
-void ebb_server_listen(ebb_server*);
0
+int ebb_server_listen_on_port(ebb_server*, const int port);
0
+int ebb_server_listen_on_socket(ebb_server*, const char *socketpath);
0
 void ebb_server_unlisten(ebb_server*);
0
 
0
 struct ebb_server {
0
   EBB_TCP_COMMON
0
-  struct hostent *dns_info;
0
   char *port;
0
-  char *address;
0
-  
0
-  void *data;
0
-  
0
+  char *socketpath;
0
+  ev_io request_watcher;
0
+  ebb_client clients[EBB_MAX_CLIENTS];
0
+  struct ev_loop *loop;
0
   void *request_cb_data;
0
   ebb_request_cb request_cb;
0
-  
0
-  ev_io *request_watcher;
0
-  struct ev_loop *loop;
0
-  
0
-  ebb_client clients[EBB_MAX_CLIENTS];
0
 };
0
 
0
 #endif ebb_h

0
@@ -110,32 +110,39 @@
0
 }
0
 
0
 
0
-VALUE server_init(VALUE server, VALUE host, VALUE port)
0
+VALUE server_init(VALUE server)
0
 {
0
   struct ev_loop *loop = ev_default_loop (0);
0
   ebb_server *_server;
0
   
0
   Data_Get_Struct(server, ebb_server, _server);
0
-  ebb_server_init(_server, loop, StringValuePtr(host), FIX2INT(port), request_cb, (void*)server);
0
-  
0
-  
0
-
0
+  ebb_server_init(_server, loop, request_cb, (void*)server);
0
   return Qnil;
0
 }
0
 
0
-VALUE server_listen(VALUE server)
0
+
0
+VALUE server_listen_on_port(VALUE server, VALUE port)
0
 {
0
   ebb_server *_server;
0
-  
0
   Data_Get_Struct(server, ebb_server, _server);
0
-  rb_iv_set(server, "@waiting_clients", rb_ary_new());
0
-  ebb_server_listen(_server);
0
-  return Qnil;
0
+  int r = ebb_server_listen_on_port(_server, FIX2INT(port));
0
+  return r < 0 ? Qfalse : Qtrue;
0
 }
0
 
0
+
0
+VALUE server_listen_on_socket(VALUE server, VALUE socketpath)
0
+{
0
+  ebb_server *_server;
0
+  Data_Get_Struct(server, ebb_server, _server);
0
+  int r = ebb_server_listen_on_socket(_server, StringValuePtr(socketpath));
0
+  return r < 0 ? Qfalse : Qtrue;
0
+}
0
+
0
+
0
 static void
0
 oneshot_timeout (struct ev_loop *loop, struct ev_timer *w, int revents) {;}
0
 
0
+
0
 VALUE server_process_connections(VALUE server)
0
 {
0
   ebb_server *_server;
0
0
@@ -247,9 +254,10 @@
0
   DEF_GLOBAL(http_host, "HTTP_HOST");
0
   
0
   rb_define_alloc_func(cServer, server_alloc);
0
-  rb_define_method(cServer, "init", server_init, 2);
0
+  rb_define_method(cServer, "init", server_init, 0);
0
   rb_define_method(cServer, "process_connections", server_process_connections, 0);
0
-  rb_define_method(cServer, "listen", server_listen, 0);
0
+  rb_define_method(cServer, "listen_on_port", server_listen_on_port, 1);
0
+  rb_define_method(cServer, "listen_on_socket", server_listen_on_socket, 1);
0
   rb_define_method(cServer, "unlisten", server_unlisten, 0);
0
   
0
   rb_define_method(cClient, "initialize", client_init, 1);