[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/05/25 02:32 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   r37244 | morriss | 2011-05-18 10:09:55 -0700 (Wed, 18 May 2011) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
 
   Add a default (else) case in the default case for cause values to avoid passing
   a NULL string pointer to format routines.
 
   While we're there, update the cause list from 48.008 v10.1.0.
   ------------------------------------------------------------------------
   r37247 | morriss | 2011-05-18 10:31:48 -0700 (Wed, 18 May 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_a_bssmap.c
 
   Finish removing tabs and fix up some indentation.
 
   Add a break after decoding CSData Codec Type.
   ------------------------------------------------------------------------
   r37279 | tuexen | 2011-05-18 21:56:04 -0700 (Wed, 18 May 2011) | 3 lines
   Changed paths:
      M /trunk/capture_info.c
 
   Fix the capture info dialog. Reset the EOF state such that the
   number get actually updated.
   ------------------------------------------------------------------------
   r37286 | guy | 2011-05-19 02:47:03 -0700 (Thu, 19 May 2011) | 11 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-smb.c
 
   The routines declared in packet-smb.h are defined in packet-smb.c;
   include packet-smb.h in packet-smb.c so that we check the declarations
   against the definitions.
 
   In query ops, info level 2 is Query EA Size, not Query EAs From List.
   In set ops, info level 2 is Set EAs, not Query EA Size.
 
   Expand the constants for the Trans2 subcodes to 16 bits.
 
   The tvb argument to dissect_find_file_unix_info2() is used.
   ------------------------------------------------------------------------
   r37298 | gerald | 2011-05-19 11:10:21 -0700 (Thu, 19 May 2011) | 26 lines
   Changed paths:
      M /trunk/CMakeLists.txt
      M /trunk/Makefile.am
      M /trunk/Makefile.nmake
      M /trunk/file.c
      M /trunk/packaging/nsis/wireshark.nsi
      A /trunk/pdml2html.xsl
      M /trunk/print.c
      M /trunk/print.h
      A /trunk/tools/colorfilters2js.pl
      M /trunk/tshark.c
 
   From Dirk Jagdmann via bug 5875:
 
   My attachment adds a link to a XSLT file to the preamble of the PDML.
   The XSLT will transform the PDML to a HTML page, and the HTML page
   features a look similar to Wireshark. See
   http://cubic.org/~doj/ebay/a.pdml for an example.
 
   The patch also contains a small perl program which converts the
   Wireshark colortable into javascript code which is used in the XSLT
   file. If you want to use a different color scheme you would execute the
   perl program and insert the generated javascript function into your XSLT
   file.
 
   To view the HTML you could either place the PDML and XSLT file on your
   webserver and verify that your webserver sends the PDML file as
   "text/xml".  Then your webbrowser will find the linked XSLT file,
   download that as well and convert the PDML to HTML on the fly.
 
   You could also use an XSLT processor like xsltproc to convert the PDML
   and XSLT into a static HTML file.
 
   From me:
 
   Minor fixups.
   ------------------------------------------------------------------------
   r37314 | guy | 2011-05-19 14:11:44 -0700 (Thu, 19 May 2011) | 6 lines
   Changed paths:
      M /trunk/Makefile.am
 
   Add pdml2html.xsl to the source tarball.
 
   (Can we have a macro that has everything in pkgdata_DATA except for
   COPYING, and use that macro in both the definition of pkgdata_DATA and
   EXTRA_DIST?)
   ------------------------------------------------------------------------
   r37316 | guy | 2011-05-19 19:35:05 -0700 (Thu, 19 May 2011) | 3 lines
   Changed paths:
      M /trunk/packaging/macosx/osx-app.sh
 
   In at least some versions of OS X SystemStarter gets cranky if the
   startup item is group-writable.
   ------------------------------------------------------------------------
   r37355 | jmayer | 2011-05-23 01:54:47 -0700 (Mon, 23 May 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   7.3.2.25 or 802.11-2007 gives an example of length 20, so it is unclear where the 24 came from (unintentionally fixes bug 5942)
   ------------------------------------------------------------------------
   r37370 | cmaynard | 2011-05-23 10:53:51 -0700 (Mon, 23 May 2011) | 2 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/epan/dissectors/packet-dect.c
 
   From Romain Fliedel via bug 5947: Fix the mask for extracting FMID.
   ------------------------------------------------------------------------
   r37374 | guy | 2011-05-24 09:17:43 -0700 (Tue, 24 May 2011) | 2 lines
   Changed paths:
      M /trunk/tshark.c
 
   Don't print hidden columns.
   ------------------------------------------------------------------------
   r37389 | alagoutte | 2011-05-25 00:15:05 -0700 (Wed, 25 May 2011) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From tschardt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5949
   802.11 IE tag number 61/62 still decoded to "Unknown"/Reserved tag Number
 
   Remove inadvertently by me in rev36120
   ------------------------------------------------------------------------

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                     Action
  +1 -1      packet-dect.c            Modified
  +16 -5     packet-gsm_a_bssmap.c    Modified
  +4 -2      packet-ieee80211.c       Modified
  +54 -55    packet-smb.c             Modified

Directory: /trunk-1.6/packaging/macosx/
  Changes    Path          Action
  +1 -0      osx-app.sh    Modified

Directory: /trunk-1.6/packaging/nsis/
  Changes    Path             Action
  +2 -0      wireshark.nsi    Modified

Directory: /trunk-1.6/
  Changes    Path              Action
  +1 -0      AUTHORS           Modified
  +1 -0      CMakeLists.txt    Modified
  +2 -1      Makefile.am       Modified
  +1 -0      Makefile.nmake    Modified
  +4 -1      capture_info.c    Modified


(5 files not shown)