Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 04:16:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Gregory Nutt
2014-07-04 19:13:08 -06:00
parent 0bb153b8cb
commit 60246e613b
74 changed files with 175 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/c5471/c5471_ethernet.c
+3 -2
View File
@@ -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>
arch/arm/src/kinetis/kinetis_enet.c
+2 -1
View File
@@ -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>
arch/arm/src/lpc17xx/lpc17_ethernet.c
+2 -1
View File
@@ -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>
arch/arm/src/sam34/sam_emac.c
+2
View File
@@ -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>
arch/arm/src/sama5/sam_emaca.c
+2
View File
@@ -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>
arch/arm/src/sama5/sam_emacb.c
+2
View File
@@ -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>
arch/arm/src/sama5/sam_gmac.c
+2
View File
@@ -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>
arch/arm/src/stm32/stm32_eth.c
+2
View File
@@ -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>
arch/arm/src/tiva/tiva_ethernet.c
+2
View File
@@ -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>
arch/hc/src/m9s12/m9s12_ethernet.c
+2 -1
View File
@@ -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>
arch/mips/src/pic32mx/pic32mx-ethernet.c
+2 -1
View File
@@ -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>
arch/sim/src/up_wpcap.c
+3
View File
@@ -54,6 +54,9 @@
#include <stdlib.h>
#include <malloc.h>
#include <netinet/in.h>
extern int netdriver_setmacaddr(unsigned char *macaddr);
/****************************************************************************
arch/z80/src/ez80/ez80_emac.c
+4 -3
View File
@@ -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"
drivers/net/cs89x0.c
+2 -1
View File
@@ -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>
drivers/net/dm90x0.c
+3 -2
View File
@@ -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>
drivers/net/e1000.c
+3 -1
View File
@@ -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"
/****************************************************************************
drivers/net/enc28j60.c
+2 -1
View File
@@ -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>
drivers/net/encx24j600.c
+3 -2
View File
@@ -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"
drivers/net/skeleton.c
+2 -1
View File
@@ -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>
drivers/net/slip.c
+2 -2
View File
@@ -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. */
drivers/net/vnet.c
+2 -1
View File
@@ -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>
fs/nfs/nfs_vfsops.c
+1
View File
@@ -73,6 +73,7 @@
#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "nfs.h"
#include "rpc.h"
include/arpa/inet.h
+18 -17
View File
@@ -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
include/nuttx/net/arp.h
+2
View File
@@ -50,7 +50,9 @@
#include <stdint.h>
#include <netinet/in.h>
#include <net/ethernet.h>
#include <nuttx/net/netconfig.h>
/****************************************************************************
include/nuttx/net/icmp.h
+4 -2
View File
@@ -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
include/nuttx/net/igmp.h
+3 -2
View File
@@ -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 */
include/nuttx/net/ip.h
+1
View File
@@ -55,6 +55,7 @@
#include <queue.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <nuttx/net/netconfig.h>
include/nuttx/net/net.h
+1
View File
@@ -43,6 +43,7 @@
#include <nuttx/config.h>
#ifdef CONFIG_NET
#include <sys/socket.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdarg.h>
include/nuttx/net/netdev.h
+4 -1
View File
@@ -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
include/nuttx/net/tcp.h
+4 -3
View File
@@ -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
*
include/nuttx/net/udp.h
+4 -2
View File
@@ -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
libc/net/lib_inetntoa.c
+3
View File
@@ -38,8 +38,11 @@
****************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#ifndef CONFIG_NET_IPv6
libc/net/lib_inetpton.c
+1
View File
@@ -53,6 +53,7 @@
#include <errno.h>
#include <arpa/inet.h>
#include <netinet/in.h>
/****************************************************************************
* Public Functions
net/arp/arp_inout.c
+2
View File
@@ -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"
net/arp/arp_table.c
+1
View File
@@ -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
net/devif/devif.h
+1
View File
@@ -52,6 +52,7 @@
#include <arch/irq.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/ip.h>
/****************************************************************************
* Pre-processor Definitions
net/devif/devif_initialize.c
+2
View File
@@ -45,7 +45,9 @@
#ifdef CONFIG_NET
#include <stdint.h>
#include <nuttx/net/netstats.h>
#include <nuttx/net/ip.h>
#include "devif/devif.h"
net/devif/devif_input.c
+1
View File
@@ -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"
net/icmp/icmp.h
+2
View File
@@ -44,6 +44,8 @@
#include <sys/types.h>
#include <nuttx/net/ip.h>
#ifdef CONFIG_NET_ICMP
/****************************************************************************
net/icmp/icmp_input.c
+3
View File
@@ -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"
net/icmp/icmp_ping.c
+2
View File
@@ -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"
net/icmp/icmp_poll.c
+1
View File
@@ -47,6 +47,7 @@
#include <nuttx/net/icmp.h>
#include "devif/devif.h"
#include "icmp/icmp.h"
/****************************************************************************
* Pre-processor Definitions
net/icmp/icmp_send.c
+5 -2
View File
@@ -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);
net/igmp/igmp.h
+2
View File
@@ -44,6 +44,8 @@
#include <sys/types.h>
#include <nuttx/net/ip.h>
#ifdef CONFIG_NET_IGMP
/****************************************************************************
net/igmp/igmp_group.c
+1
View File
@@ -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"
net/igmp/igmp_initialize.c
+1
View File
@@ -47,6 +47,7 @@
#include <assert.h>
#include <debug.h>
#include <nuttx/net/ip.h>
#include <nuttx/net/igmp.h>
#include "devif/devif.h"
net/igmp/igmp_input.c
+2 -1
View File
@@ -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"
net/igmp/igmp_join.c
+3
View File
@@ -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"
net/igmp/igmp_leave.c
+3
View File
@@ -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"
net/igmp/igmp_mcastmac.c
+1
View File
@@ -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"

Some files were not shown because too many files have changed in this diff Show More