head 1.5; access; symbols pkgsrc-2015Q4:1.4.0.4 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.2 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.3.0.24 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.22 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.20 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.18 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.16 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.14 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.12 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.10 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.6 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.4 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.2 pkgsrc-2012Q3-base:1.3 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.5 date 2016.03.03.13.33.14; author wiz; state dead; branches; next 1.4; commitid UegwScFOYltascXy; 1.4 date 2015.09.12.19.03.59; author tnn; state Exp; branches; next 1.3; commitid 8vdHpJt7ebSSQZAy; 1.3 date 2012.08.20.08.34.44; author christos; state Exp; branches; next 1.2; 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.5 log @Make wireshark2 the new default wireshark, since it is the default stable version upstream. @ text @$NetBSD: patch-bb,v 1.4 2015/09/12 19:03:59 tnn Exp $ Avoid conflict with NetBSD's popcount(3). --- epan/dissectors/x11-extension-implementation.h.orig 2015-08-12 16:47:42.000000000 +0000 +++ epan/dissectors/x11-extension-implementation.h @@@@ -19990,8 +19990,8 @@@@ static int struct_size_xkb_DeviceLedInfo int f_namesPresent; f_namesPresent = VALUE32(tvb, *offsetp + size + 4); f_mapsPresent = VALUE32(tvb, *offsetp + size + 8); - size += popcount(f_namesPresent) * 4; - size += popcount(f_mapsPresent) * 12; + size += my_popcount(f_namesPresent) * 4; + size += my_popcount(f_mapsPresent) * 12; return size + 20; } @@@@ -20018,8 +20018,8 @@@@ static void struct_xkb_DeviceLedInfo(tvb *offsetp += 4; proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order); *offsetp += 4; - listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order); - struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent)); + listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order); + struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent)); } } @@@@ -22060,7 +22060,7 @@@@ static void xkbGetMap_Reply(tvbuff_t *tv struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors); } if ((f_present & (1 << 6)) != 0) { - listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order); + listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order); if (*offsetp % 4) { UNUSED(4 - *offsetp % 4); } @@@@ -22210,8 +22210,8 @@@@ static void xkbSetMap(tvbuff_t *tvb, pac length -= f_totalKeyBehaviors * 4; } if ((f_present & (1 << 6)) != 0) { - listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, popcount(f_virtualMods), byte_order); - length -= popcount(f_virtualMods) * 1; + listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, my_popcount(f_virtualMods), byte_order); + length -= my_popcount(f_virtualMods) * 1; } if ((f_present & (1 << 3)) != 0) { struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit); @@@@ -22284,7 +22284,7 @@@@ static void xkbGetCompatMap_Reply(tvbuff *offsetp += 2; UNUSED(16); struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn); - struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn)); + struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn)); } static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@@@ -22316,8 +22316,8 @@@@ static void xkbSetCompatMap(tvbuff_t *tv UNUSED(2); struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSI); length -= f_nSI * 10; - struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups)); - length -= popcount(f_groups) * 4; + struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups)); + length -= my_popcount(f_groups) * 4; } static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@@@ -22378,7 +22378,7 @@@@ static void xkbGetIndicatorMap_Reply(tvb proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_nIndicators, tvb, *offsetp, 1, byte_order); *offsetp += 1; UNUSED(15); - struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which)); + struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which)); } static void xkbSetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@@@ -22390,8 +22390,8 @@@@ static void xkbSetIndicatorMap(tvbuff_t f_which = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order); *offsetp += 4; - struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which)); - length -= popcount(f_which) * 12; + struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which)); + length -= my_popcount(f_which) * 12; } static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@@@ -22806,13 +22806,13 @@@@ static void xkbGetNames_Reply(tvbuff_t * listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order); } if ((f_which & (1 << 8)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); } if ((f_which & (1 << 11)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); } if ((f_which & (1 << 12)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); } if ((f_which & (1 << 9)) != 0) { struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @@@@ -22957,16 +22957,16 @@@@ static void xkbSetNames(tvbuff_t *tvb, p length -= sumof_nLevelsPerType * 4; } if ((f_which & (1 << 8)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); - length -= popcount(f_indicators) * 4; + listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); + length -= my_popcount(f_indicators) * 4; } if ((f_which & (1 << 11)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); - length -= popcount(f_virtualMods) * 4; + listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); + length -= my_popcount(f_virtualMods) * 4; } if ((f_which & (1 << 12)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), byte_order); - length -= popcount(f_groupNames) * 4; + listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); + length -= my_popcount(f_groupNames) * 4; } if ((f_which & (1 << 9)) != 0) { struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @@@@ -23404,7 +23404,7 @@@@ static void xkbGetKbdByName_Reply(tvbuff struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors); } if ((f_present & (1 << 6)) != 0) { - listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order); + listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order); } if ((f_present & (1 << 3)) != 0) { struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit); @@@@ -23447,7 +23447,7 @@@@ static void xkbGetKbdByName_Reply(tvbuff *offsetp += 2; UNUSED(16); struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn); - struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn)); + struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn)); } if ((f_reported & (1 << 4)) != 0) { int f_nIndicators; @@@@ -23601,13 +23601,13 @@@@ static void xkbGetKbdByName_Reply(tvbuff listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order); } if ((f_which & (1 << 8)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); } if ((f_which & (1 << 11)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); } if ((f_which & (1 << 12)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); } if ((f_which & (1 << 9)) != 0) { struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @ 1.4 log @Update to wireshark-1.12.7. Full ChangeLog since 1.10.14 is too long to include. A few highlights: - Expert information is now filterable when the new API is in use. - "malformed" display filter has been renamed to "_ws.malformed". - Transport name resolution is now disabled by default. - Support has been added for all versions of the DCBx protocol. - Cleanup of LLDP code, all dissected fields are now navigable. - Dissector output may be encoded as UTF-8. This includes TShark output. - The ASN1 plugin has been removed as it s deemed obsolete. - The GNM dissector has been removed as it was never used. - The Kerberos dissector has been replaced by one generated from ASN1 code. - A more flexible, modular memory manager (wmem) has been added. - A new API for expert information has been added, replacing the old one. - The tvbuff API has been cleaned up. - Support for 80+ new protocols @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @upgrade to 1.8.2 @ text @d1 1 a1 1 $NetBSD: patch-bb,v 1.2 2011/07/20 18:42:45 tron Exp $ d5 3 a7 3 --- epan/dissectors/x11-extension-implementation.h.orig 2012-06-05 19:33:36.000000000 +0300 +++ epan/dissectors/x11-extension-implementation.h 2012-08-19 17:16:48.000000000 +0300 @@@@ -21153,8 +21153,8 @@@@ d18 1 a18 3 @@@@ -21187,8 +21187,8 @@@@ f_state = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order); d20 6 a25 4 - listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order); - struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent)); + listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order); + struct_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent)); d29 21 a49 1 @@@@ -23502,7 +23502,7 @@@@ d52 3 a54 3 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), byte_order); - struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn)); + struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn)); d58 1 a58 1 @@@@ -23542,8 +23542,8 @@@@ d60 3 a62 3 listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), byte_order); length -= (16 * f_nSI) * 1; - struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups)); d64 1 a64 1 + struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups)); d69 10 a78 1 @@@@ -23638,8 +23638,8 @@@@ d82 1 a82 1 - struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which)); d84 1 a84 1 + struct_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which)); d89 2 a90 2 @@@@ -24136,13 +24136,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, byte_order); d105 3 a107 3 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @@@@ -24304,16 +24304,16 @@@@ length -= (length - 52) / 4 * 4; d128 11 a138 2 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @@@@ -25102,7 +25102,7 @@@@ d141 8 a148 8 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), byte_order); - struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn)); + struct_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn)); } if ((f_reported & (1 << 2)) != 0) { int f_clientDeviceID; @@@@ -25565,13 +25565,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, byte_order); d163 1 a163 18 struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @@@@ -25724,13 +25724,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, byte_order); } if ((f_which & (1 << 8)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); } if ((f_which & (1 << 11)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); } if ((f_which & (1 << 12)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, popcount(f_groupNames), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); } if ((f_which & (1 << 9)) != 0) { struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); @ 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-bb,v 1.1 2010/09/26 23:15:18 tron Exp $ d5 3 a7 3 --- epan/dissectors/x11-extension-implementation.h.orig 2011-07-18 21:17:51.000000000 +0100 +++ epan/dissectors/x11-extension-implementation.h 2011-07-20 19:08:11.000000000 +0100 @@@@ -20760,8 +20760,8 @@@@ d18 1 a18 1 @@@@ -20794,8 +20794,8 @@@@ d20 1 a20 1 proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, little_endian); d22 4 a25 4 - listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, popcount(f_namesPresent), little_endian); - struct_IndicatorMap(tvb, offsetp, t, little_endian, popcount(f_mapsPresent)); + listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, my_popcount(f_namesPresent), little_endian); + struct_IndicatorMap(tvb, offsetp, t, little_endian, my_popcount(f_mapsPresent)); d29 1 a29 1 @@@@ -23093,7 +23093,7 @@@@ d32 3 a34 3 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), little_endian); - struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groupsRtrn)); + struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groupsRtrn)); d37 2 a38 2 static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@@@ -23133,8 +23133,8 @@@@ d40 1 a40 1 listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), little_endian); d42 1 a42 1 - struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groups)); d44 1 a44 1 + struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groups)); d48 2 a49 2 static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@@@ -23229,8 +23229,8 @@@@ d51 1 a51 1 proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, little_endian); d53 1 a53 1 - struct_IndicatorMap(tvb, offsetp, t, little_endian, popcount(f_which)); d55 1 a55 1 + struct_IndicatorMap(tvb, offsetp, t, little_endian, my_popcount(f_which)); d59 3 a61 3 static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@@@ -23727,13 +23727,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, little_endian); d64 2 a65 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); d68 2 a69 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); d72 2 a73 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); d76 2 a77 2 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); @@@@ -23895,16 +23895,16 @@@@ d81 1 a81 1 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); d83 1 a83 1 + listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); d87 1 a87 1 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); d89 1 a89 1 + listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); d93 1 a93 1 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), little_endian); d95 1 a95 1 + listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); d99 2 a100 2 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); @@@@ -24693,7 +24693,7 @@@@ d103 3 a105 3 listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), little_endian); - struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groupsRtrn)); + struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groupsRtrn)); d109 2 a110 2 @@@@ -25156,13 +25156,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, little_endian); d113 2 a114 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); d117 2 a118 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); d121 2 a122 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); d125 3 a127 3 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); @@@@ -25315,13 +25315,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, little_endian); d130 2 a131 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), little_endian); d134 2 a135 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), little_endian); d138 2 a139 2 - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, popcount(f_groupNames), little_endian); + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, my_popcount(f_groupNames), little_endian); d142 1 a142 1 struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); @ 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 3 a7 3 --- epan/dissectors/x11-extension-implementation.h.orig 2010-08-29 23:17:00.000000000 +0100 +++ epan/dissectors/x11-extension-implementation.h 2010-09-26 23:55:27.000000000 +0100 @@@@ -20648,8 +20648,8 @@@@ d18 1 a18 1 @@@@ -20682,8 +20682,8 @@@@ d29 1 a29 1 @@@@ -22981,7 +22981,7 @@@@ d38 1 a38 1 @@@@ -23021,8 +23021,8 @@@@ d49 1 a49 1 @@@@ -23117,8 +23117,8 @@@@ d60 1 a60 1 @@@@ -23615,13 +23615,13 @@@@ d77 1 a77 1 @@@@ -23783,16 +23783,16 @@@@ d100 1 a100 1 @@@@ -24569,7 +24569,7 @@@@ d109 2 a110 2 @@@@ -25032,13 +25032,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 230) / 4, little_endian); d126 2 a127 2 @@@@ -25191,13 +25191,13 @@@@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 279) / 4, little_endian); @