libbsd: Get network tests compiling under libbsd

This required a hack to get libm linked after libbsd.

2 files changed, 138 insertions, 0 deletions

diff --git a/netservices.py b/netservices.py
index 1876de4..4e25d51 100644
--- a/netservices.py
+++ b/netservices.py
@@ -58,6 +58,8 @@ def check_net_lib(conf, lib, name):
         conf.env['LDFLAGS_' + net_name] = []
         conf.env.STACK_NAME = name
         return True
+    if 'LIB_NET_LIBBSD' in conf.env:
+        conf.env.LIB_NET_LIBBSD = ['bsd', 'm']
     return False
 
 
diff --git a/stack/libbsd/net_adapter.c b/stack/libbsd/net_adapter.c
new file mode 100644
index 0000000..1c39f72
--- /dev/null
+++ b/stack/libbsd/net_adapter.c
@@ -0,0 +1,136 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @brief This file contains the adapter necessary for network services tests to
+ *        run on lwIP.
+ */
+
+/*
+ * COPYRIGHT (c) 2023. On-Line Applications Research Corporation (OAR).
+ * All rights reserved.
+ *
+ * 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 <net_adapter.h>
+#include <stddef.h>
+#include <assert.h>
+#include <sysexits.h>
+#include <machine/rtems-bsd-commands.h>
+#include <rtems/rtems/status.h>
+#include <fcntl.h>
+//#include <ifaddrs.h>
+#include <stdio.h>
+//#include <stdlib.h>
+#include <unistd.h>
+#include <rtems/dhcpcd.h>
+#include <rtems/bsd/bsd.h>
+#include <rtems/bsd/iface.h>
+
+
+static void
+default_network_ifconfig_hwif0(char *ifname)
+{
+  int exit_code;
+  char *ifcfg[] = {
+    "ifconfig",
+    ifname,
+    "up",
+    NULL
+  };
+
+  exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(ifcfg), ifcfg);
+  assert(exit_code == EX_OK);
+}
+
+static void
+default_network_dhcpcd(void)
+{
+  static const char default_cfg[] = "clientid libbsd test client\n";
+  rtems_status_code sc;
+  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, default_cfg, sizeof(default_cfg) - 1);
+  assert(n == (ssize_t) sizeof(default_cfg) - 1);
+
+  rv = close(fd);
+  assert(rv == 0);
+
+  sc = rtems_dhcpcd_start(NULL);
+  assert(sc == RTEMS_SUCCESSFUL);
+}
+
+static void
+default_wait_for_link_up( const char *name )
+{
+  size_t seconds = 0;
+  while ( true ) {
+    bool link_active = false;
+    assert(rtems_bsd_iface_link_state( name, &link_active ) == 0);
+    if (link_active) {
+      return;
+    }
+    sleep( 1 );
+    ++seconds;
+    if (seconds > 10) {
+      printf("error: %s: no active link\n", name);
+      assert(seconds < 10);
+    }
+  }
+}
+
+int net_start()
+{
+  char *ifname;
+  char ifnamebuf[IF_NAMESIZE];
+  rtems_status_code sc;
+
+  rtems_bsd_initialize();
+
+  ifname = if_indextoname(1, &ifnamebuf[0]);
+
+  /* Let the callout timer allocate its resources */
+  sc = rtems_task_wake_after(2);
+  assert(sc == RTEMS_SUCCESSFUL);
+  
+  default_network_ifconfig_hwif0(ifname);
+  rtems_bsd_ifconfig_lo0();
+  default_network_dhcpcd();
+  
+  /*
+   * Per test option to wait for the network interface. If the address
+   * is static the PHY may take a while to connect and bring the
+   * interface online.
+   */
+  default_wait_for_link_up( ifname );
+
+  // needs to wait for DHCP to finish
+  return 0;
+}