mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work around broken Solaris sys/socket.h

Browse Source
This commit is contained in:
leitner 2005-05-20 14:42:42 +00:00
parent c169ae9b4a
commit f0e9a2afc9
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
io/io_passfd.c
View File

@ -8,8 +8,10 @@ int io_passfd(int64 sock,int64 fd) {
#else #else
#define _XOPEN_SOURCE #define _XOPEN_SOURCE
#define _XOPEN_SOURCE_EXTENDED 1
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <errno.h> #include <errno.h>
@ -25,8 +27,11 @@ union fdmsg {
int io_passfd(int64 sock,int64 fd) { int io_passfd(int64 sock,int64 fd) {
struct msghdr msg; struct msghdr msg;
struct iovec iov; struct iovec iov;
#ifdef CMSG_LEN #ifdef CMSG_FIRSTHDR
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
#ifndef CMSG_SPACE
#define CMSG_SPACE(x) x+100
#endif
char buf[CMSG_SPACE(sizeof(int))]; char buf[CMSG_SPACE(sizeof(int))];
#endif #endif
iov.iov_len=1; iov.iov_len=1;
@ -35,12 +40,15 @@ int io_passfd(int64 sock,int64 fd) {
msg.msg_iovlen=1; msg.msg_iovlen=1;
msg.msg_name=0; msg.msg_name=0;
msg.msg_namelen=0; msg.msg_namelen=0;
#ifdef CMSG_LEN #ifdef CMSG_FIRSTHDR
msg.msg_control = buf; msg.msg_control = buf;
msg.msg_controllen = sizeof(buf); msg.msg_controllen = sizeof(buf);
cmsg = CMSG_FIRSTHDR(&msg); cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS; cmsg->cmsg_type = SCM_RIGHTS;
#ifndef CMSG_LEN
#define CMSG_LEN(x) x
#endif
cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_len = CMSG_LEN(sizeof(int));
msg.msg_controllen = cmsg->cmsg_len; msg.msg_controllen = cmsg->cmsg_len;
*((int*)CMSG_DATA(cmsg))=fd; *((int*)CMSG_DATA(cmsg))=fd;

10
io/io_receivefd.c
View File

@ -8,6 +8,7 @@ int64 io_receivefd(int64 sock) {
#else #else
#define _XOPEN_SOURCE #define _XOPEN_SOURCE
#define _XOPEN_SOURCE_EXTENDED 1
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -23,7 +24,7 @@ union fdmsg {
int64 io_receivefd(int64 sock) { int64 io_receivefd(int64 sock) {
struct iovec iov; struct iovec iov;
struct msghdr msg; struct msghdr msg;
#ifdef CMSG_LEN #ifdef CMSG_FIRSTHDR
union fdmsg cmsg; union fdmsg cmsg;
struct cmsghdr* h; struct cmsghdr* h;
#else #else
@ -35,7 +36,7 @@ int64 io_receivefd(int64 sock) {
iov.iov_len=100; iov.iov_len=100;
msg.msg_name=name; msg.msg_name=name;
msg.msg_namelen=100; msg.msg_namelen=100;
#ifdef CMSG_LEN #ifdef CMSG_FIRSTHDR
msg.msg_control=cmsg.buf; msg.msg_control=cmsg.buf;
msg.msg_controllen=sizeof(union fdmsg); msg.msg_controllen=sizeof(union fdmsg);
#else #else
@ -44,9 +45,12 @@ int64 io_receivefd(int64 sock) {
#endif #endif
msg.msg_iov = &iov; msg.msg_iov = &iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
#ifdef CMSG_LEN #ifdef CMSG_FIRSTHDR
msg.msg_flags=0; msg.msg_flags=0;
h=CMSG_FIRSTHDR(&msg); h=CMSG_FIRSTHDR(&msg);
#ifndef CMSG_LEN
#define CMSG_LEN(x) x
#endif
h->cmsg_len=CMSG_LEN(sizeof(int)); h->cmsg_len=CMSG_LEN(sizeof(int));
h->cmsg_level=SOL_SOCKET; h->cmsg_level=SOL_SOCKET;
h->cmsg_type=SCM_RIGHTS; h->cmsg_type=SCM_RIGHTS;