rx: Remove multi_End_Ignore

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

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 0af7ba8..23d04ee 100644 (file)
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -188,9 +188,6 @@ 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 */
 
@@ -277,7 +274,6 @@ extern void *rx_ServerProc(void *);
 # ifndef AFS_LINUX26_ENV
 extern void osi_AssertFailK(const char *expr, const char *file, int line) AFS_NORETURN;
 # endif
-extern void rxk_ListenerProc(void);
 extern void rxk_Listener(void);
 # ifndef UKERNEL
 extern void afs_rxevent_daemon(void);
@@ -304,7 +300,13 @@ extern int osi_NetSend(osi_socket asocket, struct sockaddr_in *addr,
                       struct iovec *dvec, int nvecs, afs_int32 asize,
                       int istack);
 # endif
-# ifdef RXK_UPCALL_ENV
+# ifdef AFS_SOCKPROXY_ENV
+extern void rxk_SockProxySetup(void);
+extern void rxk_SockProxyFinish(void);
+extern int rxk_SockProxyReply(struct afs_uspc_param *uspc,
+                             struct afs_pkt_hdr *pkts_recv,
+                             struct afs_pkt_hdr **pkts_send);
+# elif defined(RXK_UPCALL_ENV)
 extern void rx_upcall(socket_t so, void *arg, __unused int waitflag);
 # else
 extern int osi_NetReceive(osi_socket so, struct sockaddr_in *addr,
@@ -369,7 +371,6 @@ extern int multi_Select(struct multi_handle *mh);
 extern void multi_Ready(struct rx_call *call,
                        void *mh, int index);
 extern void multi_Finalize(struct multi_handle *mh);
-extern void multi_Finalize_Ignore(struct multi_handle *mh);
 
 
 
@@ -405,13 +406,12 @@ extern struct rx_packet *rxi_AllocSendPacket(struct rx_call *call,
                                             int want);
 extern int rxi_ReadPacket(osi_socket socket, struct rx_packet *p,
                          afs_uint32 * host, u_short * port);
-extern struct rx_packet *rxi_SplitJumboPacket(struct rx_packet *p,
-                                             afs_uint32 host, short port,
-                                             int first);
 #ifndef KERNEL
 extern int osi_NetSend(osi_socket socket, void *addr, struct iovec *dvec,
                       int nvecs, int length, int istack);
 #endif
+extern int rxi_NetSend(osi_socket socket, void *addr, struct iovec *dvec,
+                      int nvecs, int length, int istack);
 extern struct rx_packet *rxi_ReceiveDebugPacket(struct rx_packet *ap,
                                                osi_socket asocket,
                                                afs_uint32 ahost, short aport,
@@ -500,7 +500,6 @@ extern afs_kmutex_t rx_if_mutex;
 #endif
 extern osi_socket rxi_GetUDPSocket(u_short port);
 extern void rxi_InitPeerParams(struct rx_peer *pp);
-extern int rxi_HandleSocketError(int socket);
 
 #if defined(AFS_AIX32_ENV) && !defined(KERNEL)
 #ifndef osi_Alloc