From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/dietlibc/librpc/svc_tcp.c | 58 +++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 27 deletions(-)

(limited to 'mdk-stage1/dietlibc/librpc/svc_tcp.c')

diff --git a/mdk-stage1/dietlibc/librpc/svc_tcp.c b/mdk-stage1/dietlibc/librpc/svc_tcp.c
index 6edafa1b1..0444bc0d0 100644
--- a/mdk-stage1/dietlibc/librpc/svc_tcp.c
+++ b/mdk-stage1/dietlibc/librpc/svc_tcp.c
@@ -48,6 +48,7 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#include "dietfeatures.h"
 
 /*
  * Ops vector for TCP/IP based rpc service handle
@@ -59,14 +60,7 @@ static bool_t svctcp_reply();
 static bool_t svctcp_freeargs();
 static void svctcp_destroy();
 
-static struct xp_ops svctcp_op = {
-	svctcp_recv,
-	svctcp_stat,
-	svctcp_getargs,
-	svctcp_reply,
-	svctcp_freeargs,
-	svctcp_destroy
-};
+static struct xp_ops svctcp_op;
 
 /*
  * Ops vector for TCP/IP rendezvous handler
@@ -87,13 +81,13 @@ static int readtcp(), writetcp();
 static SVCXPRT *makefd_xprt();
 
 struct tcp_rendezvous {			/* kept in xprt->xp_p1 */
-	u_int sendsize;
-	u_int recvsize;
+	unsigned int sendsize;
+	unsigned int recvsize;
 };
 
 struct tcp_conn {				/* kept in xprt->xp_p1 */
 	enum xprt_stat strm_stat;
-	u_long x_id;
+	unsigned long x_id;
 	XDR xdrs;
 	char verf_body[MAX_AUTH_BYTES];
 };
@@ -120,8 +114,8 @@ struct tcp_conn {				/* kept in xprt->xp_p1 */
  */
 SVCXPRT *svctcp_create(sock, sendsize, recvsize)
 register int sock;
-u_int sendsize;
-u_int recvsize;
+unsigned int sendsize;
+unsigned int recvsize;
 {
 	bool_t madesock = FALSE;
 	register SVCXPRT *xprt;
@@ -136,7 +130,7 @@ u_int recvsize;
 		}
 		madesock = TRUE;
 	}
-	bzero((char *) &addr, sizeof(addr));
+	memset((char *) &addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
 	if (bindresvport(sock, &addr)) {
 		addr.sin_port = 0;
@@ -162,7 +156,7 @@ u_int recvsize;
 		return (NULL);
 	}
 	xprt->xp_p2 = NULL;
-	xprt->xp_p1 = (caddr_t) r;
+	xprt->xp_p1 = (char*) r;
 	xprt->xp_verf = _null_auth;
 	xprt->xp_ops = &svctcp_rendezvous_op;
 	xprt->xp_port = ntohs(addr.sin_port);
@@ -177,8 +171,8 @@ u_int recvsize;
  */
 SVCXPRT *svcfd_create(fd, sendsize, recvsize)
 int fd;
-u_int sendsize;
-u_int recvsize;
+unsigned int sendsize;
+unsigned int recvsize;
 {
 
 	return (makefd_xprt(fd, sendsize, recvsize));
@@ -186,8 +180,8 @@ u_int recvsize;
 
 static SVCXPRT *makefd_xprt(fd, sendsize, recvsize)
 int fd;
-u_int sendsize;
-u_int recvsize;
+unsigned int sendsize;
+unsigned int recvsize;
 {
 	register SVCXPRT *xprt;
 	register struct tcp_conn *cd;
@@ -207,9 +201,9 @@ u_int recvsize;
 	}
 	cd->strm_stat = XPRT_IDLE;
 	xdrrec_create(&(cd->xdrs), sendsize, recvsize,
-				  (caddr_t) xprt, readtcp, writetcp);
+				  (char*) xprt, readtcp, writetcp);
 	xprt->xp_p2 = NULL;
-	xprt->xp_p1 = (caddr_t) cd;
+	xprt->xp_p1 = (char*) cd;
 	xprt->xp_verf.oa_base = cd->verf_body;
 	xprt->xp_addrlen = 0;
 	xprt->xp_ops = &svctcp_op;	/* truely deals with calls */
@@ -267,9 +261,9 @@ register SVCXPRT *xprt;
 		/* an actual connection socket */
 		XDR_DESTROY(&(cd->xdrs));
 	}
-	mem_free((caddr_t) cd, sizeof(struct tcp_conn));
+	mem_free((char*) cd, sizeof(struct tcp_conn));
 
-	mem_free((caddr_t) xprt, sizeof(SVCXPRT));
+	mem_free((char*) xprt, sizeof(SVCXPRT));
 }
 
 /*
@@ -285,7 +279,7 @@ static struct timeval wait_per_try = { 35, 0 };
  */
 static int readtcp(xprt, buf, len)
 register SVCXPRT *xprt;
-caddr_t buf;
+char* buf;
 register int len;
 {
 	register int sock = xprt->xp_sock;
@@ -327,7 +321,7 @@ register int len;
  */
 static int writetcp(xprt, buf, len)
 register SVCXPRT *xprt;
-caddr_t buf;
+char* buf;
 int len;
 {
 	register int i, cnt;
@@ -372,7 +366,7 @@ register struct rpc_msg *msg;
 static bool_t svctcp_getargs(xprt, xdr_args, args_ptr)
 SVCXPRT *xprt;
 xdrproc_t xdr_args;
-caddr_t args_ptr;
+char* args_ptr;
 {
 
 	return ((*xdr_args)
@@ -382,7 +376,7 @@ caddr_t args_ptr;
 static bool_t svctcp_freeargs(xprt, xdr_args, args_ptr)
 SVCXPRT *xprt;
 xdrproc_t xdr_args;
-caddr_t args_ptr;
+char* args_ptr;
 {
 	register XDR *xdrs = &(((struct tcp_conn *) (xprt->xp_p1))->xdrs);
 
@@ -404,3 +398,13 @@ register struct rpc_msg *msg;
 	(void) xdrrec_endofrecord(xdrs, TRUE);
 	return (stat);
 }
+
+static struct xp_ops svctcp_op = {
+	svctcp_recv,
+	svctcp_stat,
+	svctcp_getargs,
+	svctcp_reply,
+	svctcp_freeargs,
+	svctcp_destroy
+};
+
-- 
cgit v1.2.1