From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 61D49231C for ; Thu, 27 Nov 2014 12:48:48 +0100 (CET) Received: by mail-wg0-f42.google.com with SMTP id z12so6288395wgg.15 for ; Thu, 27 Nov 2014 03:48:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XfXlfOarknO0IK886ka2XIGG5AH7Pgjbez7SEgR5oYE=; b=BaKcKDPgt0ZIIhV9RU3hwWR/iM4VEmTKEpxOVRNyQydKb24Y8o+wQGdM80kuMlj9V0 DhWGd9ljZfn1yjnNv5rVR5EfkO94AacxsBe1eQ+xlXvodl46ybFDiSHGDC7n92LVKjPN Q/pBu14pmyPWcKQZqlmuqo3E57OuApcyg3DMDKTav9vNuU6QH7gd9plh1mSPyVWruW3z qvoJH6mhMJiyMDl4LuS4kK+HrPOR4PS9L63EwaOqfhuCLCi+osU5qzABJIISmahXYg7l OeEdyGaWajcB/drdvs+LdUv1uAXY+UxKWy/LL9SfrHkwWN9FFfNl0GXJGS/GgzQ8hBiO zTIA== X-Gm-Message-State: ALoCoQnc94nNXjDZdyafjrp9+tSZVchbCd2tzSnUB1/EHCT1TW3UUWgDLhkUcDEWkWi2Hk9vhCxs X-Received: by 10.180.19.234 with SMTP id i10mr51637384wie.28.1417088927246; Thu, 27 Nov 2014 03:48:47 -0800 (PST) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id mc10sm24900174wic.24.2014.11.27.03.48.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Nov 2014 03:48:46 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Thu, 27 Nov 2014 12:48:15 +0100 Message-Id: <1417088895-15568-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <20141117141708.GE17886@hmsreliant.think-freely.org> References: <20141117141708.GE17886@hmsreliant.think-freely.org> Subject: [dpdk-dev] [PATCH] net: fix conflict with libc X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 11:48:48 -0000 It was impossible to include netinet/in.h and rte_ip.h because the IP protocols were redefined. It is removed because useless. Signed-off-by: Thomas Monjalon --- app/test-pmd/icmpecho.c | 4 ++ lib/librte_net/rte_ip.h | 112 +----------------------------------------------- 2 files changed, 5 insertions(+), 111 deletions(-) diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c index 774924e..c25a54b 100644 --- a/app/test-pmd/icmpecho.c +++ b/app/test-pmd/icmpecho.c @@ -221,12 +221,16 @@ ip_proto_name(uint8_t ip_proto) if (ip_proto < sizeof(ip_proto_names) / sizeof(ip_proto_names[0])) return ip_proto_names[ip_proto]; switch (ip_proto) { +#ifdef IPPROTO_PGM case IPPROTO_PGM: /**< PGM */ return "PGM"; +#endif case IPPROTO_SCTP: /**< Stream Control Transport Protocol */ return "SCTP"; +#ifdef IPPROTO_DIVERT case IPPROTO_DIVERT: /**< divert pseudo-protocol */ return "DIVERT"; +#endif case IPPROTO_RAW: /**< raw IP packet */ return "RAW"; default: diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 20c3ae1..61e4457 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -78,6 +78,7 @@ */ #include +#include #include #include @@ -121,117 +122,6 @@ struct ipv4_hdr { #define IPV4_HDR_OFFSET_UNITS 8 -/* IPv4 protocols */ -#define IPPROTO_IP 0 /**< dummy for IP */ -#define IPPROTO_HOPOPTS 0 /**< IP6 hop-by-hop options */ -#define IPPROTO_ICMP 1 /**< control message protocol */ -#define IPPROTO_IGMP 2 /**< group mgmt protocol */ -#define IPPROTO_GGP 3 /**< gateway^2 (deprecated) */ -#define IPPROTO_IPV4 4 /**< IPv4 encapsulation */ -#define IPPROTO_TCP 6 /**< tcp */ -#define IPPROTO_ST 7 /**< Stream protocol II */ -#define IPPROTO_EGP 8 /**< exterior gateway protocol */ -#define IPPROTO_PIGP 9 /**< private interior gateway */ -#define IPPROTO_RCCMON 10 /**< BBN RCC Monitoring */ -#define IPPROTO_NVPII 11 /**< network voice protocol*/ -#define IPPROTO_PUP 12 /**< pup */ -#define IPPROTO_ARGUS 13 /**< Argus */ -#define IPPROTO_EMCON 14 /**< EMCON */ -#define IPPROTO_XNET 15 /**< Cross Net Debugger */ -#define IPPROTO_CHAOS 16 /**< Chaos*/ -#define IPPROTO_UDP 17 /**< user datagram protocol */ -#define IPPROTO_MUX 18 /**< Multiplexing */ -#define IPPROTO_MEAS 19 /**< DCN Measurement Subsystems */ -#define IPPROTO_HMP 20 /**< Host Monitoring */ -#define IPPROTO_PRM 21 /**< Packet Radio Measurement */ -#define IPPROTO_IDP 22 /**< xns idp */ -#define IPPROTO_TRUNK1 23 /**< Trunk-1 */ -#define IPPROTO_TRUNK2 24 /**< Trunk-2 */ -#define IPPROTO_LEAF1 25 /**< Leaf-1 */ -#define IPPROTO_LEAF2 26 /**< Leaf-2 */ -#define IPPROTO_RDP 27 /**< Reliable Data */ -#define IPPROTO_IRTP 28 /**< Reliable Transaction */ -#define IPPROTO_TP 29 /**< tp-4 w/ class negotiation */ -#define IPPROTO_BLT 30 /**< Bulk Data Transfer */ -#define IPPROTO_NSP 31 /**< Network Services */ -#define IPPROTO_INP 32 /**< Merit Internodal */ -#define IPPROTO_SEP 33 /**< Sequential Exchange */ -#define IPPROTO_3PC 34 /**< Third Party Connect */ -#define IPPROTO_IDPR 35 /**< InterDomain Policy Routing */ -#define IPPROTO_XTP 36 /**< XTP */ -#define IPPROTO_DDP 37 /**< Datagram Delivery */ -#define IPPROTO_CMTP 38 /**< Control Message Transport */ -#define IPPROTO_TPXX 39 /**< TP++ Transport */ -#define IPPROTO_IL 40 /**< IL transport protocol */ -#define IPPROTO_IPV6 41 /**< IP6 header */ -#define IPPROTO_SDRP 42 /**< Source Demand Routing */ -#define IPPROTO_ROUTING 43 /**< IP6 routing header */ -#define IPPROTO_FRAGMENT 44 /**< IP6 fragmentation header */ -#define IPPROTO_IDRP 45 /**< InterDomain Routing*/ -#define IPPROTO_RSVP 46 /**< resource reservation */ -#define IPPROTO_GRE 47 /**< General Routing Encap. */ -#define IPPROTO_MHRP 48 /**< Mobile Host Routing */ -#define IPPROTO_BHA 49 /**< BHA */ -#define IPPROTO_ESP 50 /**< IP6 Encap Sec. Payload */ -#define IPPROTO_AH 51 /**< IP6 Auth Header */ -#define IPPROTO_INLSP 52 /**< Integ. Net Layer Security */ -#define IPPROTO_SWIPE 53 /**< IP with encryption */ -#define IPPROTO_NHRP 54 /**< Next Hop Resolution */ -/* 55-57: Unassigned */ -#define IPPROTO_ICMPV6 58 /**< ICMP6 */ -#define IPPROTO_NONE 59 /**< IP6 no next header */ -#define IPPROTO_DSTOPTS 60 /**< IP6 destination option */ -#define IPPROTO_AHIP 61 /**< any host internal protocol */ -#define IPPROTO_CFTP 62 /**< CFTP */ -#define IPPROTO_HELLO 63 /**< "hello" routing protocol */ -#define IPPROTO_SATEXPAK 64 /**< SATNET/Backroom EXPAK */ -#define IPPROTO_KRYPTOLAN 65 /**< Kryptolan */ -#define IPPROTO_RVD 66 /**< Remote Virtual Disk */ -#define IPPROTO_IPPC 67 /**< Pluribus Packet Core */ -#define IPPROTO_ADFS 68 /**< Any distributed FS */ -#define IPPROTO_SATMON 69 /**< Satnet Monitoring */ -#define IPPROTO_VISA 70 /**< VISA Protocol */ -#define IPPROTO_IPCV 71 /**< Packet Core Utility */ -#define IPPROTO_CPNX 72 /**< Comp. Prot. Net. Executive */ -#define IPPROTO_CPHB 73 /**< Comp. Prot. HeartBeat */ -#define IPPROTO_WSN 74 /**< Wang Span Network */ -#define IPPROTO_PVP 75 /**< Packet Video Protocol */ -#define IPPROTO_BRSATMON 76 /**< BackRoom SATNET Monitoring */ -#define IPPROTO_ND 77 /**< Sun net disk proto (temp.) */ -#define IPPROTO_WBMON 78 /**< WIDEBAND Monitoring */ -#define IPPROTO_WBEXPAK 79 /**< WIDEBAND EXPAK */ -#define IPPROTO_EON 80 /**< ISO cnlp */ -#define IPPROTO_VMTP 81 /**< VMTP */ -#define IPPROTO_SVMTP 82 /**< Secure VMTP */ -#define IPPROTO_VINES 83 /**< Banyon VINES */ -#define IPPROTO_TTP 84 /**< TTP */ -#define IPPROTO_IGP 85 /**< NSFNET-IGP */ -#define IPPROTO_DGP 86 /**< dissimilar gateway prot. */ -#define IPPROTO_TCF 87 /**< TCF */ -#define IPPROTO_IGRP 88 /**< Cisco/GXS IGRP */ -#define IPPROTO_OSPFIGP 89 /**< OSPFIGP */ -#define IPPROTO_SRPC 90 /**< Strite RPC protocol */ -#define IPPROTO_LARP 91 /**< Locus Address Resoloution */ -#define IPPROTO_MTP 92 /**< Multicast Transport */ -#define IPPROTO_AX25 93 /**< AX.25 Frames */ -#define IPPROTO_IPEIP 94 /**< IP encapsulated in IP */ -#define IPPROTO_MICP 95 /**< Mobile Int.ing control */ -#define IPPROTO_SCCSP 96 /**< Semaphore Comm. security */ -#define IPPROTO_ETHERIP 97 /**< Ethernet IP encapsulation */ -#define IPPROTO_ENCAP 98 /**< encapsulation header */ -#define IPPROTO_APES 99 /**< any private encr. scheme */ -#define IPPROTO_GMTP 100 /**< GMTP */ -#define IPPROTO_IPCOMP 108 /**< payload compression (IPComp) */ -/* 101-254: Partly Unassigned */ -#define IPPROTO_PIM 103 /**< Protocol Independent Mcast */ -#define IPPROTO_PGM 113 /**< PGM */ -#define IPPROTO_SCTP 132 /**< Stream Control Transport Protocol */ -/* 255: Reserved */ -/* BSD Private, local use, namespace incursion */ -#define IPPROTO_DIVERT 254 /**< divert pseudo-protocol */ -#define IPPROTO_RAW 255 /**< raw IP packet */ -#define IPPROTO_MAX 256 /**< maximum protocol number */ - /* * IPv4 address types */ -- 2.1.3