diff options
author | Jean Cyr <jcyr@dillobits.com> | 2013-07-07 14:29:30 -0400 |
---|---|---|
committer | Jean Cyr <jcyr@dillobits.com> | 2013-07-07 14:29:30 -0400 |
commit | 35711280df491c27ea42bd93d8102168a8514896 (patch) | |
tree | 71c5b995f1702d24db6f4e0ad242c138b286ac08 /nuttx/include/netinet | |
parent | 7a6a786708814c3ddfa2973189a7334144e4e741 (diff) | |
parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
download | px4-firmware-35711280df491c27ea42bd93d8102168a8514896.tar.gz px4-firmware-35711280df491c27ea42bd93d8102168a8514896.tar.bz2 px4-firmware-35711280df491c27ea42bd93d8102168a8514896.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'nuttx/include/netinet')
-rw-r--r-- | nuttx/include/netinet/arp.h | 114 | ||||
-rw-r--r-- | nuttx/include/netinet/ether.h | 77 | ||||
-rw-r--r-- | nuttx/include/netinet/in.h | 155 | ||||
-rw-r--r-- | nuttx/include/netinet/ip.h | 54 | ||||
-rw-r--r-- | nuttx/include/netinet/ip6.h | 54 |
5 files changed, 0 insertions, 454 deletions
diff --git a/nuttx/include/netinet/arp.h b/nuttx/include/netinet/arp.h deleted file mode 100644 index e318945aa..000000000 --- a/nuttx/include/netinet/arp.h +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** - * include/netinet/arp.h - * - * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __INCLUDE_NETINET_ARP_H -#define __INCLUDE_NETINET_ARP_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <nuttx/config.h> - -#include <stdint.h> -#include <nuttx/fs/ioctl.h> - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Three ioctls are available on all PF_INET sockets, but only if the NuttX - * configuration CONFIG_NET_ARPIOCTLS is defined. Each ioctl takes a pointer - * to a 'struct arpreq' as its parameter. - */ - -#define SIOCSARP _ARPIOC(1) /* Set a ARP mapping */ -#define SIOCDARP _ARPIOC(2) /* Delete an ARP mapping */ -#define SIOCGARP _ARPIOC(3) /* Get an ARP mapping */ - -/* Definitions for bits in field arp_flags of struct arpreq. If the - * ATF_NETMASK flag is set, then arp_netmask should be valid. This should - * be set to 0xffffffff, or 0 to remove an existing arp entry. - */ - -#define ATF_COM (1 << 0) /* Lookup complete */ -#define ATF_PERM (1 << 1) /* Permanent entry */ -#define ATF_PUBL (1 << 2) /* Publish entry */ -#define ATF_USETRAILERS (1 << 3) /* Trailers requested (obsolete) */ -#define ATF_NETMASK (1 << 4) /* Use a netmask */ -#define ATF_DONTPUB (1 << 5) /* Don't answer */ - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - -/* All ARP ioctls take a pointer to a struct arpreq as their parameter: */ - -struct arpreq -{ - struct sockaddr arp_pa; /* Protocol address */ - struct sockaddr arp_ha; /* Hardware address */ - struct sockaddr arp_netmask; /* Netmask of protocol address */ - uint8_t arp_flags; /* Flags */ - uint8_t arp_dev[IFNAMSIZ+1]; /* Device name (zero terminated)*/ -}; - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -#ifdef __cplusplus -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -/* If CONFIG_NET_ARPIOCTLS is defined then the semi-standard ioctl commands - * described above are supported. If not, you can call the uIP ARP interfaces - * directly in a very non-standard way. See include/nuttx/net/uip/uip-arp.h for - * prototypes. - */ - -#undef EXTERN -#ifdef __cplusplus -} -#endif - -#endif /* __INCLUDE_NETINET_ARP_H */ diff --git a/nuttx/include/netinet/ether.h b/nuttx/include/netinet/ether.h deleted file mode 100644 index 69b8fbba6..000000000 --- a/nuttx/include/netinet/ether.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - * include/netinet/ether.h - * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __INCLUDE_NETINET_ETHER_H -#define __INCLUDE_NETINET_ETHER_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <nuttx/config.h> - -#include <net/ethernet.h> - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#ifdef __cplusplus -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - -EXTERN FAR char *ether_ntoa(FAR const struct ether_addr *addr); -EXTERN struct ether_addr *ether_aton(const char *asc); -EXTERN int ether_ntohost(char *hostname, const struct ether_addr *addr); -EXTERN int ether_hostton(const char *hostname, struct ether_addr *addr); -EXTERN int ether_line(const char *line, struct ether_addr *addr, char *hostname); - -#undef EXTERN -#ifdef __cplusplus -} -#endif - -#endif /* __INCLUDE_NETINET_ETHER_H */ diff --git a/nuttx/include/netinet/in.h b/nuttx/include/netinet/in.h deleted file mode 100644 index 547dc0968..000000000 --- a/nuttx/include/netinet/in.h +++ /dev/null @@ -1,155 +0,0 @@ -/**************************************************************************** - * include/netinet/in.h - * - * Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __INCLUDE_NETINET_IP_H -#define __INCLUDE_NETINET_IP_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <nuttx/config.h> - -#include <sys/types.h> -#include <stdint.h> - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* Values for protocol argument to socket() */ - -#define IPPROTO_IP 0 /* Dummy protocol for TCP */ -#define IPPROTO_HOPOPTS 0 /* IPv6 Hop-by-Hop options. */ -#define IPPROTO_ICMP 1 /* Internet Control Message Protocol */ -#define IPPROTO_IGMP 2 /* Internet Group Management Protocol */ -#define IPPROTO_IPIP 4 /* IPIP tunnels (older KA9Q tunnels use 94) */ -#define IPPROTO_TCP 6 /* Transmission Control Protocol */ -#define IPPROTO_EGP 8 /* Exterior Gateway Protocol */ -#define IPPROTO_PUP 12 /* PUP protocol */ -#define IPPROTO_UDP 17 /* User Datagram Protocol */ -#define IPPROTO_IDP 22 /* XNS IDP protocol */ -#define IPPROTO_TP 29 /* SO Transport Protocol Class 4. */ -#define IPPROTO_DCCP 33 /* Datagram Congestion Control Protocol */ -#define IPPROTO_IPV6 41 /* IPv6-in-IPv4 tunnelling */ -#define IPPROTO_ROUTING 43 /* IPv6 routing header. */ -#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header. */ -#define IPPROTO_RSVP 46 /* Reservation Protocol. */ -#define IPPROTO_GRE 47 /* General Routing Encapsulation. */ -#define IPPROTO_ESP 50 /* Encapsulation Security Payload protocol */ -#define IPPROTO_AH 51 /* Authentication Header protocol */ -#define IPPROTO_ICMPV6 58 /* ICMPv6 */ -#define IPPROTO_NONE 59 /* IPv6 no next header. */ -#define IPPROTO_DSTOPTS 60 /* IPv6 destination options. */ -#define IPPROTO_MTP 92 /* Multicast Transport Protocol. */ -#define IPPROTO_ENCAP 98 /* Encapsulation Header. */ -#define IPPROTO_BEETPH 94 /* IP option pseudo header for BEET */ -#define IPPROTO_PIM 103 /* Protocol Independent Multicast */ -#define IPPROTO_COMP 108 /* Compression Header protocol */ -#define IPPROTO_SCTP 132 /* Stream Control Transport Protocol */ -#define IPPROTO_UDPLITE 136 /* UDP-Lite (RFC 3828) */ -#define IPPROTO_RAW 255 /* Raw IP packets */ - -/* Values used with SIOCSIFMCFILTER and SIOCGIFMCFILTER ioctl's */ - -#define MCAST_EXCLUDE 0 -#define MCAST_INCLUDE 1 - -/* Special values of in_addr_t */ - -#define INADDR_ANY ((in_addr_t)0x00000000) /* Address to accept any incoming messages */ -#define INADDR_BROADCAST ((in_addr_t)0xffffffff) /* Address to send to all hosts */ -#define INADDR_NONE ((in_addr_t)0xffffffff) /* Address indicating an error return */ -#define INADDR_LOOPBACK ((in_addr_t)0x7f000001) /* Inet 127.0.0.1. */ - -/* Special initializer for in6_addr_t */ - -#define IN6ADDR_ANY_INIT {{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}} -#define IN6ADDR_LOOPBACK_INIT {{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}}} - -/* struct in6_addr union selectors */ - -#define s6_addr in6_u.u6_addr8 -#define s6_addr16 in6_u.u6_addr16 -#define s6_addr32 in6_u.u6_addr32 - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - -/* IPv4 Internet address */ - -typedef uint32_t in_addr_t; - -struct in_addr -{ - in_addr_t s_addr; /* Address (network byte order) */ -}; - -struct sockaddr_in -{ - sa_family_t sin_family; /* Address family: AF_INET */ - uint16_t sin_port; /* Port in network byte order */ - struct in_addr sin_addr; /* Internet address */ -}; - -/* IPv6 Internet address */ - -struct in6_addr -{ - union - { - uint8_t u6_addr8[16]; - uint16_t u6_addr16[8]; - uint32_t u6_addr32[4]; - } in6_u; -}; - -struct sockaddr_in6 -{ - sa_family_t sin_family; /* Address family: AF_INET */ - uint16_t sin_port; /* Port in network byte order */ - struct in6_addr sin6_addr; /* IPv6 internet address */ -}; - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#endif /* __INCLUDE_NETINET_IP_H */ diff --git a/nuttx/include/netinet/ip.h b/nuttx/include/netinet/ip.h deleted file mode 100644 index e2a6aaf4f..000000000 --- a/nuttx/include/netinet/ip.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** - * include/netinet/ip.h - * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __INCLUDE_NETINET_IP_H -#define __INCLUDE_NETINET_IP_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <sys/socket.h> -#include <netinet/in.h> - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#endif /* __INCLUDE_NETINET_IP_H */ diff --git a/nuttx/include/netinet/ip6.h b/nuttx/include/netinet/ip6.h deleted file mode 100644 index be16ae722..000000000 --- a/nuttx/include/netinet/ip6.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** - * include/netinet/ip6.h - * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __INCLUDE_NETINET_I6P_H -#define __INCLUDE_NETINET_I6P_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <sys/socket.h> -#include <netinet/in.h> - -/**************************************************************************** - * Public Type Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -#endif /* __INCLUDE_NETINET_I6P_H */ |