From caeb6b32fdd40cf0219de619db80716d04b04b1e Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet <sebastien@lorquet.fr>
Date: Fri, 19 May 2017 17:30:26 +0200
Subject: [PATCH] First batch of changes

---
 examples/bridge/bridge_main.c           | 5 +++++
 examples/ftpd/ftpd_main.c               | 6 ++++++
 examples/igmp/igmp.c                    | 5 +++++
 examples/poll/net_listener.c            | 5 +++++
 examples/poll/net_reader.c              | 5 +++++
 examples/telnetd/telnetd.c              | 5 +++++
 examples/thttpd/thttpd_main.c           | 5 +++++
 examples/udpblaster/udpblaster_target.c | 6 ++++++
 examples/webserver/webserver_main.c     | 5 +++++
 examples/wget/wget_main.c               | 5 +++++
 examples/xmlrpc/xmlrpc_main.c           | 5 +++++
 11 files changed, 57 insertions(+)

diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c
index ec3d17dc8..a07501c83 100644
--- a/examples/bridge/bridge_main.c
+++ b/examples/bridge/bridge_main.c
@@ -129,6 +129,11 @@ printf("NET1: Configuring %s\n", CONFIG_EXAMPLES_BRIDGE_NET1_IFNAME);
   addr.s_addr = HTONL(CONFIG_EXAMPLES_BRIDGE_NET1_NETMASK);
   netlib_set_ipv4netmask(CONFIG_EXAMPLES_BRIDGE_NET1_IFNAME, &addr);
 
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
 #ifdef CONFIG_EXAMPLES_BRIDGE_NET1_DHCPC
   /* Get the MAC address of the NIC */
 
diff --git a/examples/ftpd/ftpd_main.c b/examples/ftpd/ftpd_main.c
index 92498577b..7967b7b68 100644
--- a/examples/ftpd/ftpd_main.c
+++ b/examples/ftpd/ftpd_main.c
@@ -114,6 +114,12 @@ static void fptd_netinit(void)
 
   addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
+
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
 #endif /* CONFIG_EXAMPLES_FTPD_NONETINIT */
 }
 
diff --git a/examples/igmp/igmp.c b/examples/igmp/igmp.c
index deb7b7c10..9bab4a275 100644
--- a/examples/igmp/igmp.c
+++ b/examples/igmp/igmp.c
@@ -123,6 +123,11 @@ int igmp_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_IGMP_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
 
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
   /* Not much of a test for now */
   /* Join the group */
 
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index f9dde4936..3c1f0dc0f 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -325,6 +325,11 @@ static void net_configure(void)
 
   addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
+
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
 }
 
 /****************************************************************************
diff --git a/examples/poll/net_reader.c b/examples/poll/net_reader.c
index b21c340b8..0fd6c8e5b 100644
--- a/examples/poll/net_reader.c
+++ b/examples/poll/net_reader.c
@@ -118,6 +118,11 @@ static void net_configure(void)
 
   addr.s_addr = HTONL(CONFIG_EXAMPLES_POLL_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
+
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
 }
 
 /****************************************************************************
diff --git a/examples/telnetd/telnetd.c b/examples/telnetd/telnetd.c
index efdd6a3aa..3808630d9 100644
--- a/examples/telnetd/telnetd.c
+++ b/examples/telnetd/telnetd.c
@@ -218,6 +218,11 @@ static void telnetd_netinit(void)
 
   addr.s_addr = HTONL(CONFIG_EXAMPLES_TELNETD_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
+
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
 }
 
 /****************************************************************************
diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c
index b252f7401..6246b82cd 100644
--- a/examples/thttpd/thttpd_main.c
+++ b/examples/thttpd/thttpd_main.c
@@ -254,6 +254,11 @@ int thttp_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_THTTPD_NETMASK);
   netlib_set_ipv4netmask(NET_DEVNAME, &addr);
 
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
 #ifdef CONFIG_THTTPD_NXFLAT
   /* Initialize the NXFLAT binary loader */
 
diff --git a/examples/udpblaster/udpblaster_target.c b/examples/udpblaster/udpblaster_target.c
index 7f0e286ba..5844d4a3f 100644
--- a/examples/udpblaster/udpblaster_target.c
+++ b/examples/udpblaster/udpblaster_target.c
@@ -173,6 +173,12 @@ static void netest_initialize(void)
   netlib_set_ipv4netmask("eth0", &addr);
 
 #endif /* CONFIG_EXAMPLES_UDPBLASTER_IPv6 */
+
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
 }
 #endif /*CONFIG_EXAMPLES_UDPBLASTER_INIT */
 
diff --git a/examples/webserver/webserver_main.c b/examples/webserver/webserver_main.c
index 38a6ea5a2..fd5c3410d 100644
--- a/examples/webserver/webserver_main.c
+++ b/examples/webserver/webserver_main.c
@@ -140,6 +140,11 @@ int webserver_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_WEBSERVER_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
 
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
 #ifdef CONFIG_EXAMPLES_WEBSERVER_DHCPC
   /* Get the MAC address of the NIC */
 
diff --git a/examples/wget/wget_main.c b/examples/wget/wget_main.c
index 441d4e1bc..59cdf27b3 100644
--- a/examples/wget/wget_main.c
+++ b/examples/wget/wget_main.c
@@ -144,6 +144,11 @@ int wget_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_WGET_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
 
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
   /* Then start the server */
 
   wget(CONFIG_EXAMPLES_WGET_URL, g_iobuffer, 512, callback, NULL);
diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c
index 0e4ca851e..89003e738 100644
--- a/examples/xmlrpc/xmlrpc_main.c
+++ b/examples/xmlrpc/xmlrpc_main.c
@@ -308,6 +308,11 @@ static int xmlrpc_netinit(void)
   addr.s_addr = HTONL(CONFIG_EXAMPLES_XMLRPC_NETMASK);
   netlib_set_ipv4netmask("eth0", &addr);
 
+  /* New versions of netlib_set_ipvXaddr will not bring the network up,
+   * So ensure the network is really up at this point. */
+
+  netlib_ifup("eth0");
+
 #ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC
   /* Get the MAC address of the NIC */