NET: emoved all includes of uip.h; added includes of ip.h wherever needed. Tried to fix problems of the now missing sneak inclusions because uip.h was removed. There are probably a few of these that were missed.

examples/discover/discover_main.c

@@ -48,6 +48,7 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <netinet/in.h>
 #include <nuttx/net/arp.h>
 
 #include <apps/netutils/netlib.h>

examples/ftpd/ftpd_main.c

@@ -44,6 +44,7 @@
 #include <debug.h>
 
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/ftpd.h>

examples/igmp/igmp.c

@@ -44,7 +44,10 @@
 #include <unistd.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
 #include <net/if.h>
+#include <netinet/in.h>
+
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/ipmsfilter.h>
 

examples/nettest/nettest.c

@@ -44,6 +44,9 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include <apps/netutils/netlib.h>
 
 #include "nettest.h"

examples/nettest/nettest.h

@@ -40,6 +40,8 @@
  * Included Files
  ****************************************************************************/
 
+#include <arpa/inet.h>
+
 #ifdef NETTEST_HOST
 #else
 # include <debug.h>

examples/nettest/nettest_client.c

@@ -46,6 +46,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include "nettest.h"
 
 /****************************************************************************

examples/nettest/nettest_server.c

@@ -46,6 +46,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include "nettest.h"
 
 /****************************************************************************

examples/poll/net_listener.c

@@ -54,6 +54,8 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <netinet/in.h>
+
 #include <apps/netutils/netlib.h>
 
 #include "poll_internal.h"

examples/poll/net_reader.c

@@ -54,6 +54,9 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include <apps/netutils/netlib.h>
 
 #include "poll_internal.h"

examples/poll/poll_listener.c

@@ -51,6 +51,8 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include "poll_internal.h"
 
 /****************************************************************************

examples/sendmail/host.c

@@ -43,6 +43,9 @@
 #include <string.h>
 #include <errno.h>
 
+#include <netinet/in.h>
+
+#include <nuttx/net/ip.h>
 #include <apps/netutils/smtp.h>
 
 /****************************************************************************
@@ -99,5 +102,6 @@ int main(int argc, char **argv, char **envp)
                 g_msg_body, strlen(g_msg_body));
       smtp_close(handle);
     }
+
   return 0;
 }

examples/sendmail/hostdefs.h

@@ -44,8 +44,10 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <arpa/inet.h>
+
 /****************************************************************************
- * Preprocessor Defintiions
+ * Pre-processor Definitions
  *****************************************************************************/
 
 #define HTONS(a) htons(a)

examples/sendmail/target.c

@@ -45,6 +45,10 @@
 #include <errno.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include <nuttx/net/ip.h>
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/smtp.h>
 

examples/tcpecho/tcpecho_main.c

@@ -54,8 +54,9 @@
 #include <unistd.h>
 
 #include <net/if.h>
-#include <nuttx/net/arp.h>
+#include <netinet/in.h>
 
+#include <nuttx/net/arp.h>
 #include <apps/netutils/netlib.h>
 
 #ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC

examples/telnetd/telnetd.c

@@ -46,6 +46,7 @@
 
 #include <net/if.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include <apps/netutils/telnetd.h>
 #include <apps/netutils/netlib.h>

examples/thttpd/content/netstat/netstat.c

@@ -43,7 +43,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <netinet/in.h>
 #include <netinet/ether.h>
+
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 

examples/thttpd/thttpd_main.c

@@ -49,6 +49,8 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/ether.h>
 
 #include <nuttx/net/arp.h>

examples/udp/target.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/udp/nettest.c
+ * examples/udp/target.c
  *
  *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,6 +41,9 @@
 #include <stdio.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include <apps/netutils/netlib.h>
 
 #include "udp-internal.h"

examples/udp/udp-client.c

@@ -39,7 +39,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,6 +46,9 @@
 #include <string.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include "udp-internal.h"
 
 /****************************************************************************

examples/udp/udp-internal.h

@@ -45,6 +45,8 @@
 # include <debug.h>
 #endif
 
+#include <arpa/inet.h>
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/

examples/udp/udp-server.c

@@ -45,6 +45,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include "udp-internal.h"
 
 /****************************************************************************

examples/webserver/webserver_main.c

@@ -54,8 +54,9 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <nuttx/net/arp.h>
+#include <netinet/in.h>
 
+#include <nuttx/net/arp.h>
 #include <apps/netutils/netlib.h>
 
 #ifdef CONFIG_EXAMPLES_WEBSERVER_DHCPC

examples/wget/hostdefs.h

@@ -44,8 +44,10 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#include <arpa/inet.h>
+
 /****************************************************************************
- * Preprocessor Defintiions
+ * Pre-processor Definitions
  *****************************************************************************/
 
 #define HTONS(a) htons(a)

examples/xmlrpc/xmlrpc_main.c

@@ -63,8 +63,9 @@
 #include <unistd.h>
 
 #include <net/if.h>
-#include <nuttx/net/arp.h>
+#include <netinet/in.h>
 
+#include <nuttx/net/arp.h>
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/xmlrpc.h>
 

include/netutils/dhcpc.h

@@ -43,6 +43,7 @@
  ****************************************************************************/
 
 #include <stdint.h>
+#include <netinet/in.h>
 
 /****************************************************************************
  * Pre-processor Definitions

include/netutils/smtp.h

@@ -45,6 +45,7 @@
  ****************************************************************************/
 
 #include <nuttx/net/netconfig.h>
+#include <nuttx/net/ip.h>
 
 /****************************************************************************
  * Type Definitions

include/netutils/tftp.h

@@ -57,13 +57,14 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
 
-EXTERN int tftpget(const char *remote, const char *local, in_addr_t addr, bool binary);
-EXTERN int tftpput(const char *local, const char *remote, in_addr_t addr, bool binary);
+int tftpget(const char *remote, const char *local, in_addr_t addr, bool binary);
+int tftpput(const char *local, const char *remote, in_addr_t addr, bool binary);
 
 #undef EXTERN
 #ifdef __cplusplus

netutils/dhcpc/dhcpc.c

@@ -52,6 +52,8 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include <apps/netutils/dhcpc.h>
 #include <apps/netutils/netlib.h>
 

netutils/dnsclient/dns_socket.c

@@ -58,6 +58,7 @@
 
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include <apps/netutils/dnsclient.h>
 #include <apps/netutils/netlib.h>

netutils/ftpc/ftpc_connect.c

@@ -45,6 +45,8 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include <apps/ftpc.h>
 
 #include "ftpc_internal.h"

netutils/ftpc/ftpc_internal.h

@@ -51,6 +51,8 @@
 #include <time.h>
 #include <wdog.h>
 
+#include <netinet/in.h>
+
 #include <apps/ftpc.h>
 
 /****************************************************************************

netutils/smtp/smtp.c

@@ -48,6 +48,7 @@
 
 #include <nuttx/config.h>
 
+#include <sys/socket.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -55,8 +56,10 @@
 #include <unistd.h>
 #include <string.h>
 #include <semaphore.h>
-#include <sys/socket.h>
 
+#include <arpa/inet.h>
+
+#include <nuttx/net/ip.h>
 #include <apps/netutils/smtp.h>
 
 /****************************************************************************

netutils/tftpc/tftpc_get.c

@@ -49,6 +49,8 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/net/netconfig.h>
 #include <apps/netutils/tftp.h>
 

netutils/tftpc/tftpc_packets.c

@@ -50,6 +50,7 @@
 #include <debug.h>
 
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <nuttx/net/netconfig.h>
 #include <apps/netutils/tftp.h>

netutils/thttpd/thttpd.c

@@ -53,6 +53,8 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/compiler.h>
 #include <nuttx/binfmt/symtab.h>
 #include <apps/netutils/thttpd.h>

netutils/webserver/httpd.c

@@ -61,6 +61,8 @@
 #  include <pthread.h>
 #endif
 
+#include <arpa/inet.h>
+
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/httpd.h>
 

nshlib/nsh_mntcmds.c

@@ -50,6 +50,9 @@
 #include <errno.h>
 #include <debug.h>
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <nuttx/fs/nfs.h>
 
 #include "nsh.h"

nshlib/nsh_netcmds.c

@@ -55,12 +55,15 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/ether.h>
 
-#include <nuttx/net/net.h>
 #include <nuttx/clock.h>
+#include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
    !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)

nshlib/nsh_netinit.c

@@ -45,6 +45,8 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include <apps/netutils/netlib.h>
 #if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)

nshlib/nsh_routecmds.c

@@ -43,6 +43,9 @@
 #include <string.h>
 #include <net/route.h>
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <apps/netutils/netlib.h>
 
 #include "nsh.h"

nshlib/nsh_telnetd.c

@@ -45,6 +45,8 @@
 #include <debug.h>
 #include <string.h>
 
+#include <arpa/inet.h>
+
 #include <apps/netutils/telnetd.h>
 
 #include "nsh.h"

system/mdio/mdio_main.c

@@ -49,6 +49,7 @@
 #include <netinet/in.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
 
 /****************************************************************************
  * Definitions