This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 88fd84e7e613ce93fc078320b312d2aa8c388a8c (commit) via 2503425036ca2ee48003ef20fcb87003e5d1e956 (commit) from 49ebafae0edebbc750742d8874ad0a7588286dea (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 88fd84e7e613ce93fc078320b312d2aa8c388a8c Author: Bill Fischofer bill.fischofer@linaro.org Date: Tue Jan 9 17:43:36 2018 -0600
helper: remove camelcase from icmp protocol
Change ODPH_IPPROTO_ICMPv4 and ODPH_IPPROTO_ICMPv6 to ODPH_IPPROTO_ICMPV4 and ODPH_PROTO_ICMPV6 to eliminate camelcase issues in ODP examples.
Signed-off-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Balasubramanian Manoharan bala.manoharan@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index b1827e9c..0fc4c9cc 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -426,7 +426,7 @@ static odp_packet_t setup_icmp_pkt_ref(odp_pool_t pool, ip->ttl = 64; ip->tot_len = odp_cpu_to_be_16(args->appl.payload + ODPH_ICMPHDR_LEN + ODPH_IPV4HDR_LEN); - ip->proto = ODPH_IPPROTO_ICMPv4; + ip->proto = ODPH_IPPROTO_ICMPV4; ip->id = 0; ip->chksum = 0;
@@ -806,7 +806,7 @@ static void print_pkts(int thr, thread_args_t *thr_args, thr_args->counters.ctr_udp_rcv++;
/* icmp */ - if (ip->proto == ODPH_IPPROTO_ICMPv4) { + if (ip->proto == ODPH_IPPROTO_ICMPV4) { icmp = (odph_icmphdr_t *)(buf + offset);
process_icmp_pkt(thr_args, icmp, msg); diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index c287282e..3773ce52 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -217,7 +217,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, ip->src_addr = odp_cpu_to_be_32(entry->tun_src_ip); ip->dst_addr = odp_cpu_to_be_32(entry->tun_dst_ip); } else { - ip->proto = ODPH_IPPROTO_ICMPv4; + ip->proto = ODPH_IPPROTO_ICMPV4; ip->src_addr = odp_cpu_to_be_32(stream->src_ip); ip->dst_addr = odp_cpu_to_be_32(stream->dst_ip); } @@ -260,7 +260,7 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, inner_ip = (odph_ipv4hdr_t *)data; memset((char *)inner_ip, 0, sizeof(*inner_ip)); inner_ip->ver_ihl = 0x45; - inner_ip->proto = ODPH_IPPROTO_ICMPv4; + inner_ip->proto = ODPH_IPPROTO_ICMPV4; inner_ip->id = odp_cpu_to_be_16(stream->id); inner_ip->ttl = 64; inner_ip->tos = 0; @@ -518,7 +518,7 @@ clear_packet: icmp = (odph_icmphdr_t *)(inner_ip + 1); data = (uint8_t *)icmp; } else { - if (ODPH_IPPROTO_ICMPv4 != ip->proto) + if (ODPH_IPPROTO_ICMPV4 != ip->proto) return FALSE; icmp = (odph_icmphdr_t *)data; } diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h index b96aab28..7ef8dbc3 100644 --- a/helper/include/odp/helper/ip.h +++ b/helper/include/odp/helper/ip.h @@ -251,14 +251,14 @@ typedef struct ODP_PACKED { * IP protocol values (IPv4:'proto' or IPv6:'next_hdr') * @{*/ #define ODPH_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */ -#define ODPH_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */ +#define ODPH_IPPROTO_ICMPV4 0x01 /**< Internet Control Message Protocol (1) */ #define ODPH_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */ #define ODPH_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */ #define ODPH_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */ #define ODPH_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */ #define ODPH_IPPROTO_AH 0x33 /**< Authentication Header (51) */ #define ODPH_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */ -#define ODPH_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */ +#define ODPH_IPPROTO_ICMPV6 0x3A /**< Internet Control Message Protocol (58) */ #define ODPH_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */
/**@}*/
commit 2503425036ca2ee48003ef20fcb87003e5d1e956 Author: Bill Fischofer bill.fischofer@linaro.org Date: Tue Jan 9 17:40:32 2018 -0600
linux-generic: remove camelcase from icmp protocol
Change ODP_IPPROTO_ICMPv4 and ODP_IPPROTO_ICMPv6 to ODP_IPPROTO_ICMPV4 and ODP_IPPROTO_ICMPV6 to eliminate camelcase issues in ODP code.
Signed-off-by: Bill Fischofer bill.fischofer@linaro.org Reviewed-by: Bogdan Pricope bogdan.pricope@linaro.org Reviewed-by: Balasubramanian Manoharan bala.manoharan@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index 7b6b736a..e92a3899 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -157,7 +157,7 @@ typedef struct ODP_PACKED { * IP protocol values (IPv4:'proto' or IPv6:'next_hdr') * @{*/ #define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */ -#define _ODP_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */ +#define _ODP_IPPROTO_ICMPV4 0x01 /**< Internet Control Message Protocol (1) */ #define _ODP_IPPROTO_IPIP 0x04 /**< IP Encapsulation within IP (4) */ #define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */ #define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */ @@ -166,7 +166,7 @@ typedef struct ODP_PACKED { #define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */ #define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */ #define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */ -#define _ODP_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */ +#define _ODP_IPPROTO_ICMPV6 0x3A /**< Internet Control Message Protocol (58) */ #define _ODP_IPPROTO_DEST 0x3C /**< IPv6 Destination header (60) */ #define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol (132) */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 83a88094..a812fec1 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2220,10 +2220,10 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
/* Parse Layer 4 headers */ switch (ip_proto) { - case _ODP_IPPROTO_ICMPv4: + case _ODP_IPPROTO_ICMPV4: /* Fall through */
- case _ODP_IPPROTO_ICMPv6: + case _ODP_IPPROTO_ICMPV6: prs->input_flags.icmp = 1; break;
-----------------------------------------------------------------------
Summary of changes: example/generator/odp_generator.c | 4 ++-- example/ipsec/odp_ipsec_stream.c | 6 +++--- helper/include/odp/helper/ip.h | 4 ++-- platform/linux-generic/include/protocols/ip.h | 4 ++-- platform/linux-generic/odp_packet.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive