diff --git a/Makefile b/Makefile index 8cea124a..31781d1f 100644 --- a/Makefile +++ b/Makefile @@ -1105,6 +1105,28 @@ LIB_C_FILES += freebsd/usr.bin/netstat/unix.c freebsd/usr.bin/netstat/unix.o: freebsd/usr.bin/netstat/unix.c $(CC) $(CPPFLAGS) $(CFLAGS) -DINET6 -c $< -o $@ +TEST_DHCPCD01 = testsuite/dhcpcd01/dhcpcd01.exe +TEST_DHCPCD01_O_FILES = +TEST_DHCPCD01_D_FILES = +TEST_DHCPCD01_O_FILES += testsuite/dhcpcd01/test_main.o +TEST_DHCPCD01_D_FILES += testsuite/dhcpcd01/test_main.d +$(TEST_DHCPCD01): $(TEST_DHCPCD01_O_FILES) $(LIB) + $(LINK.c) -Wl,-Map,testsuite/dhcpcd01/dhcpcd01.map $^ -lm -lz -o $@ +NET_TESTS += $(TEST_DHCPCD01) +O_FILES += $(TEST_DHCPCD01_O_FILES) +D_FILES += $(TEST_DHCPCD01_D_FILES) + +TEST_DHCPCD02 = testsuite/dhcpcd02/dhcpcd02.exe +TEST_DHCPCD02_O_FILES = +TEST_DHCPCD02_D_FILES = +TEST_DHCPCD02_O_FILES += testsuite/dhcpcd02/test_main.o +TEST_DHCPCD02_D_FILES += testsuite/dhcpcd02/test_main.d +$(TEST_DHCPCD02): $(TEST_DHCPCD02_O_FILES) $(LIB) + $(LINK.c) -Wl,-Map,testsuite/dhcpcd02/dhcpcd02.map $^ -lm -lz -o $@ +NET_TESTS += $(TEST_DHCPCD02) +O_FILES += $(TEST_DHCPCD02_O_FILES) +D_FILES += $(TEST_DHCPCD02_D_FILES) + TEST_ARPHOLE = testsuite/arphole/arphole.exe TEST_ARPHOLE_O_FILES = TEST_ARPHOLE_D_FILES = @@ -1301,6 +1323,73 @@ TESTS += $(TEST_THREAD01) O_FILES += $(TEST_THREAD01_O_FILES) D_FILES += $(TEST_THREAD01_D_FILES) RUN_TESTS += $(TEST_THREAD01) +LIB_C_FILES += dhcpcd/arp.c +dhcpcd/arp.o: dhcpcd/arp.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/auth.c +dhcpcd/auth.o: dhcpcd/auth.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/bpf.c +dhcpcd/bpf.o: dhcpcd/bpf.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/common.c +dhcpcd/common.o: dhcpcd/common.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/dhcp6.c +dhcpcd/dhcp6.o: dhcpcd/dhcp6.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/dhcp.c +dhcpcd/dhcp.o: dhcpcd/dhcp.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/dhcpcd.c +dhcpcd/dhcpcd.o: dhcpcd/dhcpcd.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/dhcpcd-embedded.c +dhcpcd/dhcpcd-embedded.o: dhcpcd/dhcpcd-embedded.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/dhcp-common.c +dhcpcd/dhcp-common.o: dhcpcd/dhcp-common.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/duid.c +dhcpcd/duid.o: dhcpcd/duid.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/eloop.c +dhcpcd/eloop.o: dhcpcd/eloop.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/if-bsd.c +dhcpcd/if-bsd.o: dhcpcd/if-bsd.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/if-options.c +dhcpcd/if-options.o: dhcpcd/if-options.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/if-pref.c +dhcpcd/if-pref.o: dhcpcd/if-pref.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/ipv4.c +dhcpcd/ipv4.o: dhcpcd/ipv4.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/ipv4ll.c +dhcpcd/ipv4ll.o: dhcpcd/ipv4ll.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/ipv6.c +dhcpcd/ipv6.o: dhcpcd/ipv6.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/ipv6nd.c +dhcpcd/ipv6nd.o: dhcpcd/ipv6nd.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/net.c +dhcpcd/net.o: dhcpcd/net.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/platform-bsd.c +dhcpcd/platform-bsd.o: dhcpcd/platform-bsd.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/compat/pselect.c +dhcpcd/compat/pselect.o: dhcpcd/compat/pselect.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += dhcpcd/crypt/hmac_md5.c +dhcpcd/crypt/hmac_md5.o: dhcpcd/crypt/hmac_md5.c + $(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6 -c $< -o $@ +LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-shell-dhcpcd.c ifeq ($(NEED_DUMMY_PIC_IRQ),yes) CFLAGS += -I rtems-dummy-pic-irq/include diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 15323fa8..2eb082cf 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -2429,6 +2429,8 @@ in_cksum.addCPUDependentSourceFiles( ) tests = Module('tests') +tests.addTest('dhcpcd01', ['test_main'], runTest = False, netTest = True) +tests.addTest('dhcpcd02', ['test_main'], runTest = False, netTest = True) tests.addTest('arphole', ['test_main'], runTest = False, netTest = True) tests.addTest('unix01', ['test_main']) tests.addTest('ftpd01', ['test_main'], netTest = True) @@ -2446,6 +2448,40 @@ tests.addTest('timeout01', ['init', 'timeout_test']) tests.addTest('init01', ['test_main']) tests.addTest('thread01', ['test_main']) +dhcpcd = Module('dhcpcd') +dhcpcd.addSourceFiles( + [ + 'dhcpcd/arp.c', + 'dhcpcd/auth.c', + 'dhcpcd/bpf.c', + 'dhcpcd/common.c', + 'dhcpcd/dhcp6.c', + 'dhcpcd/dhcp.c', + 'dhcpcd/dhcpcd.c', + 'dhcpcd/dhcpcd-embedded.c', + 'dhcpcd/dhcp-common.c', + 'dhcpcd/duid.c', + 'dhcpcd/eloop.c', + 'dhcpcd/if-bsd.c', + 'dhcpcd/if-options.c', + 'dhcpcd/if-pref.c', + 'dhcpcd/ipv4.c', + 'dhcpcd/ipv4ll.c', + 'dhcpcd/ipv6.c', + 'dhcpcd/ipv6nd.c', + 'dhcpcd/net.c', + 'dhcpcd/platform-bsd.c', + 'dhcpcd/compat/pselect.c', + 'dhcpcd/crypt/hmac_md5.c', + ], + '-D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET -DINET6' +) +dhcpcd.addRTEMSSourceFiles( + [ + 'rtems/rtems-bsd-shell-dhcpcd.c', + ] +) + # Register all the Module instances with the Module Manager mm.addModule(rtems) mm.addModule(base) @@ -2488,6 +2524,7 @@ mm.addModule(in_cksum) mm.addModule(userSpace) mm.addModule(tests) +mm.addModule(dhcpcd) # XXX TODO Check that no file is also listed in empty # XXX TODO Check that no file in in two modules diff --git a/rtemsbsd/include/machine/rtems-bsd-commands.h b/rtemsbsd/include/machine/rtems-bsd-commands.h index d442d3fd..6618b933 100644 --- a/rtemsbsd/include/machine/rtems-bsd-commands.h +++ b/rtemsbsd/include/machine/rtems-bsd-commands.h @@ -56,6 +56,8 @@ int rtems_bsd_command_ping6(int argc, char **argv); int rtems_bsd_command_route(int argc, char **argv); +int rtems_bsd_command_dhcpcd(int argc, char **argv); + __END_DECLS #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_COMMANDS_H_ */ diff --git a/rtemsbsd/include/rtems/netcmds-config.h b/rtemsbsd/include/rtems/netcmds-config.h index 8938e97b..199afbea 100644 --- a/rtemsbsd/include/rtems/netcmds-config.h +++ b/rtemsbsd/include/rtems/netcmds-config.h @@ -28,6 +28,7 @@ extern rtems_shell_cmd_t rtems_shell_IFCONFIG_Command; extern rtems_shell_cmd_t rtems_shell_ROUTE_Command; extern rtems_shell_cmd_t rtems_shell_NETSTAT_Command; + extern rtems_shell_cmd_t rtems_shell_DHCPCD_Command; // #endif #endif diff --git a/rtemsbsd/rtems/rtems-bsd-shell-dhcpcd.c b/rtemsbsd/rtems/rtems-bsd-shell-dhcpcd.c new file mode 100644 index 00000000..24893748 --- /dev/null +++ b/rtemsbsd/rtems/rtems-bsd-shell-dhcpcd.c @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2013 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +rtems_shell_cmd_t rtems_shell_DHCPCD_Command = { + .name = "dhcpcd", + .usage = "dhcpcd [args]", + .topic = "net", + .command = rtems_bsd_command_dhcpcd +}; diff --git a/testsuite/dhcpcd01/test_main.c b/testsuite/dhcpcd01/test_main.c new file mode 100644 index 00000000..181f92ae --- /dev/null +++ b/testsuite/dhcpcd01/test_main.c @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2013-2014 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include + +#define TEST_NAME "LIBBSD DHCPCD 1" + +static void +test_main(void) +{ + rtems_task_delete(RTEMS_SELF); + assert(0); +} + +#define DEFAULT_NETWORK_DHCPCD_ENABLE +#define DEFAULT_NETWORK_SHELL + +#include diff --git a/testsuite/dhcpcd02/test_main.c b/testsuite/dhcpcd02/test_main.c new file mode 100644 index 00000000..611c12b1 --- /dev/null +++ b/testsuite/dhcpcd02/test_main.c @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2013-2014 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include + +#define TEST_NAME "LIBBSD DHCPCD 2" + +static void +test_main(void) +{ + rtems_task_delete(RTEMS_SELF); + assert(0); +} + +#define DEFAULT_NETWORK_DHCPCD_ENABLE +#define DEFAULT_NETWORK_DHCPCD_NO_DHCP_DISCOVERY +#define DEFAULT_NETWORK_SHELL + +#include diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h index d5cdf258..b53a955a 100644 --- a/testsuite/include/rtems/bsd/test/default-network-init.h +++ b/testsuite/include/rtems/bsd/test/default-network-init.h @@ -29,9 +29,12 @@ * SUCH DAMAGE. */ +#include + #include #include +#include #include #include #include @@ -43,6 +46,11 @@ #include #include +#if defined(DEFAULT_NETWORK_DHCPCD_ENABLE) && \ + !defined(DEFAULT_NETWORK_NO_STATIC_IFCONFIG) +#define DEFAULT_NETWORK_NO_STATIC_IFCONFIG +#endif + #ifndef DEFAULT_NETWORK_NO_STATIC_IFCONFIG #include #endif @@ -143,6 +151,60 @@ default_network_route_hwif0(char *ifname) #endif } +#ifdef DEFAULT_NETWORK_DHCPCD_ENABLE +static void +default_network_dhcpcd_task(rtems_task_argument arg) +{ + int exit_code; + char *dhcpcd[] = { + "dhcpcd", + NULL + }; + +#ifdef DEFAULT_NETWORK_DHCPCD_NO_DHCP_DISCOVERY + static const char cfg[] = "nodhcp\nnodhcp6\n"; + int fd; + int rv; + ssize_t n; + + fd = open("/etc/dhcpcd.conf", O_CREAT | O_WRONLY, + S_IRWXU | S_IRWXG | S_IRWXO); + assert(fd >= 0); + + n = write(fd, cfg, sizeof(cfg)); + assert(n == (ssize_t) sizeof(cfg)); + + rv = close(fd); + assert(rv == 0); +#endif + + 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, + 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); + assert(sc == RTEMS_SUCCESSFUL); +#endif +} + static void default_network_on_exit(int exit_code, void *arg) { @@ -199,6 +261,7 @@ Init(rtems_task_argument arg) default_network_ifconfig_lo0(); default_network_ifconfig_hwif0(ifname); default_network_route_hwif0(ifname); + default_network_dhcpcd(); test_main();