#include <afsconfig.h>
#include "afs/param.h"
-RCSID("$Header$");
#include <linux/version.h>
-#ifdef AFS_LINUX22_ENV
#include "rx/rx_kcommon.h"
-#if defined(AFS_LINUX24_ENV)
-#include "h/smp_lock.h"
-#endif
+#include "rx.h"
+#include "rx_atomic.h"
+#include "rx_globals.h"
+#include "rx_stats.h"
+#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>
+#endif
+#include "osi_compat.h"
/* rxk_NewSocket
* open and bind RX socket
*/
-struct osi_socket *rxk_NewSocket(short aport)
+osi_socket *
+rxk_NewSocketHost(afs_uint32 ahost, short aport)
{
struct socket *sockp;
struct sockaddr_in myaddr;
int code;
+#ifdef AFS_ADAPT_PMTU
+ int pmtu = IP_PMTUDISC_WANT;
+#else
+ int pmtu = IP_PMTUDISC_DONT;
+#endif
-
+#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);
- if (code<0)
+#endif
+ if (code < 0)
return NULL;
/* Bind socket */
myaddr.sin_family = AF_INET;
- myaddr.sin_addr.s_addr = htonl(INADDR_ANY);
+ myaddr.sin_addr.s_addr = ahost;
myaddr.sin_port = aport;
- code = sockp->ops->bind(sockp, (struct sockaddr*)&myaddr, sizeof(myaddr));
+ code =
+ sockp->ops->bind(sockp, (struct sockaddr *)&myaddr, sizeof(myaddr));
- if (code<0) {
-#if defined(AFS_LINUX24_ENV)
+ if (code < 0) {
printk("sock_release(rx_socket) FIXME\n");
-#else
- sock_release(sockp);
-#endif
return NULL;
}
- return (struct osi_socket*)sockp;
+ afs_linux_sock_set_mtu_discover(sockp, pmtu);
+
+#ifdef AFS_RXERRQ_ENV
+ afs_linux_sock_set_recverr(sockp);
+#endif
+ return (osi_socket *)sockp;
}
+osi_socket *
+rxk_NewSocket(short aport)
+{
+ return rxk_NewSocketHost(htonl(INADDR_ANY), aport);
+}
/* free socket allocated by osi_NetSocket */
-int rxk_FreeSocket(register struct socket *asocket)
+int
+rxk_FreeSocket(struct socket *asocket)
{
AFS_STATCNT(osi_FreeSocket);
return 0;
}
+#ifdef AFS_RXERRQ_ENV
+int
+osi_HandleSocketError(osi_socket so, void *cmsgbuf, size_t cmsgbuf_len)
+{
+ struct msghdr msg;
+ struct cmsghdr *cmsg;
+ struct sock_extended_err *err;
+ struct sockaddr_in addr;
+ int code;
+ struct socket *sop = (struct socket *)so;
+
+ msg.msg_name = &addr;
+ msg.msg_namelen = sizeof(addr);
+ 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))
+ return 0;
+
+ /* 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);
+ }
+
+ return 1;
+}
+#endif
/* osi_NetSend
*
* 0 = success
* non-zero = failure
*/
-int osi_NetSend(osi_socket sop, struct sockaddr_in *to,
- struct iovec *iov, int iovcnt, afs_int32 size, int istack)
+int
+osi_NetSend(osi_socket sop, struct sockaddr_in *to, struct iovec *iovec,
+ int iovcnt, afs_int32 size, int istack)
{
- KERNEL_SPACE_DECL;
struct msghdr msg;
int code;
- struct iovec tmpvec[RX_MAXWVECS+2];
- if (iovcnt > RX_MAXWVECS+2) {
- osi_Panic("Too many (%d) iovecs passed to osi_NetSend\n", iovcnt);
- }
- if (iovcnt <= 2) { /* avoid pointless uiomove */
- tmpvec[0].iov_base = iov[0].iov_base;
- tmpvec[0].iov_len = size;
- msg.msg_iovlen = 1;
- }
- else {
- memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
- msg.msg_iovlen = iovcnt;
- }
- msg.msg_iov = tmpvec;
msg.msg_name = to;
msg.msg_namelen = sizeof(*to);
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
- TO_USER_SPACE();
- code = sock_sendmsg(sop, &msg, size);
- TO_KERNEL_SPACE();
- return (code<0) ? code : 0;
+ code = kernel_sendmsg(sop, &msg, (struct kvec *) iovec, iovcnt, size);
+
+ return (code < 0) ? code : 0;
}
*/
int rxk_lastSocketError;
int rxk_nSocketErrors;
-int osi_NetReceive(osi_socket so, struct sockaddr_in *from,
- struct iovec *iov, int iovcnt, int *lengthp)
+int
+osi_NetReceive(osi_socket so, struct sockaddr_in *from, struct iovec *iov,
+ int iovcnt, int *lengthp)
{
- KERNEL_SPACE_DECL;
struct msghdr msg;
int code;
- struct iovec tmpvec[RX_MAXWVECS+2];
- struct socket *sop = (struct socket*)so;
+ struct iovec tmpvec[RX_MAXWVECS + 2];
+ struct socket *sop = (struct socket *)so;
- if (iovcnt > RX_MAXWVECS+2) {
+ if (iovcnt > RX_MAXWVECS + 2) {
osi_Panic("Too many (%d) iovecs passed to osi_NetReceive\n", iovcnt);
}
+
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;
- TO_USER_SPACE();
- code = sock_recvmsg(sop, &msg, *lengthp, 0);
- TO_KERNEL_SPACE();
+ code = kernel_recvmsg(sop, &msg, (struct kvec *)tmpvec, iovcnt,
+ *lengthp, 0);
+ if (code < 0) {
+ afs_try_to_freeze();
- if (code<0) {
/* Clear the error before using the socket again.
* Oh joy, Linux has hidden header files as well. It appears we can
* simply call again and have it clear itself via sock_error().
*/
-#ifdef AFS_LINUX22_ENV
- flush_signals(current); /* We don't want no stinkin' signals. */
-#else
- current->signal = 0; /* We don't want no stinkin' signals. */
-#endif
+ flush_signals(current); /* We don't want no stinkin' signals. */
rxk_lastSocketError = code;
- rxk_nSocketErrors ++ ;
- }
- else {
+ rxk_nSocketErrors++;
+
+ rxi_HandleSocketErrors(so);
+ } else {
*lengthp = code;
code = 0;
}
return code;
}
-void osi_StopListener(void)
+void
+osi_StopListener(void)
{
- struct task_struct *listener;
- extern int rxk_ListenerPid;
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
- read_lock(&tasklist_lock);
-#endif
- listener = find_task_by_pid(rxk_ListenerPid);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
- read_unlock(&tasklist_lock);
-#endif
- while (rxk_ListenerPid) {
- struct task_struct *p;
-
- flush_signals(listener);
- force_sig(SIGKILL, listener);
- afs_osi_Sleep(&rxk_ListenerPid);
+ extern struct task_struct *rxk_ListenerTask;
+
+ while (rxk_ListenerTask) {
+ if (rxk_ListenerTask) {
+ flush_signals(rxk_ListenerTask);
+ send_sig(SIGKILL, rxk_ListenerTask, 1);
+ }
+ if (!rxk_ListenerTask)
+ break;
+ afs_osi_Sleep(&rxk_ListenerTask);
}
sock_release(rx_socket);
rx_socket = NULL;
}
-#endif /* AFS_LINUX22_ENV */
git://git.openafs.org / openafs.git / blobdiff