Changeset defe035 in rtems-libbsd for testsuite/include/rtems/bsd/test/default-network-init.h

Timestamp:

01/22/14 08:13:54 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

31ab470

Parents:

8118e8e

git-author:

Sebastian Huber <sebastian.huber@…> (01/22/14 08:13:54)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/30/14 15:23:01)

Message:

Add DEFAULT_NETWORK_NO_STATIC_IFCONFIG

File:

• testsuite/include/rtems/bsd/test/default-network-init.h (modified) (9 diffs)

testsuite/include/rtems/bsd/test/default-network-init.h

@@ -30 +30 @@
  */
 
+#include <net/if.h>
+
 #include <assert.h>
+#include <ifaddrs.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39 +42 @@
 #include <rtems.h>
 #include <rtems/stackchk.h>
+#include <rtems/bsd/bsd.h>
+
+#ifndef DEFAULT_NETWORK_NO_STATIC_IFCONFIG
 #include <rtems/bsd/test/network-config.h>
-#include <rtems/bsd/bsd.h>
+#endif
 
 static void
@@ -82 +88 @@
 
 static void
-default_network_ifconfig_interface_0(void)
+default_network_ifconfig_hwif0(char *ifname)
 {
         int exit_code;
-        char *iface0[] = {
+        char *ifcfg[] = {
                 "ifconfig",
-                NET_CFG_INTERFACE_0,
+                ifname,
+#ifdef DEFAULT_NETWORK_NO_STATIC_IFCONFIG
+                "up",
+#else
                 "inet",
                 NET_CFG_SELF_IP,
                 "netmask",
                 NET_CFG_NETMASK,
-                NULL
-        };
-
-        exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(iface0), iface0);
+#endif
+                NULL
+        };
+
+        exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(ifcfg), ifcfg);
         assert(exit_code == EX_OK);
 }
 
 static void
-default_network_route(void)
-{
+default_network_route_hwif0(char *ifname)
+{
+#ifndef DEFAULT_NETWORK_NO_STATIC_IFCONFIG
         int exit_code;
         char *dflt_route[] = {
@@ -109 +120 @@
                 NET_CFG_GATEWAY_IP,
                 "-iface",
-                NET_CFG_INTERFACE_0,
+                ifname,
                 NULL
         };
@@ -125 +136 @@
         exit_code = rtems_bsd_command_route(RTEMS_BSD_ARGC(dflt_route2), dflt_route2);
         assert(exit_code == EXIT_SUCCESS);
+#endif
 }
 
@@ -142 +154 @@
 {
         rtems_status_code sc;
+#ifdef DEFAULT_NETWORK_NO_STATIC_IFCONFIG
+        char ifnamebuf[IF_NAMESIZE];
+#endif
+        char *ifname;
 
         puts("*** " TEST_NAME " TEST ***");
@@ -151 +167 @@
 
         rtems_bsd_initialize();
+
+#ifdef DEFAULT_NETWORK_NO_STATIC_IFCONFIG
+        ifname = if_indextoname(1, &ifnamebuf[0]);
+        assert(ifname != NULL);
+#else
+        ifname = NET_CFG_INTERFACE_0;
+#endif
 
         /* Let the callout timer allocate its resources */
@@ -157 +180 @@
 
         default_network_ifconfig_lo0();
-        default_network_ifconfig_interface_0();
-        default_network_route();
+        default_network_ifconfig_hwif0(ifname);
+        default_network_route_hwif0(ifname);
 
         test_main();
@@ -171 +194 @@
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_ZERO_DRIVER
 
 #define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM