[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/05/18 05:29 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37197 | guy | 2011-05-16 19:29:43 -0700 (Mon, 16 May 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ntlmssp.c
 
   According to MS-NLMP, the "version" field in the NTLMSSP blobs is
   present only if the NTLMSSP_NEGOTIATE_VERSION flag is set in the flags
   field, and that appears to be true in at least one capture I've seen.
   ------------------------------------------------------------------------
   r37199 | etxrab | 2011-05-17 01:23:30 -0700 (Tue, 17 May 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_a_gm.c
 
   Use the correct value string and bitmasks.
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5928
   ------------------------------------------------------------------------
   r37236 | guy | 2011-05-18 00:20:45 -0700 (Wed, 18 May 2011) | 3 lines
   Changed paths:
      M /trunk/epan/proto.c
 
   You cannot just make the "len" field of a GByteArray larger, if there's
   no data to back that length; you can only make it smaller.
   ------------------------------------------------------------------------
   r37239 | morriss | 2011-05-18 08:33:07 -0700 (Wed, 18 May 2011) | 7 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5930 :
 
   with a variant of the patch submitted by Alexander Stein on the -dev list:
 
   Allow FT_FRAMENUMs to be added (as base BASE_NONE).  My change from Alexander's
   patch is to disallow BASE_NONE for non-framenum integers.
   ------------------------------------------------------------------------
   r36890 | wmeier | 2011-04-26 22:09:00 -0700 (Tue, 26 Apr 2011) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-aim-messaging.c
 
   From Yaniv Kaul: some 'set but not used' compilation fixes;
   From me:
   - Remove unneeded #include <stdlib.h> and <ctype.h>;
   - Indentation cleanup.
   ------------------------------------------------------------------------
   r37188 | cmaynard | 2011-05-16 13:02:14 -0700 (Mon, 16 May 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-aim-messaging.c
 
   Fix endian issues, especially w/endian arg to proto_tree_add_item().
   Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5464.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r37183 | guy | 2011-05-16 11:32:35 -0700 (Mon, 16 May 2011) | 11 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-smb.c
 
   Fix some comments.
 
   Get rid of null-pointer tests for t2i in the "not null" branch of an
   earlier test whether it's null, as those tests are redundant.
 
   Use a switch statement to check the subcommand for Trans2.
 
   If t2i->info_level is -1, it means we don't know the info level, for
   whatever reason (e.g., the request was cut short by the snapshot length
   before the info level).  Report it as such.
 
   ------------------------------------------------------------------------
   r37192 | guy | 2011-05-16 15:55:22 -0700 (Mon, 16 May 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-smb.c
 
   Give the UNIX-extension routines used for info levels that appear both
   in set and get names beginning with dissect_qspi_.
   ------------------------------------------------------------------------
   r37196 | guy | 2011-05-16 18:38:28 -0700 (Mon, 16 May 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ntlmssp.c
 
   Fix cut-and-pasteo.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                      Action
  +39 -38    packet-aim-messaging.c    Modified
  +2 -2      packet-gsm_a_gm.c         Modified
  +12 -5     packet-ntlmssp.c          Modified
  +43 -30    packet-smb.c              Modified

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

Directory: /trunk-1.4/epan/
  Changes    Path          Action
  +6 -1      proto.c       Modified

Directory: /trunk-1.4/epan/wslua/
  Changes    Path             Action
  +5 -2      wslua_proto.c    Modified