Wireshark · Wireshark-dev: Re: [Wireshark-dev] ATM Dissector Enhancement

[Guy Harris <guy@xxxxxxxxxxxx>]

McAtee, Kip wrote:

> +            if (octet[0] == 0x00 && octet[1] == 0x21)
> +            {
> +                call_dissector(ppp_handle, next_tvb, pinfo, tree);
> +            }

So is this for VC-multiplexed PPPoA (for IP)?  If so, you might want to 
use pntohs() on the two octets and compare against PPP_IP from 
epan/ppptypes.h.

> +            else if ((octet[0] == 0x45) ||
> +                     ((octet[0] & 0xf0) == 0x60))
> +            {
> +                call_dissector(ip_handle, next_tvb, pinfo, tree);
> +            }

That won't handle IPv4 headers with options - should it just do

		else if (((octet[0] & 0xf0) == 0x40) ||
			 ((octet[0] & 0xf0) == 0x60))