Mercurial > hg > nginx
comparison src/core/ngx_connection.c @ 5282:31690d934175
Style: reuse one int variable in ngx_configure_listening_sockets().
No functional changes.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 25 Jul 2013 12:46:02 +0400 |
parents | b6ffe53f9c3d |
children | 6d73e0dc4f64 |
comparison
equal
deleted
inserted
replaced
5281:7542b72fe4b1 | 5282:31690d934175 |
---|---|
462 | 462 |
463 | 463 |
464 void | 464 void |
465 ngx_configure_listening_sockets(ngx_cycle_t *cycle) | 465 ngx_configure_listening_sockets(ngx_cycle_t *cycle) |
466 { | 466 { |
467 int keepalive; | 467 int value; |
468 ngx_uint_t i; | 468 ngx_uint_t i; |
469 ngx_listening_t *ls; | 469 ngx_listening_t *ls; |
470 | 470 |
471 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) | 471 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) |
472 struct accept_filter_arg af; | 472 struct accept_filter_arg af; |
473 #endif | |
474 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) | |
475 int timeout; | |
476 #endif | 473 #endif |
477 | 474 |
478 ls = cycle->listening.elts; | 475 ls = cycle->listening.elts; |
479 for (i = 0; i < cycle->listening.nelts; i++) { | 476 for (i = 0; i < cycle->listening.nelts; i++) { |
480 | 477 |
501 ls[i].sndbuf, &ls[i].addr_text); | 498 ls[i].sndbuf, &ls[i].addr_text); |
502 } | 499 } |
503 } | 500 } |
504 | 501 |
505 if (ls[i].keepalive) { | 502 if (ls[i].keepalive) { |
506 keepalive = (ls[i].keepalive == 1) ? 1 : 0; | 503 value = (ls[i].keepalive == 1) ? 1 : 0; |
507 | 504 |
508 if (setsockopt(ls[i].fd, SOL_SOCKET, SO_KEEPALIVE, | 505 if (setsockopt(ls[i].fd, SOL_SOCKET, SO_KEEPALIVE, |
509 (const void *) &keepalive, sizeof(int)) | 506 (const void *) &value, sizeof(int)) |
510 == -1) | 507 == -1) |
511 { | 508 { |
512 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno, | 509 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno, |
513 "setsockopt(SO_KEEPALIVE, %d) %V failed, ignored", | 510 "setsockopt(SO_KEEPALIVE, %d) %V failed, ignored", |
514 keepalive, &ls[i].addr_text); | 511 value, &ls[i].addr_text); |
515 } | 512 } |
516 } | 513 } |
517 | 514 |
518 #if (NGX_HAVE_KEEPALIVE_TUNABLE) | 515 #if (NGX_HAVE_KEEPALIVE_TUNABLE) |
519 | 516 |
646 #ifdef TCP_DEFER_ACCEPT | 643 #ifdef TCP_DEFER_ACCEPT |
647 | 644 |
648 if (ls[i].add_deferred || ls[i].delete_deferred) { | 645 if (ls[i].add_deferred || ls[i].delete_deferred) { |
649 | 646 |
650 if (ls[i].add_deferred) { | 647 if (ls[i].add_deferred) { |
651 timeout = (int) (ls[i].post_accept_timeout / 1000); | 648 value = (int) (ls[i].post_accept_timeout / 1000); |
652 | 649 |
653 } else { | 650 } else { |
654 timeout = 0; | 651 value = 0; |
655 } | 652 } |
656 | 653 |
657 if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, | 654 if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, |
658 &timeout, sizeof(int)) | 655 &value, sizeof(int)) |
659 == -1) | 656 == -1) |
660 { | 657 { |
661 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, | 658 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, |
662 "setsockopt(TCP_DEFER_ACCEPT, %d) for %V failed, " | 659 "setsockopt(TCP_DEFER_ACCEPT, %d) for %V failed, " |
663 "ignored", | 660 "ignored", |
664 timeout, &ls[i].addr_text); | 661 value, &ls[i].addr_text); |
665 | 662 |
666 continue; | 663 continue; |
667 } | 664 } |
668 } | 665 } |
669 | 666 |