Changeset c11cb9a5 in rtems

Timestamp:

05/25/05 13:56:50 (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

12db3bda

Parents:

984d9224

Message:

More updates from FreeBSD.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• librpc/include/rpc/clnt.h (modified) (4 diffs)
• librpc/include/rpc/svc.h (modified) (1 diff)
• librpc/src/rpc/svc.c (modified) (2 diffs)

cpukit/ChangeLog

@@ -1 +1 @@
 2005-05-25  Ralf Corsepius  <ralf.corsepius@rtems.org>
 
-        * librpc/include/rpc/clnt.h, librpc/include/rpc/clnt_soc.h,
+        * include/rpc/clnt.h, include/rpc/svc.h,
+        librpc/include/rpc/clnt.h, librpc/include/rpc/clnt_soc.h,
         src/rpc/clnt_perror.c: More updates from FreeBSD.
 

cpukit/librpc/include/rpc/clnt.h

@@ -46 +46 @@
  * Mountain View, California  94043
  *
- *      from: @(#)clnt.h 1.31 88/02/08 SMI
+ *      from: @(#)clnt.h 1.31 94/04/29 SMI
  *      from: @(#)clnt.h        2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/clnt.h,v 1.11 1999/08/27 23:45:03 peter Exp $
+ * $FreeBSD: src/include/rpc/clnt.h,v 1.21 2003/01/24 01:47:55 fjoe Exp $
  */
 
@@ -54 +54 @@
  * clnt.h - Client side remote procedure call interface.
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
+ * Copyright (c) 1986-1991,1994-1999 by Sun Microsystems, Inc.
+ * All rights reserved.
+ */
+
+/*
+ * $Id$
+ */ 
 
 #ifndef _RPC_CLNT_H_
 #define _RPC_CLNT_H_
+#include <rpc/clnt_stat.h>
 #include <sys/cdefs.h>
 #include <sys/un.h>
-
-/*
- * Rpc calls return an enum clnt_stat.  This should be looked at more,
- * since each implementation is required to live with this (implementation
- * independent) list of errors.
- */
-enum clnt_stat {
-        RPC_SUCCESS=0,                  /* call succeeded */
-        /*
-         * local errors
-         */
-        RPC_CANTENCODEARGS=1,           /* can't encode arguments */
-        RPC_CANTDECODERES=2,            /* can't decode results */
-        RPC_CANTSEND=3,                 /* failure in sending call */
-        RPC_CANTRECV=4,                 /* failure in receiving result */
-        RPC_TIMEDOUT=5,                 /* call timed out */
-        /*
-         * remote errors
-         */
-        RPC_VERSMISMATCH=6,             /* rpc versions not compatible */
-        RPC_AUTHERROR=7,                /* authentication error */
-        RPC_PROGUNAVAIL=8,              /* program not available */
-        RPC_PROGVERSMISMATCH=9,         /* program version mismatched */
-        RPC_PROCUNAVAIL=10,             /* procedure unavailable */
-        RPC_CANTDECODEARGS=11,          /* decode arguments error */
-        RPC_SYSTEMERROR=12,             /* generic "other problem" */
-
-        /*
-         * callrpc & clnt_create errors
-         */
-        RPC_UNKNOWNHOST=13,             /* unknown host name */
-        RPC_UNKNOWNPROTO=17,            /* unkown protocol */
-
-        /*
-         * _ create errors
-         */
-        RPC_PMAPFAILURE=14,             /* the pmapper failed in its call */
-        RPC_PROGNOTREGISTERED=15,       /* remote program is not registered */
-        /*
-         * unspecified error
-         */
-        RPC_FAILED=16
-};
-
 
 /*
@@ -159 +121 @@
 } CLIENT;
 
+#define RPCSMALLMSGSIZE 400     /* a more reasonable packet size */
 
 /*
@@ -349 +312 @@
 extern struct rpc_createerr rpc_createerr;
 
-
-#define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */
-#define RPCSMALLMSGSIZE 400     /* a more reasonable packet size */
-
 /* For backward compatibility */
 #include <rpc/clnt_soc.h>

cpukit/librpc/include/rpc/svc.h

@@ -200 +200 @@
 
 __BEGIN_DECLS
-extern bool_t   svc_sendreply(SVCXPRT *, xdrproc_t, char *);
+extern bool_t   svc_sendreply(SVCXPRT *, xdrproc_t, void *);
 extern void     svcerr_decode(SVCXPRT *);
 extern void     svcerr_weakauth(SVCXPRT *);
 extern void     svcerr_noproc(SVCXPRT *);
-extern void     svcerr_progvers(SVCXPRT *, u_long, u_long);
+extern void     svcerr_progvers(SVCXPRT *, rpcvers_t, rpcvers_t);
 extern void     svcerr_auth(SVCXPRT *, enum auth_stat);
 extern void     svcerr_noprog(SVCXPRT *);

cpukit/librpc/src/rpc/svc.c

@@ -245 +245 @@
         register SVCXPRT *xprt,
         xdrproc_t xdr_results,
-        caddr_t xdr_location )
+        void *xdr_location )
 {
         struct rpc_msg rply;
@@ -356 +356 @@
 svcerr_progvers(
         register SVCXPRT *xprt,
-        u_long low_vers,
-        u_long high_vers )
+        rpcvers_t low_vers,
+        rpcvers_t high_vers )
 {
         struct rpc_msg rply;