From d9cef89c93d33985c43c0bf5d28d96955bb0e457 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 14 Jan 2010 15:41:23 -0500 Subject: [PATCH] abstract rx if structure access change things to use accessor macros styled after the mac KPI where feasible, and make access consistent. Change-Id: I284101b370666e1aeb8e42bc1a651a2781a9af78 Reviewed-on: http://gerrit.openafs.org/1101 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/AIX/osi_machdep.h | 2 - src/afs/DARWIN/osi_machdep.h | 12 ------ src/afs/FBSD/osi_machdep.h | 2 - src/afs/IRIX/osi_machdep.h | 2 - src/afs/UKERNEL/sysincludes.h | 4 +- src/afs/afs_call.c | 6 +-- src/afs/afs_server.c | 40 +++++++++--------- src/rx/LINUX/rx_knet.c | 2 +- src/rx/LINUX24/rx_knet.c | 2 +- src/rx/UKERNEL/rx_kcommon.h | 6 +-- src/rx/rx_kcommon.c | 54 +++++++++---------------- src/rx/rx_kernel.h | 33 ++++++++++++--- src/rx/rx_prototypes.h | 76 ++++++++++++++++------------------- 13 files changed, 107 insertions(+), 134 deletions(-) diff --git a/src/afs/AIX/osi_machdep.h b/src/afs/AIX/osi_machdep.h index eb52b2677..1cc84a846 100644 --- a/src/afs/AIX/osi_machdep.h +++ b/src/afs/AIX/osi_machdep.h @@ -84,6 +84,4 @@ extern simple_lock_data afs_global_lock; mutex_init(&afs_global_lock, "afs_global_lock", MUTEX_DEFAULT, NULL) #endif -#define ifnet_flags(x) (x?(x)->if_flags:0) - #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h index 7146125d4..c9e23d748 100644 --- a/src/afs/DARWIN/osi_machdep.h +++ b/src/afs/DARWIN/osi_machdep.h @@ -234,18 +234,6 @@ uio_t afsio_darwin_partialcopy(uio_t auio, int size); #define uprintf printf #endif -#ifndef AFS_DARWIN80_ENV -#define ifaddr_address_family(x) (x)->ifa_addr->sa_family -#define ifaddr_address(x, y, z) memcpy(y, (x)->ifa_addr, z) -#define ifaddr_netmask(x, y, z) memcpy(y, (x)->ifa_netmask, z) -#define ifaddr_dstaddress(x, y, z) memcpy(y, (x)->ifa_dstaddr, z) -#define ifaddr_ifnet(x) (x?(x)->ifa_ifp:0) -#define ifnet_flags(x) (x?(x)->if_flags:0) -#define ifnet_metric(x) (x?(x)->if_data.ifi_metric:0) -/*#define ifnet_mtu(x) (x)->if_mtu*/ -#define ifaddr_withnet(x) ifa_ifwithnet(x) -#endif - /* Vnode related macros */ #if defined(AFS_DARWIN80_ENV) diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h index b151690e3..227c7689e 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -166,6 +166,4 @@ extern struct proc *afs_global_owner; #undef USERPRI #define USERPRI splx(splvar) -#define ifnet_flags(x) (x?(x)->if_flags:0) - #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h index 3885aff20..991146ae3 100644 --- a/src/afs/IRIX/osi_machdep.h +++ b/src/afs/IRIX/osi_machdep.h @@ -50,8 +50,6 @@ extern flid_t osi_flid; #define vfs_data vfs_bh.bh_first->bd_pdata #endif /* AFS_SGI64_ENV */ -#define ifnet_flags(x) (x?(x)->if_flags:0) - /* * Global lock, semaphore, mutex and state vector support. */ diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index 9fcb93eeb..d2b124902 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -229,9 +229,9 @@ typedef unsigned int fsblkcnt_t; #define flock usr_flock #define fid usr_fid #define sysent usr_sysent +#define ifaddr usr_ifaddr +#define ifnet usr_ifnet #define in_ifaddr usr_in_ifaddr -#define ifaddr usr_ifaddr -#define ifnet usr_ifnet #define socket usr_socket #define crget usr_crget #define crcopy usr_crcopy diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 3f1e45909..298eff7f0 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -1045,10 +1045,10 @@ afs_syscall_call(long parm, long parm2, long parm3, i = rxi_Findcbi(parm2); mtu = ((i == -1) ? htonl(1500) : afs_cb_interface.mtu[i]); #else /* AFS_USERSPACE_IP_ADDR */ - AFS_IFNET_T tifnp; + rx_ifnet_t tifnp; tifnp = rxi_FindIfnet(parm2, NULL); /* make iterative */ - mtu = (tifnp ? ifnet_mtu(tifnp) : htonl(1500)); + mtu = (tifnp ? rx_ifnet_mtu(tifnp) : htonl(1500)); #endif /* else AFS_USERSPACE_IP_ADDR */ #endif /* !AFS_SUN5_ENV */ if (!code) @@ -1082,7 +1082,7 @@ afs_syscall_call(long parm, long parm2, long parm3, code = -1; } #else /* AFS_USERSPACE_IP_ADDR */ - AFS_IFNET_T tifnp; + rx_ifnet_t tifnp; tifnp = rxi_FindIfnet(parm2, &mask); /* make iterative */ if (!tifnp) diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index b9f177fcc..bd1e4af13 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -1181,11 +1181,7 @@ afsi_SetServerIPRank(struct srvAddr *sa, struct in_ifaddr *ifa) void afsi_SetServerIPRank(sa, ifa) struct srvAddr *sa; -#ifdef AFS_DARWIN80_ENV - ifaddr_t ifa; -#else - struct ifaddr *ifa; -#endif + rx_ifaddr_t ifa; { struct sockaddr sout; struct sockaddr_in *sin; @@ -1194,9 +1190,9 @@ afsi_SetServerIPRank(sa, ifa) afs_uint32 subnetmask, myAddr, myNet, myDstaddr, mySubnet, netMask; afs_uint32 serverAddr; - if (ifaddr_address_family(ifa) != AF_INET) + if (rx_ifaddr_address_family(ifa) != AF_INET) return; - t = ifaddr_address(ifa, &sout, sizeof(sout)); + t = rx_ifaddr_address(ifa, &sout, sizeof(sout)); if (t == 0) { sin = (struct sockaddr_in *)&sout; myAddr = ntohl(sin->sin_addr.s_addr); /* one of my IP addr in host order */ @@ -1204,14 +1200,14 @@ afsi_SetServerIPRank(sa, ifa) myAddr = 0; } serverAddr = ntohl(sa->sa_ip); /* server's IP addr in host order */ - t = ifaddr_netmask(ifa, &sout, sizeof(sout)); + t = rx_ifaddr_netmask(ifa, &sout, sizeof(sout)); if (t == 0) { sin = (struct sockaddr_in *)&sout; subnetmask = ntohl(sin->sin_addr.s_addr); /* subnet mask in host order */ } else { subnetmask = 0; } - t = ifaddr_dstaddress(ifa, &sout, sizeof(sout)); + t = rx_ifaddr_dstaddress(ifa, &sout, sizeof(sout)); if (t == 0) { sin = (struct sockaddr_in *)&sout; myDstaddr = sin->sin_addr.s_addr; @@ -1236,20 +1232,20 @@ afsi_SetServerIPRank(sa, ifa) if (serverAddr == myAddr) { /* same machine */ sa->sa_iprank = afs_min(sa->sa_iprank, TOPR); } else { /* same subnet */ - sa->sa_iprank = afs_min(sa->sa_iprank, HI + ifnet_metric(ifaddr_ifnet(ifa))); + sa->sa_iprank = afs_min(sa->sa_iprank, HI + rx_ifnet_metric(rx_ifaddr_ifnet(ifa))); } } else { /* same net */ - sa->sa_iprank = afs_min(sa->sa_iprank, MED + ifnet_metric(ifaddr_ifnet(ifa))); + sa->sa_iprank = afs_min(sa->sa_iprank, MED + rx_ifnet_metric(rx_ifaddr_ifnet(ifa))); } } #ifdef IFF_POINTTOPOINT /* check for case #4 -- point-to-point link */ - if ((ifnet_flags(ifaddr_ifnet(ifa)) & IFF_POINTOPOINT) + if ((rx_ifnet_flags(rx_ifaddr_ifnet(ifa)) & IFF_POINTOPOINT) && (myDstaddr == serverAddr)) { - if (ifnet_metric(ifaddr_ifnet(ifa)) >= (MAXDEFRANK - MED) / PPWEIGHT) + if (rx_ifnet_metric(rx_ifaddr_ifnet(ifa)) >= (MAXDEFRANK - MED) / PPWEIGHT) t = MAXDEFRANK; else - t = MED + (PPWEIGHT << ifnet_metric(ifaddr_ifnet(ifa))); + t = MED + (PPWEIGHT << rx_ifnet_metric(rx_ifaddr_ifnet(ifa))); if (sa->sa_iprank > t) sa->sa_iprank = t; } @@ -1409,7 +1405,7 @@ static int afs_SetServerPrefs(struct srvAddr *sa) { #endif /* AFS_SUN510_ENV */ #else #ifndef USEIFADDR - struct ifnet *ifn = NULL; + rx_ifnet_t ifn = NULL; struct in_ifaddr *ifad = (struct in_ifaddr *)0; struct sockaddr_in *sin; @@ -1479,12 +1475,12 @@ static int afs_SetServerPrefs(struct srvAddr *sa) { errno_t t; unsigned int count; int cnt=0, m, j; - ifaddr_t *ifads; - ifnet_t *ifn; + rx_ifaddr_t *ifads; + rx_ifnet_t *ifns; - if (!ifnet_list_get(AF_INET, &ifn, &count)) { + if (!ifnet_list_get(AF_INET, ifns, &count)) { for (m = 0; m < count; m++) { - if (!ifnet_get_address_list(ifn[m], &ifads)) { + if (!ifnet_get_address_list(ifns[m], &ifads)) { for (j = 0; ifads[j] != NULL && cnt < ADDRSPERSITE; j++) { afsi_SetServerIPRank(sa, ifads[j]); cnt++; @@ -1492,13 +1488,13 @@ static int afs_SetServerPrefs(struct srvAddr *sa) { ifnet_free_address_list(ifads); } } - ifnet_list_free(ifn); + ifnet_list_free(ifns); } } #elif defined(AFS_DARWIN60_ENV) { - struct ifnet *ifn; - struct ifaddr *ifa; + rx_ifnet_t ifn; + rx_ifaddr_t ifa; TAILQ_FOREACH(ifn, &ifnet, if_link) { TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) { afsi_SetServerIPRank(sa, ifa); diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index 69acc3a8b..40df9a8e0 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -91,7 +91,7 @@ rxk_NewSocket(short aport) /* free socket allocated by osi_NetSocket */ int -rxk_FreeSocket(register struct socket *asocket) +rxk_FreeSocket(struct socket *asocket) { AFS_STATCNT(osi_FreeSocket); return 0; diff --git a/src/rx/LINUX24/rx_knet.c b/src/rx/LINUX24/rx_knet.c index 6bb0985af..99484f62a 100644 --- a/src/rx/LINUX24/rx_knet.c +++ b/src/rx/LINUX24/rx_knet.c @@ -91,7 +91,7 @@ rxk_NewSocket(short aport) /* free socket allocated by osi_NetSocket */ int -rxk_FreeSocket(register struct socket *asocket) +rxk_FreeSocket(struct socket *asocket) { AFS_STATCNT(osi_FreeSocket); return 0; diff --git a/src/rx/UKERNEL/rx_kcommon.h b/src/rx/UKERNEL/rx_kcommon.h index 595da9bb0..edb6ed157 100644 --- a/src/rx/UKERNEL/rx_kcommon.h +++ b/src/rx/UKERNEL/rx_kcommon.h @@ -35,8 +35,6 @@ typedef char *rxk_portRocks_t[MAXRXPORTS]; extern rxk_ports_t rxk_ports; extern rxk_portRocks_t rxk_portRocks; -#ifndef ifnet_flags -#define ifnet_flags(x) (x?(x)->if_flags:0) -#endif - +#define rx_ifaddr_t struct usr_ifaddr * +#define rx_ifnet_t struct usr_ifnet * #endif /* _RX_KCOMMON_H_ */ diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index d6f5be39f..8432041a7 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -437,7 +437,7 @@ rxi_InitPeerParams(struct rx_peer *pp) pp->ifMTU = MIN(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); } # else /* AFS_USERSPACE_IP_ADDR */ - AFS_IFNET_T ifn; + rx_ifnet_t ifn; # if !defined(AFS_SGI62_ENV) if (numMyNetAddrs == 0) @@ -450,7 +450,7 @@ rxi_InitPeerParams(struct rx_peer *pp) /* pp->timeout.usec = 0; */ pp->ifMTU = MIN(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); # ifdef IFF_POINTOPOINT - if (ifnet_flags(ifn) & IFF_POINTOPOINT) { + if (rx_ifnet_flags(ifn) & IFF_POINTOPOINT) { /* wish we knew the bit rate and the chunk size, sigh. */ pp->timeout.sec = 4; pp->ifMTU = RX_PP_PACKET_SIZE; @@ -458,8 +458,8 @@ rxi_InitPeerParams(struct rx_peer *pp) # endif /* IFF_POINTOPOINT */ /* Diminish the packet size to one based on the MTU given by * the interface. */ - if (ifnet_mtu(ifn) > (RX_IPUDP_SIZE + RX_HEADER_SIZE)) { - rxmtu = ifnet_mtu(ifn) - RX_IPUDP_SIZE; + if (rx_ifnet_mtu(ifn) > (RX_IPUDP_SIZE + RX_HEADER_SIZE)) { + rxmtu = rx_ifnet_mtu(ifn) - RX_IPUDP_SIZE; if (rxmtu < pp->ifMTU) pp->ifMTU = rxmtu; } @@ -672,27 +672,27 @@ rxi_GetIFInfo(void) errno_t t; unsigned int count; int cnt=0, m, j; - ifaddr_t *ifads; - ifnet_t *ifn; + rx_ifaddr_t *ifads; + rx_ifnet_t *ifns; struct sockaddr sout; struct sockaddr_in *sin; struct in_addr pin; #else - struct ifaddr *ifad; /* ifnet points to a if_addrlist of ifaddrs */ - struct ifnet *ifn; + rx_ifaddr_t ifad; /* ifnet points to a if_addrlist of ifaddrs */ + rx_ifnet_t ifn; #endif memset(addrs, 0, sizeof(addrs)); memset(mtus, 0, sizeof(mtus)); #if defined(AFS_DARWIN80_ENV) - if (!ifnet_list_get(AF_INET, &ifn, &count)) { + if (!ifnet_list_get(AF_INET, ifns, &count)) { for (m = 0; m < count; m++) { - if (!ifnet_get_address_list(ifn[m], &ifads)) { + if (!ifnet_get_address_list(ifns[m], &ifads)) { for (j = 0; ifads[j] != NULL && cnt < ADDRSPERSITE; j++) { if ((t = ifaddr_address(ifads[j], &sout, sizeof(struct sockaddr))) == 0) { sin = (struct sockaddr_in *)&sout; - rxmtu = ifnet_mtu(ifaddr_ifnet(ifads[j])) - RX_IPUDP_SIZE; + rxmtu = rx_ifnet_mtu(rx_ifaddr_ifnet(ifads[j])) - RX_IPUDP_SIZE; ifinaddr = ntohl(sin->sin_addr.s_addr); if (myNetAddrs[i] != ifinaddr) { different++; @@ -717,7 +717,7 @@ rxi_GetIFInfo(void) ifnet_free_address_list(ifads); } } - ifnet_list_free(ifn); + ifnet_list_free(ifns); } #else #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) @@ -784,45 +784,27 @@ rxi_GetIFInfo(void) #if defined(AFS_DARWIN60_ENV) || defined(AFS_XBSD_ENV) /* Returns ifnet which best matches address */ -#ifdef AFS_DARWIN80_ENV -ifnet_t -#else -struct ifnet * -#endif +rx_ifnet_t rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) { struct sockaddr_in s, sr; -#ifdef AFS_DARWIN80_ENV - ifaddr_t ifad; -#else - struct ifaddr *ifad; -#endif + rx_ifaddr_t ifad; s.sin_family = AF_INET; s.sin_addr.s_addr = addr; -#ifdef AFS_DARWIN80_ENV - ifad = ifaddr_withnet((struct sockaddr *)&s); -#else - ifad = ifa_ifwithnet((struct sockaddr *)&s); -#endif + ifad = rx_ifaddr_withnet((struct sockaddr *)&s); -#ifdef AFS_DARWIN80_ENV if (ifad && maskp) { - ifaddr_netmask(ifad, (struct sockaddr *)&sr, sizeof(sr)); + rx_ifaddr_netmask(ifad, (struct sockaddr *)&sr, sizeof(sr)); *maskp = sr.sin_addr.s_addr; } - return (ifad ? ifaddr_ifnet(ifad) : NULL); -#else - if (ifad && maskp) - *maskp = ((struct sockaddr_in *)ifad->ifa_netmask)->sin_addr.s_addr; - return (ifad ? ifad->ifa_ifp : NULL); -#endif + return (ifad ? rx_ifaddr_ifnet(ifad) : NULL); } #else /* DARWIN60 || XBSD */ /* Returns ifnet which best matches address */ -struct ifnet * +rx_ifnet_t rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp) { int match_value = 0; diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index e3d591226..c0c41a609 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -42,12 +42,35 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val); #define osi_YieldIfPossible() #define osi_WakeupAndYieldIfPossible(x) rx_Wakeup(x) -#ifndef AFS_DARWIN80_ENV -#define ifnet_mtu(x) (x)->if_mtu -#define ifnet_flags(x) (x?(x)->if_flags:0) -#define AFS_IFNET_T struct ifnet * +#if !defined(AFS_DARWIN80_ENV) || defined(UKERNEL) +# ifdef UKERNEL +# define rx_ifnet_t struct usr_ifnet * +# define rx_ifaddr_t struct usr_ifaddr * +# else +# define rx_ifnet_t struct ifnet * +# define rx_ifaddr_t struct ifaddr * +#endif +#define rx_ifnet_mtu(x) (x)->if_mtu +#define rx_ifnet_flags(x) (x?(x)->if_flags:0) +#define rx_ifaddr_withnet(x) ifa_ifwithnet(x) +#define rx_ifnet_metric(x) (x?(x)->if_data.ifi_metric:0) +#define rx_ifaddr_ifnet(x) (x?(x)->ifa_ifp:0) +#define rx_ifaddr_address_family(x) (x)->ifa_addr->sa_family +#define rx_ifaddr_address(x, y, z) memcpy(y, (x)->ifa_addr, z) +#define rx_ifaddr_netmask(x, y, z) memcpy(y, (x)->ifa_netmask, z) +#define rx_ifaddr_dstaddress(x, y, z) memcpy(y, (x)->ifa_dstaddr, z) #else -#define AFS_IFNET_T ifnet_t +#define rx_ifnet_t ifnet_t +#define rx_ifaddr_t ifaddr_t +#define rx_ifaddr_withnet(x) ifaddr_ifwithnet(x) +#define rx_ifnet_mtu(x) ifnet_mtu(x) +#define rx_ifnet_flags(x) ifnet_flags(x) +#define rx_ifnet_metric(x) ifnet_metric(x) +#define rx_ifaddr_ifnet(x) ifaddr_ifnet(x) +#define rx_ifaddr_address_family(x) ifaddr_address_family(x) +#define rx_ifaddr_address(x, y, z) ifaddr_address(x, y, z) +#define rx_ifaddr_netmask(x, y, z) ifaddr_netmask(x, y, z) +#define rx_ifaddr_dstaddress(x, y, z) ifaddr_dstaddress(x, y, z) #endif #endif /* __RX_KERNEL_INCL_ */ diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index e1fbe5092..67f3c021f 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -353,6 +353,7 @@ extern void rx_SetMaxSendWindow(int packets); extern int rx_GetMinPeerTimeout(void); extern void rx_SetMinPeerTimeout(int msecs); +#ifdef KERNEL /* rx_kcommon.c */ struct socket; extern int (*rxk_PacketArrivalProc) (struct rx_packet * ahandle, @@ -367,59 +368,47 @@ extern int rxk_DelPort(u_short aport); extern void rxk_shutdownPorts(void); extern osi_socket rxi_GetUDPSocket(u_short port); extern osi_socket rxi_GetHostUDPSocket(u_int host, u_short port); -#if defined(KERNEL) && defined(AFS_LINUX26_ENV) -#define osi_Panic(msg...) do { printk(KERN_CRIT "openafs: " msg); BUG(); } while (0) -#undef osi_Assert -#define osi_Assert(expr) \ +# if defined(AFS_LINUX26_ENV) +# define osi_Panic(msg...) do { printk(KERN_CRIT "openafs: " msg); BUG(); } while (0) +# undef osi_Assert +# define osi_Assert(expr) \ do { if (!(expr)) { osi_AssertFailK(#expr, __FILE__, __LINE__); BUG(); } } while (0) -#else -#if defined(KERNEL) && (defined(AFS_AIX_ENV) && !defined(AFS_AIX61_ENV)) +# elif defined(AFS_AIX_ENV) && !defined(AFS_AIX61_ENV) extern void osi_Panic(char *fmt, void *a1, void *a2, void *a3); -#else -#ifdef AFS_AIX61_ENV +# elif defined(AFS_AIX61_ENV) /* No prototype. Deliberate, since there's no vprintf et al */ -#else +# else extern void osi_Panic(char *fmt, ...); -#endif -#endif -#endif +# endif extern int osi_utoa(char *buf, size_t len, unsigned long val); extern void rxi_InitPeerParams(struct rx_peer *pp); extern void shutdown_rxkernel(void); -#ifdef AFS_USERSPACE_IP_ADDR +# ifdef AFS_USERSPACE_IP_ADDR extern int rxi_GetcbiInfo(void); extern afs_int32 rxi_Findcbi(afs_uint32 addr); -#else +# else extern int rxi_GetIFInfo(void); -#endif -#ifndef UKERNEL -#if 0 +# endif +# ifndef UKERNEL extern int rxk_FreeSocket(struct socket *asocket); -#endif -#ifndef AFS_NT40_ENV extern osi_socket *rxk_NewSocket(short aport); -#endif -#endif +# endif extern int rxk_ReadPacket(osi_socket so, struct rx_packet *p, int *host, int *port); -#ifdef UKERNEL +# ifdef UKERNEL extern void *rx_ServerProc(void *); -#endif +# endif extern void osi_AssertFailK(const char *expr, const char *file, int line); extern void rxk_ListenerProc(void); extern void rxk_Listener(void); -#ifndef UKERNEL +# ifndef UKERNEL extern void afs_rxevent_daemon(void); -#endif -#if defined(AFS_DARWIN80_ENV) && defined(KERNEL) -extern ifnet_t rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp); -#else -extern struct ifnet *rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp); -#endif +# endif +extern rx_ifnet_t rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp); extern void osi_StopListener(void); /* ARCH/rx_kmutex.c */ -#if defined(KERNEL) && defined(AFS_LINUX20_ENV) +# if defined(AFS_LINUX20_ENV) extern void afs_mutex_init(afs_kmutex_t * l); extern void afs_mutex_enter(afs_kmutex_t * l); extern int afs_mutex_tryenter(afs_kmutex_t * l); @@ -427,40 +416,40 @@ extern void afs_mutex_exit(afs_kmutex_t * l); extern int afs_cv_wait(afs_kcondvar_t * cv, afs_kmutex_t * l, int sigok); extern void afs_cv_timedwait(afs_kcondvar_t * cv, afs_kmutex_t * l, int waittime); -#endif +# endif /* ARCH/rx_knet.c */ -#if defined(KERNEL) && !defined(AFS_SGI_ENV) +# if !defined(AFS_SGI_ENV) extern int osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, struct iovec *dvec, int nvecs, afs_int32 asize, int istack); -#endif +# endif extern int osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec, int nvecs, int *lengthp); -#if defined(KERNEL) && defined(AFS_SUN510_ENV) +# if defined(AFS_SUN510_ENV) extern void osi_StartNetIfPoller(void); extern void osi_NetIfPoller(void); extern struct afs_ifinfo afsifinfo[ADDRSPERSITE]; -#endif +# endif extern void osi_StopListener(void); extern int rxi_FindIfMTU(afs_uint32 addr); -#if defined(UKERNEL) +# if defined(UKERNEL) extern void rxi_ListenerProc(osi_socket usockp, int *tnop, struct rx_call **newcallp); -#endif +# endif -#ifndef RXK_LISTENER_ENV +# ifndef RXK_LISTENER_ENV extern void rxk_init(); -#endif +# endif /* UKERNEL/rx_knet.c */ -#ifdef UKERNEL +# ifdef UKERNEL extern void afs_rxevent_daemon(void); +# endif #endif - /* rx_lwp.c */ extern void rxi_Sleep(void *addr); extern void rxi_Delay(int seconds); @@ -630,6 +619,9 @@ extern void *osi_Alloc(afs_int32 x); extern void osi_Free(void *x, afs_int32 size); #endif #endif /* defined(AFS_AIX32_ENV) && !defined(KERNEL) */ +#ifndef KERNEL +extern void osi_Panic(char *fmt, ...); +#endif extern void rx_GetIFInfo(void); extern void rx_SetNoJumbo(void); -- 2.39.5