[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/07/27 04:41 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 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().
 ------------------------------------------------------------------------
 r33258 | jake | 2010-06-20 05:21:45 -0700 (Sun, 20 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-nas_eps.c
 
 From KATAOKA Toshihiro:
 The sequence number in 3GPP NAS EPS(TS24.301) cyphered PDU is outside of ciphered text.
 ------------------------------------------------------------------------
 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.
 ------------------------------------------------------------------------
 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.
 ------------------------------------------------------------------------
 r33457 | jake | 2010-07-06 10:22:12 -0700 (Tue, 06 Jul 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-omapi.c
 
 Fix for bug 4982:
 Handle concatenated Status and other message.
 ------------------------------------------------------------------------
 r33483 | jake | 2010-07-10 02:47:20 -0700 (Sat, 10 Jul 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-smb.c
 
 Fix for bug 4993:
 Mac support flags are little endian too.
 ------------------------------------------------------------------------
 r33526 | stig | 2010-07-14 13:24:38 -0700 (Wed, 14 Jul 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-packetlogger.c
    M /trunk/wiretap/packetlogger.c
 
 Don't pass tvb data to col_set_str(), as it will not stay around.
 Added support for Note (dumping as text).
 Renamed Info to Power (as used in PacketLogger).
 ------------------------------------------------------------------------
 r33611 | jake | 2010-07-21 12:31:56 -0700 (Wed, 21 Jul 2010) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-scsi.h
 
 From Zachary Mark:
 It appears that SCSI_SPC_ACCESS_CONTROL_IN is incorrectly set to opcode 0x85 
 where the actual opcode is 0x86.  0x85 is the opcode for the 16-byte version 
 of the ATA PASSTHROUGH command of the SAT standards family.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 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.
 ------------------------------------------------------------------------
 
 Copy over col_append_fstr() and col_append_sep_fstr() by hand.
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                     Action
  +6 -4      packet-ber.c             Modified
  +10 -2     packet-nas_eps.c         Modified
  +13 -1     packet-omapi.c           Modified
  +7 -4      packet-packetlogger.c    Modified
  +1 -1      packet-scsi.h            Modified
  +1 -1      packet-smb.c             Modified

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

Directory: /trunk-1.2/epan/
  Changes    Path              Action
  +50 -42    column-utils.c    Modified

Directory: /trunk-1.2/asn1/pres/
  Changes    Path                        Action
  +1 -1      ISO8823-PRESENTATION.asn    Modified
  +0 -1      pres.cnf                    Modified


(1 file not shown)