[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/10/05 05:30 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33994 | sake | 2010-08-29 08:27:20 -0700 (Sun, 29 Aug 2010) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tcp.c
    M /trunk/epan/dissectors/packet-tcp.h
 
 From  Cal Turney (bug 5132):
 TCP bytes_in flight becomes inflated with lost packets 
 
 This patch suspends Bytes-in-Flight calculation when missing packets are detected.
 ------------------------------------------------------------------------
 r34001 | etxrab | 2010-08-29 10:34:44 -0700 (Sun, 29 Aug 2010) | 22 lines
 Changed paths:
    M /trunk/asn1/gsm_map/MAP-MobileServiceOperations.asn
    M /trunk/asn1/gsm_map/packet-gsm_map-template.c
    M /trunk/epan/dissectors/packet-gsm_map.c
 
 Fix for Bug Packet details have errors when decode MAP V2 PRN_ACK msg 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5076
 
 Use:
 /*
  * Dissect Multiple Choice Message
  * This function is used to decode a message, when several encoding may be used.
  * For exemple, in the last MAP version, the Cancel Location is defined like this:
  * CancelLocationArg ::= [3] IMPLICIT SEQUENCE
  * But in the previous MAP version, it was a CHOICE between a SEQUENCE and an IMSI
  * As ASN1 encoders (or software) still uses the old encoding, this function allows
  * the decoding of both versions.
  * Moreover, some optimizations (or bad practice ?) in ASN1 encoder, removes the
  * SEQUENCE tag, when only one parameter is present in the SEQUENCE.
  * This explain why the function expects 3 parameters:
  * - a [3] SEQUENCE corresponding the recent ASN1 MAP encoding
  * - a SEQUENCE for old style
  * - and a single parameter, for old version or optimizations
  *
  * The analyze of the first ASN1 tag, indicate what kind of decoding should be used,
  * if the decoding function is provided (so not a NULL function)
  */
 ------------------------------------------------------------------------
 r34011 | stig | 2010-08-30 01:47:26 -0700 (Mon, 30 Aug 2010) | 7 lines
 Changed paths:
    M /trunk/epan/dfilter/dfilter-macro.c
    M /trunk/gtk/macros_dlg.c
    M /trunk/gtk/macros_dlg.h
    M /trunk/gtk/main.c
 
 Always update the display filter when changing a display filter macro
 and when changing profile.  Not sure why I have to invalidate cfile.dfilter
 in macro_update(), because this will be done in macros_post_update(),
 but unless this we get a crash when renaming a macro...
 
 This is a fix for bug 5002.
 ------------------------------------------------------------------------
 r34012 | stig | 2010-08-30 02:31:52 -0700 (Mon, 30 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dfilter/dfilter-macro.c
 
 Call dfilter_macro_uat->post_update_cb instead of using cfile.
 ------------------------------------------------------------------------
 r34031 | stig | 2010-08-31 03:24:08 -0700 (Tue, 31 Aug 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-gtp.c
 
 Update the header length after dissecting the header.
 
 This fixes bug 5162.
 ------------------------------------------------------------------------
 r34033 | stig | 2010-08-31 08:02:03 -0700 (Tue, 31 Aug 2010) | 4 lines
 Changed paths:
    M /trunk/epan/prefs.c
 
 Support space in list of hidden columns.
 
 This fixes bug 5163.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.4/epan/dfilter/
  Changes    Path               Action
  +6 -2      dfilter-macro.c    Modified

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                Action
  +7 -4      packet-gsm_map.c    Modified
  +1 -0      packet-gtp.c        Modified
  +10 -1     packet-tcp.c        Modified
  +1 -0      packet-tcp.h        Modified

Directory: /trunk-1.4/docbook/
  Changes    Path                 Action
  +30 -0     release-notes.xml    Modified

Directory: /trunk-1.4/epan/
  Changes    Path          Action
  +1 -0      prefs.c       Modified

Directory: /trunk-1.4/asn1/gsm_map/
  Changes    Path                               Action
  +1 -0      MAP-MobileServiceOperations.asn    Modified
  +4 -1      packet-gsm_map-template.c          Modified

Directory: /trunk-1.4/gtk/
  Changes    Path            Action
  +15 -1     macros_dlg.c    Modified
  +7 -2      macros_dlg.h    Modified


(1 file not shown)