diff options
| author | alfred <alfred@FreeBSD.org> | 2005-03-09 00:17:33 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2005-03-09 00:17:33 +0000 |
| commit | 93318a5e79cd3c39a99f56cbb64d664291aff16f (patch) | |
| tree | c66f0509ddab370c2b40c464028a7240330cd2df | |
| parent | ab661be527e20d291587f2861ab6288b036b46c9 (diff) | |
| download | FreeBSD-src-93318a5e79cd3c39a99f56cbb64d664291aff16f.zip FreeBSD-src-93318a5e79cd3c39a99f56cbb64d664291aff16f.tar.gz | |
Make MSG_NOSIGNAL available to native programs.
Bump FreeBSD_version to note this change.
Reviewed by: sobomax
| -rw-r--r-- | lib/libc/sys/send.2 | 14 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 | ||||
| -rw-r--r-- | sys/sys/socket.h | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2 index de04854..7434db2 100644 --- a/lib/libc/sys/send.2 +++ b/lib/libc/sys/send.2 @@ -103,11 +103,12 @@ The .Fa flags argument may include one or more of the following: .Bd -literal -#define MSG_OOB 0x1 /* process out-of-band data */ -#define MSG_PEEK 0x2 /* peek at incoming message */ -#define MSG_DONTROUTE 0x4 /* bypass routing, use direct interface */ -#define MSG_EOR 0x8 /* data completes record */ -#define MSG_EOF 0x100 /* data completes transaction */ +#define MSG_OOB 0x00001 /* process out-of-band data */ +#define MSG_PEEK 0x00002 /* peek at incoming message */ +#define MSG_DONTROUTE 0x00004 /* bypass routing, use direct interface */ +#define MSG_EOR 0x00008 /* data completes record */ +#define MSG_EOF 0x00100 /* data completes transaction */ +#define MSG_NOSIGNAL 0x20000 /* do not generate SIGPIPE on EOF */ .Ed .Pp The flag @@ -135,6 +136,9 @@ protocol family, and is used to implement Transaction .Xr ttcp 4 ) . .Dv MSG_DONTROUTE is usually used only by diagnostic or routing programs. +.Dv MSG_NOSIGNAL +is used to prevent SIGPIPE generation when writing a socket that +may be closed. .Pp See .Xr recv 2 diff --git a/sys/sys/param.h b/sys/sys/param.h index 1607c45..f6b6382 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 600019 /* Master, propagated to newvers */ +#define __FreeBSD_version 600020 /* Master, propagated to newvers */ #ifndef LOCORE #include <sys/types.h> diff --git a/sys/sys/socket.h b/sys/sys/socket.h index d34c816..27e5294 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -398,7 +398,9 @@ struct msghdr { #endif #ifdef _KERNEL #define MSG_SOCALLBCK 0x10000 /* for use by socket callbacks - soreceive (TCP) */ -#define MSG_NOSIGNAL 0x20000 /* for use with emulation layers */ +#endif +#if __BSD_VISIBLE +#define MSG_NOSIGNAL 0x20000 /* do not generate SIGPIPE on EOF */ #endif /* |
