Wireshark-commits: [Wireshark-commits] rev 46232: / /trunk-1.6/epan/dissectors/: packet-ieee80211.c

Date: Tue, 27 Nov 2012 18:15:23 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46232

User: gerald
Date: 2012/11/27 10:15 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r45321 | jake | 2012-10-04 12:30:15 -0700 (Thu, 04 Oct 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Sven Eckelmann:
   Fix dissection of IEEE 802.11 Channel Switch Announcement element.
   ------------------------------------------------------------------------
   r45559 | etxrab | 2012-10-15 08:59:47 -0700 (Mon, 15 Oct 2012) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee802154.c
 
   From Rakesh Kumar:
   Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function.
   Offset should be +8 not +4
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7864
   ------------------------------------------------------------------------
   r45660 | cmaynard | 2012-10-19 11:05:02 -0700 (Fri, 19 Oct 2012) | 3 lines
   Changed paths:
      M /trunk/print.ps
 
   Add back the "%!" removed in r33773; otherwise, for some unknown reason, only 1 page will be viewable.  (Tested w/gsview 5.0 and ghostscript 9.06)
   #BACKPORT(1.8, 1.6)
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r45331 | cmaynard | 2012-10-05 07:51:31 -0700 (Fri, 05 Oct 2012) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/gui_utils.c
 
   A minor modification to Stephen Fisher's r34265 patch to [attempt to] resolve bug 553.  This change takes into account that viewable_area.[x|y] may not be 0,0.  Will this finally fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=553 ?Unknown, but I am unable to reproduce it.
   ------------------------------------------------------------------------
   r45820 | martink | 2012-10-28 12:13:54 -0700 (Sun, 28 Oct 2012) | 6 lines
   Changed paths:
      M /trunk/ui/gtk/color_edit_dlg.c
 
   fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7913
 
   When we create a new color filter, we prepend the color filter list with
   a default entry and launch an edit dialogue. If the user cancels, we
   have to remove this _first_ entry from the list (not the last one).
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                   Action
  +2 -0      packet-ieee80211.c     Modified
  +1 -1      packet-ieee802154.c    Modified
  +1 -0      packet-smb2.c          Modified

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

Directory: /trunk-1.6/gtk/
  Changes    Path                Action
  +5 -2      color_edit_dlg.c    Modified
  +3 -5      gui_utils.c         Modified

Directory: /trunk-1.6/
  Changes    Path          Action
  +1 -0      print.ps      Modified