metze/wireshark/wip.git
10 years agoFix -Wsometimes-uninitialized found by Clang
alagoutte [Tue, 14 Jan 2014 17:44:21 +0000 (17:44 +0000)]
Fix -Wsometimes-uninitialized found by Clang

packet-pdcp-lte.c:1397:9: error: variable 'decrypted_data' is used uninitialized whenever 'if' condition is false
packet-pdcp-lte.c:1469:50: note: uninitialized use occurs here
    decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, payload_length, payload_length);
packet-pdcp-lte.c:1353:27: note: initialize the variable 'decrypted_data' to silence this warning

packet-pdcp-lte.c:1397:9: error: variable 'payload_length' is used uninitialized whenever 'if' condition is false
packet-pdcp-lte.c:1469:66: note: uninitialized use occurs here
    decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, payload_length, payload_length);
packet-pdcp-lte.c:1354:24: note: initialize the variable 'payload_length' to silence this warning

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54791 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix unused const variable found by Clang 3.4
alagoutte [Tue, 14 Jan 2014 17:44:07 +0000 (17:44 +0000)]
Fix unused const variable found by Clang 3.4

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54790 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpgrade LTE RRC dissector to v11.6.0
pascal [Tue, 14 Jan 2014 16:51:10 +0000 (16:51 +0000)]
Upgrade LTE RRC dissector to v11.6.0

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54789 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSNOW3G is not available on default Wireshark
pascal [Tue, 14 Jan 2014 16:48:43 +0000 (16:48 +0000)]
SNOW3G is not available on default Wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54788 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix dissection of 3GPP2 SMS encoded in UCS2
pascal [Tue, 14 Jan 2014 16:23:38 +0000 (16:23 +0000)]
Fix dissection of 3GPP2 SMS encoded in UCS2

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54787 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake sure we allocate bytes for snow3g at least rounded up to next 4 byte boundary
martinm [Tue, 14 Jan 2014 16:22:44 +0000 (16:22 +0000)]
Make sure we allocate bytes for snow3g at least rounded up to next 4 byte boundary

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54786 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpdate a comment
martinm [Tue, 14 Jan 2014 15:11:35 +0000 (15:11 +0000)]
Update a comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54785 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd snow3g integrity (not quite working for me), but rework how integrity and cipheri...
martinm [Tue, 14 Jan 2014 15:07:20 +0000 (15:07 +0000)]
Add snow3g integrity (not quite working for me), but rework how integrity and ciphering functions and conditional compilation is done

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54784 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUCS2 encoded SMS is directly read from data -> remove PROTO_ITEM_SET_GENERATED()
pascal [Tue, 14 Jan 2014 14:01:03 +0000 (14:01 +0000)]
UCS2 encoded SMS is directly read from data -> remove PROTO_ITEM_SET_GENERATED()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54783 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoProvide hook for calling EEA1 implementation (Snow3G). Implementation not supplied...
martinm [Tue, 14 Jan 2014 11:09:47 +0000 (11:09 +0000)]
Provide hook for calling EEA1 implementation (Snow3G).  Implementation not supplied due to licensing conditions.  TODO: EIA1.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54782 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoWhoever in GLibland was responsible for defining the signature of
guy [Tue, 14 Jan 2014 10:50:26 +0000 (10:50 +0000)]
Whoever in GLibland was responsible for defining the signature of
g_snprintf() owes the world a huge apology.  They *could* have just used
size_t, or they *could* at least have, if they insisted on having GLib
types to mirror regular types, made gsize an alias for size_t and,
whatever they did with gsize, they *could* have used it as the argument
for the size of the buffer for g_snprintf(), but no, they had to use
gulong.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54781 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 08:32:50 +0000 (08:32 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54780 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 08:30:45 +0000 (08:30 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54779 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBut *do* cast const void * to the appropriate type.
guy [Tue, 14 Jan 2014 08:30:24 +0000 (08:30 +0000)]
But *do* cast const void * to the appropriate type.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54778 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 08:26:24 +0000 (08:26 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54777 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't assign away constness.
guy [Tue, 14 Jan 2014 08:22:38 +0000 (08:22 +0000)]
Don't assign away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54776 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 08:14:28 +0000 (08:14 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54775 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 08:12:45 +0000 (08:12 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54774 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 08:09:33 +0000 (08:09 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54773 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agogsize, not gusize. Whatever.
guy [Tue, 14 Jan 2014 07:59:58 +0000 (07:59 +0000)]
gsize, not gusize.  Whatever.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54772 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGlib, gotta love it. No, gusize isn't the same as size_t, it's long,
guy [Tue, 14 Jan 2014 07:58:18 +0000 (07:58 +0000)]
Glib, gotta love it.  No, gusize isn't the same as size_t, it's long,
which is Too Damn Short on Windows.  (Microsoft, gotta love 'em.  I
guess even more Windows programmers than UN*X programmers thought long
was 32 bits, now and forever, world without end, amen.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54771 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 07:56:43 +0000 (07:56 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54770 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 05:49:04 +0000 (05:49 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54769 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 05:47:50 +0000 (05:47 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54768 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoHave ip6_to_str() and tvb_ip6_to_str() return const pointers, as the
guy [Tue, 14 Jan 2014 05:39:57 +0000 (05:39 +0000)]
Have ip6_to_str() and tvb_ip6_to_str() return const pointers, as the
ip_to_str equivalents do.

Don't cast away constness, and don't make it necessary to do so.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54767 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 05:29:02 +0000 (05:29 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54766 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 05:25:51 +0000 (05:25 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54765 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness. In one place, this requires that we use one
guy [Tue, 14 Jan 2014 05:23:48 +0000 (05:23 +0000)]
Don't cast away constness.  In one place, this requires that we use one
pointer while we're filling in a string and then assigning it to a const
pointer when we're done.

Don't use guint16 as a size value; it does no good (it doesn't magically
protect you againt too-long strings), it runs the potential risk of
overflow, it doesn't save time for arithmetic (32-bit or 64-bit
arithmetic may well be faster, and will at least be as fast), and it
doesn't save space (if it fits in a register, you save nothing, and if
it's on the stack, there will probably be padding.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54764 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoCast away constness.
guy [Tue, 14 Jan 2014 05:17:06 +0000 (05:17 +0000)]
Cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54763 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoConstification.
guy [Tue, 14 Jan 2014 04:09:21 +0000 (04:09 +0000)]
Constification.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54762 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 04:05:23 +0000 (04:05 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54761 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 04:01:59 +0000 (04:01 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54760 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAnd more constification.
guy [Tue, 14 Jan 2014 04:01:34 +0000 (04:01 +0000)]
And more constification.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54759 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMore constification.
guy [Tue, 14 Jan 2014 03:56:36 +0000 (03:56 +0000)]
More constification.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54758 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't make promises of constness that we can't honor.
guy [Tue, 14 Jan 2014 03:24:37 +0000 (03:24 +0000)]
Don't make promises of constness that we can't honor.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54757 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness when you don't have to.
guy [Tue, 14 Jan 2014 03:16:27 +0000 (03:16 +0000)]
Don't cast away constness when you don't have to.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54756 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSquelch some casting-away-constness warnings.
guy [Tue, 14 Jan 2014 03:06:40 +0000 (03:06 +0000)]
Squelch some casting-away-constness warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54755 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoClean up references to an address and squelch some warnings.
guy [Tue, 14 Jan 2014 02:30:05 +0000 (02:30 +0000)]
Clean up references to an address and squelch some warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54754 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't cast away constness.
guy [Tue, 14 Jan 2014 02:25:20 +0000 (02:25 +0000)]
Don't cast away constness.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54753 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMore prototype cleanup.
guy [Tue, 14 Jan 2014 02:17:16 +0000 (02:17 +0000)]
More prototype cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54752 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake a routine not used outside the SNMP dissector static.
guy [Tue, 14 Jan 2014 02:06:42 +0000 (02:06 +0000)]
Make a routine not used outside the SNMP dissector static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54751 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Tue, 14 Jan 2014 01:44:36 +0000 (01:44 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so.

Said header declares pipe_input_cb_t, so we don't have to do it
ourselves.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54750 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Tue, 14 Jan 2014 01:41:38 +0000 (01:41 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54749 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDetangle the #ifdefs a bit.
guy [Tue, 14 Jan 2014 01:40:09 +0000 (01:40 +0000)]
Detangle the #ifdefs a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54748 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Tue, 14 Jan 2014 01:35:13 +0000 (01:35 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so.

Don't cast away constness when passing something to a routine that takes
a const pointer argument.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54747 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake a routine not used outside this file static.
guy [Tue, 14 Jan 2014 01:31:49 +0000 (01:31 +0000)]
Make a routine not used outside this file static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54746 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Tue, 14 Jan 2014 01:29:16 +0000 (01:29 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54745 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoInclude ui/progress_dlg.h to get the declaration of
guy [Tue, 14 Jan 2014 01:26:51 +0000 (01:26 +0000)]
Include ui/progress_dlg.h to get the declaration of
delayed_create_progress_dlg().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54744 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago#if 0 out an unused routine.
guy [Tue, 14 Jan 2014 01:23:49 +0000 (01:23 +0000)]
#if 0 out an unused routine.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54743 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Tue, 14 Jan 2014 01:16:55 +0000 (01:16 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54742 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake a routine used only in this file static.
guy [Tue, 14 Jan 2014 01:11:42 +0000 (01:11 +0000)]
Make a routine used only in this file static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54741 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Mon, 13 Jan 2014 23:05:44 +0000 (23:05 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so - which means
creating the header file in the first place.

Also, declare proto_register_wimax_compact_dlmap_ie() early in
wimax_compact_dlmap_ie_decoder.c, similar to what we do in
wimax_copact_ulmap_ie_decoder.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54739 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agotvparse_until() is used, so don't make it static.
guy [Mon, 13 Jan 2014 23:03:30 +0000 (23:03 +0000)]
tvparse_until() is used, so don't make it static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54738 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpgrade LPP dissector to v11.5.0
pascal [Mon, 13 Jan 2014 22:57:31 +0000 (22:57 +0000)]
Upgrade LPP dissector to v11.5.0

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54737 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpdate SVN properties
pascal [Mon, 13 Jan 2014 22:54:41 +0000 (22:54 +0000)]
Update SVN properties

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54736 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agodissect_CBA_Connection_Data() isn't used outside packet-dcom-cba-acco.c,
guy [Mon, 13 Jan 2014 22:46:05 +0000 (22:46 +0000)]
dissect_CBA_Connection_Data() isn't used outside packet-dcom-cba-acco.c,
so make it static - and get rid of the #if 0'ed out declaration in
packet-dcom-cba-acco.h.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54735 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoNo reason for decode_bgp_rd()'s return value to be non-const, so make it
guy [Mon, 13 Jan 2014 22:38:56 +0000 (22:38 +0000)]
No reason for decode_bgp_rd()'s return value to be non-const, so make it
const.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54734 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMove dissect_pn_uint16_ret_item() to packet-pn.c, to be with its sibling
guy [Mon, 13 Jan 2014 22:36:52 +0000 (22:36 +0000)]
Move dissect_pn_uint16_ret_item() to packet-pn.c, to be with its sibling
dissect_pn_uint16().  Declare it in packet-pn.h.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54733 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 13 Jan 2014 22:25:13 +0000 (22:25 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54732 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Mon, 13 Jan 2014 22:25:03 +0000 (22:25 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54731 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agodispatchService() is imported from other code; declare it in
guy [Mon, 13 Jan 2014 22:24:54 +0000 (22:24 +0000)]
dispatchService() is imported from other code; declare it in
opcua_transport_layer.h, not opcua_transport_layer.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54730 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Kevin Loewen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9631
alagoutte [Mon, 13 Jan 2014 22:24:53 +0000 (22:24 +0000)]
From Kevin Loewen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9631

Add dissector for Pathport Protocol

From me :
* Fix indent (use 4 spaces)
* Remove unused variable and fix Clang warning

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54729 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Miroslav Miklus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9504...
alagoutte [Mon, 13 Jan 2014 22:24:32 +0000 (22:24 +0000)]
From Miroslav Miklus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9504 Enhance BGP dissector : bgp-ls dissector (draft-ietf-idr-ls-distribution-04)

BGPTYPE_LINK_STATE_ATTR is temporarily set to 99, would need change when IANA allocate a Path Attribute value for BGP-LS

From me :
* Fix indent
* fix arg encoding (via encoding-args tools)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54728 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago#if 0 out unused routines claimed to be "untested" and #if 0'ed out in
guy [Mon, 13 Jan 2014 22:20:25 +0000 (22:20 +0000)]
#if 0 out unused routines claimed to be "untested" and #if 0'ed out in
epan/tvparse.h, and static routines used by that code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54727 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGet rid of unused routine (the initialization is done in
guy [Mon, 13 Jan 2014 22:14:38 +0000 (22:14 +0000)]
Get rid of unused routine (the initialization is done in
geoip_db_post_update_cb() - as the comment says, "and also once on
startup").

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54726 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Mon, 13 Jan 2014 22:06:12 +0000 (22:06 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so - which means
creating the header file in the first place.

That means luaopen_bit() doesn't need to, and shouldn't be, declared in
wslua.h.

Have make-reg.pl generate a #include of lua_bitop.h.  Also fix the "this
is autogenerated" warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54725 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agof_k() is used outside packet-gsm_a_rr.c, so it can't be static.
guy [Mon, 13 Jan 2014 21:36:43 +0000 (21:36 +0000)]
f_k() is used outside packet-gsm_a_rr.c, so it can't be static.

In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so - which means
creating the header file in the first place.

That means f_k() doesn't need to, and shouldn't be, declared in
packet-gsm_rlcmac.h.  Include packet-gsm_a_rr.h in packet-gsm_rlcmac.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54724 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agolsarpc_dissect_sec_desc_buf() and lsarpc_dissect_struct_dom_sid2() are
guy [Mon, 13 Jan 2014 21:23:46 +0000 (21:23 +0000)]
lsarpc_dissect_sec_desc_buf() and lsarpc_dissect_struct_dom_sid2() are
used in the Netlogon dissector, so don't make them static.

Now that we've added HEADER START/HEADER END to Pidl, use it to declare
those routines in packet-dcerpc-lsa.h.  Don't declare them in
packet-dcerpc-netlogon.c, as they're now declared in the header.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54723 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix crash when exporting to CSV file
pascal [Mon, 13 Jan 2014 21:23:36 +0000 (21:23 +0000)]
Fix crash when exporting to CSV file

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54722 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDocument {CODE,HEADER} {START,END}.
guy [Mon, 13 Jan 2014 21:18:29 +0000 (21:18 +0000)]
Document {CODE,HEADER} {START,END}.

Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54721 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd HEADER START and HEADER END, similar to CODE START and CODE END, to
guy [Mon, 13 Jan 2014 21:05:44 +0000 (21:05 +0000)]
Add HEADER START and HEADER END, similar to CODE START and CODE END, to
allow stuff to be put into the .h file; that way, if you put helper
functions into the .c file, for use by dissectors other than the one
being generated, you can put declarations for them into the .h file.

Do some checks for mis-nesting of CODE and HEADER blocks.

Clean up the "this is generated code" header.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54720 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake a routine not used outside this file static.
guy [Mon, 13 Jan 2014 20:17:20 +0000 (20:17 +0000)]
Make a routine not used outside this file static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54719 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake a routine not used outside this file static.
guy [Mon, 13 Jan 2014 20:14:00 +0000 (20:14 +0000)]
Make a routine not used outside this file static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54718 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Mon, 13 Jan 2014 20:12:14 +0000 (20:12 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so - which means
creating the header file in the first place.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54717 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a source file that defines external functions, the header file that
guy [Mon, 13 Jan 2014 19:49:12 +0000 (19:49 +0000)]
In a source file that defines external functions, the header file that
declares the functions must be included, in order to make sure the
declarations match the function signature.  Make it so.

They *didn't* match; fix that.

Do *not* use 16-bit tvbuff offsets; there is no advantage to that (and,
in fact, 32-bit arithmetic may be easier on some platforms), and it has
the disadvantage that you're more likely to have the offset overflow.

dissect_cbs_serial_number() returns the new offset, not the length of
the item it dissected; don't add its return value to the offset, set the
offset to its return value.

Make dissect_cbs_message_identifier() return the new offset as well, for
consistency, and don't add *its* return value to the offset.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54714 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIn a file that defines external routines, the header file that declares
guy [Mon, 13 Jan 2014 19:32:10 +0000 (19:32 +0000)]
In a file that defines external routines, the header file that declares
them should be included, to make sure the declaration and definition
match.  Make it so.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54713 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake routines not used outside packet-dcerpc-lsa.c static.
guy [Mon, 13 Jan 2014 19:29:21 +0000 (19:29 +0000)]
Make routines not used outside packet-dcerpc-lsa.c static.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54712 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSquelch some warnings.
guy [Mon, 13 Jan 2014 19:07:48 +0000 (19:07 +0000)]
Squelch some warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54711 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake sure we point to the GPLv2.
gerald [Mon, 13 Jan 2014 16:22:01 +0000 (16:22 +0000)]
Make sure we point to the GPLv2.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54710 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoChange level off TCP/RST expertitem from chat to warn. Add a comment
jmayer [Mon, 13 Jan 2014 10:51:37 +0000 (10:51 +0000)]
Change level off TCP/RST expertitem from chat to warn. Add a comment
that RST is still an indicator for network errors/problems.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54709 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoOne more place where setcap does not need inheritance
jmayer [Sun, 12 Jan 2014 22:21:55 +0000 (22:21 +0000)]
One more place where setcap does not need inheritance

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54708 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 :
pascal [Sun, 12 Jan 2014 20:52:19 +0000 (20:52 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 :
Do not try to add a new NAL unit when the previous one was not decoded

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54707 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoremove unnecessary if(tree) statements
martink [Sun, 12 Jan 2014 17:57:21 +0000 (17:57 +0000)]
remove unnecessary if(tree) statements

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54706 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoCoverity 280438: missing break
martink [Sun, 12 Jan 2014 17:49:30 +0000 (17:49 +0000)]
Coverity 280438: missing break

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54705 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago[Automatic manuf, services and enterprise-numbers update for 2014-01-12]
gerald [Sun, 12 Jan 2014 15:03:43 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2014-01-12]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54702 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoZcl OTA Upgrade cluster dissector. Bug 9545 (https://bugs.wireshark.org/bugzilla...
mmann [Sun, 12 Jan 2014 03:17:51 +0000 (03:17 +0000)]
Zcl OTA Upgrade cluster dissector.  Bug 9545 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9545)

From Fabio Tarabelloni
From me: Reorder function definitions so declarations aren't necessary

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54701 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla...
mmann [Sun, 12 Jan 2014 02:29:51 +0000 (02:29 +0000)]
Bluetooth/Ubertooth improvements.  Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)

From Michal Labedzki

1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector
2. Bluetooth: Merge all UUIDs together
3. Bluetooth: Extract LE Channel MAP to separate dissector
4. Ubertooth: Dissect CC2400 registers

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54700 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla...
mmann [Sun, 12 Jan 2014 00:50:41 +0000 (00:50 +0000)]
Bluetooth/Ubertooth improvements.  Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)

From Michal Labedski

1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool
2. Bluetooth: Make EIR, AD and COD more generic
3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1  Specification
4. Ubertooth: Fix response command handling
5. Ubertooth: Update to support firmware version
6. Ubertooth: Dissect by Vendor Id/Product Id

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54699 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoClean up OPTSTRING, removing ':'s from options that don't expect args and removing...
cmaynard [Sat, 11 Jan 2014 20:40:43 +0000 (20:40 +0000)]
Clean up OPTSTRING, removing ':'s from options that don't expect args and removing the G option completely, as it doesn't appear to be supported.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54698 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoLink wiretap library with tfshark. This is hopefully a "temporary" fix as the plan...
mmann [Sat, 11 Jan 2014 19:47:24 +0000 (19:47 +0000)]
Link wiretap library with tfshark.  This is hopefully a "temporary" fix as the plan is to not have tfshark depend on wiretap.

From Michal Labedzki

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54697 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove (ugly) hack in about_dialog.cpp (include main.cpp to have function to set...
alagoutte [Sat, 11 Jan 2014 12:16:56 +0000 (12:16 +0000)]
Remove (ugly) hack in about_dialog.cpp (include main.cpp to have function to set comp_info_str and runtime_info_str variable)

Now About Dialog is start after main() and variables is set by main(), only extern variable in wireshark_applicatin.h

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54696 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix indent (use 4 spaces) and add modelines
alagoutte [Sat, 11 Jan 2014 11:16:49 +0000 (11:16 +0000)]
Fix indent (use 4 spaces) and add modelines

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54695 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpdate the enterprise-numbers URL.
gerald [Fri, 10 Jan 2014 22:57:28 +0000 (22:57 +0000)]
Update the enterprise-numbers URL.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54694 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoReturn other than 0 from RTSE when handling reassembly initiated from SES.
stig [Fri, 10 Jan 2014 18:58:56 +0000 (18:58 +0000)]
Return other than 0 from RTSE when handling reassembly initiated from SES.

This bug was introduced in revision 53093 when updating to new-style dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54693 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpdate a comment and fix some indentation
martinm [Fri, 10 Jan 2014 17:56:55 +0000 (17:56 +0000)]
Update a comment and fix some indentation

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54692 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMove UEId to the beginning of summary shown in info column, plus only look for existi...
martinm [Fri, 10 Jan 2014 12:51:57 +0000 (12:51 +0000)]
Move UEId to the beginning of summary shown in info column, plus only look for existing reassembly info when not starting a new SDU

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54691 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoNote in a comment that with Gtk 3.4.4 reselecting UE+channel doesn't work as other...
martinm [Fri, 10 Jan 2014 12:36:17 +0000 (12:36 +0000)]
Note in a comment that with Gtk 3.4.4 reselecting UE+channel doesn't work as other UEs seem to get selected while list is being repopulated during retapping

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54690 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agouse a value string for the emi
martink [Fri, 10 Jan 2014 09:23:36 +0000 (09:23 +0000)]
use a value string for the emi
correct the dot offset
other minor cleanup

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54689 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agodissect Digital Only Token and retention limit
martink [Fri, 10 Jan 2014 09:15:08 +0000 (09:15 +0000)]
dissect Digital Only Token and retention limit

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54688 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agocorrect a typo in a filter string
martink [Fri, 10 Jan 2014 08:48:38 +0000 (08:48 +0000)]
correct a typo in a filter string

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54687 f5534014-38df-0310-8fa8-9805f1628bb7