head 1.3; access; symbols pkgsrc-2015Q4:1.2.0.36 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.34 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.32 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.30 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.28 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.26 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.24 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.22 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.20 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.18 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.16 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.14 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.12 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.10 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.8 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.6 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.2 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.1.0.8 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.6 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.4 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.2 pkgsrc-2010Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2016.03.03.13.33.14; author wiz; state dead; branches; next 1.2; commitid UegwScFOYltascXy; 1.2 date 2011.07.20.18.42.45; author tron; state Exp; branches; next 1.1; 1.1 date 2010.09.26.23.15.18; author tron; state Exp; branches; next ; desc @@ 1.3 log @Make wireshark2 the new default wireshark, since it is the default stable version upstream. @ text @$NetBSD: patch-ba,v 1.2 2011/07/20 18:42:45 tron Exp $ Avoid conflict with NetBSD's popcount(3). --- epan/dissectors/packet-x11.c.orig 2011-07-18 21:18:26.000000000 +0100 +++ epan/dissectors/packet-x11.c 2011-07-20 19:03:27.000000000 +0100 @@@@ -3044,7 +3044,7 @@@@ g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info); } -static int popcount(unsigned int mask) +static int my_popcount(unsigned int mask) { #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) /* GCC 3.4 or newer */ @ 1.2 log @Update "wireshark" package to version 1.6.1. The major changes since version 1.4.* are: - Wireshark is now distributed as an installation package rather than a drag-installer on OS X. The installer adds a startup item that should make it easier to capture packets. - Large file (greater than 2 GB) support has been improved. - Wireshark and TShark can import text dumps, similar to text2pcap. - You can now view Wireshark's dissector tables (for example the TCP port to dissector mappings) from the main window. - Wireshark can export SSL session keys via File→Export→SSL Session Keys... - TShark can show a specific occurrence of a field when using '-T fields'. - Custom columns can show a specific occurrence of a field. - You can hide columns in the packet list. - Wireshark can now export SMB objects. - dftest and randpkt now have manual pages. - TShark can now display iSCSI, ICMP and ICMPv6 service response times. - Dumpcap can now save files with a user-specified group id. - Syntax checking is done for capture filters. - You can display the compiled BPF code for capture filters in the Capture Options dialog. - You can now navigate backwards and forwards through TCP and UDP sessions using Ctrl+, and Ctrl+. . - Packet length is (finally) a default column. - TCP window size is now avaiable both scaled and unscaled. A TCP window scaling graph is available in the GUI. - 802.1q VLAN tags are now shown in the Ethernet II protocol tree instead of a separate tree. - Various dissectors now display some UTF-16 strings as proper Unicode including the DCE/RPC and SMB dissectors. - The RTP player now has an option to show the time of day in the graph in addition to the seconds since beginning of capture. - The RTP player now shows why media interruptions occur. - Graphs now save as PNG images by default. - TShark can read and write host name information from and to pcapng-formatted files. Wireshark can read it. TShark can dump host name information via [-z hosts] . - TShark's -z option now uses the [-z ,srt] syntax instead of [-z ,rtt] for all protocols that support service response time statistics. This matches Wireshark's syntax for this option. - Wireshark and TShark can now read compressed Windows Sniffer files. - New Protocol Support ADwin, ADwin-Config, Apache Etch, Aruba PAPI, Babel Routing Protocol, Broadcast/Multicast Control, Constrained Application Protocol (COAP), Digium TDMoE, Erlang Distribution Protocol, Ether-S-I/O, FastCGI, Fibre Channel over InfiniBand (FCoIB), Gopher, Gigamon GMHDR, IDMP, Infiniband Socket Direct Protocol (SDP), JSON, LISP Control, LISP Data, LISP, MikroTik MAC-Telnet, MRP Multiple Mac Registration Protocol (MMRP) Mongo Wire Protocol, MUX27010, Network Monitor 802.11 radio header, OPC UA ExtensionObjects, openSAFETY, PPI-GEOLOCATION-GPS, ReLOAD, ReLOAD Framing, RObust Header Compression (ROHC), RSIP, SAMETIME, SCoP, SGSAP, Tektronix Teklink, USB/AT Commands, uTorrent Transport Protocol, WAI authentication, Wi-Fi P2P (Wi-Fi Direct) - New and Updated Capture File Support Apple PacketLogger, Catapult DCT2000, Daintree SNA, Endace ERF, HP OpenVMS TCPTrace, IPFIX (the file format, not the protocol), Lucent/Ascend debug, Microsoft Network Monitor, Network Instruments, TamoSoft CommView @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.1 2010/09/26 23:15:18 tron Exp $ @ 1.1 log @Fix build under NetBSD-current by avoiding a conflict between's popcount(3) and locally defined functions of the same name. Patch supplied by Sverre Froyen in private e-mail. @ text @d1 1 a1 1 $NetBSD$ d5 2 a6 2 --- epan/dissectors/packet-x11.c.orig 2010-08-29 23:17:16.000000000 +0100 +++ epan/dissectors/packet-x11.c 2010-09-26 23:55:27.000000000 +0100 d8 1 a8 1 g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info); d15 1 a15 1 /* GCC 3.4 or newer */ @