["Bill Meier" <wmeier@xxxxxxxxxxx>]

Patches for netxray.c


Timezone defined as gint16;


> That would make sense - the new header definition is the better one, 
> so the comments should refer to it.

   Done


> ...hence my XXX comment. An alternative might be "if (timeunit >= 1e7)", for example.

   OK - Let's do that ...


Bill Meier



92c92
<       guint16 timezone_hrs;   /* timezone hours [at least for version 2...];  */
---
>       gint16 timezone_hrs;    /* timezone hours [at least for version 2.2..]; */
93a94
>                               /*  negative values = east of UTC:              */
94a96
>                               /* [Does not appear to be adjusted for DST ]    */
564a567,568
>                * XXX - Seems reasonable to use nanosecs only if TPS
>                * greater >= than 10M
566c570
<               if (timeunit > 1e6)
---
>               if (timeunit >= 1e7)
607,617c611,617
<                                * In the Cisco HDLC capture, hdr.xxc[22:26]
<                                * is 0x02 0x00 0x01 0x00 0x06, but it's
<                                * 0x00 0x00 0x00 0x00 0x00 in the Frame
<                                * Relay capture.  Also, hdr.xxc[30:31]
<                                * is 0xff 0xff in the Cisco HDLC capture
<                                * and 0x00 0x00 in the Frame Relay capture,
<                                * and hdr.xxc[46:47] is 0xff 0xff in the
<                                * Cisco HDLC capture and 0x05 0x00 in the
<                                * Frame Relay capture.
<                                *  [XXX: xxc[46:47] appear to be Timezone]
<                                *  [Does 0xff 0xff mean "time zone unknown?]
---
>                                * [Bytes in each capture:
>                                * Cisco HDLC:  hdr.xxx_x60[06:10]: 0x02 0x00 0x01 0x00 0x06
>                                * Frame Relay: hdr.xxx_x60[06:10]  0x00 0x00 0x00 0x00 0x00
>
>                                * Cisco HDLC:  hdr.xxx_x60[14:15]: 0xff 0xff
>                                * Frame Relay: hdr.xxx_x60[14:15]: 0x00 0x00
>                                * ]
740c740
<                * 0x01 in xxb[4].  No captures I've seen with a network
---
>                * 0x01 in xxx_x40[4].  No captures I've seen with a network
744c744
<                * and with 0x01 in xxb[4], *without* FCSes in the
---
>                * and with 0x01 in xxx_x40[4], *without* FCSes in the
746c746
<                * not as simple as "xxb[4] = 0x01 means the 4 bytes at
---
>                * not as simple as "xxx_x40[4] = 0x01 means the 4 bytes at
748,749c748,749
<                * 802.11 capture with an xxb[4] value of 0x01 with junk
<                * rather than an FCS at the end of the frame, so xxb[4]
---
>                * 802.11 capture with an xxx_x40[4] value of 0x01 with junk
>                * rather than an FCS at the end of the frame, so xxx_x40[4]
753c753,754
<                * There don't seem to be any other values in xxb or xxc
---
>                * There don't seem to be any other values in any of the
>                * xxx_x5..., xxx_x6...., xxx_x7.... fields