On Thu, Nov 27, 2014 at 05:51:19PM +0000, Maxim Uvarov wrote:
> Define API and implement promisc functions for linux-generic.
> 
> Signed-off-by: Maxim Uvarov <[email protected]>
> ---
>  platform/linux-generic/include/api/odp_packet_io.h | 24 +++++++
>  platform/linux-generic/odp_packet_io.c             | 74 
> ++++++++++++++++++++++
>  2 files changed, 98 insertions(+)
> 
> diff --git a/platform/linux-generic/include/api/odp_packet_io.h 
> b/platform/linux-generic/include/api/odp_packet_io.h
> index 667395c..c7d1e40 100644
> --- a/platform/linux-generic/include/api/odp_packet_io.h
> +++ b/platform/linux-generic/include/api/odp_packet_io.h
> @@ -149,6 +149,30 @@ int odp_pktio_set_mtu(odp_pktio_t id, int mtu);
>  int odp_pktio_mtu(odp_pktio_t id);
>  
>  /**
> + * Enable promiscuous mode on a packet IO interface.
> + *
> + * @param[in] id     ODP packet IO handle.
> + * @param[in] enable    1 enabled, 0 disabled.
> + *
> + * @retval  0 on success.
> + * @retval -1 on a bad pktio id
> + * @retval -1 any other error
> + */
> +int odp_pktio_promisc_set(odp_pktio_t id, odp_bool_t enable);
> +
> +/**
> + * Determine if promiscuous mode is enabled for a packet IO interface.
> + *
> + * @param[in] id ODP packet IO handle.
> + *
> + * @retval  1 if promiscuous mode is enabled.
> + * @retval  0 if promiscuous mode is disabled.
> + * @retval -1 on a bad pktio id
> + * @retval -1 any other error
> +*/
> +int odp_pktio_promisc_enabled(odp_pktio_t id);
> +
> +/**
>   * @}
>   */
>  
> diff --git a/platform/linux-generic/odp_packet_io.c 
> b/platform/linux-generic/odp_packet_io.c
> index c523350..9140620 100644
> --- a/platform/linux-generic/odp_packet_io.c
> +++ b/platform/linux-generic/odp_packet_io.c
> @@ -542,3 +542,77 @@ int odp_pktio_mtu(odp_pktio_t id)
>  
>       return ifr.ifr_mtu;
>  }
> +
> +int odp_pktio_promisc_set(odp_pktio_t id, odp_bool_t enable)
> +{
> +     pktio_entry_t *entry;
> +     int sockfd;
> +     struct ifreq ifr;
> +     int ret;
> +
> +     entry = get_entry(id);
> +     if (entry == NULL) {
> +             ODP_DBG("pktio entry %d does not exist\n", id);
> +             return -1;
> +     }
> +
> +     if (entry->s.pkt_sock_mmap.sockfd)

This isn't right, 0 is a valid value for a sockfd, although you can't
check against -1 here either as the structure is initialised to 0.
You'll either need to initialise the sockfds properly or do what is done
elsewhere and check the entry->s.type

The odp_pktio_set_mtu and odp_pktio_mtu functions have the same issue.

> +             sockfd = entry->s.pkt_sock_mmap.sockfd;
> +     else
> +             sockfd = entry->s.pkt_sock.sockfd;
> +
> +     strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1);
> +     ifr.ifr_name[IFNAMSIZ] = 0;

This overruns, need to use IFNAMSIZ-1

-- 
Stuart.


_______________________________________________
lng-odp mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to