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

Solaris compatibility for io_passfd and io_receivefd (untested, but at

Browse Source 
least it compiles)
This commit is contained in:
leitner 2004-06-03 16:45:30 +00:00
parent 499ca6a307
commit 72382af11a
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -4,6 +4,7 @@
add io_appendfile, io_readwritefile add io_appendfile, io_readwritefile
support ip6.arpa in addition to ip6.int in dns_name (adds one support ip6.arpa in addition to ip6.int in dns_name (adds one
parameter to dns_name6_domain and two constants in dns.h) parameter to dns_name6_domain and two constants in dns.h)
Solaris compatibility for io_passfd and io_receivefd
0.19.2: 0.19.2:
for some reason, a botched dependency slipped in the the Makefile for some reason, a botched dependency slipped in the the Makefile

15
io/io_passfd.c
View File

@ -14,22 +14,29 @@ union fdmsg {
int io_passfd(int64 sock,int64 fd) { int io_passfd(int64 sock,int64 fd) {
struct msghdr msg = {0}; struct msghdr msg = {0};
struct cmsghdr *cmsg;
struct iovec iov; struct iovec iov;
#ifdef CMSG_LEN
struct cmsghdr *cmsg;
char buf[CMSG_SPACE(sizeof(int))]; char buf[CMSG_SPACE(sizeof(int))];
#endif
iov.iov_len=1; iov.iov_len=1;
iov.iov_base="x"; iov.iov_base="x";
msg.msg_control = buf;
msg.msg_controllen = sizeof buf;
msg.msg_iov=&iov; msg.msg_iov=&iov;
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
msg.msg_control = 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;
cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_len = CMSG_LEN(sizeof(int));
*((int*)CMSG_DATA(cmsg))=fd;
msg.msg_controllen = cmsg->cmsg_len; msg.msg_controllen = cmsg->cmsg_len;
*((int*)CMSG_DATA(cmsg))=fd;
#else
msg.msg_accrights = (char*)&fd;
msg.msg_accrightslen = sizeof(fd);
#endif
return sendmsg(sock,&msg,0)>=0?0:-1; return sendmsg(sock,&msg,0)>=0?0:-1;
} }

16
io/io_receivefd.c
View File

@ -13,26 +13,38 @@ 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
union fdmsg cmsg; union fdmsg cmsg;
struct cmsghdr* h; struct cmsghdr* h;
#else
int fd;
#endif
char x[100]; char x[100];
char name[100]; char name[100];
iov.iov_base=x; iov.iov_base=x;
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
msg.msg_control=cmsg.buf; msg.msg_control=cmsg.buf;
msg.msg_controllen=sizeof(union fdmsg); msg.msg_controllen=sizeof(union fdmsg);
#else
msg.msg_accrights=(char*)&fd;
msg.msg_accrightslen=sizeof(fd);
#endif
msg.msg_iov = &iov; msg.msg_iov = &iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
#ifdef CMSG_LEN
msg.msg_flags=0; msg.msg_flags=0;
h=CMSG_FIRSTHDR(&msg); h=CMSG_FIRSTHDR(&msg);
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;
*((int*)CMSG_DATA(h))=-1; *((int*)CMSG_DATA(h))=-1;
#endif
if (recvmsg(sock,&msg,0)==-1) if (recvmsg(sock,&msg,0)==-1)
return -1; return -1;
#ifdef CMSG_FIRSTHDR
h=CMSG_FIRSTHDR(&msg); h=CMSG_FIRSTHDR(&msg);
if (!h || h->cmsg_len!=CMSG_LEN(sizeof(int)) || h->cmsg_level!=SOL_SOCKET || h->cmsg_type!=SCM_RIGHTS) { if (!h || h->cmsg_len!=CMSG_LEN(sizeof(int)) || h->cmsg_level!=SOL_SOCKET || h->cmsg_type!=SCM_RIGHTS) {
#ifdef EPROTO #ifdef EPROTO
@ -43,4 +55,8 @@ int64 io_receivefd(int64 sock) {
return -1; return -1;
} }
return *((int*)CMSG_DATA(h)); return *((int*)CMSG_DATA(h));
#else
if (msg.msg_accrightslen != sizeof(fd)) return -1;
return fd;
#endif
} }