http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37979
User: gerald
Date: 2011/07/11 02:24 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r37663 | jake | 2011-06-13 13:29:51 -0700 (Mon, 13 Jun 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-q931.c
Fix for bug 6009:
Information transfer rate is a 7 bit field.
------------------------------------------------------------------------
r37665 | alagoutte | 2011-06-15 01:32:10 -0700 (Wed, 15 Jun 2011) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-icmpv6.c
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
Fix some error in ICMPv6 dissector...
------------------------------------------------------------------------
r37668 | alagoutte | 2011-06-15 02:01:04 -0700 (Wed, 15 Jun 2011) | 7 lines
Changed paths:
M /trunk/epan/dissectors/packet-ieee80211.c
From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6022
802.11 Disassociation Packet's "Reason Code" field is imprecisely decoded/described
From me :
* Display Reason code in decimal (not Hexa)
* Update list from last standard (802.11-2007 & 802.11n-2009)
------------------------------------------------------------------------
r37705 | stig | 2011-06-19 03:15:05 -0700 (Sun, 19 Jun 2011) | 4 lines
Changed paths:
M /trunk/epan/proto.c
Handle BASE_NONE as BASE_DEC for filter expression in custom columns.
This fixes bug 6035.
------------------------------------------------------------------------
r37720 | stig | 2011-06-19 12:29:19 -0700 (Sun, 19 Jun 2011) | 3 lines
Changed paths:
M /trunk/epan/proto.c
Make creating a display filter from a custom column defined as integer with
strings and BASE_NONE equal to selecting the filter from the tree entry.
------------------------------------------------------------------------
r37689 | stig | 2011-06-17 04:09:35 -0700 (Fri, 17 Jun 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-netflow.c
Added cast to int for nstime_t.nsecs.
------------------------------------------------------------------------
r37691 | stig | 2011-06-17 04:56:56 -0700 (Fri, 17 Jun 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-ieee802154.c
Added a cast from ieee802154_long_addr.addr (guint64) to guint.
------------------------------------------------------------------------
r37694 | stig | 2011-06-17 06:39:56 -0700 (Fri, 17 Jun 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-afp.c
Added some casts from spotlight_ntoh64 to guint.
------------------------------------------------------------------------
r37728 | stig | 2011-06-20 00:14:57 -0700 (Mon, 20 Jun 2011) | 2 lines
Changed paths:
M /trunk/config.h.win32
Add back support for building with MSVC2005 (and older).
------------------------------------------------------------------------
r37730 | stig | 2011-06-20 01:58:59 -0700 (Mon, 20 Jun 2011) | 2 lines
Changed paths:
M /trunk/config.h.win32
AttachConsole() needs _WIN32_WINNT 0x0500.
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r37635 | gerald | 2011-06-09 14:13:40 -0700 (Thu, 09 Jun 2011) | 4 lines
Changed paths:
M /trunk/wiretap/ascend_scanner.l
Move the copyright notice and the config.h include to the top of the
file so that we have the proper definitions in place for large file
support on Solaris (bug 6102).
------------------------------------------------------------------------
r37640 | guy | 2011-06-09 15:46:00 -0700 (Thu, 09 Jun 2011) | 5 lines
Changed paths:
M /trunk/wiretap/ascend_scanner.l
M /trunk/wiretap/file_wrappers.c
M /trunk/wiretap/wtap-int.h
The only place where we care about zlib is file_wrappers.c; include
<zlib.h> there, rather than wtap-int.h. That obviates the need to
include config.h earlier in ascend_scanner.l; revert the previous
change, so we don't require a version of Flex that supports %top.
------------------------------------------------------------------------
r37681 | tuexen | 2011-06-16 00:33:24 -0700 (Thu, 16 Jun 2011) | 4 lines
Changed paths:
M /trunk/capture_opts.c
Really print the rpcap username when logging, not
the rpcap password.
This only affects remote capturing.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+5 -5 packet-afp.c Modified
+8 -7 packet-icmpv6.c Modified
+41 -52 packet-ieee80211.c Modified
+1 -1 packet-ieee802154.c Modified
+8 -8 packet-netflow.c Modified
+1 -1 packet-q931.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+72 -0 release-notes.xml Modified
Directory: /trunk-1.6/epan/
Changes Path Action
+19 -10 proto.c Modified
Directory: /trunk-1.6/
Changes Path Action
+1 -1 capture_opts.c Modified
+3 -0 config.h.win32 Modified
(3 files not shown)
