Wireshark-commits: [Wireshark-commits] rev 45235: /trunk-1.6/ /trunk-1.6/epan/dissectors/: packet-g
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: gerald@xxxxxxxxxxxxx
Date: Mon, 01 Oct 2012 17:56:38 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=45235

User: gerald
Date: 2012/10/01 10:56 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r44790 | alagoutte | 2012-09-06 01:55:16 -0700 (Thu, 06 Sep 2012) | 16 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Masashi Honma via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691
   TKIP dissection : wrong IS_TKIP macro
 
   In [1] "11.4.2.2 TKIP MPDU formats", we could see below sentence.
   "WEPSeed[1] is not used to construct the TSC, but is set to (TSC1 | 0x20) &
   0x7f."
 
   But the IS_TKIP macro only checks (WEPSeed[1] & 0x20).
   So sometimes IS_TKIP macro mis-dissects a CCMP frame as a TKIP frame.
 
   This patch changes IS_TKIP macro to do more better check.
 
   [1] IEEE Std 802.11.-2012
 
   #BACKPORT(1.8, 1.6)
   ------------------------------------------------------------------------
   r44844 | morriss | 2012-09-10 08:18:17 -0700 (Mon, 10 Sep 2012) | 6 lines
   Changed paths:
      M /trunk/epan/emem.c
 
   Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699
   and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979 :
 
   Don't cast the buffer address to int on Win32: a 64-bit address won't
   fit in an integer.
   ------------------------------------------------------------------------
   r44880 | morriss | 2012-09-11 06:11:33 -0700 (Tue, 11 Sep 2012) | 4 lines
   Changed paths:
      M /trunk/epan/emem.c
 
   As suggested by Anatoly in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699 :
 
   Followup to r44844: use a better cast (intptr_t instead of long long).
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r44881 | pascal | 2012-09-12 03:21:00 -0700 (Wed, 12 Sep 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtpv2.c
 
   From Esa Haapamäki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7718 :
   Fix dissection of NAS Uplink and Downlink Count in MM Context IE
   ------------------------------------------------------------------------
   r44940 | etxrab | 2012-09-17 07:51:08 -0700 (Mon, 17 Sep 2012) | 1 line
   Changed paths:
      M /trunk/ui/gtk/voip_calls.c
 
   callsinfo->stop_fd not set in all branches for UNISTIM.
   ------------------------------------------------------------------------
   r45007 | cmaynard | 2012-09-19 10:57:54 -0700 (Wed, 19 Sep 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-icmp.c
      M /trunk/epan/dissectors/packet-icmpv6.c
 
   Fix request/response tracking with checksum corner case.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +2 -2      packet-gtpv2.c        Modified
  +5 -3      packet-icmp.c         Modified
  +2 -0      packet-icmpv6.c       Modified
  +2 -1      packet-ieee80211.c    Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +2 -2      emem.c        Modified

Directory: /trunk-1.6/gtk/
  Changes    Path            Action
  +12 -4     voip_calls.c    Modified