examples: Update to new autoconf scheme

Author: fwsGonzo

examples/LiveUpdate/config.json

@@ -1,5 +1,11 @@
 {
   "net" : [
-    ["10.0.0.42", "255.255.255.0", "10.0.0.1"]
+    {
+      "iface": 0,
+      "config": "dhcp-with-fallback",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
   ]
 }

examples/STREAM/README.md

@@ -1,11 +1,8 @@
 ### STREAM: Sustainable Memory Bandwidth in High Performance Computers
 
+Using Qemu and the IncludeOS boot program:
 ```
-mkdir build
-cd build
-cmake ..
-make
-../run.sh stream_example
+boot .
 ```
 
 Output should show estimated memory bandwidth inside virtual machine.

examples/STREAM/vm.json

@@ -1,3 +1,3 @@
 {
-  "mem" : 1024
+  "mem" : 256
 }

examples/acorn/config.json

@@ -1,5 +1,11 @@
 {
   "net" : [
-    "dhcp"
+    {
+      "iface": 0,
+      "config": "dhcp-with-fallback",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
   ]
 }

examples/acorn/service.cpp

@@ -36,7 +36,7 @@ Disk_ptr disk;
 #include <isotime>
 #include <net/inet4>
 
-void Service::start()
+static void start_acorn(net::Inet<net::IP4>& inet)
 {
   /** SETUP LOGGER */
   const int LOGBUFFER_LEN = 1024*16;
@@ -56,12 +56,10 @@ void Service::start()
 
   // init the first legit partition/filesystem
   disk->init_fs(
-  [] (fs::error_t err, auto& fs)
+  [&inet] (fs::error_t err, auto& fs)
   {
       if (err) panic("Could not mount filesystem...\n");
 
-      auto& inet = net::Super_stack::get<net::IP4>(0);
-
       // only works with synchronous disks (memdisk)
       list_static_content(disk);
 
@@ -163,3 +161,15 @@ void Service::start()
     }); // < disk
 
 }
+
+void Service::start()
+{
+  auto& inet = net::Super_stack::get<net::IP4>(0);
+  if (not inet.is_configured())
+  {
+    inet.on_config(start_acorn);
+  }
+  else {
+    start_acorn(inet);
+  }
+}

examples/demo_service/README.md

@@ -1,11 +1,10 @@
 ### IncludeOS Demo Service
 
+To start, using boot:
 ```
-mkdir build
-cd build
-cmake ..
-make
-../run.sh IncludeOS_example
+boot .
 ```
 
 This demo-service should start an instance of IncludeOS that brings up a minimal web service on port 80 with static content.
+
+The default static IP is 10.0.0.42, unless running on a network with DHCP.

examples/demo_service/config.json

@@ -1,5 +1,11 @@
 {
   "net" : [
-    ["10.0.0.42", "255.255.255.0", "10.0.0.1"]
+    {
+      "iface": 0,
+      "config": "dhcp-with-fallback",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
   ]
 }

examples/tcp/CMakeLists.txt

@@ -18,13 +18,6 @@ set(SOURCES
   service.cpp # ...add more here
   )
 
-#
-# Service CMake options
-# (uncomment to enable)
-#
-
-# MISC:
-
 # To add your own include paths:
 # set(LOCAL_INCLUDES ".")
 

examples/tcp/config.json

@@ -0,0 +1,11 @@
+{
+  "net" : [
+    {
+      "iface": 0,
+      "config": "dhcp-with-fallback",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
+  ]
+}

examples/tcp/service.cpp

@@ -51,14 +51,9 @@ void handle_python_on_read(Connection_ptr client, const std::string& response) {
   client->write(response);
 }
 
-void Service::start(const std::string&)
+void Service::start()
 {
-  // Static IP configuration will get overwritten by DHCP, if found
-  auto& inet = net::Inet4::ifconfig<0>(10);
-  inet.network_config({ 10,0,0,42 },      // IP
-                      { 255,255,255,0 },  // Netmask
-                      { 10,0,0,1 },       // Gateway
-                      { 8,8,8,8 });       // DNS
+  auto& inet = net::Super_stack::get<net::IP4>(0);
 
   // Set up a TCP server on port 80
   auto& server = inet.tcp().listen(80);