Changeset 2fb3a36 in rtems-libbsd

Timestamp:

Aug 4, 2016, 12:12:17 PM (3 years ago)

Author:

Christian Mauderer <Christian.Mauderer@…>

Branches:

c1e05b9ea378b2971e3d7704779112b4bc4296da, freebsd-9.3, 4a77611a223ea883fb548679b516d326a020d447

Children:

9907ae4

Parents:

7aaa9a1

git-author:

Christian Mauderer <Christian.Mauderer@…> (08/04/16 12:12:17)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/04/16 13:44:06)

Message:

freebsd: Add constant ipv6 addresses from vars.c.

This is necessary for a configuration without IPv6.

Files:

• create-kernel-namespace.sh (modified) (1 diff)
• freebsd/lib/libc/net/vars.c (modified) (1 diff)
• freebsd/sys/netinet6/in6.c (modified) (2 diffs)
• libbsd.py (modified) (1 diff)
• libbsd_waf.py (modified) (1 diff)
• rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h (modified) (1 diff)

create-kernel-namespace.sh

@@ -61 +61 @@
         | sed '/^ifqmaxlen$/d' \
         | sed '/^in6addr_any$/d' \
+        | sed '/^in6addr_loopback$/d' \
+        | sed '/^in6addr_nodelocal_allnodes$/d' \
+        | sed '/^in6addr_linklocal_allnodes$/d' \
         | sed '/^kevent$/d' \
         | sed '/^kqueue$/d' \

freebsd/lib/libc/net/vars.c

@@ +1 @@
+#include <machine/rtems-bsd-user-space.h>
+
 /*      $KAME: vars.c,v 1.2 2001/08/20 02:32:41 itojun Exp $    */
 

freebsd/sys/netinet6/in6.c

@@ -114 +114 @@
  * Definitions of some costant IP6 addresses.
  */
+#ifndef __rtems__
 const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
 const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
@@ -120 +121 @@
 const struct in6_addr in6addr_linklocal_allnodes =
         IN6ADDR_LINKLOCAL_ALLNODES_INIT;
+#endif /* __rtems__ */
 const struct in6_addr in6addr_linklocal_allrouters =
         IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;

libbsd.py

@@ -1987 +1987 @@
             'lib/libc/net/rthdr.c',
             'lib/libc/net/send.c',
+            'lib/libc/net/vars.c',
             'lib/libc/posix1e/mac.c',
             'lib/libc/resolv/h_errno.c',

libbsd_waf.py

@@ -296 +296 @@
                      'freebsd/lib/libc/net/rthdr.c',
                      'freebsd/lib/libc/net/send.c',
+                     'freebsd/lib/libc/net/vars.c',
                      'freebsd/lib/libc/posix1e/mac.c',
                      'freebsd/lib/libc/resolv/h_errno.c',

rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h

@@ -1327 +1327 @@
 #define imo_multi_filter _bsd_imo_multi_filter
 #define in4_cksum _bsd_in4_cksum
-#define in6addr_linklocal_allnodes _bsd_in6addr_linklocal_allnodes
 #define in6addr_linklocal_allrouters _bsd_in6addr_linklocal_allrouters
 #define in6addr_linklocal_allv2routers _bsd_in6addr_linklocal_allv2routers
-#define in6addr_loopback _bsd_in6addr_loopback
-#define in6addr_nodelocal_allnodes _bsd_in6addr_nodelocal_allnodes
 #define in6_addrscope _bsd_in6_addrscope
 #define in6_are_prefix_equal _bsd_in6_are_prefix_equal