diff src/imap/ngx_imap.c @ 641:5e8fb59c18c1 release-0.3.42

nginx-0.3.42-RELEASE import *) Feature: the "bind" option of the "listen" directive in IMAP/POP3 proxy. *) Bugfix: if the same capture in the "rewrite" directive was used more then once. *) Bugfix: the $sent_http_content_type, $sent_http_content_length, $sent_http_last_modified, $sent_http_connection, $sent_http_keep_alive, and $sent_http_transfer_encoding variables were not written to access log. *) Bugfix: the $sent_http_cache_control returned value of the single "Cache-Control" response header line.
author Igor Sysoev <igor@sysoev.ru>
date Wed, 26 Apr 2006 09:52:47 +0000
parents 4d9ea73a627a
children
line wrap: on
line diff
--- a/src/imap/ngx_imap.c
+++ b/src/imap/ngx_imap.c
@@ -11,6 +11,8 @@
 
 
 static char *ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+static int ngx_libc_cdecl ngx_imap_cmp_conf_in_addrs(const void *one,
+    const void *two);
 
 
 ngx_uint_t  ngx_imap_max_module;
@@ -56,10 +58,18 @@ static char *
 ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     char                        *rv;
-    ngx_uint_t                   m, mi, s;
+    u_char                      *text;
+    size_t                       len;
+    ngx_uint_t                   i, a, l, m, mi, s, p, last, bind_all, done;
     ngx_conf_t                   pcf;
+    ngx_array_t                  in_ports;
+    ngx_listening_t             *ls;
+    ngx_imap_listen_t           *imls;
     ngx_imap_module_t           *module;
+    ngx_imap_in_port_t          *imip;
     ngx_imap_conf_ctx_t         *ctx;
+    ngx_imap_conf_in_port_t     *in_port;
+    ngx_imap_conf_in_addr_t     *in_addr;
     ngx_imap_core_srv_conf_t   **cscfp;
     ngx_imap_core_main_conf_t   *cmcf;
 
@@ -191,5 +201,203 @@ ngx_imap_block(ngx_conf_t *cf, ngx_comma
 
     *cf = pcf;
 
+
+    if (ngx_array_init(&in_ports, cf->temp_pool, 4,
+                       sizeof(ngx_imap_conf_in_port_t))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    imls = cmcf->listen.elts;
+
+    for (l = 0; l < cmcf->listen.nelts; l++) {
+
+        /* AF_INET only */
+
+        in_port = in_ports.elts;
+        for (p = 0; p < in_ports.nelts; p++) {
+            if (in_port[p].port == imls[l].port) {
+                in_port = &in_port[p];
+                goto found;
+            }
+        }
+
+        in_port = ngx_array_push(&in_ports);
+        if (in_port == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        in_port->port = imls[l].port;
+
+        if (ngx_array_init(&in_port->addrs, cf->temp_pool, 2,
+                           sizeof(ngx_imap_conf_in_addr_t))
+            != NGX_OK)
+        {
+            return NGX_CONF_ERROR;
+        }
+
+    found:
+
+        in_addr = ngx_array_push(&in_port->addrs);
+        if (in_addr == NULL) {
+            return NGX_CONF_ERROR;
+        }
+
+        in_addr->addr = imls[l].addr;
+        in_addr->ctx = imls[l].ctx;
+        in_addr->bind = imls[l].bind;
+    }
+
+    /* optimize the lists of ports and addresses */
+
+    /* AF_INET only */
+
+    in_port = in_ports.elts;
+    for (p = 0; p < in_ports.nelts; p++) {
+
+        ngx_qsort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
+                  sizeof(ngx_imap_conf_in_addr_t), ngx_imap_cmp_conf_in_addrs);
+
+        in_addr = in_port[p].addrs.elts;
+        last = in_port[p].addrs.nelts;
+
+        /*
+         * if there is the binding to the "*:port" then we need to bind()
+         * to the "*:port" only and ignore the other bindings
+         */
+
+        if (in_addr[last - 1].addr == INADDR_ANY) {
+            in_addr[last - 1].bind = 1;
+            bind_all = 0;
+
+        } else {
+            bind_all = 1;
+        }
+
+        for (a = 0; a < last; /* void */ ) {
+
+            if (!bind_all && !in_addr[a].bind) {
+                a++;
+                continue;
+            }
+
+            ls = ngx_listening_inet_stream_socket(cf, in_addr[a].addr,
+                                                  in_port[p].port);
+            if (ls == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ls->backlog = -1;
+            ls->rcvbuf = -1;
+            ls->sndbuf = -1;
+
+            ls->addr_ntop = 1;
+            ls->handler = ngx_imap_init_connection;
+            ls->pool_size = 256;
+
+            /* STUB */
+            ls->log = *cf->cycle->new_log;
+            ls->log.data = &ls->addr_text;
+            ls->log.handler = ngx_accept_log_error;
+            /**/
+
+            imip = ngx_palloc(cf->pool, sizeof(ngx_imap_in_port_t));
+            if (imip == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            ls->servers = imip;
+
+            in_addr = in_port[p].addrs.elts;
+
+            if (in_addr[a].bind && in_addr[a].addr != INADDR_ANY) {
+                imip->naddrs = 1;
+                done = 0;
+
+            } else if (in_port[p].addrs.nelts > 1
+                       && in_addr[last - 1].addr == INADDR_ANY)
+            {
+                imip->naddrs = last;
+                done = 1;
+
+            } else {
+                imip->naddrs = 1;
+                done = 0;
+            }
+
+#if 0
+            ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
+                          "%ui: %V %d %ui %ui",
+                          a, &ls->addr_text, in_addr[a].bind,
+                          imip->naddrs, last);
+#endif
+
+            imip->addrs = ngx_pcalloc(cf->pool,
+                                    imip->naddrs * sizeof(ngx_imap_in_addr_t));
+            if (imip->addrs == NULL) {
+                return NGX_CONF_ERROR;
+            }
+
+            for (i = 0; i < imip->naddrs; i++) {
+                imip->addrs[i].addr = in_addr[i].addr;
+                imip->addrs[i].ctx = in_addr[i].ctx;
+
+                text = ngx_palloc(cf->pool,
+                                  INET_ADDRSTRLEN - 1 + sizeof(":65535") - 1);
+                if (text == NULL) {
+                    return NGX_CONF_ERROR;
+                }
+
+                len = ngx_inet_ntop(AF_INET, &in_addr[i].addr, text,
+                                    INET_ADDRSTRLEN);
+
+                len = ngx_sprintf(text + len, ":%d", in_port[p].port) - text;
+
+                imip->addrs[i].addr_text.len = len;
+                imip->addrs[i].addr_text.data = text;
+            }
+
+            if (done) {
+                break;
+            }
+
+            in_addr++;
+            in_port[p].addrs.elts = in_addr;
+            last--;
+
+            a = 0;
+        }
+    }
+
     return NGX_CONF_OK;
 }
+
+
+static int ngx_libc_cdecl
+ngx_imap_cmp_conf_in_addrs(const void *one, const void *two)
+{
+    ngx_imap_conf_in_addr_t  *first, *second;
+
+    first = (ngx_imap_conf_in_addr_t *) one;
+    second = (ngx_imap_conf_in_addr_t *) two;
+
+    if (first->addr == INADDR_ANY) {
+        /* the INADDR_ANY must be the last resort, shift it to the end */
+        return 1;
+    }
+
+    if (first->bind && !second->bind) {
+        /* shift explicit bind()ed addresses to the start */
+        return -1;
+    }
+
+    if (!first->bind && second->bind) {
+        /* shift explicit bind()ed addresses to the start */
+        return 1;
+    }
+
+    /* do not sort by default */
+
+    return 0;
+}