Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25844
Modified Files:
merovingian_proxy.c
Log Message:
Fixes for Linux: it confuses the kernel when there is a connected socket and
also a target address being given to sendmsg, second you cannot retrieve the
first header when the message buffer is not yet set.
Index: merovingian_proxy.c
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/backends/monet5/merovingian/merovingian_proxy.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- merovingian_proxy.c 18 Mar 2010 10:02:17 -0000 1.6
+++ merovingian_proxy.c 22 Mar 2010 14:34:52 -0000 1.7
@@ -130,19 +130,20 @@
return(newErr("cannot connect: %s", strerror(errno)));
/* send first byte, nothing special to happen */
- msg.msg_name = (struct sockaddr*)&server;
- msg.msg_namelen = sizeof(server);
+ msg.msg_name = NULL;
+ msg.msg_namelen = 0;
*buf = '1'; /* pass fd */
vec.iov_base = buf;
vec.iov_len = 1;
msg.msg_iov = &vec;
msg.msg_iovlen = 1;
+ msg.msg_control = ccmsg;
+ msg.msg_controllen = sizeof(ccmsg);
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(psock));
*(int *)CMSG_DATA(cmsg) = psock;
- msg.msg_control = ccmsg;
msg.msg_controllen = cmsg->cmsg_len;
msg.msg_flags = 0;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
