nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 08:38:38 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/src/c5471/c5471_ethernet.c
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>

3
arch/arm/src/kinetis/kinetis_enet.c
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>

3
arch/arm/src/lpc17xx/lpc17_ethernet.c
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>

2
arch/arm/src/sam34/sam_emac.c
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>

2
arch/arm/src/sama5/sam_emaca.c
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>

2
arch/arm/src/sama5/sam_emacb.c
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>

2
arch/arm/src/sama5/sam_gmac.c
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>

2
arch/arm/src/stm32/stm32_eth.c
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>

2
arch/arm/src/tiva/tiva_ethernet.c
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>

3
arch/hc/src/m9s12/m9s12_ethernet.c
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>

3
arch/mips/src/pic32mx/pic32mx-ethernet.c
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>

3
arch/sim/src/up_wpcap.c
View file

@ -54,6 +54,9 @@
#include <stdlib.h>
#include <malloc.h>
#include <netinet/in.h>
extern int netdriver_setmacaddr(unsigned char *macaddr);
/****************************************************************************

7
arch/z80/src/ez80/ez80_emac.c
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"

3
drivers/net/cs89x0.c
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>

5
drivers/net/dm90x0.c
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>

4
drivers/net/e1000.c
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"
/****************************************************************************

3
drivers/net/enc28j60.c
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>

5
drivers/net/encx24j600.c
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"

3
drivers/net/skeleton.c
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>

4
drivers/net/slip.c
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. */

3
drivers/net/vnet.c
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>

1
fs/nfs/nfs_vfsops.c
View file

@ -73,6 +73,7 @@
#include <net/if.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "nfs.h"
#include "rpc.h"

35
include/arpa/inet.h
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

2
include/nuttx/net/arp.h
View file

@ -50,7 +50,9 @@
#include <stdint.h>
#include <netinet/in.h>
#include <net/ethernet.h>
#include <nuttx/net/netconfig.h>
/****************************************************************************

6
include/nuttx/net/icmp.h
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

5
include/nuttx/net/igmp.h
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 */

1
include/nuttx/net/ip.h
View file

@ -55,6 +55,7 @@
#include <queue.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <nuttx/net/netconfig.h>

1
include/nuttx/net/net.h
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>

5
include/nuttx/net/netdev.h
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

7
include/nuttx/net/tcp.h
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
*

6
include/nuttx/net/udp.h
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

3
libc/net/lib_inetntoa.c
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

1
libc/net/lib_inetpton.c
View file

@ -53,6 +53,7 @@
#include <errno.h>
#include <arpa/inet.h>
#include <netinet/in.h>
/****************************************************************************
* Public Functions

2
net/arp/arp_inout.c
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"

1
net/arp/arp_table.c
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

1
net/devif/devif.h
View file

@ -52,6 +52,7 @@
#include <arch/irq.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/ip.h>
/****************************************************************************
* Pre-processor Definitions

2
net/devif/devif_initialize.c
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"

1
net/devif/devif_input.c
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"

2
net/icmp/icmp.h
View file

@ -44,6 +44,8 @@
#include <sys/types.h>
#include <nuttx/net/ip.h>
#ifdef CONFIG_NET_ICMP
/****************************************************************************

3
net/icmp/icmp_input.c
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"

2
net/icmp/icmp_ping.c
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"

1
net/icmp/icmp_poll.c
View file

@ -47,6 +47,7 @@
#include <nuttx/net/icmp.h>
#include "devif/devif.h"
#include "icmp/icmp.h"
/****************************************************************************
* Pre-processor Definitions

7
net/icmp/icmp_send.c
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);

2
net/igmp/igmp.h
View file

@ -44,6 +44,8 @@
#include <sys/types.h>
#include <nuttx/net/ip.h>
#ifdef CONFIG_NET_IGMP
/****************************************************************************

1
net/igmp/igmp_group.c
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"

1
net/igmp/igmp_initialize.c
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"

3
net/igmp/igmp_input.c
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"

3
net/igmp/igmp_join.c
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"

3
net/igmp/igmp_leave.c
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"

1
net/igmp/igmp_mcastmac.c
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"

1
net/igmp/igmp_poll.c
View file

@ -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"

3
net/igmp/igmp_send.c
View file

@ -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);

3
net/ipv6/ipv6.h
View file

@ -46,8 +46,11 @@
****************************************************************************/
#include <stdint.h>
#include <net/ethernet.h>
#include <nuttx/net/ip.h>
/****************************************************************************
* Public Types
****************************************************************************/

2
net/ipv6/net_neighbor.c
View file

@ -43,6 +43,8 @@
#include <string.h>
#include <debug.h>
#include <nuttx/net/ip.h>
#include "ipv6/ipv6.h"
/****************************************************************************

2
net/netdev/netdev.h
View file

@ -44,6 +44,8 @@
#include <sys/types.h>
#include <nuttx/net/ip.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/

1
net/netdev/netdev_findbyaddr.c
View file

@ -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"

1
net/netdev/netdev_ioctl.c
View file

@ -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>

1
net/netdev/netdev_rxnotify.c
View file

@ -46,6 +46,7 @@
#include <debug.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
#include "netdev/netdev.h"

1
net/netdev/netdev_txnotify.c
View file

@ -46,6 +46,7 @@
#include <debug.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
#include "netdev/netdev.h"

4
net/pkt/pkt_send.c
View file

@ -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"

1
net/route/net_addroute.c
View file

@ -45,6 +45,7 @@
#include <debug.h>
#include <nuttx/net/net.h>
#include <nuttx/net/ip.h>
#include <arch/irq.h>

2
net/route/net_delroute.c
View file

@ -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)

2
net/route/net_router.c
View file

@ -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)

1
net/route/netdev_router.c
View file

@ -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"

3
net/route/route.h
View file

@ -43,8 +43,11 @@
#include <nuttx/config.h>
#include <queue.h>
#include <net/if.h>
#include <nuttx/net/ip.h>
#ifdef CONFIG_NET_ROUTE
/****************************************************************************

1
net/socket/accept.c
View file

@ -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"

2
net/socket/connect.c
View file

@ -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

2
net/socket/recvfrom.c
View file

@ -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>

1
net/tcp/tcp_conn.c
View file

@ -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"

3
net/tcp/tcp_input.c
View file

@ -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"

3
net/tcp/tcp_send.c
View file

@ -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;

2
net/udp/udp_conn.c
View file

@ -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"

9
net/udp/udp_send.c
View file

@ -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);

7
net/utils/net_chksum.c
View file

@ -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 */