-/* Copyright 1998 Transarc Corporation - All Rights Reserved.
- *
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ *
+ * This software has been released under the terms of the IBM Public
+ * License. For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+/*
* rx_knet.c - RX kernel send, receive and timer routines.
*
* Linux implementation.
*/
-#include "../afs/param.h"
+#include <afsconfig.h>
+#include "afs/param.h"
+
+RCSID
+ ("$Header$");
+
+#include <linux/version.h>
#ifdef AFS_LINUX22_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
+#if defined(AFS_LINUX24_ENV)
+#include "h/smp_lock.h"
+#endif
#include <asm/uaccess.h>
/* rxk_NewSocket
* open and bind RX socket
*/
-struct osi_socket *rxk_NewSocket(short aport)
+struct osi_socket *
+rxk_NewSocketHost(afs_uint32 ahost, short aport)
{
struct socket *sockp;
struct sockaddr_in myaddr;
int code;
-
+
+#ifdef LINUX_KERNEL_IS_SELINUX
+ 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 (code < 0) {
+#if defined(AFS_LINUX24_ENV)
+ printk("sock_release(rx_socket) FIXME\n");
+#else
sock_release(sockp);
+#endif
return NULL;
}
- return (struct osi_socket*)sockp;
+ return (struct osi_socket *)sockp;
}
+struct osi_socket *
+rxk_NewSocket(short aport)
+{
+ return rxk_NewSocketHost(htonl(INADDR_ANY), aport);
+}
/* free socket allocated by osi_NetSocket */
-int rxk_FreeSocket(asocket)
- register struct socket *asocket;
+int
+rxk_FreeSocket(register struct socket *asocket)
{
AFS_STATCNT(osi_FreeSocket);
return 0;
* 0 = success
* non-zero = failure
*/
-int osi_NetSend(struct socket *sop, struct sockaddr_in *to,
- struct iovec *iov, int iovcnt, int size, int istack)
+int
+osi_NetSend(osi_socket sop, struct sockaddr_in *to, struct iovec *iov,
+ int iovcnt, afs_int32 size, int istack)
{
KERNEL_SPACE_DECL;
struct msghdr msg;
int code;
- struct iovec tmpvec[RX_MAXWVECS+2];
+ struct iovec tmpvec[RX_MAXWVECS + 2];
- if (iovcnt > 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 */
+ if (iovcnt <= 2) { /* avoid pointless uiomove */
tmpvec[0].iov_base = iov[0].iov_base;
tmpvec[0].iov_len = size;
msg.msg_iovlen = 1;
- }
- else {
+ } else {
memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
msg.msg_iovlen = iovcnt;
}
TO_USER_SPACE();
code = sock_sendmsg(sop, &msg, size);
TO_KERNEL_SPACE();
- return (code<0) ? code : 0;
+ 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));
code = sock_recvmsg(sop, &msg, *lengthp, 0);
TO_KERNEL_SPACE();
- if (code<0) {
+ 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. */
+ flush_signals(current); /* We don't want no stinkin' signals. */
#else
- current->signal = 0; /* We don't want no stinkin' signals. */
+ current->signal = 0; /* We don't want no stinkin' signals. */
#endif
rxk_lastSocketError = code;
- rxk_nSocketErrors ++ ;
- }
- else {
+ rxk_nSocketErrors++;
+ } else {
*lengthp = code;
code = 0;
}
return code;
}
-void osi_StopListener(void)
+void
+osi_StopListener(void)
{
- extern int (*sys_killp)();
+ struct task_struct *listener;
extern int rxk_ListenerPid;
- if (rxk_ListenerPid) {
- (void) (*sys_killp)(rxk_ListenerPid, 9);
- rxk_ListenerPid = 0;
+#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);
}
sock_release(rx_socket);
rx_socket = NULL;
git://git.openafs.org / openafs.git / blobdiff