Deleted
Added
nxt_unit.c (828:b9f7635e6be2) | nxt_unit.c (951:88e329f1c65c) |
---|---|
1 2/* 3 * Copyright (C) NGINX, Inc. 4 */ 5 6#include <stdlib.h> 7 8#include "nxt_main.h" --- 527 unchanged lines hidden (view full) --- 536 if (oob_size >= CMSG_SPACE(sizeof(int)) 537 && cm->cmsg_len == CMSG_LEN(sizeof(int)) 538 && cm->cmsg_level == SOL_SOCKET 539 && cm->cmsg_type == SCM_RIGHTS) 540 { 541 memcpy(&fd, CMSG_DATA(cm), sizeof(int)); 542 } 543 | 1 2/* 3 * Copyright (C) NGINX, Inc. 4 */ 5 6#include <stdlib.h> 7 8#include "nxt_main.h" --- 527 unchanged lines hidden (view full) --- 536 if (oob_size >= CMSG_SPACE(sizeof(int)) 537 && cm->cmsg_len == CMSG_LEN(sizeof(int)) 538 && cm->cmsg_level == SOL_SOCKET 539 && cm->cmsg_type == SCM_RIGHTS) 540 { 541 memcpy(&fd, CMSG_DATA(cm), sizeof(int)); 542 } 543 |
544 nxt_queue_init(&incoming_buf); 545 |
|
544 if (nxt_slow_path(buf_size < sizeof(nxt_port_msg_t))) { 545 nxt_unit_warn(ctx, "message too small (%d bytes)", (int) buf_size); 546 goto fail; 547 } 548 549 recv_msg.port_msg = *port_msg; 550 recv_msg.start = port_msg + 1; 551 recv_msg.size = buf_size - sizeof(nxt_port_msg_t); --- 13 unchanged lines hidden (view full) --- 565 /* Fragmentation is unsupported. */ 566 if (nxt_slow_path(port_msg->nf != 0 || port_msg->mf != 0)) { 567 nxt_unit_warn(ctx, "#%"PRIu32": fragmented message type (%d)", 568 port_msg->stream, (int) port_msg->type); 569 goto fail; 570 } 571 572 if (port_msg->mmap) { | 546 if (nxt_slow_path(buf_size < sizeof(nxt_port_msg_t))) { 547 nxt_unit_warn(ctx, "message too small (%d bytes)", (int) buf_size); 548 goto fail; 549 } 550 551 recv_msg.port_msg = *port_msg; 552 recv_msg.start = port_msg + 1; 553 recv_msg.size = buf_size - sizeof(nxt_port_msg_t); --- 13 unchanged lines hidden (view full) --- 567 /* Fragmentation is unsupported. */ 568 if (nxt_slow_path(port_msg->nf != 0 || port_msg->mf != 0)) { 569 nxt_unit_warn(ctx, "#%"PRIu32": fragmented message type (%d)", 570 port_msg->stream, (int) port_msg->type); 571 goto fail; 572 } 573 574 if (port_msg->mmap) { |
573 nxt_queue_init(&incoming_buf); 574 | |
575 if (nxt_unit_mmap_read(ctx, &recv_msg, &incoming_buf) != NXT_UNIT_OK) { 576 goto fail; 577 } 578 } 579 580 cb = &lib->callbacks; 581 582 switch (port_msg->type) { --- 3072 unchanged lines hidden --- | 575 if (nxt_unit_mmap_read(ctx, &recv_msg, &incoming_buf) != NXT_UNIT_OK) { 576 goto fail; 577 } 578 } 579 580 cb = &lib->callbacks; 581 582 switch (port_msg->type) { --- 3072 unchanged lines hidden --- |