Mercurial > hg > nginx

comparison src/event/ngx_event_udp.c @ 7440:6d4bc025c5a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevented scheduling events on a shared connection. A shared connection does not own its file descriptor, which means that ngx_handle_read_event/ngx_handle_write_event calls should do nothing for it. Currently the c->shared flag is checked in several places in the stream proxy module prior to calling these functions. However it was not done everywhere. Missing checks could lead to calling ngx_handle_read_event/ngx_handle_write_event on shared connections. The problem manifested itself when using proxy_upload_rate and resulted in either duplicate file descriptor error (e.g. with epoll) or incorrect further udp packet processing (e.g. with kqueue). The fix is to set and reset the event active flag in a way that prevents ngx_handle_read_event/ngx_handle_write_event from scheduling socket events.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 14 Jan 2019 20:36:23 +0300
parents 4698cede59ff
children fdc3d40979b0 45db1b5c1706
comparison
equal deleted inserted replaced
7439:5efc23d83bc2 7440:6d4bc025c5a7
254 buf.last = buffer + n; 254 buf.last = buffer + n;
255 255
256 rev = c->read; 256 rev = c->read;
257 257
258 c->udp->buffer = &buf; 258 c->udp->buffer = &buf;
259
259 rev->ready = 1; 260 rev->ready = 1;
261 rev->active = 0;
260 262
261 rev->handler(rev); 263 rev->handler(rev);
262 264
263 if (c->udp) { 265 if (c->udp) {
264 c->udp->buffer = NULL; 266 c->udp->buffer = NULL;
265 } 267 }
266 268
267 rev->ready = 0; 269 rev->ready = 0;
270 rev->active = 1;
268 271
269 goto next; 272 goto next;
270 } 273 }
271 274
272 #if (NGX_STAT_STUB) 275 #if (NGX_STAT_STUB)
341 c->buffer->last = ngx_cpymem(c->buffer->last, buffer, n); 344 c->buffer->last = ngx_cpymem(c->buffer->last, buffer, n);
342 345
343 rev = c->read; 346 rev = c->read;
344 wev = c->write; 347 wev = c->write;
345 348
349 rev->active = 1;
346 wev->ready = 1; 350 wev->ready = 1;
347 351
348 rev->log = log; 352 rev->log = log;
349 wev->log = log; 353 wev->log = log;
350 354
451 n = ngx_min(b->last - b->pos, (ssize_t) size); 455 n = ngx_min(b->last - b->pos, (ssize_t) size);
452 456
453 ngx_memcpy(buf, b->pos, n); 457 ngx_memcpy(buf, b->pos, n);
454 458
455 c->udp->buffer = NULL; 459 c->udp->buffer = NULL;
460
456 c->read->ready = 0; 461 c->read->ready = 0;
462 c->read->active = 1;
457 463
458 return n; 464 return n;
459 } 465 }
460 466
461 467