*/
#include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
-RCSID("$Header$");
+RCSID
+ ("$Header$");
#ifdef AFS_SUN5_ENV
-#include "../rx/rx_kcommon.h"
+#include "rx/rx_kcommon.h"
#ifdef AFS_SUN56_ENV
-#include "../inet/common.h"
-#include "../sys/tiuser.h"
-#include "../sys/t_kuser.h"
-#include "../sys/stropts.h"
-#include "../sys/stream.h"
-#include "../sys/tihdr.h"
-#include "../sys/fcntl.h"
+#include "inet/common.h"
+#include "sys/tiuser.h"
+#include "sys/t_kuser.h"
+#include "sys/stropts.h"
+#include "sys/stream.h"
+#include "sys/tihdr.h"
+#include "sys/fcntl.h"
#ifdef AFS_SUN58_ENV
-#include "../netinet/ip6.h"
+#include "netinet/ip6.h"
#define ipif_local_addr ipif_lcl_addr
#ifndef V4_PART_OF_V6
#define V4_PART_OF_V6(v6) v6.s6_addr32[3]
#endif
#endif
-#include "../inet/ip.h"
-#include "../inet/ip_if.h"
-#include "../netinet/udp.h"
+#include "inet/ip.h"
+#include "inet/ip_if.h"
+#include "netinet/udp.h"
+#ifdef AFS_SUN510_ENV
+#include "h/ddi.h"
+#include "h/ksynch.h"
+#include "h/sunddi.h"
+#include "h/sunldi.h"
+#include "h/sockio.h"
+#include "h/cmn_err.h"
+#include "h/socket.h"
+#include "netinet/in.h"
+#endif
/*
* Function pointers for kernel socket routines
*/
struct sonode *(*sockfs_socreate)
- (vnode_t *, int, int, int, int, struct sonode *, int *) = NULL;
+ (vnode_t *, int, int, int, int, struct sonode *, int *) = NULL;
struct vnode *(*sockfs_solookup)
- (int, int, int, char *, int *) = NULL;
+ (int, int, int, char *, int *) = NULL;
int (*sockfs_sobind)
- (struct sonode *, struct sockaddr *, int, int, int) = NULL;
+ (struct sonode *, struct sockaddr *, int, int, int) = NULL;
int (*sockfs_sorecvmsg)
- (struct sonode *, struct nmsghdr *, struct uio *) = NULL;
+ (struct sonode *, struct nmsghdr *, struct uio *) = NULL;
int (*sockfs_sosendmsg)
- (struct sonode *, struct nmsghdr *, struct uio *) = NULL;
+ (struct sonode *, struct nmsghdr *, struct uio *) = NULL;
int (*sockfs_sosetsockopt)
- (struct sonode *, int, int, void *, int) = NULL;
+ (struct sonode *, int, int, void *, int) = NULL;
+#ifndef AFS_SUN510_ENV
int (*sockfs_sounbind)
- (struct sonode *, int);
+ (struct sonode *, int);
void (*sockfs_sockfree)
- (struct sonode *);
+ (struct sonode *);
+#endif
+
+#ifndef UDP_MOD_NAME
+#define UDP_MOD_NAME "udp"
+#endif
static afs_uint32 myNetAddrs[ADDRSPERSITE];
static int myNetMTUs[ADDRSPERSITE];
{
int i = 0;
int different = 0;
-
+#ifndef AFS_SUN510_ENV
ill_t *ill;
ipif_t *ipif;
+#endif
int rxmtu, maxmtu;
-
int mtus[ADDRSPERSITE];
afs_uint32 addrs[ADDRSPERSITE];
afs_uint32 ifinaddr;
memset(mtus, 0, sizeof(mtus));
memset(addrs, 0, sizeof(addrs));
+#ifdef AFS_SUN510_ENV
+ (void) rw_enter(&afsifinfo_lock, RW_READER);
+
+ for (i = 0; (afsifinfo[i].ipaddr != NULL) && (i < ADDRSPERSITE); i++) {
+
+ /* Ignore addresses which are down.. */
+ if (!(afsifinfo[i].flags & IFF_UP))
+ continue;
+
+ /* Compute the Rx interface MTU */
+ rxmtu = (afsifinfo[i].mtu - RX_IPUDP_SIZE);
+
+ ifinaddr = afsifinfo[i].ipaddr;
+ if (myNetAddrs[i] != ifinaddr)
+ different++;
+
+ /* Copy interface MTU and address; adjust maxmtu */
+ mtus[i] = rxmtu;
+ rxmtu = rxi_AdjustIfMTU(rxmtu);
+ maxmtu = rxmtu * rxi_nRecvFrags +
+ ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE);
+ maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu);
+ addrs[i] = ifinaddr;
+
+ if (ifinaddr != 0x7f000001 && maxmtu > rx_maxReceiveSize) {
+ rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu);
+ rx_maxReceiveSize =
+ MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);
+ }
+
+ }
+
+ (void) rw_exit(&afsifinfo_lock);
+
+ rx_maxJumboRecvSize =
+ RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE +
+ (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE;
+ rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize);
+
+ if (different) {
+ int j;
+
+ for (j = 0; j < i; j++) {
+ myNetMTUs[j] = mtus[j];
+ myNetAddrs[j] = addrs[j];
+ }
+ }
+
+ return different;
+}
+
+#else
for (ill = ill_g_head; ill; ill = ill->ill_next) {
#ifdef AFS_SUN58_ENV
/* Make sure this is an IPv4 ILL */
- if (ill->ill_isv6) continue;
+ if (ill->ill_isv6)
+ continue;
#endif
/* Iterate over all the addresses on this ILL */
for (ipif = ill->ill_ipif; ipif; ipif = ipif->ipif_next) {
- if (i >= ADDRSPERSITE) break;
+ if (i >= ADDRSPERSITE)
+ break;
/* Ignore addresses which are down.. */
- if (!(ipif->ipif_flags & IFF_UP)) continue;
+ if (!(ipif->ipif_flags & IFF_UP))
+ continue;
/* Compute the Rx interface MTU */
rxmtu = (ipif->ipif_mtu - RX_IPUDP_SIZE);
/* Copy interface MTU and address; adjust maxmtu */
mtus[i] = rxmtu;
rxmtu = rxi_AdjustIfMTU(rxmtu);
- maxmtu = rxmtu * rxi_nRecvFrags + ((rxi_nRecvFrags-1) *
- UDP_HDR_SIZE);
+ maxmtu =
+ rxmtu * rxi_nRecvFrags +
+ ((rxi_nRecvFrags - 1) * UDP_HDR_SIZE);
maxmtu = rxi_AdjustMaxMTU(rxmtu, maxmtu);
addrs[i] = ifinaddr;
i++;
if (ifinaddr != 0x7f000001 && maxmtu > rx_maxReceiveSize) {
- rx_maxReceiveSize = MIN( RX_MAX_PACKET_SIZE, maxmtu);
- rx_maxReceiveSize = MIN( rx_maxReceiveSize,
- rx_maxReceiveSizeUser);
+ rx_maxReceiveSize = MIN(RX_MAX_PACKET_SIZE, maxmtu);
+ rx_maxReceiveSize =
+ MIN(rx_maxReceiveSize, rx_maxReceiveSizeUser);
}
}
}
- rx_maxJumboRecvSize = RX_HEADER_SIZE +
- rxi_nDgramPackets * RX_JUMBOBUFFERSIZE +
- (rxi_nDgramPackets-1) * RX_JUMBOHEADERSIZE;
+ rx_maxJumboRecvSize =
+ RX_HEADER_SIZE + rxi_nDgramPackets * RX_JUMBOBUFFERSIZE +
+ (rxi_nDgramPackets - 1) * RX_JUMBOHEADERSIZE;
rx_maxJumboRecvSize = MAX(rx_maxJumboRecvSize, rx_maxReceiveSize);
if (different) {
return different;
}
+#endif
int
-rxi_FindIfMTU(addr)
- afs_uint32 addr;
+rxi_FindIfMTU(afs_uint32 addr)
{
- ill_t *ill;
- ipif_t *ipif;
afs_uint32 myAddr, netMask;
int match_value = 0;
int mtu = -1;
+#ifdef AFS_SUN510_ENV
+ int i = 0;
+#else
+ ill_t *ill;
+ ipif_t *ipif;
+#endif
if (numMyNetAddrs == 0)
rxi_GetIFInfo();
myAddr = ntohl(addr);
- if (IN_CLASSA(myAddr)) netMask = IN_CLASSA_NET;
- else if (IN_CLASSB(myAddr)) netMask = IN_CLASSB_NET;
- else if (IN_CLASSC(myAddr)) netMask = IN_CLASSC_NET;
- else netMask = 0;
+ if (IN_CLASSA(myAddr))
+ netMask = IN_CLASSA_NET;
+ else if (IN_CLASSB(myAddr))
+ netMask = IN_CLASSB_NET;
+ else if (IN_CLASSC(myAddr))
+ netMask = IN_CLASSC_NET;
+ else
+ netMask = 0;
+
+#ifdef AFS_SUN510_ENV
+ (void) rw_enter(&afsifinfo_lock, RW_READER);
+
+ for (i = 0; (afsifinfo[i].ipaddr != NULL) && (i < ADDRSPERSITE); i++) {
+ afs_uint32 thisAddr, subnetMask;
+ int thisMtu;
+
+ /* Ignore addresses which are down.. */
+ if ((afsifinfo[i].flags & IFF_UP) == 0)
+ continue;
+
+ thisAddr = afsifinfo[i].ipaddr;
+ subnetMask = afsifinfo[i].netmask;
+ thisMtu = afsifinfo[i].mtu;
+
+ if ((myAddr & netMask) == (thisAddr & netMask)) {
+ if ((myAddr & subnetMask) == (thisAddr & subnetMask)) {
+ if (myAddr == thisAddr) {
+ match_value = 4;
+ mtu = thisMtu;
+ }
+
+ if (match_value < 3) {
+ match_value = 3;
+ mtu = thisMtu;
+ }
+ }
+
+ if (match_value < 2) {
+ match_value = 2;
+ mtu = thisMtu;
+ }
+ }
+ }
+
+ (void) rw_exit(&afsifinfo_lock);
+ return mtu;
+}
+#else
for (ill = ill_g_head; ill; ill = ill->ill_next) {
#ifdef AFS_SUN58_ENV
/* Make sure this is an IPv4 ILL */
- if (ill->ill_isv6) continue;
+ if (ill->ill_isv6)
+ continue;
#endif
/* Iterate over all the addresses on this ILL */
afs_uint32 thisAddr, subnetMask;
int thisMtu;
- thisAddr = ipif->ipif_local_addr;
+ thisAddr = ipif->ipif_local_addr;
subnetMask = ipif->ipif_net_mask;
- thisMtu = ipif->ipif_mtu;
+ thisMtu = ipif->ipif_mtu;
if ((myAddr & netMask) == (thisAddr & netMask)) {
if ((myAddr & subnetMask) == (thisAddr & subnetMask)) {
return mtu;
}
+#endif
/* rxi_NewSocket, rxi_FreeSocket and osi_NetSend are from the now defunct
* afs_osinet.c.
struct sockaddr_in rx_sockaddr;
/* Allocate a new socket at specified port in network byte order. */
-struct osi_socket *rxk_NewSocket(short aport)
+osi_socket *
+rxk_NewSocketHost(afs_uint32 ahost, short aport)
{
vnode_t *accessvp;
struct sonode *so;
AFS_STATCNT(osi_NewSocket);
if (sockfs_solookup == NULL) {
- sockfs_solookup = (struct vnode *(*)())modlookup("sockfs", "solookup");
+ sockfs_solookup =
+ (struct vnode * (*)())modlookup("sockfs", "solookup");
if (sockfs_solookup == NULL) {
return NULL;
}
}
if (sockfs_socreate == NULL) {
- sockfs_socreate = (struct sonode *(*)())modlookup("sockfs", "socreate");
+ sockfs_socreate =
+ (struct sonode * (*)())modlookup("sockfs", "socreate");
if (sockfs_socreate == NULL) {
return NULL;
}
return NULL;
}
}
+#ifndef AFS_SUN510_ENV
if (sockfs_sounbind == NULL) {
sockfs_sounbind = (int (*)())modlookup("sockfs", "sounbind");
if (sockfs_sounbind == NULL)
if (sockfs_sockfree == NULL)
return NULL;
}
+#endif
accessvp = sockfs_solookup(AF_INET, SOCK_DGRAM, 0, "/dev/udp", &error);
if (accessvp == NULL) {
return NULL;
}
- so = sockfs_socreate(accessvp, AF_INET, SOCK_DGRAM, 0,
- SOV_STREAM, NULL, &error);
+ so = sockfs_socreate(accessvp, AF_INET, SOCK_DGRAM, 0, SOV_STREAM, NULL,
+ &error);
if (so == NULL) {
return NULL;
}
addr.sin_family = AF_INET;
addr.sin_port = aport;
- addr.sin_addr.s_addr = INADDR_ANY;
+ addr.sin_addr.s_addr = ahost; /* I wonder what the odds are on
+ needing to unbyteswap this */
error = sockfs_sobind(so, (struct sockaddr *)&addr, sizeof(addr), 0, 0);
if (error != 0) {
return NULL;
return NULL;
}
- return (struct osi_socket *)so;
+ return (osi_socket *)so;
}
-int osi_FreeSocket(asocket)
- register struct osi_socket *asocket;
+osi_socket *
+rxk_NewSocket(short aport)
+{
+ return rxk_NewSocketHost(htonl(INADDR_ANY), aport);
+}
+
+int
+osi_FreeSocket(register osi_socket *asocket)
{
extern int rxk_ListenerPid;
struct sonode *so = (struct sonode *)asocket;
struct sockaddr_in taddr;
struct iovec dvec;
char c;
+ vnode_t *vp;
AFS_STATCNT(osi_FreeSocket);
taddr.sin_family = AF_INET;
- taddr.sin_port = htons(rx_port);
+ taddr.sin_port = rx_port;
taddr.sin_addr.s_addr = htonl(0x7f000001);
dvec.iov_base = &c;
afs_osi_Sleep(&rxk_ListenerPid);
}
- sockfs_sounbind(so, 0);
- sockfs_sockfree(so);
+ /* Was sockfs_sounbind(so, 0); sockfs_sockfree(so); That's wrong */
+ vp = SOTOV(so);
+ #ifdef AFS_SUN511_ENV
+ VOP_CLOSE(vp, FREAD|FWRITE, 1, (offset_t)0, CRED(), NULL);
+ #else
+ VOP_CLOSE(vp, FREAD|FWRITE, 1, (offset_t)0, CRED());
+ #endif
+ VN_RELE(vp);
+
return 0;
}
-int osi_NetSend(asocket, addr, dvec, nvecs, asize, istack)
- struct osi_socket *asocket;
- struct sockaddr_in *addr;
- struct iovec dvec[];
- int nvecs;
- afs_int32 asize;
- int istack;
+int
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec,
+ int nvecs, afs_int32 asize, int istack)
{
struct sonode *so = (struct sonode *)asocket;
struct nmsghdr msg;
struct iovec iov[RX_MAXIOVECS];
int error;
int i;
-
+
if (nvecs > RX_MAXIOVECS) {
- osi_Panic("osi_NetSend: %d: Too many iovecs.\n", nvecs);
+ osi_Panic("osi_NetSend: %d: Too many iovecs.\n", nvecs);
}
msg.msg_name = (struct sockaddr *)addr;
msg.msg_controllen = 0;
msg.msg_flags = 0;
- for (i = 0 ; i < nvecs ; i++) {
+ for (i = 0; i < nvecs; i++) {
iov[i].iov_base = dvec[i].iov_base;
iov[i].iov_len = dvec[i].iov_len;
}
uio.uio_iovcnt = nvecs;
uio.uio_loffset = 0;
uio.uio_segflg = UIO_SYSSPACE;
- uio.uio_fmode = FREAD|FWRITE;
+ uio.uio_fmode = FREAD | FWRITE;
uio.uio_limit = 0;
uio.uio_resid = asize;
return error;
}
-int osi_NetReceive(asocket, addr, dvec, nvecs, alength)
- struct osi_socket *asocket;
- struct sockaddr_in *addr;
- struct iovec *dvec;
- int nvecs;
- int *alength;
+int
+osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec,
+ int nvecs, int *alength)
{
- struct sonode *so = (struct sonode *)asocket;
+ struct sonode *asocket = (struct sonode *)so;
struct nmsghdr msg;
struct uio uio;
struct iovec iov[RX_MAXIOVECS];
int error;
int i;
-
+
if (nvecs > RX_MAXIOVECS) {
- osi_Panic("osi_NetSend: %d: Too many iovecs.\n", nvecs);
+ osi_Panic("osi_NetSend: %d: Too many iovecs.\n", nvecs);
}
msg.msg_name = NULL;
msg.msg_controllen = 0;
msg.msg_flags = 0;
- for (i = 0 ; i < nvecs ; i++) {
+ for (i = 0; i < nvecs; i++) {
iov[i].iov_base = dvec[i].iov_base;
iov[i].iov_len = dvec[i].iov_len;
}
uio.uio_limit = 0;
uio.uio_resid = *alength;
- error = sockfs_sorecvmsg(so, &msg, &uio);
+ error = sockfs_sorecvmsg(asocket, &msg, &uio);
if (error == 0) {
if (msg.msg_name == NULL) {
error = -1;
return error;
}
-void shutdown_rxkernel(void)
+#if defined(AFS_SUN510_ENV)
+/* How often afs collects interface info. Tunable via /etc/system: */
+/* set afs:afs_if_poll_interval = integer (value is in seconds) */
+static int afs_if_poll_interval = 30;
+
+/* Global array which holds the interface info for consumers */
+struct afs_ifinfo afsifinfo[ADDRSPERSITE];
+
+void
+osi_StartNetIfPoller()
{
+ (void) ddi_taskq_dispatch(afs_taskq, (void(*) (void*)) osi_NetIfPoller,
+ NULL, DDI_SLEEP);
}
-void osi_StopListener(void)
+void
+osi_NetIfPoller()
+{
+ cred_t *cr;
+ ldi_ident_t li;
+ ldi_handle_t lh;
+ struct lifnum lifn;
+ struct lifconf lifc;
+ struct lifreq lifr;
+ struct lifreq *lifrp;
+ struct sockaddr_in *sin4_local;
+ struct sockaddr_in *sin4_dst;
+ major_t udpmajor;
+ caddr_t lifcbuf;
+ int i, count, error, rv;
+ int ifcount;
+ int metric;
+ int index;
+ uint_t mtu;
+ uint64_t flags;
+
+ if (afs_termState == AFSOP_STOP_NETIF) {
+ afs_warn("NetIfPoller... ");
+ rw_destroy(&afsifinfo_lock);
+ ddi_taskq_destroy(afs_taskq);
+ afs_termState = AFSOP_STOP_COMPLETE;
+ osi_rxWakeup(&afs_termState);
+ return;
+ }
+ /* Get our permissions */
+ cr = CRED();
+
+ /* Initialize and open /dev/udp for receiving ioctls */
+ udpmajor = ddi_name_to_major(UDP_MOD_NAME);
+
+ error = ldi_ident_from_major(udpmajor, &li);
+ if (error)
+ cmn_err(CE_PANIC, "osi_NetIfPoller: ldi_ident_from_major failed: %d",
+ error);
+
+ error = ldi_open_by_name(UDP_DEV_NAME, FREAD, cr, &lh, li);
+ if (error)
+ cmn_err(CE_PANIC,
+ "osi_NetIfPoller: ldi_open_by_name failed: %d", error);
+
+
+ /* First, how many interfaces do we have? */
+ (void) bzero((void *)&lifn, sizeof(struct lifnum));
+ lifn.lifn_family = AF_INET;
+
+ error = ldi_ioctl(lh, SIOCGLIFNUM, (intptr_t)&lifn,
+ FKIOCTL, cr, &rv);
+ if (error)
+ cmn_err(CE_PANIC,
+ "osi_NetIfPoller: ldi_ioctl: SIOCGLIFNUM failed: %d", error);
+
+ ifcount = lifn.lifn_count;
+
+ /* Set up some stuff for storing the results of SIOCGLIFCONF */
+ (void) bzero((void *)&lifc, sizeof(struct lifconf));
+
+ lifcbuf = kmem_zalloc(ifcount * sizeof(struct lifreq), KM_SLEEP);
+
+ lifc.lifc_family = AF_INET;
+ lifc.lifc_flags = IFF_UP;
+ lifc.lifc_len = ifcount * sizeof(struct lifreq);
+ lifc.lifc_buf = lifcbuf;
+
+ /* Get info on each of our available interfaces. */
+ error = ldi_ioctl(lh, SIOCGLIFCONF, (intptr_t)&lifc,
+ FKIOCTL, cr, &rv);
+ if (error)
+ cmn_err(CE_PANIC,
+ "osi_NetIfPoller: ldi_ioctl: SIOCGLIFCONF failed: %d", error);
+
+ lifrp = lifc.lifc_req;
+
+ count = 0;
+
+ /* Loop through our interfaces and pick out the info we want */
+ for (i = lifc.lifc_len / sizeof(struct lifreq);
+ i > 0; i--, lifrp++) {
+
+ if (count >= ADDRSPERSITE)
+ break;
+
+ (void) bzero((void *)&lifr, sizeof(struct lifreq));
+
+ (void) strncpy(lifr.lifr_name, lifrp->lifr_name,
+ sizeof(lifr.lifr_name));
+
+ /* Get this interface's Flags */
+ error = ldi_ioctl(lh, SIOCGLIFFLAGS, (intptr_t)&lifr,
+ FKIOCTL, cr, &rv);
+ if (error)
+ cmn_err(CE_PANIC,
+ "osi_NetIfPoller: ldi_ioctl: SIOCGLIFFLAGS failed: %d",
+ error);
+
+ /* Ignore plumbed but down interfaces. */
+ if ((lifr.lifr_flags & IFF_UP) == 0)
+ continue;
+
+ flags = lifr.lifr_flags;
+
+ /* Get this interface's MTU */
+ error = ldi_ioctl(lh, SIOCGLIFMTU, (intptr_t)&lifr,
+ FKIOCTL, cr, &rv);
+
+ if (error) {
+ mtu = 1125;
+ } else {
+ mtu = lifr.lifr_metric;
+ }
+
+ /* Get this interface's Metric */
+ error = ldi_ioctl(lh, SIOCGLIFMETRIC, (intptr_t)&lifr,
+ FKIOCTL, cr, &rv);
+
+ if (error) {
+ metric = 0;
+ } else {
+ metric = lifr.lifr_metric;
+ }
+
+ sin4_local = (struct sockaddr_in *) &lifrp->lifr_addr;
+ sin4_dst = (struct sockaddr_in *) &lifrp->lifr_dstaddr;
+
+ /* Acquire global array write lock */
+ (void) rw_enter(&afsifinfo_lock, RW_WRITER);
+
+ /* Copy our collected data into the global array */
+ (void) strncpy(afsifinfo[count].ifname, lifrp->lifr_name,
+ sizeof(afsifinfo[count].ifname));
+ afsifinfo[count].ipaddr = ntohl(sin4_local->sin_addr.s_addr);
+ afsifinfo[count].mtu = mtu;
+ afsifinfo[count].netmask = lifrp->lifr_addrlen;
+ afsifinfo[count].flags = flags;
+ afsifinfo[count].metric = metric;
+ afsifinfo[count].dstaddr = ntohl(sin4_dst->sin_addr.s_addr);
+
+ /* Release global array write lock */
+ (void) rw_exit(&afsifinfo_lock);
+
+ count++;
+
+ } /* Bottom of loop: for each interface ... */
+
+ kmem_free(lifcbuf, ifcount * sizeof(struct lifreq));
+
+ /* End of thread. Time to clean up */
+ (void) ldi_close(lh, FREAD, cr);
+ (void) ldi_ident_release(li);
+
+ /* Schedule this to run again after afs_if_poll_interval seconds */
+ (void) timeout((void(*) (void *)) osi_StartNetIfPoller, NULL,
+ drv_usectohz((clock_t)afs_if_poll_interval * MICROSEC));
+
+}
+#endif /* AFS_SUN510_ENV */
+
+void
+shutdown_rxkernel(void)
+{
+}
+
+void
+osi_StopListener(void)
{
osi_FreeSocket(rx_socket);
}
#else /* AFS_SUN56_ENV */
-#include "../inet/common.h"
-#include "../sys/tiuser.h"
-#include "../sys/t_kuser.h"
-#include "../sys/ioctl.h"
-#include "../sys/stropts.h"
-#include "../sys/stream.h"
-#include "../sys/strsubr.h"
-#include "../sys/vnode.h"
-#include "../sys/stropts.h"
-#include "../sys/tihdr.h"
-#include "../sys/timod.h"
-#include "../sys/fcntl.h"
-#include "../sys/debug.h"
-#include "../inet/common.h"
-#include "../inet/mi.h"
-#include "../netinet/udp.h"
+#include "inet/common.h"
+#include "sys/tiuser.h"
+#include "sys/t_kuser.h"
+#include "sys/ioctl.h"
+#include "sys/stropts.h"
+#include "sys/stream.h"
+#include "sys/strsubr.h"
+#include "sys/vnode.h"
+#include "sys/stropts.h"
+#include "sys/tihdr.h"
+#include "sys/timod.h"
+#include "sys/fcntl.h"
+#include "sys/debug.h"
+#include "inet/common.h"
+#include "inet/mi.h"
+#include "netinet/udp.h"
extern dev_t afs_udp_rdev;
-int rxi_GetIFInfo()
+int
+rxi_GetIFInfo()
{
return 0;
}
* afs_osinet.c.
*/
-dev_t afs_udp_rdev = (dev_t)0;
+dev_t afs_udp_rdev = (dev_t) 0;
/* Allocate a new socket at specified port in network byte order. */
-struct osi_socket *rxk_NewSocket(short aport)
+osi_socket *
+rxk_NewSocketHost(afs_uint32 ahost, short aport)
{
TIUSER *udp_tiptr;
struct t_bind *reqp, *rspp;
AFS_STATCNT(osi_NewSocket);
afs_udp_rdev = makedevice(11 /*CLONE*/, ddi_name_to_major("udp"));
- code = t_kopen(NULL, afs_udp_rdev, FREAD|FWRITE, &udp_tiptr, CRED());
+ code = t_kopen(NULL, afs_udp_rdev, FREAD | FWRITE, &udp_tiptr, CRED());
if (code) {
- return (struct osi_socket *)0;
+ return (osi_socket *)0;
}
code = t_kalloc(udp_tiptr, T_BIND, T_ADDR, (char **)&reqp);
if (code) {
t_kfree(udp_tiptr, (char *)reqp, T_BIND);
t_kclose(udp_tiptr, 0);
- return (struct osi_socket *)0;
+ return (osi_socket *)0;
}
reqp->addr.len = sizeof(struct sockaddr_in);
- myaddrp = (struct sockaddr_in *) reqp->addr.buf;
+ myaddrp = (struct sockaddr_in *)reqp->addr.buf;
myaddrp->sin_family = AF_INET;
myaddrp->sin_port = aport;
- myaddrp->sin_addr.s_addr = INADDR_ANY; /* XXX Was 0 XXX */
+ myaddrp->sin_addr.s_addr = ahost; /* byteswap? */
code = t_kbind(udp_tiptr, reqp, rspp);
if (code) {
t_kfree(udp_tiptr, (char *)reqp, T_BIND);
t_kfree(udp_tiptr, (char *)rspp, T_BIND);
t_kclose(udp_tiptr, 0);
- return (struct osi_socket *)0;
+ return (osi_socket *)0;
}
if (memcmp(reqp->addr.buf, rspp->addr.buf, rspp->addr.len)) {
t_kfree(udp_tiptr, (char *)reqp, T_BIND);
t_kfree(udp_tiptr, (char *)rspp, T_BIND);
t_kclose(udp_tiptr, 0);
- return (struct osi_socket *)0;
+ return (osi_socket *)0;
}
t_kfree(udp_tiptr, (char *)reqp, T_BIND);
t_kfree(udp_tiptr, (char *)rspp, T_BIND);
q->q_next->q_hiwat = rx_UdpBufSize;
RD(q)->q_hiwat = rx_UdpBufSize;
- return (struct osi_socket *) udp_tiptr;
+ return (osi_socket *)udp_tiptr;
}
+osi_socket *
+rxk_NewSocket(short aport)
+{
+ return rxk_NewSocketHost(htonl(INADDR_ANY), aport);
+}
-int osi_FreeSocket(asocket)
- register struct osi_socket *asocket;
+int
+osi_FreeSocket(register osi_socket *asocket)
{
extern int rxk_ListenerPid;
- TIUSER *udp_tiptr = (TIUSER *) asocket;
+ TIUSER *udp_tiptr = (TIUSER *) asocket;
AFS_STATCNT(osi_FreeSocket);
if (rxk_ListenerPid) {
}
-int osi_NetSend(asocket, addr, dvec, nvecs, asize, istack)
- register struct osi_socket *asocket;
- struct iovec dvec[];
- int nvecs;
- register afs_int32 asize;
- struct sockaddr_in *addr;
- int istack;
+int
+osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec,
+ int nvecs, afs_int32 asize, int istack)
{
int i;
int code;
- TIUSER *udp_tiptr = (TIUSER *) asocket;
+ TIUSER *udp_tiptr = (TIUSER *) asocket;
struct t_kunitdata *udreq;
struct sockaddr_in sin;
mblk_t *bp;
/*
* Append each element in the iovec to the buffer
*/
- for (i = 1 ; i < nvecs ; i++) {
+ for (i = 1; i < nvecs; i++) {
/* Get a buffer for the next chunk */
while (!(dbp = allocb(dvec[i].iov_len, BPRI_LO))) {
if (strwaitbuf(dvec[i].iov_len, BPRI_LO)) {
}
/* Copy the data into the buffer */
- memcpy((char *)dbp->b_wptr, (char *)dvec[i].iov_base, dvec[i].iov_len);
+ memcpy((char *)dbp->b_wptr, (char *)dvec[i].iov_base,
+ dvec[i].iov_len);
dbp->b_datap->db_type = M_DATA;
dbp->b_wptr += dvec[i].iov_len;
}
udreq->addr.len = sizeof(struct sockaddr_in);
udreq->addr.maxlen = sizeof(struct sockaddr_in);
- udreq->addr.buf = (char *)kmem_alloc(sizeof(struct sockaddr_in), KM_SLEEP);
+ udreq->addr.buf =
+ (char *)kmem_alloc(sizeof(struct sockaddr_in), KM_SLEEP);
udreq->opt.len = 0;
udreq->opt.maxlen = 0;
memcpy(udreq->addr.buf, (char *)&sin, sizeof(struct sockaddr_in));
printf("osi_NetSend: t_ksndudata failed %d\n", code);
}
- t_kfree(udp_tiptr, (caddr_t)udreq, T_UNITDATA);
+ t_kfree(udp_tiptr, (caddr_t) udreq, T_UNITDATA);
return code;
}
-int osi_NetReceive(asocket, addr, dvec, nvecs, alength)
- struct osi_socket *asocket;
- struct sockaddr_in *addr;
- struct iovec *dvec;
- int nvecs;
- int *alength;
+int
+osi_NetReceive(osi_socket *asocket, struct sockaddr_in *addr,
+ struct iovec *dvec, int nvecs, int *alength)
{
int i;
- TIUSER *udp_tiptr = (TIUSER *) asocket;
+ TIUSER *udp_tiptr = (TIUSER *) asocket;
struct t_kunitdata *udreq;
mblk_t *dbp;
char *phandle;
}
udreq->addr.len = sizeof(struct sockaddr_in);
udreq->addr.maxlen = sizeof(struct sockaddr_in);
- udreq->addr.buf = (char *)kmem_alloc(sizeof(struct sockaddr_in), KM_SLEEP);
+ udreq->addr.buf =
+ (char *)kmem_alloc(sizeof(struct sockaddr_in), KM_SLEEP);
udreq->opt.len = 0;
udreq->opt.maxlen = 0;
/*
* Loop until we get an error or receive some data.
*/
- while(1) {
+ while (1) {
/*
* Wait until there is something to do
*/
}
lwp->lwp_cursig = 0;
if (lwp->lwp_curinfo) {
- kmem_free((caddr_t)lwp->lwp_curinfo, sizeof(*lwp->lwp_curinfo));
+ kmem_free((caddr_t) lwp->lwp_curinfo,
+ sizeof(*lwp->lwp_curinfo));
lwp->lwp_curinfo = NULL;
}
}
* Copy out the message buffers, take care not to overflow
* the I/O vector.
*/
- dbp = udreq->udata.udata_mp;
+ dbp = udreq->udata.udata_mp;
length = *alength;
- for (i = 0 ; dbp != NULL && length > 0 && i < nvecs ; i++) {
+ for (i = 0; dbp != NULL && length > 0 && i < nvecs; i++) {
tlen = dvec[i].iov_len;
tbase = dvec[i].iov_base;
if (tlen > length) {
dbp = dbp->b_cont;
}
}
- }
+ }
*alength = *alength - length;
break;
}
- t_kfree(udp_tiptr, (caddr_t)udreq, T_UNITDATA);
+ t_kfree(udp_tiptr, (caddr_t) udreq, T_UNITDATA);
return code;
}
-void osi_StopListener(void)
+void
+osi_StopListener(void)
{
osi_FreeSocket(rx_socket);
}
-void shutdown_rxkernel(void)
+void
+shutdown_rxkernel(void)
{
}
git://git.openafs.org / openafs.git / blobdiff