Mercurial > hg > nginx-quic

comparison src/event/ngx_event_accept.c @ 714:698033350558

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename variable
author Igor Sysoev <igor@sysoev.ru>
date Mon, 25 Sep 2006 14:34:29 +0000
parents 5fd7a5e99047
children f30b1a75fd3b
comparison
equal deleted inserted replaced
713:86600665553c 714:698033350558
19 19
20 20
21 void 21 void
22 ngx_event_accept(ngx_event_t *ev) 22 ngx_event_accept(ngx_event_t *ev)
23 { 23 {
24 socklen_t sl; 24 socklen_t socklen;
25 ngx_err_t err; 25 ngx_err_t err;
26 ngx_log_t *log; 26 ngx_log_t *log;
27 ngx_socket_t s; 27 ngx_socket_t s;
28 ngx_event_t *rev, *wev; 28 ngx_event_t *rev, *wev;
29 ngx_listening_t *ls; 29 ngx_listening_t *ls;
46 46
47 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, 47 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
48 "accept on %V, ready: %d", &ls->addr_text, ev->available); 48 "accept on %V, ready: %d", &ls->addr_text, ev->available);
49 49
50 do { 50 do {
51 sl = NGX_SOCKLEN; 51 socklen = NGX_SOCKLEN;
52 52
53 s = accept(lc->fd, (struct sockaddr *) sa, &sl); 53 s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
54 54
55 if (s == -1) { 55 if (s == -1) {
56 err = ngx_socket_errno; 56 err = ngx_socket_errno;
57 57
58 if (err == NGX_EAGAIN) { 58 if (err == NGX_EAGAIN) {
102 if (c->pool == NULL) { 102 if (c->pool == NULL) {
103 ngx_close_accepted_connection(c); 103 ngx_close_accepted_connection(c);
104 return; 104 return;
105 } 105 }
106 106
107 c->sockaddr = ngx_palloc(c->pool, sl); 107 c->sockaddr = ngx_palloc(c->pool, socklen);
108 if (c->sockaddr == NULL) { 108 if (c->sockaddr == NULL) {
109 ngx_close_accepted_connection(c); 109 ngx_close_accepted_connection(c);
110 return; 110 return;
111 } 111 }
112 112
113 ngx_memcpy(c->sockaddr, sa, sl); 113 ngx_memcpy(c->sockaddr, sa, socklen);
114 114
115 log = ngx_palloc(c->pool, sizeof(ngx_log_t)); 115 log = ngx_palloc(c->pool, sizeof(ngx_log_t));
116 if (log == NULL) { 116 if (log == NULL) {
117 ngx_close_accepted_connection(c); 117 ngx_close_accepted_connection(c);
118 return; 118 return;
150 150
151 c->log = log; 151 c->log = log;
152 c->pool->log = log; 152 c->pool->log = log;
153 153
154 c->listening = ls; 154 c->listening = ls;
155 c->socklen = sl; 155 c->socklen = socklen;
156 156
157 c->unexpected_eof = 1; 157 c->unexpected_eof = 1;
158 158
159 rev = c->read; 159 rev = c->read;
160 wev = c->write; 160 wev = c->write;