FBSD: update ifa_ifwithnet usage

[openafs.git] / src / rx / rx_kernel.h

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index 46fbeef..f72a322 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -15,38 +15,68 @@
 #define osi_Alloc afs_osi_Alloc
 #define osi_Free  afs_osi_Free
 
-#define rxi_ReScheduleEvents    0 /* Not needed by kernel */
+#ifndef AFS_DARWIN80_ENV
+#define rxi_ReScheduleEvents    0      /* Not needed by kernel */
+#endif
 
 /* This is a no-op, because the kernel server procs are pre-allocated */
-#define rxi_StartServerProcs(x) 0
+#define rxi_StartServerProcs(x) (void)0
 
 /* Socket stuff */
 typedef struct socket *osi_socket;
 #define        OSI_NULLSOCKET  ((osi_socket) 0)
 
-#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS)) || (defined(AFS_HPUX_ENV) && !defined(RX_ENABLE_LOCKS))
-#define RX_KERNEL_TRACE 1
-#ifdef RX_KERNEL_TRACE
-#include "../afs/icl.h"
-#include "../afs/afs_trace.h"
+#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS))
+#include "afs/icl.h"
+#include "afs/afs_trace.h"
+#endif
 #define osi_rxSleep(a)  afs_Trace2(afs_iclSetp, CM_TRACE_RXSLEEP, \
         ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__); afs_osi_Sleep(a)
 #define osi_rxWakeup(a) if (afs_osi_Wakeup(a) == 0) afs_Trace2(afs_iclSetp, \
         CM_TRACE_RXWAKE, ICL_TYPE_STRING, __FILE__, ICL_TYPE_INT32, __LINE__)
-#else /* RX_KERNEL_TRACE */
-#define        osi_rxSleep(a)  afs_osi_Sleep(a)
-#define        osi_rxWakeup(a) afs_osi_Wakeup(a)
-#endif /* RX_KERNEL_TRACE */
-#endif
 
 extern int osi_utoa(char *buf, size_t len, unsigned long val);
-#define osi_Assert(e) (void)((e) || (osi_AssertFailK(#e, __FILE__, __LINE__), 0))
+#define osi_Assert(exp) (void)((exp) || (osi_AssertFailK( #exp , __FILE__, __LINE__), 0))
 
 #define        osi_Msg printf)(
+#define osi_VMsg vprintf)(
 
 #define        osi_YieldIfPossible()
 #define        osi_WakeupAndYieldIfPossible(x)     rx_Wakeup(x)
 
-#include "../afs/longc_procs.h"
+#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)
+#if defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV)
+#define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0)
+#else
+#define rx_ifaddr_withnet(x) ifa_ifwithnet(x)
+#endif
+#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 rx_ifnet_t ifnet_t
+#define rx_ifaddr_t ifaddr_t
+#define rx_ifaddr_withnet(x) ifaddr_withnet(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_ */