[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/01/28 02:34 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r47136 | jake | 2013-01-17 14:06:22 -0800 (Thu, 17 Jan 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-jxta.c
 
   Fix for bug 8212.
   Disable speed optimization which otherwise cause dissector asserts due to
   appending text and setting lengths.
   ------------------------------------------------------------------------
   r47144 | jake | 2013-01-17 22:22:01 -0800 (Thu, 17 Jan 2013) | 2 lines
   Changed paths:
      M /trunk/docbook/wsug_src/WSUG_chapter_capture.xml
 
   Replace SESSIONNAME with the use of an API call, just as in the code.
   ------------------------------------------------------------------------
   r47173 | grahamb | 2013-01-20 02:01:34 -0800 (Sun, 20 Jan 2013) | 1 line
   Changed paths:
      M /trunk/asn1/snmp/packet-snmp-template.c
      M /trunk/epan/dissectors/packet-snmp.c
 
   snmp dissector did not correctly set length of pdu's of more than 127 bytes.  The dissector assumed the ber identifier and length fields were always 2 bytes long, so a pdu length of more than 127 bytes, which requires more than 1 length octet, was incorrectly dissected.
   ------------------------------------------------------------------------
   r47223 | jake | 2013-01-22 22:11:18 -0800 (Tue, 22 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-lapd.c
 
   Fix for CID 280286:
   Take negative value into account, avoid all casting in the process.
   ------------------------------------------------------------------------
   r47294 | jake | 2013-01-26 03:34:55 -0800 (Sat, 26 Jan 2013) | 3 lines
   Changed paths:
      M /trunk/plugins/wimax/packet-wmx.c
 
   Fix for CID 280529 and 280530.
   Check the validity of the TLV before using its retreived data.
   ------------------------------------------------------------------------
   r47298 | cmaynard | 2013-01-26 07:41:16 -0800 (Sat, 26 Jan 2013) | 4 lines
   Changed paths:
      M /trunk/tempfile.c
      M /trunk/tempfile.h
 
   Replace disallowed filename characters to '-'.
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7877
   #BACKPORT(1.8, 1.6)
   ------------------------------------------------------------------------
   r47300 | eapache | 2013-01-26 07:51:01 -0800 (Sat, 26 Jan 2013) | 2 lines
   Changed paths:
      M /trunk/tempfile.c
      M /trunk/tempfile.h
 
   The const was important, take a copy of the suffix to sanitize instead.
   ------------------------------------------------------------------------
   r47314 | mmann | 2013-01-27 07:28:55 -0800 (Sun, 27 Jan 2013) | 1 line
   Changed paths:
      M /trunk/epan/crypt/airpdcap.c
 
   Bugfix crash caused by AirPDcap decryption.  Bug 8177 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177)
   ------------------------------------------------------------------------
   r47328 | mmann | 2013-01-28 13:08:14 -0800 (Mon, 28 Jan 2013) | 2 lines
   Changed paths:
      M /trunk/asn1/snmp/packet-snmp-template.c
      M /trunk/epan/dissectors/packet-snmp.c
 
   Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
   Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)
   ------------------------------------------------------------------------
 
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r46556 | pascal | 2012-12-16 00:58:46 -0800 (Sun, 16 Dec 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtpv2.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8098 :
   Incorrect dissection of SAC and RAC in 3GPP ULI AVP
   ------------------------------------------------------------------------
   r47277 | cmaynard | 2013-01-25 11:01:57 -0800 (Fri, 25 Jan 2013) | 5 lines
   Changed paths:
      M /trunk/ui/gtk/packet_panes.c
 
   When searching for hex bytes from the "Find Packet" dialog, highlight the correct number of bytes.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8085
   #BACKPORT
   1.8: ui/gtk/main_proto_draw.c:packet_hex_print()
   1.6: gtk/main_proto_draw.c:packet_hex_print()
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/crypt/
  Changes    Path          Action
  +5 -3      airpdcap.c    Modified

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path              Action
  +3 -3      packet-fcp.c      Modified
  +8 -6      packet-gtpv2.c    Modified
  +8 -2      packet-jxta.c     Modified
  +1 -1      packet-lapd.c     Modified
  +2 -2      packet-snmp.c     Modified

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

Directory: /trunk-1.6/gtk/
  Changes    Path                 Action
  +8 -1      main_proto_draw.c    Modified

Directory: /trunk-1.6/asn1/snmp/
  Changes    Path                      Action
  +2 -2      packet-snmp-template.c    Modified

Directory: /trunk-1.6/
  Changes    Path          Action
  +24 -6     tempfile.c    Modified
  +2 -2      tempfile.h    Modified


(2 files not shown)