Ethereal-dev: Re: [Ethereal-dev] netxray.c - patches

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Guy Harris <gharris@xxxxxxxxx>
Date: Mon, 29 Nov 2004 10:58:25 -0800
Bill Meier wrote:

For the third case (for "PPP Captured with Pod" and fhdr.timeunit = 2) I've changed the code to use the timeunit, etc which results in the correct time display for the captures that I have.

	...

		else if ((network_type == 1) && (hdr.xxb[20] == CAPTYPE_PPP)) {

A network type of 1 is Ethernet, not PPP - are there PPP captures that have a network type of 1 rather than 4? I think the NDIS PPP captures have a network type of 4 ("WAN(PPP), but shaped like Ethernet"), and have fake Ethernet headers (as that's what NDISWAN puts on packets before handing them to regular NDIS protocol drivers), and at least some PPP captures done with a pod (CAPTYPE_PPP) also have a network type of 4.

Also, please submit the patches as "diff -c" or "diff -u" output - "diff" output of the sort you sent won't work if the file has been modified in SVN since you made the patch (fortunately, I don't think it has, but there's no version 12341 in the main branch, so I can't check that - perhaps that's the version number assigned by SVN when the 0.10.7 branch was made).