1 diff --git a/src/clnt_dg.c b/src/clnt_dg.c
2 index 151b449..0e35742 100644
10 +#include <asm/types.h>
11 +#include <linux/errqueue.h>
16 #define MAX_DEFAULT_FDS 20000
18 static struct clnt_ops *clnt_dg_ops(void);
19 @@ -246,6 +253,12 @@ clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz)
21 (void)bindresvport_sa(fd, (struct sockaddr *)svcaddr->buf);
26 + setsockopt(fd, SOL_IP, IP_RECVERR, &on, sizeof(on));
29 ioctl(fd, FIONBIO, (char *)(void *)&one);
31 * By default, closeit is always FALSE. It is users responsibility
32 @@ -352,7 +365,7 @@ call_again:
34 *(u_int32_t *)(void *)(cu->cu_outbuf) = htonl(xid);
36 - if ((! XDR_PUTINT32(xdrs, &proc)) ||
37 + if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) ||
38 (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
39 (! (*xargs)(xdrs, argsp))) {
40 cu->cu_error.re_status = RPC_CANTENCODEARGS;
41 @@ -404,6 +417,48 @@ get_reply:
46 + if (fd.revents & POLLERR)
49 + struct cmsghdr *cmsg;
50 + struct sock_extended_err *e;
51 + struct sockaddr_in err_addr;
52 + struct sockaddr_in *sin = (struct sockaddr_in *)&cu->cu_raddr;
54 + char *cbuf = (char *) alloca (outlen + 256);
57 + iov.iov_base = cbuf + 256;
58 + iov.iov_len = outlen;
59 + msg.msg_name = (void *) &err_addr;
60 + msg.msg_namelen = sizeof (err_addr);
64 + msg.msg_control = cbuf;
65 + msg.msg_controllen = 256;
66 + ret = recvmsg (cu->cu_fd, &msg, MSG_ERRQUEUE);
68 + && memcmp (cbuf + 256, cu->cu_outbuf, ret) == 0
69 + && (msg.msg_flags & MSG_ERRQUEUE)
70 + && ((msg.msg_namelen == 0
72 + || (msg.msg_namelen == sizeof (err_addr)
73 + && err_addr.sin_family == AF_INET
74 + && memcmp (&err_addr.sin_addr, &sin->sin_addr,
75 + sizeof (err_addr.sin_addr)) == 0
76 + && err_addr.sin_port == sin->sin_port)))
77 + for (cmsg = CMSG_FIRSTHDR (&msg); cmsg;
78 + cmsg = CMSG_NXTHDR (&msg, cmsg))
79 + if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR)
81 + e = (struct sock_extended_err *) CMSG_DATA(cmsg);
82 + cu->cu_error.re_errno = e->ee_errno;
83 + return (cu->cu_error.re_status = RPC_CANTRECV);
88 /* We have some data now */