[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=25877

User: gerald
Date: 2008/07/30 11:26 AM

Log:
 Copy over r25677 by hand:
 
 ------------------------------------------------------------------------
 r25677 | morriss | 2008-07-08 13:04:11 -0700 (Tue, 08 Jul 2008) | 1 line
 Changed paths:
    M /trunk/epan/tvbuff.c
 
 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2649 by adding some length checks to two while loops in tvb_uncompress()
 ------------------------------------------------------------------------
 
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r25719 | guy | 2008-07-11 19:36:32 -0700 (Fri, 11 Jul 2008) | 7 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-erf.c
    M /trunk/epan/prefs.c
 
 ERF Ethernet records always contain Ethernet packets, as the name
 indicates; replace the "erf.eth" preference with an "erf.ethfcs"
 preference, specifying whether the FCS is present in Ethernet frames,
 and offer the options "present", "not present", and "maybe present" -
 for "maybe present", call the regular Ethernet dissector, which tries to
 figure out whether there's an FCS at the end of the packet or not.
 
 ------------------------------------------------------------------------
 r25720 | guy | 2008-07-11 19:42:33 -0700 (Fri, 11 Jul 2008) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-erf.c
    M /trunk/epan/prefs.c
 
 Rename the preference values to something that leaves out the "eth" (as
 it's redundant).
 
 ------------------------------------------------------------------------
 r25722 | sake | 2008-07-12 10:23:18 -0700 (Sat, 12 Jul 2008) | 5 lines
 Changed paths:
    M /trunk/capture_stop_conditions.c
 
 Fix an off-by-one error which caused capturing with
 a duration limit of X seconds per file to actually
 save X+1 seconds per file
 
 ------------------------------------------------------------------------
 r25724 | guy | 2008-07-12 11:26:47 -0700 (Sat, 12 Jul 2008) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-erf.c
    M /trunk/epan/prefs.c
 
 Make erf.ethfcs a Boolean, with "FCS present" and "FCS not present" the
 only options, and default to "FCS present".
 
 ------------------------------------------------------------------------
 r25729 | guy | 2008-07-13 10:11:02 -0700 (Sun, 13 Jul 2008) | 10 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ppp.c
 
 Dissect the PPP Bridge Control Protocol header.  Hand Ethernet packets
 to the "no FCS" dissector if the "FCS present" flag isn't set.  Strip
 off padding.  Don't hand non-Ethernet packets to the Ethernet dissector.
 
 Update the RFC number for the PPP Multilink protocol.  Add a preference
 for short sequence numbers.  Check only the "first fragment" and "last
 fragment" flags when constructing the summary description for the flags
 field.  Use the global "tfs_yes_no" true_false_string structure rather
 than defining our own "Yes"/"No" true_false_string structure.
 
 ------------------------------------------------------------------------
 r25732 | guy | 2008-07-13 12:04:53 -0700 (Sun, 13 Jul 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ppp.c
    M /trunk/epan/ppptypes.h
 
 The PPP protocol type of 0031 is for the PPP Bridging Control Protocol;
 it's not the "Bridge Control Protocol", and the packets aren't "BPDU"s
 in the sense of Spanning Tree Protocol packets.
 
 ------------------------------------------------------------------------
 r25736 | guy | 2008-07-14 11:56:25 -0700 (Mon, 14 Jul 2008) | 14 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-erf.c
    M /trunk/epan/prefs.c
 
 Replace the old "erfatm" preference for the ERF dissector with an
 "aal5_type" dissector, which offers only "guess the traffic type" and
 "LLC multiplexed" as options, defaulting to "guess the type".
 
 Add a separate preference to control whether to treat single ATM cells
 as raw data or as the first cell of an AAL5 PDU (and dissecting them as
 short AAL5 PDUs).
 
 Don't reach inside the tvbuff to get the data and the length; use
 tvb_length() and tvb_get_ptr().
 
 Pass the data *after* the AAL5 header to the "guess the traffic type"
 routine.
 
 ------------------------------------------------------------------------
 r25737 | guy | 2008-07-14 12:28:19 -0700 (Mon, 14 Jul 2008) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-erf.c
    M /trunk/epan/prefs.c
 
 Rename the ERF "erfhdlc" preference to "hdlc_type" ("erf" is redundant,
 and "hdlc" doesn't indicate that it's a protocol type), and, instead of
 a "raw" option, have a "try to guess the traffic type" option - for now,
 if the first byte is 0x0f or 0x8f, treat it as Cisco HDLC, otherwise
 treat it as PPP.
 
 ------------------------------------------------------------------------
 r25739 | guy | 2008-07-14 13:26:58 -0700 (Mon, 14 Jul 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-erf.c
 
 Just have a scalar handle_t for the Infiniband handle, for now.  (The
 old code had the type value past the end of the array.)
 
 Rename the handle variables.
 
 ------------------------------------------------------------------------
 r25751 | jake | 2008-07-15 22:17:32 -0700 (Tue, 15 Jul 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-aim.c
 
 From Alex Turbov:
 AIM 'New Connection' packet dissector have incorrect size for details pane of
 TLV 0x14. Actual size is 4 (not 2).
 
 ------------------------------------------------------------------------
 r25752 | jake | 2008-07-15 22:33:25 -0700 (Tue, 15 Jul 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-aim.c
 
 From Alex Turbov:
 Function dissect_aim_tlv_value_uint32 have consumed 24 bits instead of 32 to
 obtain a value.
 
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.0/epan/dissectors/
  Changes    Path            Action
  +2 -2      packet-aim.c    Modified
  +135 -111  packet-erf.c    Modified
  +213 -35   packet-ppp.c    Modified

Directory: /trunk-1.0/docbook/
  Changes    Path                 Action
  +14 -6     release-notes.xml    Modified

Directory: /trunk-1.0/epan/
  Changes    Path          Action
  +1 -1      ppptypes.h    Modified
  +39 -0     prefs.c       Modified

Directory: /trunk-1.0/
  Changes    Path                         Action
  +1 -1      capture_stop_conditions.c    Modified