[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/07/02 12:31 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33349 | stig | 2010-06-28 06:58:00 -0700 (Mon, 28 Jun 2010) | 8 lines
 Changed paths:
    M /trunk/util.c
 
 From Jan ?afránek via bug 4945:
 Remove any '%<interface>' from default filter.
 
 Wireshark prepares unparseable default filter when it's started under
 'ssh <link-local ipv6 address>%<interface name>' - '%' in SSH_CONNECTION
 is not allowed filter. Let's cut the '%<interface name>' from any IP
 addresses in default filters. 
 ------------------------------------------------------------------------
 r33351 | etxrab | 2010-06-28 08:31:41 -0700 (Mon, 28 Jun 2010) | 1 line
 Changed paths:
    M /trunk/asn1/ranap/ranap.cnf
    M /trunk/asn1/s1ap/Makefile.common
    M /trunk/asn1/s1ap/s1ap.cnf
    M /trunk/epan/dissectors/Makefile.common
    M /trunk/epan/dissectors/packet-gtpv2.c
    M /trunk/epan/dissectors/packet-ranap.c
    M /trunk/epan/dissectors/packet-ranap.h
    M /trunk/epan/dissectors/packet-s1ap.c
 
 Dissect more GTPV2 IE's
 ------------------------------------------------------------------------
 r33356 | stig | 2010-06-28 14:04:56 -0700 (Mon, 28 Jun 2010) | 2 lines
 Changed paths:
    A /trunk/asn1/s1ap/packet-s1ap-template.h
    A /trunk/epan/dissectors/packet-s1ap.h
 
 Add the missing packet-s1ap.h
 ------------------------------------------------------------------------
 r33357 | stig | 2010-06-28 14:05:31 -0700 (Mon, 28 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-gtpv2.c
 
 Mark an unused argument.
 ------------------------------------------------------------------------
 r33354 | gerald | 2010-06-28 10:26:07 -0700 (Mon, 28 Jun 2010) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ber.c
 
 It looks like dissect_ber_octet_string() is called with the expectation
 that out_tvb will always be set (the H.248 dissector does this, at
 least). Make sure we do so. Do the same for
 dissect_ber_constrained_octet_string().
 ------------------------------------------------------------------------
 r33362 | gerald | 2010-06-28 17:08:24 -0700 (Mon, 28 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
 
 Make sure we don't dereference an invalid function pointer. Fixes bug 4949.
 ------------------------------------------------------------------------
 r33369 | etxrab | 2010-06-29 03:46:54 -0700 (Tue, 29 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/asn1/s1ap/S1AP-CommonDataTypes.asn
    M /trunk/asn1/s1ap/S1AP-Constants.asn
    M /trunk/asn1/s1ap/S1AP-IEs.asn
    M /trunk/asn1/s1ap/S1AP-PDU-Contents.asn
    M /trunk/asn1/s1ap/S1AP-PDU-Descriptions.asn
    M /trunk/asn1/s1ap/s1ap.cnf
    M /trunk/epan/dissectors/packet-s1ap.c
    M /trunk/epan/dissectors/packet-s1ap.h
 
 Update to V9.3.0 (2010-06)
 Export ENB-StatusTransfer-TransparentContainer
 ------------------------------------------------------------------------
 r33371 | etxrab | 2010-06-29 07:50:40 -0700 (Tue, 29 Jun 2010) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-nas_eps.c
 
 Allow dissection if not ciphered.
 ------------------------------------------------------------------------
 r33372 | etxrab | 2010-06-29 07:56:39 -0700 (Tue, 29 Jun 2010) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-gtpv2.c
 
 Dissect one F-container
 ------------------------------------------------------------------------
 r33374 | gal | 2010-06-29 11:07:33 -0700 (Tue, 29 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/asn1/ansi_tcap/ansi_tcap.cnf
    M /trunk/epan/dissectors/packet-ansi_tcap.c
 
 Decode parameters as ASN.1 directly and avoid interpreting as an OCTET STRING.
 ------------------------------------------------------------------------
 r33375 | gal | 2010-06-29 11:09:03 -0700 (Tue, 29 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/asn1/pres/ISO8823-PRESENTATION.asn
    M /trunk/asn1/pres/pres.cnf
    M /trunk/epan/dissectors/packet-pres.c
 
 Interpret single-ASN1-type as ASN.1 and not as an OCTET STRING.
 ------------------------------------------------------------------------
 r33376 | etxrab | 2010-06-29 14:29:53 -0700 (Tue, 29 Jun 2010) | 4 lines
 Changed paths:
    M /trunk/gtk/menus.c
 
 Fix:new_packet_list: Crash triggered when changing display filter from right-mouse pop-up menu via packet-list.
  g_object_set_data() was using physical_row rather than row.
 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4860
 ------------------------------------------------------------------------
 r33377 | guy | 2010-06-29 15:38:00 -0700 (Tue, 29 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/gtk/menus.c
 
 Back out what I suspect were private/not-ready-for-prime-time changes,
 not all of the parts of which were present, causing the build to fail.
 ------------------------------------------------------------------------

Directory: /trunk-1.4/asn1/ansi_tcap/
  Changes    Path             Action
  +6 -29     ansi_tcap.cnf    Modified

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                     Action
  +1 -0      Makefile.common          Modified
  +24 -41    packet-ansi_tcap.c       Modified
  +6 -4      packet-ber.c             Modified
  +4 -3      packet-gsm_a_bssmap.c    Modified
  +328 -51   packet-gtpv2.c           Modified
  +6 -1      packet-nas_eps.c         Modified
  +6 -9      packet-pres.c            Modified
  +33 -20    packet-ranap.c           Modified
  +1 -0      packet-ranap.h           Modified
  +66 -33    packet-s1ap.c            Modified


(12 files not shown)