[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/07/20 11:52 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r42899 | darkjames | 2012-05-29 13:01:25 -0700 (Tue, 29 May 2012) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-radius.c
 
   Fix bug #5735
 
   dissect_attribute_value_pairs() should be also called with NULL tree.
   Broken from r29964.
   ------------------------------------------------------------------------
   r43050 | wmeier | 2012-06-03 18:09:56 -0700 (Sun, 03 Jun 2012) | 17 lines
   Changed paths:
      M /trunk/radius/dictionary.3gpp
 
   From René Scheibe:
 
   "
   I just noticed when upgrading from 1.2.15 to 1.6.8 that the file
   dictionary.3gpp now contains an invalid entry. There is a typo (3GGP
   instead of 3GPP) and the decoding is incorrect too.
 
   wireshark:
   ATTRIBUTE   3GGP-IMEISV   20   octets
 
   freeradius:
   ATTRIBUTE   3GPP-IMEISV   20   string
   "
 
   http://www.wireshark.org/lists/wireshark-dev/201206/msg00021.html
   ------------------------------------------------------------------------
   r43139 | darkjames | 2012-06-06 12:59:55 -0700 (Wed, 06 Jun 2012) | 4 lines
   Changed paths:
      M /trunk/wiretap/netscreen.c
 
   Fix bug #7340
 
   interface name can also contain hyphen (v1-untrust, v1-trust).
   ------------------------------------------------------------------------
   r43166 | morriss | 2012-06-08 15:23:11 -0700 (Fri, 08 Jun 2012) | 10 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-diameter.c
 
   Don't register 3 (IPAddress) hf's with the same abbreviation but with 3
   different types; instead use different abbreviations (filters).
 
   This is in order to prevent running into
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402
 
   and seg-faulting when someone applies a filter of, for example,
   diameter.Framed-IP-Address .
   ------------------------------------------------------------------------
   r43174 | cmaynard | 2012-06-09 08:43:08 -0700 (Sat, 09 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-syslog.c
 
   Allow syslog to work with "Decode As" for TCP.
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5241
   ------------------------------------------------------------------------
   r43176 | cmaynard | 2012-06-09 10:08:46 -0700 (Sat, 09 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   Do not use BASE_NONE for FT_UINT8 types.
   Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7333 (I think).
   ------------------------------------------------------------------------
   r43178 | cmaynard | 2012-06-09 10:51:30 -0700 (Sat, 09 Jun 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-mndp.c
 
   Do not use BASE_NONE for FT_*INT* types.
   ------------------------------------------------------------------------
   r43179 | cmaynard | 2012-06-09 10:56:08 -0700 (Sat, 09 Jun 2012) | 2 lines
   Changed paths:
      M /trunk/asn1/snmp/packet-snmp-template.c
      M /trunk/epan/dissectors/packet-diameter.c
      M /trunk/epan/dissectors/packet-snmp.c
      M /trunk/epan/dissectors/packet-vmlab.c
 
   Do not use BASE_NONE for FT_*INT* types.
   ------------------------------------------------------------------------
   r43187 | cmaynard | 2012-06-10 12:43:40 -0700 (Sun, 10 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-udp.c
 
   Fix UDP-Lite checksum verification bug introduced with r40387 and reported by "answer" via http://ask.wireshark.org/questions/11798/is-udp-lite-checksum-correct-ipv6
   There is a difference between the UDP and UDP-Lite pseudo header that wasn't realized when r40387 was committed.  Details of the difference in http://tools.ietf.org/html/rfc3828#section-3.2
   ------------------------------------------------------------------------
   r43191 | cmaynard | 2012-06-10 17:53:23 -0700 (Sun, 10 Jun 2012) | 2 lines
   Changed paths:
      M /trunk/AUTHORS
 
   Remove duplicate entry.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r42764 | guy | 2012-05-21 20:52:12 -0700 (Mon, 21 May 2012) | 12 lines
   Changed paths:
      M /trunk/file.c
      M /trunk/file.h
      M /trunk/ui/gtk/main.c
      M /trunk/ui/gtk/main_statusbar.c
      M /trunk/ui/qt/wireshark_application.cpp
 
   The GUI's state machine requires that, when reloading a capture after a
   save, we post capture file callback events similar to the ones posted
   when reading a capture - otherwise, the reload will leave the welcome
   screen up.
 
   Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished,
   add a cf_cb_file_reload_started callback, have them work similarly to
   read_finished and read_started except that the reload uses "Reloading"
   in the progress bar and status bar.
 
   Clean up some indentation while we're at it.
   ------------------------------------------------------------------------
   ------------------------------------------------------------------------
   r43172 | cmaynard | 2012-06-08 20:41:23 -0700 (Fri, 08 Jun 2012) | 2 lines
   Changed paths:
      M /trunk/capture_sync.c
      M /trunk/epan/filesystem.c
      M /trunk/rawshark.c
 
   Be sure to specify FORMAT_MESSAGE_IGNORE_INSERTS in the dwFlags arg to all FormatMessage() calls where FORMAT_MESSAGE_FROM_SYSTEM is also specified.  (Ref: http://blogs.msdn.com/b/oldnewthing/archive/2007/11/28/6564257.aspx)
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +4 -4      packet-diameter.c     Modified
  +3 -3      packet-ieee80211.c    Modified
  +1 -1      packet-mndp.c         Modified
  +1 -1      packet-radius.c       Modified
  +1 -1      packet-snmp.c         Modified
  +1 -0      packet-syslog.c       Modified
  +8 -2      packet-udp.c          Modified
  +1 -1      packet-vmlab.c        Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path            Action
  +1 -1      filesystem.c    Modified


(10 files not shown)