From 23cd284af026fe326e14d920c162a1107a40d226 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 10 Nov 2017 11:48:51 +0100 Subject: Add rtems_bsd_ifconfig_lo0() --- libbsd.py | 1 + libbsd_waf.py | 1 + rtemsbsd/include/rtems/bsd/bsd.h | 7 ++ rtemsbsd/rtems/rtems-bsd-ifconfig-lo0.c | 77 ++++++++++++++++++++++ .../include/rtems/bsd/test/default-network-init.h | 33 +--------- 5 files changed, 87 insertions(+), 32 deletions(-) create mode 100644 rtemsbsd/rtems/rtems-bsd-ifconfig-lo0.c diff --git a/libbsd.py b/libbsd.py index abc405a3..e270626c 100644 --- a/libbsd.py +++ b/libbsd.py @@ -69,6 +69,7 @@ def rtems(mm): 'rtems/rtems-bsd-get-mac-address.c', 'rtems/rtems-bsd-get-task-priority.c', 'rtems/rtems-bsd-get-task-stack-size.c', + 'rtems/rtems-bsd-ifconfig-lo0.c', 'rtems/rtems-bsd-rc-conf-net.c', 'rtems/rtems-bsd-rc-conf-pf.c', 'rtems/rtems-bsd-rc-conf.c', diff --git a/libbsd_waf.py b/libbsd_waf.py index 8b7b20f9..4964463a 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -2193,6 +2193,7 @@ def build(bld): 'rtemsbsd/rtems/rtems-bsd-get-mac-address.c', 'rtemsbsd/rtems/rtems-bsd-get-task-priority.c', 'rtemsbsd/rtems/rtems-bsd-get-task-stack-size.c', + 'rtemsbsd/rtems/rtems-bsd-ifconfig-lo0.c', 'rtemsbsd/rtems/rtems-bsd-rc-conf-net.c', 'rtemsbsd/rtems/rtems-bsd-rc-conf-pf.c', 'rtemsbsd/rtems/rtems-bsd-rc-conf.c', diff --git a/rtemsbsd/include/rtems/bsd/bsd.h b/rtemsbsd/include/rtems/bsd/bsd.h index 2e89dce6..6bea4e6f 100755 --- a/rtemsbsd/include/rtems/bsd/bsd.h +++ b/rtemsbsd/include/rtems/bsd/bsd.h @@ -91,6 +91,13 @@ typedef struct { rtems_status_code rtems_bsd_initialize(void); +/** + * @brief Configures the lo0 (loopback) interface. + * + * @return Returns an exit code, see also . + */ +int rtems_bsd_ifconfig_lo0(void); + /** * @brief Returns the initial priority for a task specified by its name. * diff --git a/rtemsbsd/rtems/rtems-bsd-ifconfig-lo0.c b/rtemsbsd/rtems/rtems-bsd-ifconfig-lo0.c new file mode 100644 index 00000000..ae19a709 --- /dev/null +++ b/rtemsbsd/rtems/rtems-bsd-ifconfig-lo0.c @@ -0,0 +1,77 @@ +/** + * @file + * + * @ingroup rtems_bsd_rtems + * + * @brief TODO. + */ + +/* + * Copyright (c) 2013, 2017 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 + +#include + +int +rtems_bsd_ifconfig_lo0(void) +{ + int exit_code; + char *lo0[] = { + "ifconfig", + "lo0", + "inet", + "127.0.0.1", + "netmask", + "255.255.255.0", + NULL + }; + char *lo0_inet6[] = { + "ifconfig", + "lo0", + "inet6", + "::1", + "prefixlen", + "128", + "alias", + NULL + }; + + exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0), lo0); + if (exit_code != EX_OK) { + return (exit_code); + } + + exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0_inet6), lo0_inet6); + return (exit_code); +} diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h index 438c7bde..fb7fee0e 100644 --- a/testsuite/include/rtems/bsd/test/default-network-init.h +++ b/testsuite/include/rtems/bsd/test/default-network-init.h @@ -71,37 +71,6 @@ default_network_set_self_prio(rtems_task_priority prio) assert(sc == RTEMS_SUCCESSFUL); } -static void -default_network_ifconfig_lo0(void) -{ - int exit_code; - char *lo0[] = { - "ifconfig", - "lo0", - "inet", - "127.0.0.1", - "netmask", - "255.255.255.0", - NULL - }; - char *lo0_inet6[] = { - "ifconfig", - "lo0", - "inet6", - "::1", - "prefixlen", - "128", - "alias", - NULL - }; - - exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0), lo0); - assert(exit_code == EX_OK); - - exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0_inet6), lo0_inet6); - assert(exit_code == EX_OK); -} - #ifndef DEFAULT_NETWORK_NO_INTERFACE_0 static void default_network_ifconfig_hwif0(char *ifname) @@ -283,7 +252,7 @@ Init(rtems_task_argument arg) sc = rtems_task_wake_after(2); assert(sc == RTEMS_SUCCESSFUL); - default_network_ifconfig_lo0(); + rtems_bsd_ifconfig_lo0(); #ifndef DEFAULT_NETWORK_NO_INTERFACE_0 default_network_ifconfig_hwif0(ifname); default_network_route_hwif0(ifname); -- cgit v1.2.3