From c861bb0d779b54236b63eda87d9dfaf7792d1659 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 28 Jul 2009 12:55:36 +0100 Subject: [PATCH] Additional UKERNEL headers, prototyping and other fixes Add additonal headers to include prototypes for UKERNEL builds Add some more prototypes Remove some unused variables Reviewed-on: http://gerrit.openafs.org/241 Reviewed-by: Derrick Brashear Tested-by: Marc Dionne --- src/kauth/token.c | 1 + src/kauth/user.c | 2 ++ src/ptserver/ptclient.c | 1 + src/ptserver/ptuser.c | 3 +++ src/rx/UKERNEL/rx_knet.c | 4 +++- src/rx/rx_kernel.h | 2 +- src/rx/rx_packet.c | 7 ++++--- src/rx/rx_prototypes.h | 9 ++++++++- 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/kauth/token.c b/src/kauth/token.c index c5635a25a..07e79781e 100644 --- a/src/kauth/token.c +++ b/src/kauth/token.c @@ -31,6 +31,7 @@ #include "afs/kautils.h" #include "afs/auth.h" #include "afs/pthread_glock.h" +#include "afs/afsutil.h" #else /* defined(UKERNEL) */ #include #include diff --git a/src/kauth/user.c b/src/kauth/user.c index ec82f62bb..0f0a27445 100644 --- a/src/kauth/user.c +++ b/src/kauth/user.c @@ -34,6 +34,8 @@ #include "afs/kauth.h" #include "afs/kautils.h" #include "afs/afsutil.h" +#include "afs/ptuser.h" +#include "des.h" #else /* defined(UKERNEL) */ #include #include diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c index f4d1ab5ab..4ae639ac3 100644 --- a/src/ptserver/ptclient.c +++ b/src/ptserver/ptclient.c @@ -31,6 +31,7 @@ #include #include "ptclient.h" #include "pterror.h" +#include "display.h" #include diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index 67436f215..a90fe84c6 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -28,6 +28,7 @@ #include "afs/ptclient.h" #include "afs/ptuser.h" #include "afs/pterror.h" +#include "afs/com_err.h" #else /* defined(UKERNEL) */ #include #include @@ -69,7 +70,9 @@ pr_Initialize(IN afs_int32 secLevel, IN const char *confDir, IN char *cell) afs_int32 scIndex; static struct afsconf_cell info; afs_int32 i; +#if !defined(UKERNEL) char cellstr[64]; +#endif afs_int32 gottdir = 0; afs_int32 refresh = 0; diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c index 00d800faf..6692b5444 100644 --- a/src/rx/UKERNEL/rx_knet.c +++ b/src/rx/UKERNEL/rx_knet.c @@ -24,6 +24,7 @@ struct usr_ifnet *usr_ifnet = NULL; struct usr_in_ifaddr *usr_in_ifaddr = NULL; void rxk_InitializeSocket(void); +extern int afs_osi_CheckTimedWaits(void); void afs_rxevent_daemon(void) @@ -200,7 +201,8 @@ rxk_InitializeSocket(void) #ifdef AFS_USR_AIX_ENV unsigned long len, optval, optval0, optlen; #else /* AFS_USR_AIX_ENV */ - int len, optval, optval0, optlen; + socklen_t len, optlen; + int optval, optval0; #endif /* AFS_USR_AIX_ENV */ struct usr_socket *usockp; struct sockaddr_in lcladdr; diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h index 2d997ad8a..e3d591226 100644 --- a/src/rx/rx_kernel.h +++ b/src/rx/rx_kernel.h @@ -18,7 +18,7 @@ #define rxi_ReScheduleEvents 0 /* Not needed by kernel */ /* 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; diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 402f78a14..9f16c5f62 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -104,12 +104,13 @@ static void rxi_SendDebugPacket(struct rx_packet *apacket, osi_socket asocket, afs_int32 ahost, short aport, afs_int32 istack); -static int rxi_FreeDataBufsToQueue(struct rx_packet *p, - afs_uint32 first, - struct rx_queue * q); #ifdef RX_ENABLE_TSFPQ static int rxi_FreeDataBufsTSFPQ(struct rx_packet *p, afs_uint32 first, int flush_global); +#else +static int rxi_FreeDataBufsToQueue(struct rx_packet *p, + afs_uint32 first, + struct rx_queue * q); #endif /* some rules about packets: diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index b7415ac78..94009be0a 100755 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -280,6 +280,9 @@ extern int clock_UnInit(void); #if !defined(clock_UpdateTime) extern void clock_UpdateTime(void); #endif +#if defined(UKERNEL) && !defined(osi_GetTime) +extern int osi_GetTime(struct timeval *tv); +#endif /* rx_clock_nt.c */ @@ -438,6 +441,11 @@ extern struct afs_ifinfo afsifinfo[ADDRSPERSITE]; #endif extern void osi_StopListener(void); extern int rxi_FindIfMTU(afs_uint32 addr); +#if defined(UKERNEL) +extern void rxi_ListenerProc(osi_socket usockp, int *tnop, + struct rx_call **newcallp); +#endif + #ifndef RXK_LISTENER_ENV extern void rxk_init(); #endif @@ -570,7 +578,6 @@ extern int rxi_Listen(osi_socket sock); extern int rxi_Recvmsg(osi_socket socket, struct msghdr *msg_p, int flags); extern int rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags); - /* rx_rdwr.c */ extern int rxi_ReadProc(struct rx_call *call, char *buf, int nbytes); -- 2.39.5