#include "rx_peer.h"
#include "rx_packet.h"
#include "rx_internal.h"
+#if defined(HAVE_LINUX_UACCESS_H)
+#include <linux/uaccess.h>
+#else
#include <asm/uaccess.h>
+#endif
#ifdef AFS_RXERRQ_ENV
#include <linux/errqueue.h>
#include <linux/icmp.h>
int pmtu = IP_PMTUDISC_DONT;
#endif
- /* We need a better test for this. if you need it back, tell us
- * how to detect it.
- */
-#ifdef LINUX_KERNEL_SOCK_CREATE_V
+#ifdef HAVE_LINUX_SOCK_CREATE_KERN_NS
+ code = sock_create_kern(&init_net, AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
+#elif defined(HAVE_LINUX_SOCK_CREATE_KERN)
+ code = sock_create_kern(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
+#elif defined(LINUX_KERNEL_SOCK_CREATE_V)
code = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp, 0);
#else
code = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp);
}
#ifdef AFS_RXERRQ_ENV
-void
-handle_socket_error(osi_socket so)
+static int
+osi_HandleSocketError(osi_socket so, char *cmsgbuf, size_t cmsgbuf_len)
{
struct msghdr msg;
struct cmsghdr *cmsg;
struct sock_extended_err *err;
struct sockaddr_in addr;
- struct sockaddr *offender;
- char *controlmsgbuf;
int code;
struct socket *sop = (struct socket *)so;
- if (!(controlmsgbuf=rxi_Alloc(256)))
- return;
msg.msg_name = &addr;
msg.msg_namelen = sizeof(addr);
- msg.msg_control = controlmsgbuf;
- msg.msg_controllen = 256;
+ msg.msg_control = cmsgbuf;
+ msg.msg_controllen = cmsgbuf_len;
msg.msg_flags = 0;
code = kernel_recvmsg(sop, &msg, NULL, 0, 0,
MSG_ERRQUEUE|MSG_DONTWAIT|MSG_TRUNC);
if (code < 0 || !(msg.msg_flags & MSG_ERRQUEUE))
- goto out;
+ return 0;
- for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
- if (CMSG_OK(&msg, cmsg) && cmsg->cmsg_level == SOL_IP &&
- cmsg->cmsg_type == IP_RECVERR)
- break;
- }
- if (!cmsg)
- goto out;
- err = CMSG_DATA(cmsg);
- offender = SO_EE_OFFENDER(err);
-
- if (offender->sa_family != AF_INET)
- goto out;
-
- memcpy(&addr, offender, sizeof(addr));
-
-# ifdef AFS_ADAPT_PMTU
- if (err->ee_origin == SO_EE_ORIGIN_ICMP &&
- err->ee_type == ICMP_DEST_UNREACH &&
- err->ee_code == ICMP_FRAG_NEEDED) {
- rxi_SetPeerMtu(NULL, ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port),
- err->ee_info);
+ /* kernel_recvmsg changes msg_control to point at the _end_ of the buffer,
+ * and msg_controllen is set to the number of bytes remaining */
+ msg.msg_controllen = ((char*)msg.msg_control - (char*)cmsgbuf);
+ msg.msg_control = cmsgbuf;
+
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg && CMSG_OK(&msg, cmsg);
+ cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+
+ if (cmsg->cmsg_level != SOL_IP || cmsg->cmsg_type != IP_RECVERR) {
+ continue;
+ }
+
+ err = CMSG_DATA(cmsg);
+ rxi_ProcessNetError(err, addr.sin_addr.s_addr, addr.sin_port);
}
-# endif
- /* other DEST_UNREACH's and TIME_EXCEEDED should be dealt with too */
-out:
- rxi_Free(controlmsgbuf, 256);
- return;
+ return 1;
}
#endif
+static void
+do_handlesocketerror(osi_socket so)
+{
+#ifdef AFS_RXERRQ_ENV
+ char *cmsgbuf;
+ size_t cmsgbuf_len;
+
+ cmsgbuf_len = 256;
+ cmsgbuf = rxi_Alloc(cmsgbuf_len);
+ if (!cmsgbuf) {
+ return;
+ }
+
+ while (osi_HandleSocketError(so, cmsgbuf, cmsgbuf_len))
+ ;
+
+ rxi_Free(cmsgbuf, cmsgbuf_len);
+#endif
+}
+
/* osi_NetSend
*
* Return codes:
{
struct msghdr msg;
int code;
-#ifdef AFS_RXERRQ_ENV
- int sockerr;
- int esize;
-
- while (1) {
- sockerr=0;
- esize = sizeof(sockerr);
- kernel_getsockopt(sop, SOL_SOCKET, SO_ERROR, (char *)&sockerr, &esize);
- if (sockerr == 0)
- break;
- handle_socket_error(sop);
- }
-#endif
+
msg.msg_name = to;
msg.msg_namelen = sizeof(*to);
msg.msg_flags = 0;
code = kernel_sendmsg(sop, &msg, (struct kvec *) iovec, iovcnt, size);
+
+ if (code < 0) {
+ do_handlesocketerror(sop);
+ }
+
return (code < 0) ? code : 0;
}
{
struct msghdr msg;
int code;
-#ifdef AFS_RXERRQ_ENV
- int sockerr;
- int esize;
-#endif
struct iovec tmpvec[RX_MAXWVECS + 2];
struct socket *sop = (struct socket *)so;
if (iovcnt > RX_MAXWVECS + 2) {
osi_Panic("Too many (%d) iovecs passed to osi_NetReceive\n", iovcnt);
}
-#ifdef AFS_RXERRQ_ENV
- while (1) {
- sockerr=0;
- esize = sizeof(sockerr);
- kernel_getsockopt(sop, SOL_SOCKET, SO_ERROR, (char *)&sockerr, &esize);
- if (sockerr == 0)
- break;
- handle_socket_error(so);
- }
-#endif
+
memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
msg.msg_name = from;
+#if defined(STRUCT_MSGHDR_HAS_MSG_ITER)
+ msg.msg_iter.iov = tmpvec;
+ msg.msg_iter.nr_segs = iovcnt;
+#else
msg.msg_iov = tmpvec;
msg.msg_iovlen = iovcnt;
+#endif
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
flush_signals(current); /* We don't want no stinkin' signals. */
rxk_lastSocketError = code;
rxk_nSocketErrors++;
+
+ do_handlesocketerror(so);
} else {
*lengthp = code;
code = 0;
while (rxk_ListenerTask) {
if (rxk_ListenerTask) {
flush_signals(rxk_ListenerTask);
- force_sig(SIGKILL, rxk_ListenerTask);
+ send_sig(SIGKILL, rxk_ListenerTask, 1);
}
if (!rxk_ListenerTask)
break;
git://git.openafs.org / openafs.git / blobdiff