Merged in slorquet/apps/ifupfixes (pull request #85)

Ensure netlib will not be broken when setip will not bring the network up anymore

Approved-by: Gregory Nutt <gnutt@nuttx.org>

examples/bridge/bridge_main.c

@@ -129,6 +129,12 @@ 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 */
 

examples/dhcpd/target.c

@@ -127,6 +127,12 @@ int dhcpd_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_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 */
 
   dhcpd_run();

examples/discover/discover_main.c

@@ -134,6 +134,12 @@ int discover_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_DISCOVER_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_DISCOVER_DHCPC
   /* Get the MAC address of the NIC */
 

examples/ftpd/ftpd_main.c

@@ -114,6 +114,13 @@ 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 */
 }
 

examples/igmp/igmp.c

@@ -123,6 +123,12 @@ 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 */
 

examples/nettest/nettest.c

@@ -159,6 +159,12 @@ static void netest_initialize(void)
   netlib_set_ipv6netmask("eth0",
                         (FAR const struct in6_addr *)g_ipv6_netmask);
 
+  /* 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_NET_ICMPv6_AUTOCONF */
 #else /* CONFIG_EXAMPLES_NETTEST_IPv6 */
 

examples/poll/net_listener.c

@@ -325,6 +325,12 @@ 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");
 }
 
 /****************************************************************************

examples/poll/net_reader.c

@@ -118,6 +118,12 @@ 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");
 }
 
 /****************************************************************************

examples/sendmail/sendmail_main.c

@@ -150,6 +150,12 @@ int sendmail_main(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLES_SENDMAIL_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 send the mail */
 
   net_ipaddr(addr.s_addr, 127, 0, 0, 1);

examples/tcpecho/tcpecho_main.c

@@ -143,6 +143,12 @@ static int tcpecho_netsetup()
   addr.s_addr = HTONL(CONFIG_EXAMPLES_TCPECHO_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_TCPECHO_DHCPC
   /* Get the MAC address of the NIC */
 

examples/telnetd/telnetd.c

@@ -218,6 +218,12 @@ 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");
 }
 
 /****************************************************************************

examples/thttpd/thttpd_main.c

@@ -254,6 +254,12 @@ 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 */
 

examples/udp/target.c

@@ -160,6 +160,12 @@ int udp_main(int argc, char *argv[])
 
 #endif /* CONFIG_EXAMPLES_UDP_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");
+
 #ifdef CONFIG_EXAMPLES_UDP_SERVER
   recv_server();
 #else

examples/udpblaster/udpblaster_target.c

@@ -173,6 +173,13 @@ 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 */
 

examples/webserver/webserver_main.c

@@ -140,6 +140,12 @@ 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 */
 

examples/wget/wget_main.c

@@ -144,6 +144,12 @@ 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);

examples/xmlrpc/xmlrpc_main.c

@@ -308,6 +308,12 @@ 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 */
 

nshlib/nsh_netinit.c

@@ -358,6 +358,12 @@ static void nsh_netinit_configure(void)
   netlib_set_ipv4dnsaddr(&addr);
 #endif
 
+  /* 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_WIRELESS_WAPI
   /* Associate the wlan with an access point. */