nginx: src/event/ngx_event_accept.c comparison

debug_connection: added the IPv6 and UNIX-domain socket support.

comparison

equal deleted inserted replaced

-:c42553296af1
+:9ee20e074a2e
 }
 #if (NGX_DEBUG)
 {
-in_addr_t            i;
+struct sockaddr_in   *sin;
-ngx_event_debug_t   *dc;
+ngx_cidr_t           *cidr;
-struct sockaddr_in  *sin;
+ngx_uint_t            i;
+#if (NGX_HAVE_INET6)
-sin = (struct sockaddr_in *) sa;
+struct sockaddr_in6  *sin6;
-dc = ecf->debug_connection.elts;
+ngx_uint_t            n;
+#endif
+cidr = ecf->debug_connection.elts;
 for (i = 0; i < ecf->debug_connection.nelts; i++) {
-if ((sin->sin_addr.s_addr & dc[i].mask) == dc[i].addr) {
+if (cidr[i].family != c->sockaddr->sa_family) {
-log->log_level = NGX_LOG_DEBUG_CONNECTION|NGX_LOG_DEBUG_ALL;
+goto next;
+}
+switch (cidr[i].family) {
+#if (NGX_HAVE_INET6)
+case AF_INET6:
+sin6 = (struct sockaddr_in6 *) c->sockaddr;
+for (n = 0; n < 16; n++) {
+if ((sin6->sin6_addr.s6_addr[n]
+& cidr[i].u.in6.mask.s6_addr[n])
+!= cidr[i].u.in6.addr.s6_addr[n])
+{
+goto next;
+}
+}
 break;
-}
+#endif
+#if (NGX_HAVE_UNIX_DOMAIN)
+case AF_UNIX:
+break;
+#endif
+default: /* AF_INET */
+sin = (struct sockaddr_in *) c->sockaddr;
+if ((sin->sin_addr.s_addr & cidr[i].u.in.mask)
+!= cidr[i].u.in.addr)
+{
+goto next;
+}
+break;
+}
+log->log_level = NGX_LOG_DEBUG_CONNECTION|NGX_LOG_DEBUG_ALL;
+break;
+next:
+continue;
 }
 }
 #endif

Mercurial > hg > nginx