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 08487413ead04cb5fef8e813af06e5bc29207334 (commit) from b018868aa429fd25dae1137490419784e8e569f9 (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 08487413ead04cb5fef8e813af06e5bc29207334 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Jun 20 19:18:38 2016 +0300
test: pktio: correct mac addr len check
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c index 5922ba5..d53a419 100644 --- a/test/validation/pktio/pktio.c +++ b/test/validation/pktio/pktio.c @@ -143,11 +143,13 @@ static void pktio_pkt_set_macs(odp_packet_t pkt, odph_ethhdr_t *eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, &len); int ret;
- ret = odp_pktio_mac_addr(src, ð->src, sizeof(eth->src)); + ret = odp_pktio_mac_addr(src, ð->src, ODP_PKTIO_MACADDR_MAXSIZE); CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE);
- ret = odp_pktio_mac_addr(dst, ð->dst, sizeof(eth->dst)); + ret = odp_pktio_mac_addr(dst, ð->dst, ODP_PKTIO_MACADDR_MAXSIZE); CU_ASSERT(ret == ODPH_ETHADDR_LEN); + CU_ASSERT(ret <= ODP_PKTIO_MACADDR_MAXSIZE); }
static uint32_t pktio_pkt_set_seq(odp_packet_t pkt) @@ -239,7 +241,7 @@ static uint32_t pktio_init_packet(odp_packet_t pkt) odph_udphdr_t *udp; char *buf; uint16_t seq; - uint8_t mac[ODPH_ETHADDR_LEN] = {0}; + uint8_t mac[ODP_PKTIO_MACADDR_MAXSIZE] = {0}; int pkt_len = odp_packet_len(pkt);
buf = odp_packet_data(pkt); @@ -1036,7 +1038,7 @@ void pktio_test_promisc(void)
void pktio_test_mac(void) { - unsigned char mac_addr[ODPH_ETHADDR_LEN]; + unsigned char mac_addr[ODP_PKTIO_MACADDR_MAXSIZE]; int mac_len; int ret; odp_pktio_t pktio; @@ -1047,8 +1049,10 @@ void pktio_test_mac(void)
printf("testing mac for %s\n", iface_name[0]);
- mac_len = odp_pktio_mac_addr(pktio, mac_addr, sizeof(mac_addr)); + mac_len = odp_pktio_mac_addr(pktio, mac_addr, + ODP_PKTIO_MACADDR_MAXSIZE); CU_ASSERT(ODPH_ETHADDR_LEN == mac_len); + CU_ASSERT(ODP_PKTIO_MACADDR_MAXSIZE >= mac_len);
printf(" %X:%X:%X:%X:%X:%X ", mac_addr[0], mac_addr[1], mac_addr[2],
-----------------------------------------------------------------------
Summary of changes: test/validation/pktio/pktio.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
hooks/post-receive