mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use CMSG_LEN(), this fixes an alert "sendmsg() failed (9: Bad file descriptor)"

Browse Source 
on some 64-bit platforms
This commit is contained in:
Igor Sysoev 2008-02-19 16:34:55 +00:00
parent bb7c84159f
commit 09248b7a55
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/unix/ngx_channel.c
View File

@ -33,7 +33,7 @@ ngx_write_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size,
msg.msg_control = (caddr_t) &cmsg; msg.msg_control = (caddr_t) &cmsg;
msg.msg_controllen = sizeof(cmsg); msg.msg_controllen = sizeof(cmsg);
cmsg.cm.cmsg_len = sizeof(cmsg); cmsg.cm.cmsg_len = CMSG_LEN(sizeof(int));
cmsg.cm.cmsg_level = SOL_SOCKET; cmsg.cm.cmsg_level = SOL_SOCKET;
cmsg.cm.cmsg_type = SCM_RIGHTS; cmsg.cm.cmsg_type = SCM_RIGHTS;
*(int *) CMSG_DATA(&cmsg.cm) = ch->fd; *(int *) CMSG_DATA(&cmsg.cm) = ch->fd;
@ -138,7 +138,7 @@ ngx_read_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size, ngx_log_t *log)
if (ch->command == NGX_CMD_OPEN_CHANNEL) { if (ch->command == NGX_CMD_OPEN_CHANNEL) {
if (cmsg.cm.cmsg_len < (socklen_t) sizeof(cmsg)) { if (cmsg.cm.cmsg_len < (socklen_t) CMSG_LEN(sizeof(int))) {
ngx_log_error(NGX_LOG_ALERT, log, 0, ngx_log_error(NGX_LOG_ALERT, log, 0,
"recvmsg() returned too small ancillary data"); "recvmsg() returned too small ancillary data");
return NGX_ERROR; return NGX_ERROR;

7
src/os/unix/ngx_freebsd_config.h
View File

@ -48,11 +48,16 @@
#if __FreeBSD_version < 400017 #if __FreeBSD_version < 400017
/* FreeBSD 3.x has no CMSG_SPACE() at all and has the broken CMSG_DATA() */ /*
* FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
*/
#undef CMSG_SPACE #undef CMSG_SPACE
#define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l)) #define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l))
#undef CMSG_LEN
#define CMSG_LEN(l) (ALIGN(sizeof(struct cmsghdr)) + (l))
#undef CMSG_DATA #undef CMSG_DATA
#define CMSG_DATA(cmsg) ((u_char *)(cmsg) + ALIGN(sizeof(struct cmsghdr))) #define CMSG_DATA(cmsg) ((u_char *)(cmsg) + ALIGN(sizeof(struct cmsghdr)))

7
src/os/unix/ngx_posix_config.h
View File

@ -110,11 +110,16 @@
#include <sys/param.h> /* ALIGN() */ #include <sys/param.h> /* ALIGN() */
/* FreeBSD 3.x has no CMSG_SPACE() at all and has the broken CMSG_DATA() */ /*
* FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
*/
#undef CMSG_SPACE #undef CMSG_SPACE
#define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l)) #define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l))
#undef CMSG_LEN
#define CMSG_LEN(l) (ALIGN(sizeof(struct cmsghdr)) + (l))
#undef CMSG_DATA #undef CMSG_DATA
#define CMSG_DATA(cmsg) ((u_char *)(cmsg) + ALIGN(sizeof(struct cmsghdr))) #define CMSG_DATA(cmsg) ((u_char *)(cmsg) + ALIGN(sizeof(struct cmsghdr)))