Commit Graph

27192 Commits

Author SHA1 Message Date
Guy Harris 091aea8c3c And some more comment cleanup.
Change-Id: Idfc541a08de2ed9e1ca8bccca366612830213ead
Reviewed-on: https://code.wireshark.org/review/4858
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 08:00:00 +00:00
Guy Harris 700bfdcba6 More comment cleanup.
Change-Id: Ifa65c3090e204b93ec526358b863fdf9bafc6a03
Reviewed-on: https://code.wireshark.org/review/4857
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 07:46:09 +00:00
Guy Harris 9ffb72b8cf Clean up some comments.
Change-Id: Ibe96878ba9ae94f9f22a221797fb36d713286d32
Reviewed-on: https://code.wireshark.org/review/4856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 07:42:37 +00:00
Guy Harris 80e6f6251e Get rid of calls to ctype.h functions.
They don't handle values outside the range -1 to 127, and their behavior
is locale-dependent.  Use g_ascii_isXXX() and g_ascii_toXXX() instead of
isXXX() and toXXX().

If you're checking for printable ASCII, don't use isascii() and don't
use iscntrl(), use g_ascii_isprint().  If you're checking for graphical
ASCII, i.e. printable ASCII except for a space, use g_ascii_isgraph().

Use ws_xton() to convert a hex digit character to the corresponding
numeric value.

Change-Id: Id3039bc586fbf66d8736c2df248c790c0d7a2330
Reviewed-on: https://code.wireshark.org/review/4851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 06:15:19 +00:00
Guy Harris 0b9eb9f4b7 Get rid of unnecessary includes of ctype.h.
Change-Id: I2cf49f808558147ce77e7d086558966cfb2defca
Reviewed-on: https://code.wireshark.org/review/4850
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-20 06:02:51 +00:00
Stig Bjørlykke 39c3a794d8 Check if mask_greatest_bit_offset is within limits.
The result of the '>>' expression is undefined if mask_greatest_bit_offset = 0.

Change-Id: I15b094a5220a5075878bad65ab0b8c5279e80e8a
Reviewed-on: https://code.wireshark.org/review/4723
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-20 01:45:28 +00:00
Michael Mann 4963d99c4a Eliminate proto_tree_add_text from packet-cdp.c
Change-Id: I77e1f5788e0567dcaef9f75e1f45e61c63d54b4e
Reviewed-on: https://code.wireshark.org/review/4849
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-20 01:20:34 +00:00
Guy Harris 2b6c267a57 Eliminate use of ctype.h routines.
That way, we don't do locale-sensitive case-insensitivity (yes, the
locale can affect case-mapping - in a Turkish locale, "I" isn't the
upper-case version of "i", for example).

Change-Id: I5f7663e85160558ff3769617f924e45049c9c384
Reviewed-on: https://code.wireshark.org/review/4843
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19 22:45:27 +00:00
Guy Harris ac55a6d2f5 Get rid of unnecessary include of ctype.h.
Change-Id: I30c4d75e16e1816c4a792e023ffe04f5a970b6d3
Reviewed-on: https://code.wireshark.org/review/4842
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19 22:40:08 +00:00
Michael Mann 5e4e17ca5e Remove unnecessary tvb_ensure_bytes_exist calls.
All of the calls removed are followed by proto_tree_add_xxx calls of the same offset/length of the tvb_ensure_bytes_exist call.  The proto_tree_add_xxx calls should throw the exception, so we don't need the "double check".
There are probably more calls that can be removed, these were just obvious as first glance, spurred mostly by noticing the (ab)use in packet-wsp.c

Change-Id: I37cee347c8cf8ab0559e21562c802d3b37f4871e
Reviewed-on: https://code.wireshark.org/review/4833
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-19 15:26:43 +00:00
Gerald Combs 1427a8e986 [Automatic manuf, services and enterprise-numbers update for 2014-10-19]
Change-Id: Ifc13fdb5898cad85ba7cd35c28024f3d4fefe70a
Reviewed-on: https://code.wireshark.org/review/4839
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-19 15:06:03 +00:00
Alexis La Goutte db316c9d9f TDS: Make buildbot happy
Fix Field 'Server Version' (tds.server_version) is an integral value (FT_UINT32) but is being displayed as BASE_NONE

Change-Id: I601e71ac8e7928ef90fdd16956af3a34bca269a9
Reviewed-on: https://code.wireshark.org/review/4836
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-19 14:21:28 +00:00
Bill Meier 8def8ef9c4 packet-amqp.c: Temporary/preliminary fix for Bug #10582 (crash)
This is a temporary/preliminary fix to prevent the buildbot fuzz-test
 failures seen when testing the capture file attached to Bug #10582.

As noted in the bug, a complete fix will require some reworking of
  the amqp dissector.

Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df
Reviewed-on: https://code.wireshark.org/review/4835
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-19 14:14:22 +00:00
Michael Mann 8842e2e893 Eliminate proto_tree_add_text from packet-tds.c
Change-Id: Ib3dc7f8a87e55ef34d4847f4837d645e418607a3
Reviewed-on: https://code.wireshark.org/review/4826
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 12:00:52 +00:00
Michael Mann 54dfe3b9b6 Eliminate proto_tree_add_text from packet-smpp.c
Change-Id: I6e1e62ff7910be535229d7e1a15557879a5cee1f
Reviewed-on: https://code.wireshark.org/review/4832
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 03:18:58 +00:00
Michael Mann 7f5398687a Eliminate proto_tree_add_text from packet-nhrp.c
Change-Id: I51702e9372551a28ea604d21d4bbf0eb4d9588ae
Reviewed-on: https://code.wireshark.org/review/4831
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 03:18:35 +00:00
Michael Mann 6720c80bab Eliminate proto_tree_add_text from packet-ismp.c
Change-Id: Ie2a395b808a8879625185a6de458f61d386cff55
Reviewed-on: https://code.wireshark.org/review/4830
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 03:13:21 +00:00
Michael Mann e0e03ee7e7 Eliminate proto_tree_add_text from packet-arp.c
Change-Id: Ie9596df97a135b411693eefc39fdbd03316166a0
Reviewed-on: https://code.wireshark.org/review/4828
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 03:08:04 +00:00
Michael Mann c347eb965b Eliminate proto_tree_add_text from packet-ipx.c
Change-Id: Ie084a33be94d91eec7f5f70ef31fcb0835ad266c
Reviewed-on: https://code.wireshark.org/review/4829
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 03:01:54 +00:00
Michael Mann 283f478964 Eliminate proto_tree_add_text from packet-igrp.c
Change-Id: If73e3bb924036b7746d15058e9fca6f551f9538c
Reviewed-on: https://code.wireshark.org/review/4827
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-19 01:43:20 +00:00
Stig Bjørlykke 147e7fe510 Lua: Added ProtoField.none
This field can be used for adding filterable subtree entries.

Change-Id: Id395c9a8194dc00e6544170631b48d71ae9dd33e
Reviewed-on: https://code.wireshark.org/review/4573
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-10-18 18:25:40 +00:00
Alexis La Goutte e7b07ae73e IPv6: QuickStart option Nonce is read incorrectly
In Wireshark, the option's TTL field looks ok, but the [TTL diff] field points to the byte after the TTL field, which is part of the nonce field.
The nonce field is being read one byte after where it should be read and so the value being read is incorrect.
Moreover, the option data length says 6 but because of the extra byte being read 7 bytes are being read for this option data and the next option is read one byte later incorrectly so the options after the QuickStart option are being read incorrectly.

Found by boaz
Bug:10575

Change-Id: Icd836b2a5c2f92cef7b6fea61957a85fca5e3352
Reviewed-on: https://code.wireshark.org/review/4815
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-18 17:40:36 +00:00
Alexis La Goutte 51f4962203 MIPv6: Mobility Option Mobile Node Link Layer Identifier Link-layer Identifier field is read beyond the option data
there's a single IPv6 packet with Mobile Node Link Layer Identifier mobility option.
The option's data length is 9 but and since the Reserved field takes 2 bytes, the Link Layer Identifier field should take 7 bytes.
However, the Link Layer Identifier field is read until the end of the packet, which is 519 bytes.

Bug:10578
Change-Id: I518de7f6b75e5b749cb029845fd4846954ca6d0e
Reviewed-on: https://code.wireshark.org/review/4818
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-18 17:16:31 +00:00
Alexis La Goutte 8a10f77ab4 MIPv6: Mobility Option Binding Authorization Data for FMIPv6 Authenticator field is read beyond the option data
There's a single IPv6 packet with Binding Authorization Data for FMIPv6 mobility option.
The option's data length is 14 but and since the SPI takes 4 bytes, the Authenticator field should take 10 bytes.
However, the Authenticator field is read until the end of the packet, which is 178 bytes.

Found by boaz
Bug: 10577
Change-Id: Ia79c5131d8477c1a7c111c47c2a94e990bbeae4d
Reviewed-on: https://code.wireshark.org/review/4817
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-18 17:12:18 +00:00
Alexis La Goutte 31c119fa78 MIPv6: Mobility Option IPv6 Address/Prefix marks too many bytes for the address/prefix field
One of the mobility options is the IPv6 Address/Prefix.
The prefix length of this option is 52.
Note that according to RFC 5568, the prefix length is in bits and not in bytes.
The IPv6 Address/Prefix field of this option marks 52 bytes.

In addition, I'm not sure that the IPv6 Address/Prefix field is a variable size field.
RFC 5568 section 6.4.2 has a diagram of this options that shows this field as if it always takes 128 bits, and the prefix length field just says the length of the prefix (not the length of the field).

Found by boaz

Bug:10576
Change-Id: I2a9a35cb7c537ec3b91c9a089f14fa31f41d8c80
Reviewed-on: https://code.wireshark.org/review/4816
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-18 17:07:52 +00:00
Alexis La Goutte 8d6fd8dd23 GSM(_a_rr): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I07fe19af11bff3d001193e4af472c05090728392
Reviewed-on: https://code.wireshark.org/review/4814
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-18 16:15:34 +00:00
David Ameiss 975b02f879 Converted numerous proto_tree_add_none_format() calls for bitmask/flag items to proto_tree_add_bitmask().
Correctly set the length of LBT-RM and LBT-RU header blocks.
Various other cosmetic cleanups.

Change-Id: If19bbdeb10176b8059fd4cf657719b3b9817bc6a
Reviewed-on: https://code.wireshark.org/review/4776
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-18 12:29:19 +00:00
Guy Harris 77acaa1f48 Get rid of unnecessary includes of ctype.h.
Change-Id: I9e2cd7a9fed33fc2f4b0c0da3603690450f6952d
Reviewed-on: https://code.wireshark.org/review/4809
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-18 01:22:31 +00:00
Guy Harris 1de3a5bc49 Check for printable ASCII in an ENBName.
I'm not sure why the check is only for alphabetical characters; if
that's correct, change this to use g_ascii_isalpha, and change
is_printable_ascii to is_ascii_alpha or something such as that.

Don't use ctype.h routines, as they are locale-dependent.

Change-Id: I61d0672350d35ad918e95d7e96ed5dd263102da9
Reviewed-on: https://code.wireshark.org/review/4805
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-18 00:22:55 +00:00
Guy Harris 19b7819694 Get rid of unnecessary includes of ctype.h.
Change-Id: Ibb194cd839d174af9c96f7bb1e2941b3dd6c1ce1
Reviewed-on: https://code.wireshark.org/review/4797
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 23:31:20 +00:00
Guy Harris 033f096ee9 Don't use ctype.h routines.
That avoids locale dependency and handles possibly-signed chars (which
we weren't always doing before).

Change-Id: Ieceb93029252f646397b6488f2df8a57c6d2a23d
Reviewed-on: https://code.wireshark.org/review/4794
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 23:11:18 +00:00
AndersBroman 17a1a0d5e7 SGsAP Update to V12.6.0 except for IE TMSI based NRI container.
Change-Id: Iafb62a27589de1810d4d3bd1e32f1c89898e9171
Reviewed-on: https://code.wireshark.org/review/4777
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-17 14:52:12 +00:00
AndersBroman 0ceeddee17 Dissect CDMA2000 PDU if GCSNA dissector exists.
Change-Id: I866fb9bbc3e94df63231959d6745f3d45ca84020
Reviewed-on: https://code.wireshark.org/review/4772
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-17 12:01:27 +00:00
Guy Harris 23b233d741 Remove unnecessary include of <ctype.h>.
Change-Id: I596b252d5fb41e654961483cb530754442f25bc7
Reviewed-on: https://code.wireshark.org/review/4763
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 06:29:36 +00:00
Guy Harris 44d4339eb3 Don't use <ctype.h> macros, and eliminate an include of <ctype.h>.
This avoids locale-dependent tests, and fixes cases where we passed
signed char values to those macros (which is not safe with char being
signed, as it is on most, but not all, platforms).

Change-Id: I51d9716fe3eb02a6e98208334285c07597a6be79
Reviewed-on: https://code.wireshark.org/review/4761
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 06:22:20 +00:00
Guy Harris 25d9a7b5f1 Don't use <ctype.h> macros, and eliminate an include of <ctype.h>.
This avoids locale-dependent tests.

Change-Id: I709ff6b1a837fb0390b29f911d3b9ef1015a2d1e
Reviewed-on: https://code.wireshark.org/review/4758
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 06:09:11 +00:00
Guy Harris 762b8d78ec Don't use ctype.h routines.
That avoids locale dependency and handles possibly-signed chars (which
we weren't doing before).

Change-Id: I2afab254044e0d39dfa67acd840b9fe4ff1e6d08
Reviewed-on: https://code.wireshark.org/review/4756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 06:01:58 +00:00
Guy Harris 0d9b449ae9 Don't use <ctype.h> macros.
They're locale-dependent (although those *particular* ones might not
be).

Remove no-longer necessary (or not-even-necessary-before-this-change)
includes of <ctype.h>

Change-Id: I1384e3ae4ccba6af9220a08773abcde7ea320573
Reviewed-on: https://code.wireshark.org/review/4755
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 01:26:27 +00:00
Guy Harris 359a32f735 No need for our own wrappers around tolower() and toupper().
We can just use g_ascii_tolower() and g_ascii_toupper();

Change-Id: I8a88a096d16ce8c60dd9151e5bdddf6747702145
Reviewed-on: https://code.wireshark.org/review/4754
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17 01:21:48 +00:00
Guy Harris e6fcff1eb6 Use g_ascii_isalnum() rather than isalnum().
That way, we don't have to worry about casting the argument (which, in
one place, was done wrong - casting to int preserves the sign-extension
done with signed chars), and don't have to worry about a locale in which
particular 8-bit byte values are considered alphanumeric characters.

Change-Id: I129b4bfdad70ade4ab6e0a1d2c13d59ae9e6f524
Reviewed-on: https://code.wireshark.org/review/4751
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 23:46:58 +00:00
Guy Harris f249589938 Just have get_mac_lte_rapid_description() return the description string.
If get_mac_lte_rapid_description() returned FALSE, we always used "" as
the description string; just have it return the string, or return "" if
rapid ranges haven't been configured, and just use the string.

(If the code ever needs to determine in other places whether rapid ranges
have been configured, it can check s_rapid_ranges_configured, or
get_mac_lte_rapid_description() could return NULL in that case and the
code using the string can check for a null value.)

This should squelch some incorrect used-but-not-set warnings from at
least one compiler.

Change-Id: I3ed495a4beb4a553e453e7bca764d1d8a07c5e53
Reviewed-on: https://code.wireshark.org/review/4750
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 23:04:26 +00:00
Guy Harris a517d500b4 Make sort_alphabet() not fail too badly with characters in [128,255].
Treat all values in the alphabet as unsigned.

Change-Id: I4476c75352f32673a9cd131ea233465f3376fa25
Reviewed-on: https://code.wireshark.org/review/4747
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 21:56:03 +00:00
Martin Kaiser aa1f2c5e4c use supported/unsupported for the bitfield elements
order them from MSB to LSB

Change-Id: Ie758285c2cf5d19e00d6d256c49acca15ce81168
Reviewed-on: https://code.wireshark.org/review/4746
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-16 21:25:36 +00:00
Martin Kaiser ee56b721bb smartcard descriptor: start a bitfield for the features
Change-Id: I636cfdfcd61d6d5dc041f9dbc657244d94e88b7f
Reviewed-on: https://code.wireshark.org/review/4745
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-16 21:24:58 +00:00
AndersBroman b64183285b GTPv2 in Complete Request Message call the NAS dissector with a tvb only
containing the IE not the rest of the tvb.

Change-Id: I3eead5047b4f8de47e280ac447c66b110592bccd
Reviewed-on: https://code.wireshark.org/review/4744
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-16 20:32:49 +00:00
Guy Harris 71a42e0fbc Oops, I missed one "cast a char to int and use it as a subscript" case.
Casting a signed char with a negative value to int will preserve the
value, so it'll still be a negative subscript.  Cast to guchar instead,
to make sure 0x80 through 0xFF are treated as 128 to 255, not -128 to
-1.

Change-Id: I1f0b33ba3686e963d45317b45465ff335431d17f
Reviewed-on: https://code.wireshark.org/review/4742
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 20:04:28 +00:00
Guy Harris f6bc6f957a Better fix - just check that the upper and lower nibbles are >= 0xA.
An unsigned 8-bit integer is always <= 0xFF; that was the cause of the
warning.

To see whether a byte, when represented as hex, has letters for its
upper and lower nibbles, just check whether both nibbles are >= 0xA.
Cast the extracted nibbles to make sure there's no sign-extension.

Change-Id: If4c7717a5d2fe341c02e9309ee6b89973a6ac292
Reviewed-on: https://code.wireshark.org/review/4739
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 19:08:19 +00:00
Dario Lombardo 7f74471229 Added italian translation to qt.
Change-Id: If58ed29e78a9994fc488a4d01cf665f7e8d82830
Reviewed-on: https://code.wireshark.org/review/4707
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-16 18:55:33 +00:00
Guy Harris 50add40a2d Fix some more "char is unsigned" issues, and a possible "char is signed" one.
C neither guarantees that char is signed nor that it's unsigned.  Make
the str_to_nibble tables arrays of gint8, to make sure they can hold
numbers between 0 and 15 as well as -1.  Cast gchar to guchar, not int,
when using it as a subscript into that array, so that the subscripts are
in the range 0 to 255, not -128 to 127.

Change-Id: Ib85de5aa4e83ae9efd808c78ce3f86f45b4a3f2a
Reviewed-on: https://code.wireshark.org/review/4734
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 18:16:58 +00:00
Guy Harris 353f6258f9 Fix issues in some ARM compilers, due to char being unsigned?
I'm not 100% certain the comparisons were right even with signed char;
make the comparisons unsigned vs. unsigned, regardless of whether char
is signed or not.  (No, C doesn't require it to be signed; that's why
there's a "signed" keyword.)

Change-Id: Icbbd1019a2f7d4ebb40d821255834f825cd7c5a7
Reviewed-on: https://code.wireshark.org/review/4731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-16 18:06:38 +00:00
Pascal Quantin 14b75d838d ETSI CAT: fix a typo and remove deprecated API call
Change-Id: I7df02d6a605ca0912c179caa04a405c5c18eb552
Reviewed-on: https://code.wireshark.org/review/4727
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-16 16:01:48 +00:00
Michael Mann 371e4ae1c7 Eliminate some proto_tree_add_text from GSM dissectors (so now there are no dissectors with 100+ proto_tree_add_text calls).
Add tfs_allocated_by_receiver_sender to tfs.h because it seems "popular" enough.

Change-Id: I478461d9b951a2c3e3aec6aaf996d95ba2c0feee
Reviewed-on: https://code.wireshark.org/review/4708
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-15 19:16:37 +00:00
Alexis La Goutte 0444c473b7 IPv6: Calipso option length is not used properly
This field indeed indicates the length of the Compartment Bitmap but *in 32-bit words*, which means that the value of 12 means the compartment bitmap is 48 bytes long.

Issue found by boaz
Bug:10561

Change-Id: I6c6ac25d0680837594d7cc6d2e4807a60a523b80
Reviewed-on: https://code.wireshark.org/review/4697
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-15 14:09:48 +00:00
Evan Huus 5cdb032304 smb2: fully initialize dummy session
A few fields weren't being zeroed and were causing valgrind warnings.

Bug: 10569
Change-Id: I30e1e70c9445376806f385f3578b65bf6e320f8b
Reviewed-on: https://code.wireshark.org/review/4702
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-15 12:24:04 +00:00
AndersBroman 1a652bd78d GTPv2: Fully dissect Presence Reporting Area Action.
Change-Id: If38f639049bd897587ed61cc2d94f974131ccd20
Reviewed-on: https://code.wireshark.org/review/4700
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-15 11:14:49 +00:00
Stig Bjørlykke a25ae55c92 LDAP: Improved a if-check to avoid a analyzis warning.
Change-Id: Iceeaa94a80543570a720281ac39d3ccd9ac924fa
Reviewed-on: https://code.wireshark.org/review/4699
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-15 10:53:59 +00:00
Bill Meier 6206fa5a19 raknet: fix two checkfiltername errors; mcpe,raknet: minor cleanup;
Change-Id: Ieac370d232c6349f7acc45f4817637a80915e315
Reviewed-on: https://code.wireshark.org/review/4695
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-15 01:29:09 +00:00
Bill Meier 60e738cd20 packet-raknet.c: value_string array (created at runtime) must be terminated with {0, NULL}.
This should fix crash in 'tshark -G values' seen on 64 bit tshark.

Change-Id: Ia183fc5d5604f71b824cf4f758c18ff1ccd4540f
Reviewed-on: https://code.wireshark.org/review/4694
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-15 00:16:45 +00:00
Bill Meier bfe3706035 Always put editor-modelines at the end of the file ...
... to ensure that there are no potential issues with respect to
editors limiting the number of lines scanned at the end of the file
when checking for editor modelines.

Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4
Reviewed-on: https://code.wireshark.org/review/4688
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 20:08:29 +00:00
Bill Meier 71c5ac03e2 packet-assa_r3.c: Use editor modelines from http://www.wireshark.org/tools/modelines.html
Change-Id: I2d9accd2336448ced30dca1878a3e27cdba29566
Reviewed-on: https://code.wireshark.org/review/4687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 20:07:51 +00:00
Nick Carter 0ce5b8cdac Add RakNet protocol dissector
Bug: 10534
Change-Id: Id56008da0c21a5f3a0309cdf21aff287c7820dcf
Reviewed-on: https://code.wireshark.org/review/4372
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-14 19:38:17 +00:00
Bill Meier 87ea03bf37 packet-gvsp.c: removed an unused #define
Change-Id: If330124cdc459867b33e1bbbe960c969deb85b10
Reviewed-on: https://code.wireshark.org/review/4684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 16:56:25 +00:00
AndersBroman 2359e67f9c GTPv2 Dissect more bits in IE Indication.
Change-Id: I19d0b67e06ec22bfc5bafc58fdeb445e30e25f95
Reviewed-on: https://code.wireshark.org/review/4682
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:33 +00:00
Stig Bjørlykke 3ec9ddc14e PIM: Disable unused pimbdirdfvals.
Change-Id: I2b023868d9f84e891e36f2cfcfd4ad25e1e43592
Reviewed-on: https://code.wireshark.org/review/4681
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:18 +00:00
Bill Meier 9cba3b6eb6 packet-gvsp.c: sort pixeltypenames[] for extended value-string use.
Change-Id: Iaf753d432603422922ad7ef4ba7a2c2b3cd84136
Reviewed-on: https://code.wireshark.org/review/4678
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 07:35:52 +00:00
Bill Meier 0149015b6e packet-gvsp.c: Fix license; Remove unneeded code from proto_reg_handoff..(); adjust whitespace.
Change-Id: I24a9033bbed3d50daf886f3d00239c1580894c35
Reviewed-on: https://code.wireshark.org/review/4670
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-14 06:14:17 +00:00
warrenm ea1137881a Adding GigEVision GVSP dissector
Bug: 8673
Change-Id: I4e8270c76291d6ea0e0187f00a342804275f2c11
Reviewed-on: https://code.wireshark.org/review/4547
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 04:08:55 +00:00
Pascal Quantin fb27a682a1 NCP: cast to guint instead of gulong
Change-Id: Idc8f8f3177703ce5546b8a472034705cb6070707
Reviewed-on: https://code.wireshark.org/review/4666
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 21:16:03 +00:00
Martin Kaiser 8342eb891d smartcard descriptor: bitmask for pin support field
Change-Id: If0e5cd90ff73bfbb211970f9a24974119c6ec550
Reviewed-on: https://code.wireshark.org/review/4664
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:29:03 +00:00
Martin Kaiser 9dd515cbd7 smartcard descriptor:
dissect number of lines, characters per line in the lcd layout

Change-Id: I36c9c6f2e73cdfde8a9b7c4ad0450d93722fca2b
Reviewed-on: https://code.wireshark.org/review/4663
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:28:38 +00:00
Martin Kaiser 15f23c735b smartcard descriptor: the lcd layout is two bytes long
Change-Id: Ie8fd82d652a9a3fc1d3139ab610bbaa7a5ecd32d
Reviewed-on: https://code.wireshark.org/review/4662
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13 20:25:51 +00:00
Pascal Quantin 89a95f2205 Add Kerberos 3.2.2 package for Win64
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb
Reviewed-on: https://code.wireshark.org/review/4661
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 20:15:27 +00:00
Stig Bjørlykke ab7f9aa164 BER: Code cleanup in call functions
Change-Id: I0ba958485dffd3cc1e419fb27cf7f2bc492d05fe
Reviewed-on: https://code.wireshark.org/review/4643
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 19:18:48 +00:00
Pascal Quantin 63faad686b NCP: add a missing cast following g6ca40c5
Change-Id: I0b93c4faab52d830b8160d89b9bb8026ab2a216e
Reviewed-on: https://code.wireshark.org/review/4657
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-13 19:07:07 +00:00
Stig Bjørlykke b653564fe2 Lua: luaL_checkstring does not return NULL
Removed all checks for NULL strings to cleanup the code.

Change-Id: Ia890cd9b206296f586e85214f07765f14984580b
Reviewed-on: https://code.wireshark.org/review/4632
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 19:06:40 +00:00
Alexis La Goutte 631834ff51 IPv6: use proto_tree_add_item for IPv6 Routing Header Next and Length
Like other header (Fragment, Hop by Hop...)

Change-Id: I5d0a85bf285b37eed38345d659439400c5f50d06
Reviewed-on: https://code.wireshark.org/review/4634
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 18:16:39 +00:00
Evan Huus b9988e2bbf ncp2222: don't overflow buffer constructing string
Fixes stack-smashing vuln.

Somehow there was already an XXX in the code about this, but nobody realized at
the time it was worth fixing... really?

Bug: 10552
Change-Id: I849068bd6c45146339444f295b72430d3c6e08f2
Reviewed-on: https://code.wireshark.org/review/4653
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:59:51 +00:00
Stig Bjørlykke 4f37f554f1 RTSE: Return dissected length from call_rtse_oid_callback
Change-Id: I6766135ddcdfe25d9bcc060bb2a47376abb36794
Reviewed-on: https://code.wireshark.org/review/4642
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:01:36 +00:00
Stig Bjørlykke 748e522815 ROS: Return dissected length from call_ros_oid_callback
Change-Id: I8d119cd3dc9ac0a724497400680a70f39fc21ede
Reviewed-on: https://code.wireshark.org/review/4641
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 16:01:19 +00:00
Alexis La Goutte 24b6a1141a IPv6 RPL option is read as less bytes than it is
Add check if the opt len equal to the "calculcate" length
and display expert info if not.. also replace offset by the opt len

Bug:10559
Bug:10561
Change-Id: I6e80e4055b6d0c5ef3f030c544cd1629e6b9abec
Reviewed-on: https://code.wireshark.org/review/4627
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:47:05 +00:00
Tim (Thanh) Nguyen a9497befeb RoCE and CM dissector fixes
- fixed cm.req cm.rep bit fields
- fixed packetLength and CRC length for RoCE
- use "RoCE" or "RRoCE" instead of "InfiniBand" in COL_PROTOCOL where appropriate

Change-Id: Id491658f9368034bb2267922fa5618e1c259cd56
Reviewed-on: https://code.wireshark.org/review/4614
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-13 15:45:33 +00:00
Pascal Quantin b3ad51db7c Follow-up of ged0b19b (Make boolean bitmask type 64-bit wide)
- use G_GINT64_MODIFIER instead of "%ll"
- use G_GUINT64_CONSTANT instead of ULL
- add some missing explicit casts

Change-Id: Ic048d9ee8966ea504ea542cefe55688edcfb2dc7
Reviewed-on: https://code.wireshark.org/review/4644
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 15:34:09 +00:00
Alexis La Goutte e8a63a5a46 SPDY: Add Slot field for SYN_STREAM (and also unused field...)
Ping-Bug: 10566
Change-Id: I4d3d991eb8b5ede349a361d1f6b605b4a67a98b6
Reviewed-on: https://code.wireshark.org/review/4645
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 15:07:59 +00:00
Alexis La Goutte 017fc82d74 SPDY: Fix bitmask for priority bit
Found by yurui ming

Ping-Bug: 10566

Change-Id: I92e784eb91dc6c88af409e2936671b0ea473fba9
Reviewed-on: https://code.wireshark.org/review/4637
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:25:56 +00:00
Alexis La Goutte 2c23c7e79d SPDY: Fix the display of COL_INFO...
Clear the COL_INFO before start to dissect SPDY PDU

Change-Id: I7a22515f1c2c89b5647003320ff455a74fbce42a
Ping-Bug: 10566
Reviewed-on: https://code.wireshark.org/review/4636
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:24:10 +00:00
Stig Bjørlykke ebbe70b335 ASN1: Register BER syntaxes as NEW
Change-Id: Id85eaecd84dbe1115935e1977dca321fd601d986
Reviewed-on: https://code.wireshark.org/review/4639
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 12:22:13 +00:00
Alexis La Goutte 71ae57e38d IPv6: Fix typo for Fragment nxt (Next Header)
Change-Id: Id7d6cd4a4c09238890394d5dc887ec840dc2d2af
Reviewed-on: https://code.wireshark.org/review/4633
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 12:18:30 +00:00
Stig Bjørlykke 313c4005f9 P1: Added ORAddress and ORName syntax.
Change-Id: Icf8e8cb2988d9134aa65f04a3459e4a4c4a5721f
Reviewed-on: https://code.wireshark.org/review/4640
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 11:40:00 +00:00
Stig Bjørlykke 4e1b5ea866 ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-13 11:24:07 +00:00
Alexis La Goutte 94d35481b7 SPDY: Fix typo about length for Control bit
Found by yurui ming

Change-Id: Ibef07fa13af0de8357bdf98a038460706d0972f7
Ping-Bug: 10566
Reviewed-on: https://code.wireshark.org/review/4635
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:49:12 +00:00
Alexis La Goutte 749832a35c USB Mass Storage: Display target number for SCM USB-SCSI converters
The USB Mass Storage Class (Bulk Only Transport) has the LUN in bits [3:0] of byte 13 of the command block wrapper. Bits [7:4] of that byte are undefined/reserved.

USB-SCSI converters based on a chipset from SCM Microsystems can work with multiple SCSI devices. After enabling multi-target mode (which the vendor driver and Linux do), the target number is given in bits [6:4] of CBW byte 13.

Request from Mark

Bug:10563
Change-Id: I8e6d9b7d47ff4296d41e8b9b15f4bd44c89238c9
Reviewed-on: https://code.wireshark.org/review/4625
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:43:49 +00:00
Joseph Huffman 8cc7b0d6cf Fixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors.
There was no tree items for padding in the many instances where there were
bytes added to make certain data types align on even boundaries of 2, 4, or
8 bytes. These instances now show up as "Padding" in the display.

There were many instances where ENC_NA was used for fields of more than one
byte. This wasn't noticed before because ENC_NA was ENC_BIG_ENDIAN for
historical reasons and all these fields are big endian fields.

Change-Id: Iabadd46eacc9ceb8ca85f4a5ba42b6583375c5f0
Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org>
Reviewed-on: https://code.wireshark.org/review/4413
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 10:37:09 +00:00
Matthieu Texier 8d0becd821 Aliging PIM hello message type to IANA in order to fix BUG 10231
Change-Id: Ie9a126d106c08935eb385fd93d011e481913ab3c
Reviewed-on: https://code.wireshark.org/review/4448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 08:57:00 +00:00
Michael Mann b563a84db6 Eliminate proto_tree_add_text from IP dissectors
Change-Id: I81fc364cbff3c5b305d61b2d444bf8599fbd19e7
Reviewed-on: https://code.wireshark.org/review/4631
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-13 06:45:13 +00:00
Alexis La Goutte 5518513eef IPv6 RPL: Display RPL flag on HEX
Change-Id: I0b3bb9e1a0de388135a71bc6a97602d6abf6a9dc
Reviewed-on: https://code.wireshark.org/review/4628
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 02:13:04 +00:00
Alexis La Goutte 73613d414a Remove DIRTY_DISSECTOR_SRC
x11 dissector don't have longer warning !
and fix different between Autotools and CMake (about gsm_a_common dissector)

Change-Id: Id9da62d84b8b0bb4b0ed5d8fc62abba4e2442ed2
Reviewed-on: https://code.wireshark.org/review/4621
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-13 02:06:12 +00:00
Pascal Quantin 38c9ac870a GlusterFS: fix OSX compilation failure
ged0b19b introduced support for 64 bits bitmask. Make use of it and add an explicit cast to fix a compilation error

Change-Id: I9f2202d851aedc0dc78655c505b5a0b26b224c0e
Reviewed-on: https://code.wireshark.org/review/4630
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12 21:44:36 +00:00
Alexis La Goutte 4e328e4709 DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC
Now mapi and drsuapi build without warning !

Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58
Reviewed-on: https://code.wireshark.org/review/4619
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:46:58 +00:00
Alexis La Goutte d62b323c5e PIDL (DCERPC misc): enhance dissector
* Fix -Wunused-function (Set NOEMIT winreg_Data and remove unused function)
* Remove dissector DCERPC misc from DIRTY list

Change-Id: If59b14f8db33354a2d5248e8bc256cadee3ea4bf
Reviewed-on: https://code.wireshark.org/review/4345
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:46:26 +00:00
Alexis La Goutte 148136c9a5 ISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I17163b18348919d19d3d336ccf9c1310d473a05d
Reviewed-on: https://code.wireshark.org/review/4624
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:43:12 +00:00
Alexis La Goutte 44208b98d1 LMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ie651e8a7d0309330504a77664bb2eac75c00d968
Reviewed-on: https://code.wireshark.org/review/4623
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 17:42:18 +00:00
Stig Bjørlykke 1b65cb646d Add back get_uinteger for boolean_type.
This was removed in ed0b19b94b

Change-Id: I548ca955eda6e0b6991a0f6731cbbb3bf82e0e2b
Reviewed-on: https://code.wireshark.org/review/4620
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-12 16:59:14 +00:00
Gerald Combs 6e3a2b450e [Automatic manuf, services and enterprise-numbers update for 2014-10-12]
Change-Id: Icc98f156e55bc8523490bb8a8d712ca80076649e
Reviewed-on: https://code.wireshark.org/review/4615
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-12 15:06:08 +00:00
Pascal Quantin f7c5e3a5b9 E-LMI: add what seems to be a missing break (Coverity CID 1245648)
Change-Id: I6b35ea96fba142bdabf17d3fc3f9db23dc390d31
Reviewed-on: https://code.wireshark.org/review/4613
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-12 14:57:03 +00:00
Daniel Mack ed0b19b94b Make boolean bitmask type 64-bit wide
There are protocols out there that have 64-bit wide bit mask fields, so
make the internal representation and bitfield decoders 64-bit aware.

For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked
slightly.

Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233
Reviewed-on: https://code.wireshark.org/review/4158
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 14:15:12 +00:00
Matthieu Patou 29afac24a5 Add support for NTTIME_hyper and NTTIME_1sec
It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution

Bug: 10541
Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9
Reviewed-on: https://code.wireshark.org/review/4606
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-12 14:08:44 +00:00
Stig Bjørlykke eb72d2a160 Use variable name 'len' when handling length.
Change-Id: Icb1d81316d1ead3455c68ad55e52b8120b7dccf9
Reviewed-on: https://code.wireshark.org/review/4609
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-11 20:41:58 +00:00
Matthieu Patou e331083812 Add dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocols
Bug: 10540
Change-Id: If4a8603a7cb62894cc46094056dd5313039884b2
Reviewed-on: https://code.wireshark.org/review/4604
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-11 04:04:36 +00:00
Michael Mann 6e42a72923 Dissection of sid28 needs null check.
Bug: 10542
Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a
Reviewed-on: https://code.wireshark.org/review/4603
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 23:24:18 +00:00
cbontje d330cd4ecb DNP3 Protocol Bugfix / Enhancement
- Fix for Single-bit Objects offset-pointer
- Enhancement for Obj 12 Var 2 (Pattern Control Block) and Var 3 (Pattern Mask) Decoding

Bug: 10558
Change-Id: I8d3f6cee4acbab09d0b93dab6b868cddd842b682
Reviewed-on: https://code.wireshark.org/review/4597
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 20:19:08 +00:00
Anish Bhatt f7588eaec2 [ELMI] Add missing information elements, add support for sub-information elements.
Bug 10532

Updated with Bandwidth Profile support

Change-Id: I0f31eb6c78a5e34bcb1c286a9a10730b3b63481c
Reviewed-on: https://code.wireshark.org/review/4571
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 19:29:14 +00:00
Michael Mann a168c44fc0 Remove (almost all) proto_tree_add_text calls in ISUP dissector.
Change-Id: I57a01eacaa02e45c23bb4827ae982c897fb308ee
Reviewed-on: https://code.wireshark.org/review/4592
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10 19:14:14 +00:00
Pascal Quantin a1933022f2 NCP: switch to wmem memory and ensure that all fields are initialized
Change-Id: Ia17e189baed05d8020654e6702a51f51bd384f26
Reviewed-on: https://code.wireshark.org/review/4589
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 19:02:36 +00:00
Pascal Quantin 6463d2a7e6 GSM MAP: fix detection of SMS direction when application context version is < 3
Bug: 10547
Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e
Reviewed-on: https://code.wireshark.org/review/4579
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-10 18:26:49 +00:00
Bill Meier 23e78cd6bd Add editor modelines; Adjust whitespace as needed.
Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50
Reviewed-on: https://code.wireshark.org/review/4594
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-10 14:50:08 +00:00
AndersBroman bdbc8e3a79 GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI
and TAI.

Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123
Reviewed-on: https://code.wireshark.org/review/4593
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10 13:45:27 +00:00
Guy Harris f5b06c5630 Fix some more int-to-enum conversion complaint.
While we're at it, log a message if a Lua file format module lacks a
read or a seek-read routine, rather than completely silently ignoring
that module if it claims a file.

Change-Id: I9778f7835922439e2d3708614689280ef7b61d33
Reviewed-on: https://code.wireshark.org/review/4590
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-10 08:14:38 +00:00
Gerald Combs 3a4cab751e CMake: Bundle our libraries.
Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa
Reviewed-on: https://code.wireshark.org/review/4588
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 01:45:55 +00:00
Gerald Combs 33d20c64dc Add back a value_string conversion lost in g58cc452.
I don't have a capture to check but this appears to be correct.

Change-Id: I93405d1e3ec4aac3761d06e257db3ec2e32b2fc2
Reviewed-on: https://code.wireshark.org/review/4587
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 01:40:16 +00:00
Guy Harris 45e462985d Use an enum for the open-routine return value, as per Evan Huus's suggestion.
Clean up some things we ran across while making those changes.

Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e
Reviewed-on: https://code.wireshark.org/review/4581
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-09 23:45:30 +00:00
Pascal Quantin 112c90a04b Kerberos: fix decryption of DCERPC with Kerberos encryption
Bug: 10538
Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c
Reviewed-on: https://code.wireshark.org/review/4566
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 21:45:18 +00:00
Pascal Quantin 7690afbc54 Kerberos: remove debug logs when loading a keytab
Bug: 10543
Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27
Reviewed-on: https://code.wireshark.org/review/4567
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:57:56 +00:00
Pascal Quantin 40e6d764c5 GTPv2: fix an infinite loop
Bug: 10548
Change-Id: I916e15cecf0ec9dc607362b902709567d69243df
Reviewed-on: https://code.wireshark.org/review/4578
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:34:16 +00:00
Michael Mann 58cc452d6f Eliminate proto_tree_add_text from packet-lmp.c
Also "refactored" a few fields into proto_tree_add_bitmask calls.

Change-Id: I3a222b38e1992943d6ee4bd300026bc28c5bbb78
Reviewed-on: https://code.wireshark.org/review/4575
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09 19:47:38 +00:00
Sean O. Stalley 608207fcf6 Add Dissection of MA packets over UDP
Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6
Reviewed-on: https://code.wireshark.org/review/4576
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 19:41:19 +00:00
Michael Mann 39b281461d Eliminate proto_tree_add_text from packet-nbns.c
Some other cleanup while in the neighborhood.  Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there.

Change-Id: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a
Reviewed-on: https://code.wireshark.org/review/4574
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09 17:13:39 +00:00
Anish Bhatt 1c51075376 [BACnet][trivial] change strings as per Bug 9640
Change-Id: I542b5a96bcff6c779359b80ddce513524852272c
Reviewed-on: https://code.wireshark.org/review/4572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-09 07:49:55 +00:00
Stig Bjørlykke 4edda1b2ce Lua: Improved TreeItem:add documentation.
The protofield is optional and can not be replaced with 'nil'
as with the other fields for this function.

Change-Id: I2b1dd7f290264394b400cea2110b65b657c71456
Reviewed-on: https://code.wireshark.org/review/4549
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-09 05:42:13 +00:00
Gerald Combs c303a2ebf5 Make sure we don't dereference a null pointer.
Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123
Reviewed-on: https://code.wireshark.org/review/4561
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 20:46:20 +00:00
Guy Harris ea5587a090 Fix a comment.
Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190
Reviewed-on: https://code.wireshark.org/review/4560
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:25:19 +00:00
Stig Bjørlykke 23286b7b14 ANSI 683: Removed unused assignments.
Change-Id: I952ce5329f69fa947e39b020a70a06f2bbf8a014
Reviewed-on: https://code.wireshark.org/review/4558
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 20:12:37 +00:00
Guy Harris 97e462d116 "long" does not necessary mean "64-bit". Use G_GINT64_MODIFIER.
Change-Id: I2521bf368ea30ac691af50c760a63b81efedeeae
Reviewed-on: https://code.wireshark.org/review/4559
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-08 20:10:07 +00:00
Alexis La Goutte fb6e0430aa DCERPC (DRSUAPI) Fix typo found on idl file
Change-Id: I79ad05122ae48de671c9c919bab6b3e8d94a50de
Reviewed-on: https://code.wireshark.org/review/4554
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 17:59:41 +00:00
Johan Wahl 7207d2f8b0 SIP Enhance dissecion of PATH
Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8
Reviewed-on: https://code.wireshark.org/review/4543
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-08 13:43:20 +00:00
Anish Bhatt 57a7aca8c3 elmi: Fix bug in message type coding
Bug: 10531
Change-Id: Ide6237afb71c79243347dedd1c744b3e97ff612e
Reviewed-on: https://code.wireshark.org/review/4542
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-08 11:22:03 +00:00
Alexis La Goutte ceda0f9a40 Remove #pragma warning (MSVC) for PIDL generate dissector
Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c
Reviewed-on: https://code.wireshark.org/review/4479
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 09:45:45 +00:00
Alexis La Goutte 41b8c6b519 DCERPC DFS: Remove from Dirty PIDL list
Change-Id: I87bd196d1c4ba14d9af6d174754b37d2b4d772c8
Reviewed-on: https://code.wireshark.org/review/4527
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-08 03:43:11 +00:00
Anish Bhatt f31836dbaf [bacnet] update vendors list, fix whitespace issues, all generated via script
Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744
Reviewed-on: https://code.wireshark.org/review/4519
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08 02:51:54 +00:00
Lorand Jakab 65321dfb87 Add support for LISP over TCP control messages
draft-kouvelas-lisp-rloc-membership-00 specifies 9 new LISP control
message types using TCP transport instead of UDP (which is used by all
existing messages).  These new messages are related to each other and
are used to exchange RLOC membership information between a tunnel router
and a map server.

Bug: 10494
Change-Id: I129f0d6344693092bd5d0efb06b025e89fd26bf2
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/4253
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08 01:34:13 +00:00
Guy Harris a566f617d8 No need for WTAP_ERR_CANT_READ.
Unlike the standard I/O routines, the code we introduced that supports
fast random seeking on gzipped files will always supply some specific
error code for read errors, so we don't need WTAP_ERR_CANT_READ.

Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard
I/O routines for that.  Set errno to WTAP_ERR_CANT_WRITE before calling
fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails
without setting errno.

Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63
Reviewed-on: https://code.wireshark.org/review/4540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 23:19:56 +00:00
Evan Huus cf4fc57966 ANSI683: Fix mobile country code base
Fixes error:
Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value
(FT_UINT16) but is being displayed as BASE_NONE

Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d
Reviewed-on: https://code.wireshark.org/review/4536
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 21:25:14 +00:00
Alexis La Goutte 43dffab8c8 GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10
Reviewed-on: https://code.wireshark.org/review/4526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 21:24:13 +00:00
Michael Mann a9e6c2c917 Overhaul the filterability of packet-ansi_683.c
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl.  Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector.  That started the cleanup, and I did more while in the neighborhood.

Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c
Reviewed-on: https://code.wireshark.org/review/4521
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07 21:14:28 +00:00
Anish Bhatt 12800157d6 [iSCSI] Fix incorrect heuristic.
The only valid check for Expected Data Transfer Length is :
R and W  MUST  NOT both be 0 when the Expected Data Transfer Length and/or
Bidirectional Read Expected Data Transfer Length are not 0

Bug #10469
Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172
Reviewed-on: https://code.wireshark.org/review/4514
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07 20:53:27 +00:00
Stig Bjørlykke d89cc1cf9a ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()

This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).

Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4
Reviewed-on: https://code.wireshark.org/review/4531
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 20:27:35 +00:00
Michał Orynicz 47a1735ca1 Add proper decoding for type field in OBEX headers
Change type field type from byte sequence to string.

Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee
Reviewed-on: https://code.wireshark.org/review/4417
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07 20:14:19 +00:00
Gerald Combs 9033f137a9 Revert "ASN1: Added support for using #.REGISTER_NEW"
This temporarily reverts commit
acc09c2aa2.

Change-Id: I7a55c8c2da3f65e914b90648ee92c84efd57f1a0
Reviewed-on: https://code.wireshark.org/review/4525
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07 16:34:18 +00:00
Stig Bjørlykke acc09c2aa2 ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()

This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).

Change-Id: I8802a812bd484c1e8794c618b87e676003aea94a
Reviewed-on: https://code.wireshark.org/review/4493
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 16:23:55 +00:00
Richard Sharpe 15e89ecdfa Dissect an SVHDX Open Device Context that appears as an Extra Create Parameter
in a CREATE request. This helps understand HyperV over SMB 3.x stuff.

Bug: 10527
Change-Id: I1e206ed38e12fed419b1ac4a0793b91f9308f364
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-on: https://code.wireshark.org/review/4477
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07 15:10:35 +00:00
Martin Kaiser 8439fd5796 - Handle strings that have an opening but no closing quote
fixes the endless loop reported in

Bug: 10521

- Fix a typo.
Change-Id: I17b4a15e780d1d6122841a308348518063f82a59
Reviewed-on: https://code.wireshark.org/review/4467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 07:49:13 +00:00