diff options
author | christos <christos@pkgsrc.org> | 2012-08-20 08:34:43 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 2012-08-20 08:34:43 +0000 |
commit | 80c947d5024bd86a005e6355f9492e92ec46e6a2 (patch) | |
tree | bff4d11d67d8ed971f0b4711c2e7ecc23d4598ac /net | |
parent | 72e876d1580291e6a5dd76f625a2570be29fb71b (diff) | |
download | pkgsrc-80c947d5024bd86a005e6355f9492e92ec46e6a2.tar.gz |
upgrade to 1.8.2
Diffstat (limited to 'net')
-rw-r--r-- | net/wireshark/Makefile | 4 | ||||
-rw-r--r-- | net/wireshark/PLIST | 12 | ||||
-rw-r--r-- | net/wireshark/distinfo | 12 | ||||
-rw-r--r-- | net/wireshark/patches/patch-aa | 24 | ||||
-rw-r--r-- | net/wireshark/patches/patch-bb | 128 |
5 files changed, 86 insertions, 94 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 3b9bffb1463..eb0baa2cf9b 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.81 2012/08/16 14:52:27 drochner Exp $ +# $NetBSD: Makefile,v 1.82 2012/08/20 08:34:43 christos Exp $ -DISTNAME= wireshark-1.6.10 +DISTNAME= wireshark-1.8.2 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index 619d38f0f77..15c2ce2f313 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.21 2011/11/02 07:56:24 tron Exp $ +@comment $NetBSD: PLIST,v 1.22 2012/08/20 08:34:43 christos Exp $ bin/capinfos bin/dftest bin/dumpcap bin/editcap -bin/idl2wrs bin/mergecap bin/randpkt bin/rawshark @@ -14,21 +13,15 @@ lib/libwireshark.la lib/libwiretap.la lib/libwsutil.la lib/wireshark/plugins/${PKGVERSION}/asn1.la -lib/wireshark/plugins/${PKGVERSION}/coseventcomm.la -lib/wireshark/plugins/${PKGVERSION}/cosnaming.la lib/wireshark/plugins/${PKGVERSION}/docsis.la lib/wireshark/plugins/${PKGVERSION}/ethercat.la lib/wireshark/plugins/${PKGVERSION}/gryphon.la -lib/wireshark/plugins/${PKGVERSION}/interlink.la lib/wireshark/plugins/${PKGVERSION}/irda.la lib/wireshark/plugins/${PKGVERSION}/m2m.la lib/wireshark/plugins/${PKGVERSION}/mate.la lib/wireshark/plugins/${PKGVERSION}/opcua.la -lib/wireshark/plugins/${PKGVERSION}/parlay.la lib/wireshark/plugins/${PKGVERSION}/profinet.la -lib/wireshark/plugins/${PKGVERSION}/sercosiii.la lib/wireshark/plugins/${PKGVERSION}/stats_tree.la -lib/wireshark/plugins/${PKGVERSION}/tango.la lib/wireshark/plugins/${PKGVERSION}/unistim.la lib/wireshark/plugins/${PKGVERSION}/wimax.la lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la @@ -36,7 +29,6 @@ man/man1/capinfos.1 man/man1/dftest.1 man/man1/dumpcap.1 man/man1/editcap.1 -man/man1/idl2wrs.1 man/man1/mergecap.1 man/man1/randpkt.1 man/man1/rawshark.1 @@ -92,7 +84,6 @@ share/wireshark/help/faq.txt share/wireshark/help/getting_started.txt share/wireshark/help/overview.txt share/wireshark/help/toc -share/wireshark/idl2wrs.html ${PLIST.lua}share/wireshark/init.lua share/wireshark/ipmap.html share/wireshark/manuf @@ -237,7 +228,6 @@ share/wireshark/radius/dictionary.wimax share/wireshark/radius/dictionary.wimax.wichorus share/wireshark/radius/dictionary.wispr share/wireshark/radius/dictionary.xedia -share/wireshark/radius/dictionary.xylan share/wireshark/radius/dictionary.zyxel share/wireshark/randpkt.html share/wireshark/rawshark.html diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index eb4bb945d6d..03b18d41512 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.57 2012/08/16 14:52:27 drochner Exp $ +$NetBSD: distinfo,v 1.58 2012/08/20 08:34:44 christos Exp $ -SHA1 (wireshark-1.6.10.tar.bz2) = a48ce979905d8c8506e9a4e077b6734313d9c9e0 -RMD160 (wireshark-1.6.10.tar.bz2) = fa1dd90784e142eb19c06effe4009682d6ddd0bc -Size (wireshark-1.6.10.tar.bz2) = 22026939 bytes -SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 +SHA1 (wireshark-1.8.2.tar.bz2) = 4737d9745dbf002444ea42615243abf3bb80b943 +RMD160 (wireshark-1.8.2.tar.bz2) = 5fece857d5187b146a690fda111a0611e108c2a9 +Size (wireshark-1.8.2.tar.bz2) = 24121798 bytes +SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 -SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72 +SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa index 0d9b6541195..41fa5cdc87f 100644 --- a/net/wireshark/patches/patch-aa +++ b/net/wireshark/patches/patch-aa @@ -1,13 +1,15 @@ -$NetBSD: patch-aa,v 1.10 2009/07/21 20:39:41 tron Exp $ +$NetBSD: patch-aa,v 1.11 2012/08/20 08:34:44 christos Exp $ ---- text2pcap.c.orig 2009-07-20 00:23:54.000000000 +0200 -+++ text2pcap.c -@@ -90,7 +90,7 @@ - # define __USE_XOPEN - #endif - #ifndef _XOPEN_SOURCE --# define _XOPEN_SOURCE -+# define _XOPEN_SOURCE 4 - #endif +--- ui/gtk/time_shift_dlg.c.orig 2012-06-05 19:33:15.000000000 +0300 ++++ ui/gtk/time_shift_dlg.c 2012-08-19 19:30:08.000000000 +0300 +@@ -90,6 +90,10 @@ + */ + static GtkWidget *time_shift_frame_w; - /* ++#ifndef HAVE_FLOORL ++#define floorl(a) floor((double)(a)) ++#endif ++ + void + time_shift_cb(GtkWidget *w _U_, gpointer d _U_) + { diff --git a/net/wireshark/patches/patch-bb b/net/wireshark/patches/patch-bb index 6ae41e19531..68c54e0dcb3 100644 --- a/net/wireshark/patches/patch-bb +++ b/net/wireshark/patches/patch-bb @@ -1,10 +1,10 @@ -$NetBSD: patch-bb,v 1.2 2011/07/20 18:42:45 tron Exp $ +$NetBSD: patch-bb,v 1.3 2012/08/20 08:34:44 christos Exp $ Avoid conflict with NetBSD's popcount(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 @@ +--- 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 @@ int f_namesPresent; f_namesPresent = VALUE32(tvb, *offsetp + size + 4); f_mapsPresent = VALUE32(tvb, *offsetp + size + 8); @@ -15,128 +15,128 @@ Avoid conflict with NetBSD's popcount(3). return size + 20; } -@@ -20794,8 +20794,8 @@ +@@ -21187,8 +21187,8 @@ f_state = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order); *offsetp += 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)); +- 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)); } } -@@ -23093,7 +23093,7 @@ +@@ -23502,7 +23502,7 @@ *offsetp += 2; UNUSED(16); - 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)); + 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)); } - 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 @@ + static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +@@ -23542,8 +23542,8 @@ UNUSED(2); - listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), little_endian); + listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), byte_order); length -= (16 * f_nSI) * 1; -- struct_ModDef(tvb, offsetp, t, little_endian, popcount(f_groups)); +- struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups)); - length -= popcount(f_groups) * 4; -+ struct_ModDef(tvb, offsetp, t, little_endian, my_popcount(f_groups)); ++ struct_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, int little_endian, int length _U_) -@@ -23229,8 +23229,8 @@ + static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +@@ -23638,8 +23638,8 @@ f_which = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order); *offsetp += 4; -- struct_IndicatorMap(tvb, offsetp, t, little_endian, popcount(f_which)); +- struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which)); - length -= popcount(f_which) * 12; -+ struct_IndicatorMap(tvb, offsetp, t, little_endian, my_popcount(f_which)); ++ struct_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, 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); + static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +@@ -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); } 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), 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); +- 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), 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); +- 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), 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); +- 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_KeyName(tvb, offsetp, t, little_endian, f_nKeys); -@@ -23895,16 +23895,16 @@ + struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); +@@ -24304,16 +24304,16 @@ length -= (length - 52) / 4 * 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), little_endian); +- 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), little_endian); ++ 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), little_endian); +- 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), little_endian); ++ 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), little_endian); +- 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), little_endian); ++ 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_KeyName(tvb, offsetp, t, little_endian, f_nKeys); -@@ -24693,7 +24693,7 @@ + struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); +@@ -25102,7 +25102,7 @@ *offsetp += 2; UNUSED(16); - 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)); + 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; -@@ -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); +@@ -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); } 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), 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); +- 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), 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); +- 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), 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); +- 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_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); + 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), 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); +- 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), 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); +- 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), 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); +- 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, little_endian, f_nKeys); + struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys); |