[ovs-dev] [PATCH 2/3] Do not print ICMP fields for non IP packets.

Ethan Jackson ethan at nicira.com
Sat Oct 20 17:49:12 UTC 2012


> -    if (f->nw_proto == IPPROTO_ICMP) {
> +    if (f->dl_type == htons(ETH_TYPE_IP) &&
> +        f->nw_proto == IPPROTO_ICMP) {
>          format_be16_masked(s, "icmp_type", f->tp_src, wc->masks.tp_src);
>          format_be16_masked(s, "icmp_code", f->tp_dst, wc->masks.tp_dst);
> -    } else if (f->nw_proto == IPPROTO_ICMPV6) {
> +    } else if (f->dl_type == htons(ETH_TYPE_IPV6) &&
> +               f->nw_proto == IPPROTO_ICMPV6) {

Traditionally we've put the && on the next line so you end up with:

> +    if (f->dl_type == htons(ETH_TYPE_IP)
> +        && f->nw_proto == IPPROTO_ICMP) {

Otherwise looks good, thanks.

Acked-by: Ethan Jackson <ethan at nicira.com>



More information about the dev mailing list