Merge pull request #1689 from harry-xm/stream

Rename NGX_STREAM_SNI macro to T_NGX_STREAM_SNI

Author: chobits

auto/modules

@@ -1195,7 +1195,7 @@ if [ $STREAM != NO ]; then
             echo "--with-stream_ssl_module is needed by --with-stream_sni"
             exit 1;
         fi
-        have=NGX_STREAM_SNI . auto/have
+        have=T_NGX_STREAM_SNI . auto/have
     fi
 fi
 

src/stream/ngx_stream.c

@@ -317,7 +317,7 @@ ngx_stream_init_phases(ngx_conf_t *cf, ngx_stream_core_main_conf_t *cmcf)
     return NGX_OK;
 }
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 
 static int ngx_libc_cdecl
 ngx_stream_cmp_dns_wildcards(const void *one, const void *two)
@@ -555,7 +555,7 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     struct sockaddr         *sa;
     ngx_stream_conf_port_t  *port;
     ngx_stream_conf_addr_t  *addr;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_stream_core_srv_conf_t *cscf;
 #endif
 
@@ -595,7 +595,7 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     }
 
 found:
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 
     cscf = listen->ctx->srv_conf[ngx_stream_core_module.ctx_index];
     addr = port->addrs.elts;
@@ -662,7 +662,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
     ngx_stream_conf_addr_t      *addr;
     ngx_stream_core_srv_conf_t  *cscf;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_stream_core_main_conf_t *cmcf;
 #endif
     port = ports->elts;
@@ -743,7 +743,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
 
             stport->naddrs = i + 1;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
             cmcf = addr->opt.ctx->main_conf[ngx_stream_core_module.ctx_index];
             /*Because of ssl_sni_force we have to do this even one server*/
             if (addr[i].servers.nelts >= 1) {
@@ -784,7 +784,7 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
     ngx_uint_t             i;
     struct sockaddr_in    *sin;
     ngx_stream_in_addr_t  *addrs;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_stream_virtual_names_t  *vn;
 #endif
 
@@ -808,7 +808,7 @@ ngx_stream_add_addrs(ngx_conf_t *cf, ngx_stream_port_t *stport,
         addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
         addrs[i].conf.addr_text = addr[i].opt.addr_text;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
         addrs[i].conf.default_server = addr[i].default_server;
 
         if (addr[i].hash.buckets == NULL
@@ -847,7 +847,7 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
     ngx_uint_t              i;
     struct sockaddr_in6    *sin6;
     ngx_stream_in6_addr_t  *addrs6;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_stream_virtual_names_t  *vn;
 #endif
 
@@ -871,7 +871,7 @@ ngx_stream_add_addrs6(ngx_conf_t *cf, ngx_stream_port_t *stport,
         addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
         addrs6[i].conf.addr_text = addr[i].opt.addr_text;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
         addrs6[i].conf.default_server = addr[i].default_server;
 
         if (addr[i].hash.buckets == NULL

src/stream/ngx_stream.h

@@ -66,7 +66,7 @@ typedef struct {
     int                            rcvbuf;
     int                            sndbuf;
     int                            type;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     unsigned                       default_server;
 #endif
 } ngx_stream_listen_t;
@@ -77,7 +77,7 @@ typedef struct {
     ngx_str_t                      addr_text;
     unsigned                       ssl:1;
     unsigned                       proxy_protocol:1;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     void                          *default_server;
     void                          *virtual_names;
 #endif
@@ -116,7 +116,7 @@ typedef struct {
 
 typedef struct {
     ngx_stream_listen_t            opt;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     void                          *default_server;
     ngx_array_t                    servers;  /* array of ngx_stream_core_srv_conf_t */
     ngx_hash_t                     hash;
@@ -181,7 +181,7 @@ typedef struct {
 
     ngx_stream_phase_t             phases[NGX_STREAM_LOG_PHASE + 1];
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_uint_t                     server_names_hash_max_size;
     ngx_uint_t                     server_names_hash_bucket_size;
 #endif
@@ -209,14 +209,14 @@ typedef struct {
 
     ngx_uint_t                     listen;  /* unsigned  listen:1; */
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     /* array of the ngx_stream_server_name_t, "server_name" directive */
     ngx_array_t                    server_names;
     ngx_str_t                      server_name;
 #endif
 } ngx_stream_core_srv_conf_t;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 /* list of structures to find core_srv_conf quickly at run time */
 typedef struct {
     ngx_stream_core_srv_conf_t  *server;   /* virtual name server conf */
@@ -262,7 +262,7 @@ struct ngx_stream_session_s {
     unsigned                       stat_processing:1;
 
     unsigned                       health_check:1;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_stream_addr_conf_t        *addr_conf;
 #endif
 

src/stream/ngx_stream_core_module.c

@@ -25,7 +25,7 @@ static char *ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd,
 static char *ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 static char *ngx_stream_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 #endif
@@ -109,7 +109,7 @@ static ngx_command_t  ngx_stream_core_commands[] = {
       offsetof(ngx_stream_core_srv_conf_t, preread_timeout),
       NULL },
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     { ngx_string("server_name"),
       NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
       ngx_stream_core_server_name,
@@ -398,7 +398,7 @@ ngx_stream_core_create_main_conf(ngx_conf_t *cf)
     cmcf->variables_hash_max_size = NGX_CONF_UNSET_UINT;
     cmcf->variables_hash_bucket_size = NGX_CONF_UNSET_UINT;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     cmcf->server_names_hash_max_size = NGX_CONF_UNSET_UINT;
     cmcf->server_names_hash_bucket_size = NGX_CONF_UNSET_UINT;
 #endif
@@ -415,7 +415,7 @@ ngx_stream_core_init_main_conf(ngx_conf_t *cf, void *conf)
     ngx_conf_init_uint_value(cmcf->variables_hash_max_size, 1024);
     ngx_conf_init_uint_value(cmcf->variables_hash_bucket_size, 64);
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_conf_init_uint_value(cmcf->server_names_hash_max_size, 512);
     ngx_conf_init_uint_value(cmcf->server_names_hash_bucket_size,
                              ngx_cacheline_size);
@@ -457,7 +457,7 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
     cscf->preread_buffer_size = NGX_CONF_UNSET_SIZE;
     cscf->preread_timeout = NGX_CONF_UNSET_MSEC;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     if (ngx_array_init(&cscf->server_names, cf->temp_pool, 4,
                        sizeof(ngx_stream_server_name_t))
         != NGX_OK)
@@ -475,7 +475,7 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 {
     ngx_stream_core_srv_conf_t *prev = parent;
     ngx_stream_core_srv_conf_t *conf = child;
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_str_t                   name;
     ngx_stream_server_name_t   *sn;
 #endif
@@ -528,7 +528,7 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->preread_timeout,
                               prev->preread_timeout, 30000);
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     if (conf->server_names.nelts == 0) {
         /* the array has 4 empty preallocated elements, so push cannot fail */
         sn = ngx_array_push(&conf->server_names);
@@ -705,7 +705,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
 #endif
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
         if (ngx_strcmp(value[i].data, "default_server") == 0
             || ngx_strcmp(value[i].data, "default") == 0) {
 
@@ -957,7 +957,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         ls[n].addr_text = u.addrs[n].name;
         ls[n].wildcard = ngx_inet_wildcard(ls[n].sockaddr);
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
         continue;
 #endif
 
@@ -1005,7 +1005,7 @@ ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return NGX_CONF_OK;
 }
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 static char *
 ngx_stream_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {

src/stream/ngx_stream_handler.c

@@ -125,7 +125,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
     s->main_conf = addr_conf->ctx->main_conf;
     s->srv_conf = addr_conf->ctx->srv_conf;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     s->addr_conf = addr_conf;
     s->main_conf = ((ngx_stream_core_srv_conf_t*)addr_conf->default_server)->ctx->main_conf;
     s->srv_conf = ((ngx_stream_core_srv_conf_t*)addr_conf->default_server)->ctx->srv_conf;

src/stream/ngx_stream_ssl_module.c

@@ -47,7 +47,7 @@ static char *ngx_stream_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static ngx_int_t ngx_stream_ssl_init(ngx_conf_t *cf);
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 int ngx_stream_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad,
     void *arg);
 #endif
@@ -251,7 +251,7 @@ static ngx_command_t  ngx_stream_ssl_commands[] = {
       offsetof(ngx_stream_ssl_conf_t, crl),
       NULL },
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     { ngx_string("ssl_sni_force"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -514,7 +514,7 @@ ngx_stream_ssl_handshake_handler(ngx_connection_t *c)
     ngx_stream_core_run_phases(s);
 }
 
-#ifdef NGX_STREAM_SNI
+#ifdef T_NGX_STREAM_SNI
 static ngx_int_t
 ngx_stream_find_virtual_server(ngx_connection_t *c,
     ngx_stream_virtual_names_t *virtual_names, ngx_str_t *host,
@@ -807,7 +807,7 @@ ngx_stream_ssl_create_conf(ngx_conf_t *cf)
     scf->session_tickets = NGX_CONF_UNSET;
     scf->session_ticket_keys = NGX_CONF_UNSET_PTR;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     scf->sni_force = NGX_CONF_UNSET;
 #endif
 
@@ -873,7 +873,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_conf_merge_value(conf->sni_force, prev->sni_force, 0);
 #endif
 
@@ -972,7 +972,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
     cln->handler = ngx_ssl_cleanup_ctx;
     cln->data = &conf->ssl;
 
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
 #if (SSL_CTRL_SET_TLSEXT_HOSTNAME)
     if (SSL_CTX_set_tlsext_servername_callback(conf->ssl.ctx,
                                                ngx_stream_ssl_servername)

src/stream/ngx_stream_ssl_module.h

@@ -62,7 +62,7 @@ typedef struct {
     ngx_str_t        sign_certificate;
     ngx_str_t        sign_certificate_key;
 #endif
-#if (NGX_STREAM_SNI)
+#if (T_NGX_STREAM_SNI)
     ngx_flag_t       sni_force;
 #endif
 } ngx_stream_ssl_conf_t;