Wireshark · Wireshark-dev: Re: [Wireshark-dev] broken OAM cell detection for juniper dissector

[Richard van der Hoff <richardv@xxxxxxxxxxxxx>]

Applied as revision 21477 - thank you.

In future, please could you send patches as attachments rather than 
pasting them into the body of the email? Also, could you take the diff 
from the root of the wireshark source tree, rather than from within the 
epan/dissectors directory.

Cheers,

Richard

Hannes Gredler wrote:
> hi, could the committers pls pick this up ?
>
> ---
>
> hi wireshark developers,
>
> attached a small bugfix that uses the correct bits
> for determining if the ATM payload is a OAM cell.
>
> asking for inclusion.
>
> tx,
>
> /hannes
>
> Index: packet-juniper.c
> ===================================================================
> --- packet-juniper.c    (revision 21334)
> +++ packet-juniper.c    (working copy)
> @@ -1100,7 +1100,7 @@
>    case JUNIPER_PIC_ATM2:
>        tisub = proto_tree_add_uint64(juniper_subtree, hf_juniper_atm2_cookie, tvb, offset, 8, cookie2);
>        offset += atm2_header_len;
> -      if (cookie2 & 0x7000) /* OAM cell ? */
> +      if (cookie2 & 0x70) /* OAM cell ? */
>            next_proto = PROTO_OAM;
>        break;
>    default: /* should not happen */
> _______________________________________________
> Wireshark-dev mailing list
> Wireshark-dev@xxxxxxxxxxxxx
> http://www.wireshark.org/mailman/listinfo/wireshark-dev
> _______________________________________________
> Wireshark-dev mailing list
> Wireshark-dev@xxxxxxxxxxxxx
> http://www.wireshark.org/mailman/listinfo/wireshark-dev