Changeset 0c20a46 in rtems

Timestamp:

Feb 3, 2005, 3:58:18 PM (15 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

5b6111b

Parents:

abb63593

Message:

2005-02-03 Ralf Corsepius <ralf.corsepius@…>

• librpc/include/rpc/types.h: Partial update from FreeBSD. Use stdint.h types instead of sys/types.h.
• librpc/src/rpc/bindresvport.c: Partial update from FreeBSD.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• librpc/include/rpc/types.h (modified) (4 diffs)
• librpc/src/rpc/bindresvport.c (modified) (8 diffs)

cpukit/ChangeLog

@@ +1 @@
+2005-02-03      Ralf Corsepius <ralf.corsepius@rtems.org>
+
+        * librpc/include/rpc/types.h: Partial update from FreeBSD. 
+        Use stdint.h types instead of sys/types.h.
+        * librpc/src/rpc/bindresvport.c: Partial update from FreeBSD.
+
 2005-02-03      Ralf Corsepius <ralf.corsepius@rtems.org>
 

cpukit/librpc/include/rpc/types.h

@@ +1 @@
+/*      $NetBSD: types.h,v 1.13 2000/06/13 01:02:44 thorpej Exp $       */
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -29 +31 @@
  *      from: @(#)types.h 1.18 87/07/24 SMI
  *      from: @(#)types.h       2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/types.h,v 1.9 1999/08/27 23:45:06 peter Exp $
+ * $FreeBSD: src/include/rpc/types.h,v 1.11 2003/12/07 21:10:06 marcel Exp $
  */
 
@@ -40 +42 @@
 #include <rtems/stdint.h>
 
-#define bool_t  int32_t
-#define enum_t  int32_t
+typedef int32_t bool_t;
+typedef int32_t enum_t;
+
+typedef uint32_t rpcprog_t;
+typedef uint32_t rpcvers_t;
+typedef uint32_t rpcproc_t;
+typedef uint32_t rpcprot_t;
+typedef uint32_t rpcport_t;
+typedef  int32_t rpc_inline_t;
+ 
 #define __dontcare__    -1
 
@@ -50 +60 @@
 #       define TRUE     (1)
 #endif
-#ifndef NULL
-#       define NULL     0
-#endif
 
 #define mem_alloc(bsize)        malloc(bsize)
 #define mem_free(ptr, bsize)    free(ptr)
 
-#ifndef makedev /* ie, we haven't already included it */
-#include <sys/types.h>
-#endif
 #include <sys/time.h>
 

cpukit/librpc/src/rpc/bindresvport.c

@@ +1 @@
+/*      $NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $       */
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -42 +44 @@
 
 #include <sys/types.h>
-#include <sys/errno.h>
 #include <sys/socket.h>
+
 #include <netinet/in.h>
+
+#include <errno.h>
+#include <string.h>
 #include <unistd.h>
-#include <string.h>
+
+#include <rpc/rpc.h>
 
 /*
- * Bind a socket to a privileged port for whatever protocol.
+ * Bind a socket to a privileged IP port
+ */
+int
+bindresvport(sd, sin)
+        int sd;
+        struct sockaddr_in *sin;
+{
+        return bindresvport_sa(sd, (struct sockaddr *)sin);
+}
+
+/*
+ * Bind a socket to a privileged IP port
  */
 int
@@ -59 +76 @@
         struct sockaddr myaddr;
         struct sockaddr_in *sin;
-#if (defined(AF_INET6) && defined(IPPROTO_IPV6))
+#ifdef INET6
         struct sockaddr_in6 *sin6;
 #endif
@@ -78 +95 @@
                 af = sa->sa_family;
 
-        if (af == AF_INET) {
+        switch (af) {
+        case AF_INET:
                 proto = IPPROTO_IP;
                 portrange = IP_PORTRANGE;
@@ -85 +103 @@
                 salen = sizeof(struct sockaddr_in);
                 port = sin->sin_port;
-#if (defined(AF_INET6) && defined(IPPROTO_IPV6))
-        } else if (af == AF_INET6) {
+                break;
+#ifdef INET6
+        case AF_INET6:
                 proto = IPPROTO_IPV6;
                 portrange = IPV6_PORTRANGE;
@@ -93 +112 @@
                 salen = sizeof(struct sockaddr_in6);
                 port = sin6->sin6_port;
+                break;
 #endif
-        } else {
+        default:
                 errno = EPFNOSUPPORT;
                 return (-1);
@@ -127 +147 @@
 
                 if (sa != (struct sockaddr *)&myaddr) {
-                        /* Hmm, what did the kernel assign... */
+                        /* Hmm, what did the kernel assign? */
                         if (getsockname(sd, sa, &salen) < 0)
                                 errno = saved_errno;
@@ -135 +155 @@
         return (error);
 }
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport(sd, sin)
-        int sd;
-        struct sockaddr_in *sin;
-{
-        return bindresvport_sa(sd, (struct sockaddr *)sin);
-}