summaryrefslogtreecommitdiffstats
path: root/testsuite/include/rtems/bsd/test/default-network-init.h
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-05-02 08:58:48 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-05-08 06:50:17 +0200
commit8bd38d645ca2a3bc481a2c1dbfa78fbcb9882378 (patch)
tree8a3bd431075685a3aa212af743e17dcfe134ea00 /testsuite/include/rtems/bsd/test/default-network-init.h
parentrc_conf: Do not create directories used by dhcpcd (diff)
downloadrtems-libbsd-8bd38d645ca2a3bc481a2c1dbfa78fbcb9882378.tar.bz2
dhcpcd: Add rtems_dhcpcd_start()
Use it throughout to start the DHCP client (dhcpcd).
Diffstat (limited to 'testsuite/include/rtems/bsd/test/default-network-init.h')
-rw-r--r--testsuite/include/rtems/bsd/test/default-network-init.h37
1 files changed, 5 insertions, 32 deletions
diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h
index ee95d26e..304c7a96 100644
--- a/testsuite/include/rtems/bsd/test/default-network-init.h
+++ b/testsuite/include/rtems/bsd/test/default-network-init.h
@@ -48,6 +48,7 @@
#include <rtems/stackchk.h>
#include <rtems/bsd/bsd.h>
#include <rtems/bsd/modules.h>
+#include <rtems/dhcpcd.h>
#if defined(DEFAULT_NETWORK_DHCPCD_ENABLE) && \
!defined(DEFAULT_NETWORK_NO_STATIC_IFCONFIG)
@@ -126,22 +127,16 @@ default_network_route_hwif0(char *ifname)
}
#endif
-#ifdef DEFAULT_NETWORK_DHCPCD_ENABLE
static void
-default_network_dhcpcd_task(rtems_task_argument arg)
+default_network_dhcpcd(void)
{
+#ifdef DEFAULT_NETWORK_DHCPCD_ENABLE
static const char default_cfg[] = "clientid libbsd test client\n";
- int exit_code;
- char *dhcpcd[] = {
- "dhcpcd",
- NULL
- };
+ rtems_status_code sc;
int fd;
int rv;
ssize_t n;
- (void)arg;
-
fd = open("/etc/dhcpcd.conf", O_CREAT | O_WRONLY,
S_IRWXU | S_IRWXG | S_IRWXO);
assert(fd >= 0);
@@ -159,29 +154,7 @@ default_network_dhcpcd_task(rtems_task_argument arg)
rv = close(fd);
assert(rv == 0);
- exit_code = rtems_bsd_command_dhcpcd(RTEMS_BSD_ARGC(dhcpcd), dhcpcd);
- assert(exit_code == EXIT_SUCCESS);
-}
-#endif
-
-static void
-default_network_dhcpcd(void)
-{
-#ifdef DEFAULT_NETWORK_DHCPCD_ENABLE
- rtems_status_code sc;
- rtems_id id;
-
- sc = rtems_task_create(
- rtems_build_name('D', 'H', 'C', 'P'),
- RTEMS_MAXIMUM_PRIORITY - 1,
- 2 * RTEMS_MINIMUM_STACK_SIZE,
- RTEMS_DEFAULT_MODES,
- RTEMS_FLOATING_POINT,
- &id
- );
- assert(sc == RTEMS_SUCCESSFUL);
-
- sc = rtems_task_start(id, default_network_dhcpcd_task, 0);
+ sc = rtems_dhcpcd_start(NULL);
assert(sc == RTEMS_SUCCESSFUL);
#endif
}