VLAN(4): Enable and test

Makefile

@@ -1429,6 +1429,18 @@ $(TEST_MEDIA01): $(TEST_MEDIA01_O_FILES) $(LIB)
 TESTS += $(TEST_MEDIA01)
 O_FILES += $(TEST_MEDIA01_O_FILES)
 D_FILES += $(TEST_MEDIA01_D_FILES)
+
+TEST_VLAN01 = testsuite/vlan01/vlan01.exe
+TEST_VLAN01_O_FILES =
+TEST_VLAN01_D_FILES =
+TEST_VLAN01_O_FILES += testsuite/vlan01/test_main.o
+TEST_VLAN01_D_FILES += testsuite/vlan01/test_main.d
+$(TEST_VLAN01): $(TEST_VLAN01_O_FILES) $(LIB)
+	$(LINK.c) -Wl,-Map,testsuite/vlan01/vlan01.map $^ -lm -lz -o $@
+NET_TESTS += $(TEST_VLAN01)
+O_FILES += $(TEST_VLAN01_O_FILES)
+D_FILES += $(TEST_VLAN01_D_FILES)
+RUN_NET_TESTS += $(TEST_VLAN01)
 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 $@

freebsd-to-rtems.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-#  Copyright (c) 2009-2013 embedded brains GmbH.  All rights reserved.
+#  Copyright (c) 2009-2015 embedded brains GmbH.  All rights reserved.
 #
 #   embedded brains GmbH
 #   Dornierstr. 4
@@ -2539,6 +2539,7 @@ tests.addTest('ppp01', ['test_main'], runTest = False)
 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)
 
 dhcpcd = Module('dhcpcd')
 dhcpcd.addSourceFiles(

rtemsbsd/include/machine/rtems-bsd-sysinit.h

@@ -102,4 +102,7 @@
 #define SYSINIT_NEED_NET_IF_DC \
 	SYSINIT_DRIVER_REFERENCE(dc, pci)
 
+#define SYSINIT_NEED_NET_IF_VLAN \
+	SYSINIT_MODULE_REFERENCE(if_vlan)
+
 #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_SYSINIT_H_ */

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_VLAN;
 
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

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_VLAN;
 
 #include <bsp/nexus-devices.h>
 

testsuite/vlan01/test_main.c

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@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 VLAN 1"
+
+static void
+ifconfig_vlan(char *ifname)
+{
+	int exit_code;
+	char *vlan_create[] = {
+		"ifconfig",
+		"vlan122",
+		"create",
+		NULL
+	};
+	char *vlan_assign[] = {
+		"ifconfig",
+		"vlan122",
+		"vlan",
+		"122",
+		"vlandev",
+		ifname,
+		NULL
+	};
+	char *vlan_ip[] = {
+		"ifconfig",
+		"vlan122",
+		"10.1.122.1/24",
+		NULL
+	};
+	char *vlan_up[] = {
+		"ifconfig",
+		"vlan122",
+		"up",
+		NULL
+	};
+	char *vlan_info[] = {
+		"ifconfig",
+		"vlan122",
+		NULL
+	};
+
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(vlan_create),
+	    vlan_create);
+	assert(exit_code == EX_OK);
+
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(vlan_assign),
+	    vlan_assign);
+	assert(exit_code == EX_OK);
+
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(vlan_ip),
+	    vlan_ip);
+	assert(exit_code == EX_OK);
+
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(vlan_up),
+	    vlan_up);
+	assert(exit_code == EX_OK);
+
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(vlan_info),
+	    vlan_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_vlan(ifname);
+
+	exit(0);
+}
+
+#include <rtems/bsd/test/default-network-init.h>