[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/05/13 09:25 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r48814 | pascal | 2013-04-11 01:41:28 -0700 (Thu, 11 Apr 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-nfs.c
 
   From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8575 :
   Fix description of ACE4_APPEND_DATA
   r46187 | wmeier | 2012-11-25 13:47:04 -0800 (Sun, 25 Nov 2012) | 3 lines
   Changed paths:
      M /trunk/airpcap_loader.c
 
    Fix a [-Wshadow] warning;
    Also: Do some minor whitespace and formatting changes.
   ------------------------------------------------------------------------
   r48308 | mmann | 2013-03-14 18:31:53 -0700 (Thu, 14 Mar 2013) | 3 lines
   Changed paths:
      M /trunk/airpcap_loader.c
      M /trunk/epan/crypt/airpdcap.c
      M /trunk/epan/dissectors/packet-ieee80211.c
      M /trunk/epan/dissectors/packet-ieee80211.h
      M /trunk/ui/gtk/airpcap_dlg.c
 
   Bugfix Decryption Key Management dialog, bug 8446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446)
 
   Needed to convert use of old IEEE802.11 preference strings to UAT.  Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.
   ------------------------------------------------------------------------
   r48900 | alagoutte | 2013-04-17 12:38:34 -0700 (Wed, 17 Apr 2013) | 6 lines
   Changed paths:
      M /trunk/airpcap_loader.c
 
   From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446 Wifi details are not stored in the Decryption Key Management dialog (post 1.8.x)
 
   If there is not 80211_keys file, using Decryption Management Key don't create the file and keys is not saved.
 
   From me:
   Use a err2 variable to avoid to break API/ABI when backport to 1.8
   ------------------------------------------------------------------------
   r48901 | alagoutte | 2013-04-17 12:38:50 -0700 (Wed, 17 Apr 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/airpcap_dlg.c
 
   Fix the following GTK-CRITICAL error Gtk-CRITICAL **: gtk_list_store_get_path: assertion `iter->stamp == GTK_LIST_STORE (tree_model)->stamp' failed
 
   Problem come from no item in list (and impossible to select the first item...)
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r48850 | alagoutte | 2013-04-15 01:42:12 -0700 (Mon, 15 Apr 2013) | 8 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-bt-dht.c
 
   From report of chen li via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8572 Endian error and IP:Port error when decoding BT-DHT response message
 
   When the remote client sended a node set, it contains nodes info
   The node info it shows like (1	3cad1f360cc51870d3e68d61ed604078bc608ee2 60.173.31.54:43365), but this node's true ip and port is 99.192.73.131:26025. When we expand these items, the ips and ports in detailed information are right.
 
   From me :
   It is a problem of encoding (LITTLE ENDIAN => BIG ENDIAN) and wrong offset
   Some issue with Peers info
   ------------------------------------------------------------------------
   r48882 | eapache | 2013-04-16 09:16:15 -0700 (Tue, 16 Apr 2013) | 5 lines
   Changed paths:
      M /trunk/ui/gtk/io_stat.c
 
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8583
 
   IO graph was misbehaving if the packets covered too much real time.
   It's still ungodly slow, but at least it seems to work.
   ------------------------------------------------------------------------
   r48893 | eapache | 2013-04-17 08:07:48 -0700 (Wed, 17 Apr 2013) | 6 lines
   Changed paths:
      M /trunk/ui/gtk/io_stat.c
 
   Cast scrolling values to gdoubles, not gfloats - GtkAdjustment have
   always taken doubles that I've been able to find, and casting to floats
   causes loss of precision and weird bugs when the values get enormous.
 
   Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8460
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.8/epan/crypt/
  Changes    Path          Action
  +5 -6      airpdcap.c    Modified

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                  Action
  +3 -4      packet-bt-dht.c       Modified
  +0 -6      packet-ieee80211.c    Modified
  +6 -0      packet-ieee80211.h    Modified
  +1 -1      packet-nfs.c          Modified

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

Directory: /trunk-1.8/ui/gtk/
  Changes    Path             Action
  +4 -45     airpcap_dlg.c    Modified
  +21 -7     io_stat.c        Modified

Directory: /trunk-1.8/
  Changes    Path                Action
  +791 -775  airpcap_loader.c    Modified