diff options
117 files changed, 273 insertions, 73 deletions
diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c index cd0cfc4e4..3995c475e 100644 --- a/apps/examples/discover/discover_main.c +++ b/apps/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> diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c index bfd20b093..507d90e5f 100644 --- a/apps/examples/ftpd/ftpd_main.c +++ b/apps/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> diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c index 730edce97..61272bf3c 100644 --- a/apps/examples/igmp/igmp.c +++ b/apps/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> diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c index b1596ec61..a24ce30f4 100644 --- a/apps/examples/nettest/nettest.c +++ b/apps/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" diff --git a/apps/examples/nettest/nettest.h b/apps/examples/nettest/nettest.h index 5021e05d6..c6ed3f1be 100644 --- a/apps/examples/nettest/nettest.h +++ b/apps/examples/nettest/nettest.h @@ -40,6 +40,8 @@ * Included Files ****************************************************************************/ +#include <arpa/inet.h> + #ifdef NETTEST_HOST #else # include <debug.h> diff --git a/apps/examples/nettest/nettest_client.c b/apps/examples/nettest/nettest_client.c index 8ab5b14d6..7686d0ac8 100644 --- a/apps/examples/nettest/nettest_client.c +++ b/apps/examples/nettest/nettest_client.c @@ -46,6 +46,8 @@ #include <string.h> #include <errno.h> +#include <arpa/inet.h> + #include "nettest.h" /**************************************************************************** diff --git a/apps/examples/nettest/nettest_server.c b/apps/examples/nettest/nettest_server.c index ffa021286..bdea83dc8 100644 --- a/apps/examples/nettest/nettest_server.c +++ b/apps/examples/nettest/nettest_server.c @@ -46,6 +46,8 @@ #include <unistd.h> #include <errno.h> +#include <arpa/inet.h> + #include "nettest.h" /**************************************************************************** diff --git a/apps/examples/poll/net_listener.c b/apps/examples/poll/net_listener.c index 4094753a5..841d7d95c 100644 --- a/apps/examples/poll/net_listener.c +++ b/apps/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" diff --git a/apps/examples/poll/net_reader.c b/apps/examples/poll/net_reader.c index 812600d77..beecee275 100644 --- a/apps/examples/poll/net_reader.c +++ b/apps/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" diff --git a/apps/examples/poll/poll_listener.c b/apps/examples/poll/poll_listener.c index d7f4bf495..e253d59ff 100644 --- a/apps/examples/poll/poll_listener.c +++ b/apps/examples/poll/poll_listener.c @@ -51,6 +51,8 @@ #include <errno.h> #include <debug.h> +#include <arpa/inet.h> + #include "poll_internal.h" /**************************************************************************** diff --git a/apps/examples/sendmail/host.c b/apps/examples/sendmail/host.c index d603372ad..28af0d53c 100644 --- a/apps/examples/sendmail/host.c +++ b/apps/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; } diff --git a/apps/examples/sendmail/hostdefs.h b/apps/examples/sendmail/hostdefs.h index e9860c22d..e29df7856 100644 --- a/apps/examples/sendmail/hostdefs.h +++ b/apps/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) diff --git a/apps/examples/sendmail/target.c b/apps/examples/sendmail/target.c index 4d7232b4d..684f2b742 100644 --- a/apps/examples/sendmail/target.c +++ b/apps/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> diff --git a/apps/examples/tcpecho/tcpecho_main.c b/apps/examples/tcpecho/tcpecho_main.c index cbcafcce5..9e9333e52 100644 --- a/apps/examples/tcpecho/tcpecho_main.c +++ b/apps/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 diff --git a/apps/examples/telnetd/telnetd.c b/apps/examples/telnetd/telnetd.c index be3bbe98d..2541f96ef 100644 --- a/apps/examples/telnetd/telnetd.c +++ b/apps/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> diff --git a/apps/examples/thttpd/content/netstat/netstat.c b/apps/examples/thttpd/content/netstat/netstat.c index 19c8ca871..133831c4a 100644 --- a/apps/examples/thttpd/content/netstat/netstat.c +++ b/apps/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> diff --git a/apps/examples/thttpd/thttpd_main.c b/apps/examples/thttpd/thttpd_main.c index e847ebad3..c2e6325a7 100644 --- a/apps/examples/thttpd/thttpd_main.c +++ b/apps/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> diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c index 8b31fc8cd..ac76aec00 100644 --- a/apps/examples/udp/target.c +++ b/apps/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" diff --git a/apps/examples/udp/udp-client.c b/apps/examples/udp/udp-client.c index 6b8473582..297cde5f5 100644 --- a/apps/examples/udp/udp-client.c +++ b/apps/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" /**************************************************************************** diff --git a/apps/examples/udp/udp-internal.h b/apps/examples/udp/udp-internal.h index da2be440a..49439aedb 100644 --- a/apps/examples/udp/udp-internal.h +++ b/apps/examples/udp/udp-internal.h @@ -45,6 +45,8 @@ # include <debug.h> #endif +#include <arpa/inet.h> + /**************************************************************************** * Definitions ****************************************************************************/ diff --git a/apps/examples/udp/udp-server.c b/apps/examples/udp/udp-server.c index 191f89cc0..e16449b8d 100644 --- a/apps/examples/udp/udp-server.c +++ b/apps/examples/udp/udp-server.c @@ -45,6 +45,8 @@ #include <unistd.h> #include <errno.h> +#include <arpa/inet.h> + #include "udp-internal.h" /**************************************************************************** diff --git a/apps/examples/webserver/webserver_main.c b/apps/examples/webserver/webserver_main.c index 6b5f81127..58e8757ea 100644 --- a/apps/examples/webserver/webserver_main.c +++ b/apps/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 diff --git a/apps/examples/wget/hostdefs.h b/apps/examples/wget/hostdefs.h index e9860c22d..e29df7856 100644 --- a/apps/examples/wget/hostdefs.h +++ b/apps/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) diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c index 025185531..228855e1e 100644 --- a/apps/examples/xmlrpc/xmlrpc_main.c +++ b/apps/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> diff --git a/apps/include/netutils/dhcpc.h b/apps/include/netutils/dhcpc.h index a6c53dc30..c982b7d9e 100644 --- a/apps/include/netutils/dhcpc.h +++ b/apps/include/netutils/dhcpc.h @@ -43,6 +43,7 @@ ****************************************************************************/ #include <stdint.h> +#include <netinet/in.h> /**************************************************************************** * Pre-processor Definitions diff --git a/apps/include/netutils/smtp.h b/apps/include/netutils/smtp.h index e33d914fb..2ca7f1e8c 100644 --- a/apps/include/netutils/smtp.h +++ b/apps/include/netutils/smtp.h @@ -45,6 +45,7 @@ ****************************************************************************/ #include <nuttx/net/netconfig.h> +#include <nuttx/net/ip.h> /**************************************************************************** * Type Definitions diff --git a/apps/include/netutils/tftp.h b/apps/include/netutils/tftp.h index 276073aad..2969fb700 100644 --- a/apps/include/netutils/tftp.h +++ b/apps/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 diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c index 44f4d1747..879cab1f8 100644 --- a/apps/netutils/dhcpc/dhcpc.c +++ b/apps/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> diff --git a/apps/netutils/dnsclient/dns_socket.c b/apps/netutils/dnsclient/dns_socket.c index 6b78169ea..a240b4392 100644 --- a/apps/netutils/dnsclient/dns_socket.c +++ b/apps/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> diff --git a/apps/netutils/ftpc/ftpc_connect.c b/apps/netutils/ftpc/ftpc_connect.c index 4fa8178a7..74598f931 100644 --- a/apps/netutils/ftpc/ftpc_connect.c +++ b/apps/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" diff --git a/apps/netutils/ftpc/ftpc_internal.h b/apps/netutils/ftpc/ftpc_internal.h index a2a6fffce..5bb683f50 100644 --- a/apps/netutils/ftpc/ftpc_internal.h +++ b/apps/netutils/ftpc/ftpc_internal.h @@ -51,6 +51,8 @@ #include <time.h> #include <wdog.h> +#include <netinet/in.h> + #include <apps/ftpc.h> /**************************************************************************** diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c index add48de3c..095a1c495 100644 --- a/apps/netutils/smtp/smtp.c +++ b/apps/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> /**************************************************************************** diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c index 3847b2aad..4a4789c05 100644 --- a/apps/netutils/tftpc/tftpc_get.c +++ b/apps/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> diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c index f2f1a0a22..8775ca3a2 100644 --- a/apps/netutils/tftpc/tftpc_packets.c +++ b/apps/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> diff --git a/apps/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c index 6f082fc23..6611b2e3b 100644 --- a/apps/netutils/thttpd/thttpd.c +++ b/apps/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> diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c index 29dd1f336..d1bbb103c 100644 --- a/apps/netutils/webserver/httpd.c +++ b/apps/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> diff --git a/apps/nshlib/nsh_mntcmds.c b/apps/nshlib/nsh_mntcmds.c index de40c8e6c..584c1258a 100644 --- a/apps/nshlib/nsh_mntcmds.c +++ b/apps/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" diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index c5834f55c..93ed13237 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/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) diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index b59eaf571..ec502e796 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/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) diff --git a/apps/nshlib/nsh_routecmds.c b/apps/nshlib/nsh_routecmds.c index 5ca96a5f4..b8a6c4784 100644 --- a/apps/nshlib/nsh_routecmds.c +++ b/apps/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" diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c index 61a196601..bbb0393f7 100644 --- a/apps/nshlib/nsh_telnetd.c +++ b/apps/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" diff --git a/apps/system/mdio/mdio_main.c b/apps/system/mdio/mdio_main.c index 5df090b49..6d770102a 100644 --- a/apps/system/mdio/mdio_main.c +++ b/apps/system/mdio/mdio_main.c @@ -49,6 +49,7 @@ #include <netinet/in.h> #include <net/if.h> +#include <arpa/inet.h> /**************************************************************************** * Definitions diff --git a/misc/drivers/rtl8187x/rtl8187x.c b/misc/drivers/rtl8187x/rtl8187x.c index 8b09483dd..f39e88f9f 100644 --- a/misc/drivers/rtl8187x/rtl8187x.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -62,6 +62,8 @@ #include <errno.h> #include <debug.h> +#include <arpa/inet.h> + #include <nuttx/kmalloc.h> #include <nuttx/fs/fs.h> #include <nuttx/clock.h> diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index fe79c0e90..36b79a9d3 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -54,10 +54,11 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> +#include <net/ethernet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> - -#include <net/ethernet.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index 407228c84..8b46150a1 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -49,10 +49,11 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/net/mii.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 08dc10c4e..1b726da2a 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -48,10 +48,11 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/net/mii.h> - #include <nuttx/net/netconfig.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index aaeeefeb6..dc881c605 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/arch/arm/src/sam34/sam_emac.c @@ -59,6 +59,8 @@ #include <queue.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/kmalloc.h> diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c index 2daf5f48a..e4149c131 100644 --- a/nuttx/arch/arm/src/sama5/sam_emaca.c +++ b/nuttx/arch/arm/src/sama5/sam_emaca.c @@ -60,6 +60,8 @@ #include <queue.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/kmalloc.h> diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c index a7567e794..fb06788c5 100644 --- a/nuttx/arch/arm/src/sama5/sam_emacb.c +++ b/nuttx/arch/arm/src/sama5/sam_emacb.c @@ -74,6 +74,8 @@ #include <queue.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/kmalloc.h> diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c index 1aef6a032..8e2e4f8f1 100644 --- a/nuttx/arch/arm/src/sama5/sam_gmac.c +++ b/nuttx/arch/arm/src/sama5/sam_gmac.c @@ -57,6 +57,8 @@ #include <queue.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/kmalloc.h> diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 082ebfd97..64aa3d39a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -49,6 +49,8 @@ #include <queue.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/net/mii.h> diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index f1ebd7054..e200f7d75 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -48,6 +48,8 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <arch/board/board.h> diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index 1c98c8d87..b65876010 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -48,9 +48,10 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index 91ddb93c6..ecc9e1697 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -51,10 +51,11 @@ #include <errno.h> #include <assert.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/net/mii.h> - #include <nuttx/net/netconfig.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/arch/sim/src/up_wpcap.c b/nuttx/arch/sim/src/up_wpcap.c index 87f376e70..dabbe0dab 100644 --- a/nuttx/arch/sim/src/up_wpcap.c +++ b/nuttx/arch/sim/src/up_wpcap.c @@ -54,6 +54,9 @@ #include <stdlib.h> #include <malloc.h> +#include <netinet/in.h> + + extern int netdriver_setmacaddr(unsigned char *macaddr); /**************************************************************************** diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index a4777ed50..7f0ba5757 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -52,15 +52,16 @@ #include <errno.h> #include <assert.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/net/mii.h> - -#include <arch/io.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> +#include <arch/io.h> + #include "chip.h" #include "up_internal.h" diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c index 3bc3462e4..6af54d7b0 100644 --- a/nuttx/drivers/net/cs89x0.c +++ b/nuttx/drivers/net/cs89x0.c @@ -48,9 +48,10 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index 76293386f..093a84807 100644 --- a/nuttx/drivers/net/dm90x0.c +++ b/nuttx/drivers/net/dm90x0.c @@ -60,10 +60,11 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> +#include <net/ethernet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> - -#include <net/ethernet.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c index e302f744e..21a58d2e3 100644 --- a/nuttx/drivers/net/e1000.c +++ b/nuttx/drivers/net/e1000.c @@ -50,10 +50,11 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/kmalloc.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> @@ -63,6 +64,7 @@ #include <rgmp/utils.h> #include <rgmp/arch/pci.h> #include <rgmp/memio.h> + #include "e1000.h" /**************************************************************************** diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index 3303f4006..ed5ea8379 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -54,13 +54,14 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/spi/spi.h> #include <nuttx/wqueue.h> #include <nuttx/clock.h> #include <nuttx/net/enc28j60.h> - #include <nuttx/net/net.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c index c995a75fb..3c1b5c43a 100644 --- a/nuttx/drivers/net/encx24j600.c +++ b/nuttx/drivers/net/encx24j600.c @@ -60,16 +60,17 @@ #include <errno.h> #include <queue.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> #include <nuttx/spi/spi.h> #include <nuttx/wqueue.h> #include <nuttx/clock.h> -#include <nuttx/net/encx24j600.h> - #include <nuttx/net/net.h> #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/encx24j600.h> #include "encx24j600.h" diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index cf51181ba..fe28be603 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/drivers/net/skeleton.c @@ -48,9 +48,10 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c index b67bd9f05..b7c70af36 100644 --- a/nuttx/drivers/net/slip.c +++ b/nuttx/drivers/net/slip.c @@ -56,8 +56,8 @@ #include <nuttx/irq.h> #include <nuttx/net/net.h> - #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP) @@ -708,7 +708,7 @@ static int slip_rxtask(int argc, char *argv[]) * enough to hold an IP header. */ - if (priv->rxlen >= UIP_IPH_LEN) + if (priv->rxlen >= IPHDR_LEN) { /* Handle the IP input. Get exclusive access to uIP. */ diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c index b1ed8e304..f0d7af8f2 100644 --- a/nuttx/drivers/net/vnet.c +++ b/nuttx/drivers/net/vnet.c @@ -52,9 +52,10 @@ #include <wdog.h> #include <errno.h> +#include <arpa/inet.h> + #include <nuttx/irq.h> #include <nuttx/arch.h> - #include <nuttx/net/arp.h> #include <nuttx/net/netdev.h> diff --git a/nuttx/fs/nfs/nfs_vfsops.c b/nuttx/fs/nfs/nfs_vfsops.c index fca03aa09..54bfcd153 100644 --- a/nuttx/fs/nfs/nfs_vfsops.c +++ b/nuttx/fs/nfs/nfs_vfsops.c @@ -73,6 +73,7 @@ #include <net/if.h> #include <netinet/in.h> +#include <arpa/inet.h> #include "nfs.h" #include "rpc.h" diff --git a/nuttx/include/arpa/inet.h b/nuttx/include/arpa/inet.h index 7428c76f2..e3ff44aca 100644 --- a/nuttx/include/arpa/inet.h +++ b/nuttx/include/arpa/inet.h @@ -91,42 +91,43 @@ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif /* Functions to convert between nost and network byte ordering */ -EXTERN uint32_t ntohl(uint32_t nl); -EXTERN uint16_t ntohs(uint16_t ns); -EXTERN uint32_t htonl(uint32_t hl); -EXTERN uint16_t htons(uint16_t hs); +uint32_t ntohl(uint32_t nl); +uint16_t ntohs(uint16_t ns); +uint32_t htonl(uint32_t hl); +uint16_t htons(uint16_t hs); /* Functions to manipulate address representations */ -EXTERN int inet_aton(FAR const char *cp, FAR struct in_addr *inp); -EXTERN in_addr_t inet_addr(FAR const char *cp); -EXTERN in_addr_t inet_network(FAR const char *cp); +int inet_aton(FAR const char *cp, FAR struct in_addr *inp); +in_addr_t inet_addr(FAR const char *cp); +in_addr_t inet_network(FAR const char *cp); #ifdef CONFIG_CAN_PASS_STRUCTS -EXTERN FAR char *inet_ntoa(struct in_addr in); -EXTERN in_addr_t inet_lnaof(struct in_addr in); -EXTERN in_addr_t inet_netof(struct in_addr in); +FAR char *inet_ntoa(struct in_addr in); +in_addr_t inet_lnaof(struct in_addr in); +in_addr_t inet_netof(struct in_addr in); #else -EXTERN FAR char *_inet_ntoa(in_addr_t in); +FAR char *_inet_ntoa(in_addr_t in); # define inet_ntoa(in) _inet_ntoa(in.s_addr); -EXTERN in_addr_t _inet_lnaof(in_addr_t in); +in_addr_t _inet_lnaof(in_addr_t in); # define inet_lnaof(in) _inet_lnaof(in.s_addr); -EXTERN in_addr_t _inet_netof(in_addr_t in); +in_addr_t _inet_netof(in_addr_t in); # define inet_netof(in) _inet_netof(in.s_addr); #endif -EXTERN struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host); +struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host); -EXTERN int inet_pton(int af, FAR const char *src, FAR void *dst); -EXTERN const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t size); +int inet_pton(int af, FAR const char *src, FAR void *dst); +const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t size); #undef EXTERN #ifdef __cplusplus diff --git a/nuttx/include/nuttx/net/arp.h b/nuttx/include/nuttx/net/arp.h index b1ecf0277..7b75007ac 100644 --- a/nuttx/include/nuttx/net/arp.h +++ b/nuttx/include/nuttx/net/arp.h @@ -50,7 +50,9 @@ #include <stdint.h> +#include <netinet/in.h> #include <net/ethernet.h> + #include <nuttx/net/netconfig.h> /**************************************************************************** diff --git a/nuttx/include/nuttx/net/icmp.h b/nuttx/include/nuttx/net/icmp.h index a7dfe7b42..ae8dcf9db 100644 --- a/nuttx/include/nuttx/net/icmp.h +++ b/nuttx/include/nuttx/net/icmp.h @@ -48,7 +48,9 @@ #include <nuttx/config.h> #include <stdint.h> + #include <nuttx/net/netconfig.h> +#include <nuttx/net/ip.h> /**************************************************************************** * Pre-processor Definitions @@ -101,8 +103,8 @@ /* Header sizes */ -#define UIP_ICMPH_LEN 4 /* Size of ICMP header */ -#define UIP_IPICMPH_LEN (UIP_ICMPH_LEN + UIP_IPH_LEN) /* Size of IP + ICMP header */ +#define UIP_ICMPH_LEN 4 /* Size of ICMP header */ +#define UIP_IPICMPH_LEN (UIP_ICMPH_LEN + IPHDR_LEN) /* Size of IP + ICMP header */ /**************************************************************************** * Public Type Definitions diff --git a/nuttx/include/nuttx/net/igmp.h b/nuttx/include/nuttx/net/igmp.h index 6fe0f1fd7..5770e585d 100644 --- a/nuttx/include/nuttx/net/igmp.h +++ b/nuttx/include/nuttx/net/igmp.h @@ -54,8 +54,9 @@ #include <netinet/in.h> -#include <nuttx/net/netdev.h> #include <nuttx/net/netconfig.h> +#include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #ifdef CONFIG_NET_IGMP @@ -82,7 +83,7 @@ */ #define UIP_IGMPH_LEN 8 -#define UIP_IPIGMPH_LEN (UIP_IGMPH_LEN + UIP_IPH_LEN + 4) +#define UIP_IPIGMPH_LEN (UIP_IGMPH_LEN + IPHDR_LEN + 4) /* Group flags */ diff --git a/nuttx/include/nuttx/net/ip.h b/nuttx/include/nuttx/net/ip.h index 4b7339dc5..12f8f9c03 100644 --- a/nuttx/include/nuttx/net/ip.h +++ b/nuttx/include/nuttx/net/ip.h @@ -55,6 +55,7 @@ #include <queue.h> #include <arpa/inet.h> +#include <netinet/in.h> #include <nuttx/net/netconfig.h> diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index 416582e6d..e2c465a21 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -43,6 +43,7 @@ #include <nuttx/config.h> #ifdef CONFIG_NET +#include <sys/socket.h> #include <stdint.h> #include <stdbool.h> #include <stdarg.h> diff --git a/nuttx/include/nuttx/net/netdev.h b/nuttx/include/nuttx/net/netdev.h index 3380bf273..efe74f818 100644 --- a/nuttx/include/nuttx/net/netdev.h +++ b/nuttx/include/nuttx/net/netdev.h @@ -52,12 +52,15 @@ #include <stdint.h> #include <net/if.h> +#include <net/ethernet.h> +#include <arpa/inet.h> + #ifdef CONFIG_NET_IGMP # include <nuttx/net/igmp.h> #endif #include <nuttx/net/netconfig.h> -#include <net/ethernet.h> +#include <nuttx/net/ip.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/include/nuttx/net/tcp.h b/nuttx/include/nuttx/net/tcp.h index 30cccdc43..d34ee03ea 100644 --- a/nuttx/include/nuttx/net/tcp.h +++ b/nuttx/include/nuttx/net/tcp.h @@ -58,6 +58,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/iob.h> +#include <nuttx/net/ip.h> /**************************************************************************** * Pre-processor Definitions @@ -103,9 +104,9 @@ /* TCP header sizes */ -#define UIP_TCPH_LEN 20 /* Size of TCP header */ -#define UIP_IPTCPH_LEN (UIP_TCPH_LEN + UIP_IPH_LEN) /* Size of IP + TCP header */ -#define UIP_TCPIP_HLEN UIP_IPTCPH_LEN +#define UIP_TCPH_LEN 20 /* Size of TCP header */ +#define UIP_IPTCPH_LEN (UIP_TCPH_LEN + IPHDR_LEN) /* Size of IP + TCP header */ +#define UIP_TCPIP_HLEN UIP_IPTCPH_LEN /* Initial minimum MSS according to RFC 879 * diff --git a/nuttx/include/nuttx/net/udp.h b/nuttx/include/nuttx/net/udp.h index 4fac3ab76..05b5c2105 100644 --- a/nuttx/include/nuttx/net/udp.h +++ b/nuttx/include/nuttx/net/udp.h @@ -52,7 +52,9 @@ #include <nuttx/config.h> #include <stdint.h> + #include <nuttx/net/netconfig.h> +#include <nuttx/net/ip.h> /**************************************************************************** * Pre-processor Definitions @@ -60,8 +62,8 @@ /* Header sizes */ -#define UIP_UDPH_LEN 8 /* Size of UDP header */ -#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN) /* Size of IP + UDP header */ +#define UIP_UDPH_LEN 8 /* Size of UDP header */ +#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + IPHDR_LEN) /* Size of IP + UDP header */ /**************************************************************************** * Public Type Definitions diff --git a/nuttx/libc/net/lib_inetntoa.c b/nuttx/libc/net/lib_inetntoa.c index e2d92d864..f7152d154 100644 --- a/nuttx/libc/net/lib_inetntoa.c +++ b/nuttx/libc/net/lib_inetntoa.c @@ -38,8 +38,11 @@ ****************************************************************************/ #include <nuttx/config.h> + #include <stdio.h> + #include <arpa/inet.h> +#include <netinet/in.h> #ifndef CONFIG_NET_IPv6 diff --git a/nuttx/libc/net/lib_inetpton.c b/nuttx/libc/net/lib_inetpton.c index a0eca934b..2805a7047 100644 --- a/nuttx/libc/net/lib_inetpton.c +++ b/nuttx/libc/net/lib_inetpton.c @@ -53,6 +53,7 @@ #include <errno.h> #include <arpa/inet.h> +#include <netinet/in.h> /**************************************************************************** * Public Functions diff --git a/nuttx/net/arp/arp_inout.c b/nuttx/net/arp/arp_inout.c index 09d17b944..4bd9970e6 100644 --- a/nuttx/net/arp/arp_inout.c +++ b/nuttx/net/arp/arp_inout.c @@ -61,11 +61,13 @@ #include <debug.h> #include <netinet/in.h> +#include <arpa/inet.h> #include <net/ethernet.h> #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/arp.h> +#include <nuttx/net/ip.h> #include "netdev/netdev.h" #include "route/route.h" diff --git a/nuttx/net/arp/arp_table.c b/nuttx/net/arp/arp_table.c index b6c361285..ffe2ec214 100644 --- a/nuttx/net/arp/arp_table.c +++ b/nuttx/net/arp/arp_table.c @@ -56,6 +56,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/arp.h> +#include <nuttx/net/ip.h> #ifdef CONFIG_NET_ARP diff --git a/nuttx/net/devif/devif.h b/nuttx/net/devif/devif.h index ad4b10cb8..a66bcd6c0 100644 --- a/nuttx/net/devif/devif.h +++ b/nuttx/net/devif/devif.h @@ -52,6 +52,7 @@ #include <arch/irq.h> #include <nuttx/net/arp.h> +#include <nuttx/net/ip.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/devif/devif_initialize.c b/nuttx/net/devif/devif_initialize.c index 406662021..f46f78d7c 100644 --- a/nuttx/net/devif/devif_initialize.c +++ b/nuttx/net/devif/devif_initialize.c @@ -45,7 +45,9 @@ #ifdef CONFIG_NET #include <stdint.h> + #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include "devif/devif.h" diff --git a/nuttx/net/devif/devif_input.c b/nuttx/net/devif/devif_input.c index eecad4b9f..f1c2cdbe6 100644 --- a/nuttx/net/devif/devif_input.c +++ b/nuttx/net/devif/devif_input.c @@ -88,6 +88,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #ifdef CONFIG_NET_IPv6 # include "net_neighbor.h" diff --git a/nuttx/net/icmp/icmp.h b/nuttx/net/icmp/icmp.h index e0c2c756c..a5cad2b19 100644 --- a/nuttx/net/icmp/icmp.h +++ b/nuttx/net/icmp/icmp.h @@ -44,6 +44,8 @@ #include <sys/types.h> +#include <nuttx/net/ip.h> + #ifdef CONFIG_NET_ICMP /**************************************************************************** diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c index c4eb4a397..5107dbfdf 100644 --- a/nuttx/net/icmp/icmp_input.c +++ b/nuttx/net/icmp/icmp_input.c @@ -49,9 +49,12 @@ #include <debug.h> #include <net/if.h> +#include <arpa/inet.h> + #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include "devif/devif.h" #include "icmp/icmp.h" diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c index 9a9a57179..4b460a210 100644 --- a/nuttx/net/icmp/icmp_ping.c +++ b/nuttx/net/icmp/icmp_ping.c @@ -48,10 +48,12 @@ #include <debug.h> #include <net/if.h> + #include <nuttx/clock.h> #include <nuttx/net/netconfig.h> #include <nuttx/net/net.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/icmp.h> #include "netdev/netdev.h" diff --git a/nuttx/net/icmp/icmp_poll.c b/nuttx/net/icmp/icmp_poll.c index 0bd4aa10e..b6604117f 100644 --- a/nuttx/net/icmp/icmp_poll.c +++ b/nuttx/net/icmp/icmp_poll.c @@ -47,6 +47,7 @@ #include <nuttx/net/icmp.h> #include "devif/devif.h" +#include "icmp/icmp.h" /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c index 1a16ae282..d5cdbc4d3 100644 --- a/nuttx/net/icmp/icmp_send.c +++ b/nuttx/net/icmp/icmp_send.c @@ -42,9 +42,12 @@ #include <debug.h> +#include <arpa/inet.h> + #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include "devif/devif.h" #include "utils/utils.h" @@ -118,7 +121,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr) picmp->flow = 0x00; picmp->len[0] = (dev->d_sndlen >> 8); picmp->len[1] = (dev->d_sndlen & 0xff); - picmp->nexthdr = UIP_PROTO_ICMP; + picmp->nexthdr = IP_PROTO_ICMP; picmp->hoplimit = UIP_TTL; net_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr); @@ -136,7 +139,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr) picmp->ipoffset[0] = UIP_TCPFLAG_DONTFRAG >> 8; picmp->ipoffset[1] = UIP_TCPFLAG_DONTFRAG & 0xff; picmp->ttl = UIP_TTL; - picmp->proto = UIP_PROTO_ICMP; + picmp->proto = IP_PROTO_ICMP; net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr); net_ipaddr_hdrcopy(picmp->destipaddr, destaddr); diff --git a/nuttx/net/igmp/igmp.h b/nuttx/net/igmp/igmp.h index a1b33c8b2..0bd5edd2d 100644 --- a/nuttx/net/igmp/igmp.h +++ b/nuttx/net/igmp/igmp.h @@ -44,6 +44,8 @@ #include <sys/types.h> +#include <nuttx/net/ip.h> + #ifdef CONFIG_NET_IGMP /**************************************************************************** diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c index 865462afd..0d70c10b1 100644 --- a/nuttx/net/igmp/igmp_group.c +++ b/nuttx/net/igmp/igmp_group.c @@ -56,6 +56,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/net/net.h> +#include <nuttx/net/ip.h> #include <nuttx/net/igmp.h> #include "devif/devif.h" diff --git a/nuttx/net/igmp/igmp_initialize.c b/nuttx/net/igmp/igmp_initialize.c index 2dd9df654..1d51f4522 100644 --- a/nuttx/net/igmp/igmp_initialize.c +++ b/nuttx/net/igmp/igmp_initialize.c @@ -47,6 +47,7 @@ #include <assert.h> #include <debug.h> +#include <nuttx/net/ip.h> #include <nuttx/net/igmp.h> #include "devif/devif.h" diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c index c7825d643..1eb09b193 100644 --- a/nuttx/net/igmp/igmp_input.c +++ b/nuttx/net/igmp/igmp_input.c @@ -48,8 +48,9 @@ #include <debug.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/igmp.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> +#include <nuttx/net/igmp.h> #include "devif/devif.h" #include "igmp/igmp.h" diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c index 6c7c5abf4..5a97e2df6 100644 --- a/nuttx/net/igmp/igmp_join.c +++ b/nuttx/net/igmp/igmp_join.c @@ -46,8 +46,11 @@ #include <assert.h> #include <debug.h> +#include <netinet/in.h> + #include <nuttx/net/netconfig.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include <nuttx/net/igmp.h> #include "devif/devif.h" diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c index 0f64d24dc..50742a18f 100644 --- a/nuttx/net/igmp/igmp_leave.c +++ b/nuttx/net/igmp/igmp_leave.c @@ -47,9 +47,12 @@ #include <assert.h> #include <debug.h> +#include <netinet/in.h> + #include <nuttx/net/netconfig.h> #include <nuttx/net/net.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include <nuttx/net/igmp.h> #include "devif/devif.h" diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c index f053ba56f..62df7e72c 100644 --- a/nuttx/net/igmp/igmp_mcastmac.c +++ b/nuttx/net/igmp/igmp_mcastmac.c @@ -47,6 +47,7 @@ #include <debug.h> #include <nuttx/net/netconfig.h> +#include <nuttx/net/ip.h> #include <nuttx/net/igmp.h> #include "devif/devif.h" diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c index 482f54cdb..8a16e47e4 100644 --- a/nuttx/net/igmp/igmp_poll.c +++ b/nuttx/net/igmp/igmp_poll.c @@ -49,6 +49,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include "devif/devif.h" #include "igmp/igmp.h" diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c index dcbc0d15b..c9ba71aa6 100644 --- a/nuttx/net/igmp/igmp_send.c +++ b/nuttx/net/igmp/igmp_send.c @@ -45,6 +45,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include <nuttx/net/ipopt.h> #include <nuttx/net/igmp.h> @@ -151,7 +152,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, IGMPBUF->ipoffset[0] = UIP_TCPFLAG_DONTFRAG >> 8; IGMPBUF->ipoffset[1] = UIP_TCPFLAG_DONTFRAG & 0xff; IGMPBUF->ttl = IGMP_TTL; - IGMPBUF->proto = UIP_PROTO_IGMP; + IGMPBUF->proto = IP_PROTO_IGMP; net_ipaddr_hdrcopy(IGMPBUF->srcipaddr, &dev->d_ipaddr); net_ipaddr_hdrcopy(IGMPBUF->destipaddr, destipaddr); diff --git a/nuttx/net/ipv6/ipv6.h b/nuttx/net/ipv6/ipv6.h index 25e2dc610..41004505d 100644 --- a/nuttx/net/ipv6/ipv6.h +++ b/nuttx/net/ipv6/ipv6.h @@ -46,8 +46,11 @@ ****************************************************************************/ #include <stdint.h> + #include <net/ethernet.h> +#include <nuttx/net/ip.h> + /**************************************************************************** * Public Types ****************************************************************************/ diff --git a/nuttx/net/ipv6/net_neighbor.c b/nuttx/net/ipv6/net_neighbor.c index c85f24212..7070acc1c 100644 --- a/nuttx/net/ipv6/net_neighbor.c +++ b/nuttx/net/ipv6/net_neighbor.c @@ -43,6 +43,8 @@ #include <string.h> #include <debug.h> +#include <nuttx/net/ip.h> + #include "ipv6/ipv6.h" /**************************************************************************** diff --git a/nuttx/net/netdev/netdev.h b/nuttx/net/netdev/netdev.h index 010d82ce1..3fc2d5eb0 100644 --- a/nuttx/net/netdev/netdev.h +++ b/nuttx/net/netdev/netdev.h @@ -44,6 +44,8 @@ #include <sys/types.h> +#include <nuttx/net/ip.h> + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ diff --git a/nuttx/net/netdev/netdev_findbyaddr.c b/nuttx/net/netdev/netdev_findbyaddr.c index 9aa868b81..9130166c7 100644 --- a/nuttx/net/netdev/netdev_findbyaddr.c +++ b/nuttx/net/netdev/netdev_findbyaddr.c @@ -46,6 +46,7 @@ #include <debug.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include "netdev/netdev.h" #include "route/route.h" diff --git a/nuttx/net/netdev/netdev_ioctl.c b/nuttx/net/netdev/netdev_ioctl.c index f2bcff957..af32a8052 100644 --- a/nuttx/net/netdev/netdev_ioctl.c +++ b/nuttx/net/netdev/netdev_ioctl.c @@ -49,6 +49,7 @@ #include <debug.h> #include <nuttx/net/net.h> +#include <nuttx/net/ip.h> #include <net/if.h> #include <net/route.h> diff --git a/nuttx/net/netdev/netdev_rxnotify.c b/nuttx/net/netdev/netdev_rxnotify.c index bb8d90368..d3eba2d1e 100644 --- a/nuttx/net/netdev/netdev_rxnotify.c +++ b/nuttx/net/netdev/netdev_rxnotify.c @@ -46,6 +46,7 @@ #include <debug.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include "netdev/netdev.h" diff --git a/nuttx/net/netdev/netdev_txnotify.c b/nuttx/net/netdev/netdev_txnotify.c index 81679ac93..c19f0a7d5 100644 --- a/nuttx/net/netdev/netdev_txnotify.c +++ b/nuttx/net/netdev/netdev_txnotify.c @@ -46,6 +46,7 @@ #include <debug.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include "netdev/netdev.h" diff --git a/nuttx/net/pkt/pkt_send.c b/nuttx/net/pkt/pkt_send.c index daee8c445..1d3f94f7f 100644 --- a/nuttx/net/pkt/pkt_send.c +++ b/nuttx/net/pkt/pkt_send.c @@ -50,10 +50,12 @@ #include <debug.h> #include <arch/irq.h> + #include <nuttx/clock.h> +#include <nuttx/net/netdev.h> #include <nuttx/net/net.h> #include <nuttx/net/arp.h> -#include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/pkt.h> #include "netdev/netdev.h" diff --git a/nuttx/net/route/net_addroute.c b/nuttx/net/route/net_addroute.c index 32d5c2063..7053ffb98 100644 --- a/nuttx/net/route/net_addroute.c +++ b/nuttx/net/route/net_addroute.c @@ -45,6 +45,7 @@ #include <debug.h> #include <nuttx/net/net.h> +#include <nuttx/net/ip.h> #include <arch/irq.h> diff --git a/nuttx/net/route/net_delroute.c b/nuttx/net/route/net_delroute.c index f8b714984..9e3d271bd 100644 --- a/nuttx/net/route/net_delroute.c +++ b/nuttx/net/route/net_delroute.c @@ -43,6 +43,8 @@ #include <string.h> #include <errno.h> +#include <nuttx/net/ip.h> + #include "route/route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/route/net_router.c b/nuttx/net/route/net_router.c index 6dab94664..1181262e7 100644 --- a/nuttx/net/route/net_router.c +++ b/nuttx/net/route/net_router.c @@ -43,6 +43,8 @@ #include <string.h> #include <errno.h> +#include <nuttx/net/ip.h> + #include "route/route.h" #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE) diff --git a/nuttx/net/route/netdev_router.c b/nuttx/net/route/netdev_router.c index 3adaa3bdb..d49c1e4d0 100644 --- a/nuttx/net/route/netdev_router.c +++ b/nuttx/net/route/netdev_router.c @@ -44,6 +44,7 @@ #include <errno.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include "netdev/netdev.h" #include "route/route.h" diff --git a/nuttx/net/route/route.h b/nuttx/net/route/route.h index a6e457c2f..046a7e9de 100644 --- a/nuttx/net/route/route.h +++ b/nuttx/net/route/route.h @@ -43,8 +43,11 @@ #include <nuttx/config.h> #include <queue.h> + #include <net/if.h> +#include <nuttx/net/ip.h> + #ifdef CONFIG_NET_ROUTE /**************************************************************************** diff --git a/nuttx/net/socket/accept.c b/nuttx/net/socket/accept.c index b30f61373..48e068510 100644 --- a/nuttx/net/socket/accept.c +++ b/nuttx/net/socket/accept.c @@ -52,6 +52,7 @@ #include <arch/irq.h> #include <nuttx/net/net.h> +#include <nuttx/net/ip.h> #include <nuttx/net/tcp.h> #include "socket/socket.h" diff --git a/nuttx/net/socket/connect.c b/nuttx/net/socket/connect.c index d851b7b22..eff1d3cb4 100644 --- a/nuttx/net/socket/connect.c +++ b/nuttx/net/socket/connect.c @@ -56,7 +56,7 @@ #include "devif/devif.h" #include "tcp/tcp.h" #include "udp/udp.h" -#include "socket/socket.h +#include "socket/socket.h" /**************************************************************************** * Private Types diff --git a/nuttx/net/socket/recvfrom.c b/nuttx/net/socket/recvfrom.c index 6c6360928..ccc037f4e 100644 --- a/nuttx/net/socket/recvfrom.c +++ b/nuttx/net/socket/recvfrom.c @@ -53,10 +53,12 @@ #endif #include <arch/irq.h> + #include <nuttx/clock.h> #include <nuttx/net/net.h> #include <nuttx/net/iob.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/tcp.h> #include <nuttx/net/udp.h> #include <nuttx/net/pkt.h> diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c index 2d87f8d4f..f1bc36557 100644 --- a/nuttx/net/tcp/tcp_conn.c +++ b/nuttx/net/tcp/tcp_conn.c @@ -54,6 +54,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/net.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/tcp.h> #include "devif/devif.h" diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c index 09b0c3111..7182275d1 100644 --- a/nuttx/net/tcp/tcp_input.c +++ b/nuttx/net/tcp/tcp_input.c @@ -52,8 +52,9 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/tcp.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> +#include <nuttx/net/tcp.h> #include "devif/devif.h" #include "utils/utils.h" diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c index 80a8cd965..ae8c31bec 100644 --- a/nuttx/net/tcp/tcp_send.c +++ b/nuttx/net/tcp/tcp_send.c @@ -51,6 +51,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> #include "devif/devif.h" #include "utils/utils.h" @@ -180,7 +181,7 @@ static void tcp_sendcommon(FAR struct net_driver_s *dev, memcpy(pbuf->ackno, conn->rcvseq, 4); memcpy(pbuf->seqno, conn->sndseq, 4); - pbuf->proto = UIP_PROTO_TCP; + pbuf->proto = IP_PROTO_TCP; pbuf->srcport = conn->lport; pbuf->destport = conn->rport; diff --git a/nuttx/net/udp/udp_conn.c b/nuttx/net/udp/udp_conn.c index 66893edba..51c9a1fc5 100644 --- a/nuttx/net/udp/udp_conn.c +++ b/nuttx/net/udp/udp_conn.c @@ -53,7 +53,9 @@ #include <arch/irq.h> #include <nuttx/net/netconfig.h> +#include <nuttx/net/net.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/udp.h> #include "devif/devif.h" diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c index f2f58f41f..a56c91467 100644 --- a/nuttx/net/udp/udp_send.c +++ b/nuttx/net/udp/udp_send.c @@ -46,10 +46,13 @@ #include <debug.h> +#include <arpa/inet.h> + #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/udp.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> +#include <nuttx/net/udp.h> #include "devif/devif.h" #include "utils/utils.h" @@ -118,7 +121,7 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn) pudpbuf->flow = 0x00; pudpbuf->len[0] = (dev->d_sndlen >> 8); pudpbuf->len[1] = (dev->d_sndlen & 0xff); - pudpbuf->nexthdr = UIP_PROTO_UDP; + pudpbuf->nexthdr = IP_PROTO_UDP; pudpbuf->hoplimit = conn->ttl; net_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr); @@ -136,7 +139,7 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn) pudpbuf->ipoffset[0] = 0; pudpbuf->ipoffset[1] = 0; pudpbuf->ttl = conn->ttl; - pudpbuf->proto = UIP_PROTO_UDP; + pudpbuf->proto = IP_PROTO_UDP; net_ipaddr_hdrcopy(pudpbuf->srcipaddr, &dev->d_ipaddr); net_ipaddr_hdrcopy(pudpbuf->destipaddr, &conn->ripaddr); diff --git a/nuttx/net/utils/net_chksum.c b/nuttx/net/utils/net_chksum.c index 960d364a7..188ec1bf1 100644 --- a/nuttx/net/utils/net_chksum.c +++ b/nuttx/net/utils/net_chksum.c @@ -45,6 +45,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/icmp.h> #include "utils/utils.h" @@ -158,7 +159,7 @@ static uint16_t upper_layer_chksum(FAR struct net_driver_s *dev, uint8_t proto) #ifdef CONFIG_NET_IPv6 static uint16_t icmp_6chksum(FAR struct net_driver_s *dev) { - return upper_layer_chksum(dev, UIP_PROTO_ICMP6); + return upper_layer_chksum(dev, IP_PROTO_ICMP6); } #endif /* CONFIG_NET_IPv6 */ #endif /* CONFIG_NET_ARCH_CHKSUM */ @@ -311,7 +312,7 @@ uint16_t ip_chksum(FAR struct net_driver_s *dev) #if !CONFIG_NET_ARCH_CHKSUM uint16_t tcp_chksum(FAR struct net_driver_s *dev) { - return upper_layer_chksum(dev, UIP_PROTO_TCP); + return upper_layer_chksum(dev, IP_PROTO_TCP); } #endif /* CONFIG_NET_ARCH_CHKSUM */ @@ -326,7 +327,7 @@ uint16_t tcp_chksum(FAR struct net_driver_s *dev) #if defined(CONFIG_NET_UDP_CHECKSUMS) && !defined(CONFIG_NET_ARCH_CHKSUM) uint16_t udp_chksum(FAR struct net_driver_s *dev) { - return upper_layer_chksum(dev, UIP_PROTO_UDP); + return upper_layer_chksum(dev, IP_PROTO_UDP); } #endif /* CONFIG_NET_UDP_CHECKSUMS && !CONFIG_NET_ARCH_CHKSUM */ |