[rtems-libbsd commit] LAGG(4): Enable and test
Sebastian Huber
sebh at rtems.org
Mon Mar 30 21:02:50 UTC 2015
Module: rtems-libbsd
Branch: master
Commit: 49b9c5e2dff347bffc80241e7cdd9f4cc7023242
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=49b9c5e2dff347bffc80241e7cdd9f4cc7023242
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon Mar 30 23:01:09 2015 +0200
LAGG(4): Enable and test
---
Makefile | 12 +++
freebsd-to-rtems.py | 1 +
rtemsbsd/include/machine/rtems-bsd-sysinit.h | 3 +
testsuite/include/rtems/bsd/test/default-init.h | 1 +
.../include/rtems/bsd/test/default-network-init.h | 1 +
testsuite/lagg01/test_main.c | 98 ++++++++++++++++++++++
6 files changed, 116 insertions(+)
diff --git a/Makefile b/Makefile
index 838031f..22bf578 100644
--- a/Makefile
+++ b/Makefile
@@ -1441,6 +1441,18 @@ NET_TESTS += $(TEST_VLAN01)
O_FILES += $(TEST_VLAN01_O_FILES)
D_FILES += $(TEST_VLAN01_D_FILES)
RUN_NET_TESTS += $(TEST_VLAN01)
+
+TEST_LAGG01 = testsuite/lagg01/lagg01.exe
+TEST_LAGG01_O_FILES =
+TEST_LAGG01_D_FILES =
+TEST_LAGG01_O_FILES += testsuite/lagg01/test_main.o
+TEST_LAGG01_D_FILES += testsuite/lagg01/test_main.d
+$(TEST_LAGG01): $(TEST_LAGG01_O_FILES) $(LIB)
+ $(LINK.c) -Wl,-Map,testsuite/lagg01/lagg01.map $^ -lm -lz -o $@
+NET_TESTS += $(TEST_LAGG01)
+O_FILES += $(TEST_LAGG01_O_FILES)
+D_FILES += $(TEST_LAGG01_D_FILES)
+RUN_NET_TESTS += $(TEST_LAGG01)
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 $@
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index 00e1a26..9ba9e21 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -2540,6 +2540,7 @@ tests.addTest('zerocopy01', ['test_main'], runTest = False, netTest = True)
tests.addTest('smp01', ['test_main'])
tests.addTest('media01', ['test_main'], runTest = False)
tests.addTest('vlan01', ['test_main'], netTest = True)
+tests.addTest('lagg01', ['test_main'], netTest = True)
dhcpcd = Module('dhcpcd')
dhcpcd.addSourceFiles(
diff --git a/rtemsbsd/include/machine/rtems-bsd-sysinit.h b/rtemsbsd/include/machine/rtems-bsd-sysinit.h
index b5ce5a9..c8af236 100644
--- a/rtemsbsd/include/machine/rtems-bsd-sysinit.h
+++ b/rtemsbsd/include/machine/rtems-bsd-sysinit.h
@@ -102,6 +102,9 @@
#define SYSINIT_NEED_NET_IF_DC \
SYSINIT_DRIVER_REFERENCE(dc, pci)
+#define SYSINIT_NEED_NET_IF_LAGG \
+ SYSINIT_MODULE_REFERENCE(if_lagg)
+
#define SYSINIT_NEED_NET_IF_VLAN \
SYSINIT_MODULE_REFERENCE(if_vlan)
diff --git a/testsuite/include/rtems/bsd/test/default-init.h b/testsuite/include/rtems/bsd/test/default-init.h
index 31de5d8..0a532b8 100644
--- a/testsuite/include/rtems/bsd/test/default-init.h
+++ b/testsuite/include/rtems/bsd/test/default-init.h
@@ -70,6 +70,7 @@ rtems_task Init(
#include <machine/rtems-bsd-sysinit.h>
SYSINIT_NEED_NET_PF_UNIX;
+SYSINIT_NEED_NET_IF_LAGG;
SYSINIT_NEED_NET_IF_VLAN;
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h
index 78b8742..66134ff 100644
--- a/testsuite/include/rtems/bsd/test/default-network-init.h
+++ b/testsuite/include/rtems/bsd/test/default-network-init.h
@@ -280,6 +280,7 @@ Init(rtems_task_argument arg)
#include <machine/rtems-bsd-sysinit.h>
SYSINIT_NEED_NET_PF_UNIX;
+SYSINIT_NEED_NET_IF_LAGG;
SYSINIT_NEED_NET_IF_VLAN;
#include <bsp/nexus-devices.h>
diff --git a/testsuite/lagg01/test_main.c b/testsuite/lagg01/test_main.c
new file mode 100644
index 0000000..99544a5
--- /dev/null
+++ b/testsuite/lagg01/test_main.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2015 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Dornierstr. 4
+ * 82178 Puchheim
+ * Germany
+ * <rtems at embedded-brains.de>
+ *
+ * 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 <sys/stat.h>
+#include <net/if.h>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <sysexits.h>
+
+#include <machine/rtems-bsd-commands.h>
+
+#include <rtems.h>
+
+#define TEST_NAME "LIBBSD LAGG 1"
+
+static void
+ifconfig_lagg(char *ifname)
+{
+ int exit_code;
+ char *lagg_create[] = {
+ "ifconfig",
+ "lagg0",
+ "create",
+ NULL
+ };
+ char *lagg_up[] = {
+ "ifconfig",
+ "lagg0",
+ "up",
+ "laggproto",
+ "lacp",
+ "laggport",
+ ifname,
+ NULL
+ };
+ char *lagg_info[] = {
+ "ifconfig",
+ "lagg0",
+ NULL
+ };
+
+ exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lagg_create),
+ lagg_create);
+ assert(exit_code == EX_OK);
+
+ exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lagg_up),
+ lagg_up);
+ assert(exit_code == EX_OK);
+
+ exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lagg_info),
+ lagg_info);
+ assert(exit_code == EX_OK);
+}
+
+static void
+test_main(void)
+{
+ char ifnamebuf[IF_NAMESIZE];
+ char *ifname;
+
+ ifname = if_indextoname(1, &ifnamebuf[0]);
+ assert(ifname != NULL);
+
+ ifconfig_lagg(ifname);
+
+ exit(0);
+}
+
+#include <rtems/bsd/test/default-network-init.h>
More information about the vc
mailing list