Commit graph

19756 commits

Author SHA1 Message Date
Martin Kaiser
447c96304e tree variables don't have to be initialized
Change-Id: Ic87133b143170d0146cd3a8fb23f8d0b33ec6502
2014-01-28 20:31:01 +00:00
Bill Meier
58bb4726a8 Comment out a lot more hf[] entries and related.
(Found by checkhf).

Note: There's quite a large amount of hf[] entries which are
      commented out. I wonder if there are "top-level" entries
      missing from the "parse-tree" arrays ?


svn path=/trunk/; revision=54990
2014-01-28 03:09:03 +00:00
Bill Meier
9d0207ed90 Comment out unused hf[] entries and related found by checkhf.
svn path=/trunk/; revision=54989
2014-01-28 03:06:03 +00:00
Bill Meier
c1e53e7359 Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain.
svn path=/trunk/; revision=54988
2014-01-28 03:02:37 +00:00
Evan Huus
953d54b120 From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697

Architectural support for multiple version of the same Asterix categories.
Includes implementation of CAT064 v.0.17.

svn path=/trunk/; revision=54987
2014-01-28 00:48:23 +00:00
Bill Meier
5c9c6cd8fb Fix hf[] entries with refs to range_string arrays
to add missing BASE_RANGE_STRING and to use RVALS instead of VALS.

Fixes crashes in 'tshark -G values' and presumably also fixes
 crashes when used in a dissection.

Introduced in SVN #54449.

(I suspect that ' convert_proto_tree_add_text.pl' may need some work
 to handle range_strings).



svn path=/trunk/; revision=54984
2014-01-27 18:22:39 +00:00
Bill Meier
80b5c57713 Fix: value string specified as a BASE_VAL64_STRING in
an hf[] entry but defined as a 'value_string' intead of
 as a 'val64_string'.

Caused 'tshark -G values' to crash
 (and presumably would also cause a crash when the value-string
  is referenced in a dissection):

Introduced in svn #54728

(Note: There's still another 'tshark -G values' crash to to found & fixed)


svn path=/trunk/; revision=54983
2014-01-27 17:20:44 +00:00
Bill Meier
dfb3d167b3 (Trivial) Fix spellling in a comment.
svn path=/trunk/; revision=54982
2014-01-27 14:33:54 +00:00
Evan Huus
dab27680cd From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612
Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP.

svn path=/trunk/; revision=54981
2014-01-27 13:42:34 +00:00
Evan Huus
2338fdea0f Add missing cast.
svn path=/trunk/; revision=54980
2014-01-27 13:12:59 +00:00
Martin Mathieson
9416835735 Revert part of previous change
svn path=/trunk/; revision=54979
2014-01-27 12:54:34 +00:00
Martin Mathieson
f903141d65 Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting
svn path=/trunk/; revision=54978
2014-01-27 12:06:46 +00:00
Stig Bjørlykke
3abb51aa67 Do not handle BER bitstring as ASCII string, because this will fail
when the first bit is set.

svn path=/trunk/; revision=54977
2014-01-27 09:57:24 +00:00
Stig Bjørlykke
fbaff1f081 Add back the fix from revision 54693.
svn path=/trunk/; revision=54976
2014-01-27 09:55:46 +00:00
Stig Bjørlykke
face757db3 Added back x509af_get_last_algorithm_id() removed in revision 54647 to
restore usage in cms and pkcs12.  They never got a valid value in 
actx->external.direct_reference because they use another actx in this case.

This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.

See comments in bug 9573.

svn path=/trunk/; revision=54975
2014-01-27 09:02:06 +00:00
Alexis La Goutte
c802536f67 Fix encoding arg for RSVP dissector (with fix-encodings-args tools
svn path=/trunk/; revision=54963
2014-01-26 12:55:59 +00:00
Bill Meier
64fd4c9c28 (Trivial) update a comment
svn path=/trunk/; revision=54962
2014-01-25 18:44:29 +00:00
Martin Kaiser
b2c8429a2c TABs -> spaces
add editor modelines

svn path=/trunk/; revision=54961
2014-01-25 14:38:51 +00:00
Martin Kaiser
0d1f9021ff BASE_NONE -> STR_ASCII
svn path=/trunk/; revision=54960
2014-01-25 14:29:45 +00:00
Martin Kaiser
5a70a53e11 the sametime dissector stores the result of tvb_get_string() into hf
variables that can handle only 7bit ascii strings
replace this with tvb_get_string_enc()

svn path=/trunk/; revision=54959
2014-01-25 14:27:49 +00:00
Bill Meier
5be35448f6 Mark a few function parameters as unused....
svn path=/trunk/; revision=54950
2014-01-24 20:24:02 +00:00
Bill Meier
1bd982a492 Rework and simplify the code to follow the principle of "dissect as
much as possible" rather than dissecting nothing if the length of a
 set of fields (e.g., a "command") seems wrong or if an exception
 occurs fetching data before previous fields have been displayed.
In general: just fetch/dissect from start to end: If there is missing
   data, a Wireshark exception will eventually occur;

Add lwm subtrees under the lwm protocol tree (*not* as protocols
 under the top (outermost) tree.

Fix a bug which caused an exception to be reported as:
 "[Packet size limited during capture: LwMesh truncated]"
 rather than as the correct: "[Malformed...]"

col_...() and expert...() functions shouldn't be called under 'if(tree)';

Register the heuristic dissector using "IEEE802154_PROTOABBREV_WPAN"
 (like certain other dissectors) rather than using "wpan";

missmatch --> mismatch

Fix some long lines.


svn path=/trunk/; revision=54949
2014-01-24 20:19:06 +00:00
Pascal Quantin
c1a88c0995 Add packet-mbim.h to Makefile.common
svn path=/trunk/; revision=54948
2014-01-24 20:08:22 +00:00
Pascal Quantin
d8c15b8d91 Add ability to register new UUID and CIDs
svn path=/trunk/; revision=54944
2014-01-24 18:53:06 +00:00
Pascal Quantin
7a44616a1d Fix dissection of 8PSK Power Capability IE
svn path=/trunk/; revision=54942
2014-01-24 16:33:31 +00:00
Guy Harris
2fa2515f77 Check for a zero offset in the "get status" reply *before* adding the
offset in the tvbuff of the beginning of the packet to it.  Otherwise,
it will never be zero, and the tests will always think the field pointed
to by the offset is present.

svn path=/trunk/; revision=54938
2014-01-24 07:55:03 +00:00
Martin Kaiser
81f3392d32 country and language are ISO-8859-1
svn path=/trunk/; revision=54935
2014-01-23 22:20:35 +00:00
Martin Kaiser
089cedc784 make the menu string filterable
svn path=/trunk/; revision=54934
2014-01-23 22:19:52 +00:00
Martin Kaiser
055be45abf the menu string is a DVB string
svn path=/trunk/; revision=54933
2014-01-23 22:18:41 +00:00
Alexis La Goutte
bc14487ea6 From me for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9519 RSVP dissector does not decode Session Object (1) C-type (13) message
svn path=/trunk/; revision=54932
2014-01-23 20:31:20 +00:00
Evan Huus
893b1aa3cd Remove duplicate #include.
svn path=/trunk/; revision=54928
2014-01-23 13:39:39 +00:00
Pascal Quantin
a70ec94269 Please GCC 4.3.2 that complains about a wrong 'variable may be used uninitialized in this function' error
svn path=/trunk/; revision=54927
2014-01-23 07:57:20 +00:00
Guy Harris
8376b41cc0 Use tvb_get_string_enc() rather than tvb_get_string().
svn path=/trunk/; revision=54926
2014-01-23 02:46:56 +00:00
Guy Harris
d2815333f5 Use tvb_get_string_enc() rather than tvb_get_string(). RFC 5352 says,
in section 6.1 "Registration.Request Primitive":

	The Pool Handle parameter contains a NULL terminated ASCII
	string of fixed length.

svn path=/trunk/; revision=54925
2014-01-23 02:37:43 +00:00
Guy Harris
8944519bf4 Use tvb_get_string_enc() rather than tvb_get_string().
Update URL of spec.

svn path=/trunk/; revision=54924
2014-01-23 02:30:00 +00:00
Guy Harris
138987aea0 Use tvb_get_string_enc() rather than tvb_get_string(). The version of
the AR.drone Developer Guide I found online mentioned ASCII but not
UTF-8.

svn path=/trunk/; revision=54923
2014-01-23 02:24:34 +00:00
Evan Huus
732db281e9 Use wmem_new0 to ensure that all field values are initialized. Caught by
valgrind fuzzing.

svn path=/trunk/; revision=54922
2014-01-23 01:48:13 +00:00
Guy Harris
6dcce1fb9b Use tvb_get_string_enc() rather than tvb_get_string(). The specs say
ASCII, but there's a proposal to use UTF-8.

svn path=/trunk/; revision=54921
2014-01-23 01:45:55 +00:00
Guy Harris
d4b7cc2742 Use tvb_get_string_enc() rather than tvb_get_string().
svn path=/trunk/; revision=54920
2014-01-23 01:37:39 +00:00
Guy Harris
aa69618c74 Use tvb_memdup(), not tvb_get_string(), when copying octets (such as
octets within a BCD number).

Use tvb_get_string_enc() rather than tvb_get_string().

svn path=/trunk/; revision=54919
2014-01-23 01:35:28 +00:00
Martin Kaiser
45418273e0 BASE_NONE -> STR_ASCII
svn path=/trunk/; revision=54918
2014-01-22 22:37:10 +00:00
Guy Harris
205a9f9b50 Use tvb_get_string_enc() rather than tvb_get_string(); according to
TIA/EIA-637-A, call-back numbers are either BCD or ASCII.

svn path=/trunk/; revision=54917
2014-01-22 22:37:08 +00:00
Martin Kaiser
fc586507ba use tvb_get_string_enc()
svn path=/trunk/; revision=54916
2014-01-22 22:34:46 +00:00
Martin Kaiser
a592b6af9f BASE_NONE -> STR_ASCII
svn path=/trunk/; revision=54915
2014-01-22 22:29:54 +00:00
Martin Kaiser
0f44a72088 use tvb_get_string_enc(), the strings are 7-bit ascii
svn path=/trunk/; revision=54914
2014-01-22 22:28:27 +00:00
Martin Kaiser
0c44ca6825 BASE_NONE -> STR_ASCII
svn path=/trunk/; revision=54913
2014-01-22 22:23:22 +00:00
Martin Kaiser
6d85633b15 edonkey seems to use 7-bit ascii for its tags etc
(not sure about one item that could contain arbitrary data...)

svn path=/trunk/; revision=54912
2014-01-22 22:20:16 +00:00
Martin Kaiser
28a5c66d0a no need for if(tree)
svn path=/trunk/; revision=54911
2014-01-22 21:57:42 +00:00
Guy Harris
222296999b Use tvb_get_string_enc() with appropriate encodings rather than
tvb_get_string().  (Some versions of the spec speak of ISO 8859-15
strings as well as UTF-8 strings, but we don't appear to try to handle
those.)

Update spec URL.

svn path=/trunk/; revision=54910
2014-01-22 20:51:56 +00:00
Guy Harris
dd8cf3de90 Use tvb_get_string_enc(), and assume ASCII for E.164 addresses. (I must
be misreading Q.2630.3, as it seems to indicate that the addresses are
BCD, not ASCII, speaking as it does of "hexadecimal digit[s] of
address[es]".

svn path=/trunk/; revision=54909
2014-01-22 20:29:47 +00:00
Guy Harris
2019647757 At least according to
http://web.archive.org/web/20080308233204/http://dev.aol.com/aim/oscar/#SNAC

"In general strings are not NULL terminated and are encoded using UTF8."

It also says

	Authentication

	Over the years, the AIM backend has supported several different
	methods for authentication. ...

	When a client collects the loginId and password for the user it
	should not normalize them in any manner.  It also should not
	prevent the user from entering certain characters as the AIM
	name space is constantly changing.  For example, currently the
	AIM name space is ASCII based, but in the future that may
	change.  In general, the client should not perform input
	checking and instead allow the backend to reject bad values.

which also suggests not assuming ASCII.

So use ENC_UTF_8 in most cases.

For actual messages, it says:

	An IM can be encoded in the following different forms:

	Name	Value	Notes
	ASCII	0	ANSI ASCII -- ISO 646
	UNICODE	2	ISO 10646.USC-2 Unicode
	LATIN_1	3	ISO 8859-1

so, if that's the case, the dissector should choose beween
ENC_ASCII|ENC_NA, ENC_UCS_2|ENC_appropriate_ENDIAN, and
ENC_ISO_8859_1|ENC_NA.

Use tvb_get_string_enc() with an encoding rather than tvb_get_string().

svn path=/trunk/; revision=54908
2014-01-22 20:05:17 +00:00
Guy Harris
76131de4ab Update introductory comment to have correct file name.
svn path=/trunk/; revision=54907
2014-01-22 19:46:20 +00:00
Guy Harris
07f22ffd40 Use tvb_get_string_enc() rather than tvb_get_string().
XXX - if we supported various MacXXX character encodings, we could use
those; that might require a preference to specify the encoding.

svn path=/trunk/; revision=54906
2014-01-22 19:31:03 +00:00
Guy Harris
6b7fc8f0ef Use tvb_get_string_enc() with an explicit encoding, and assume ASCII.
Fix the encoding argument to proto_tree_add_item() calls that add
strings.

svn path=/trunk/; revision=54904
2014-01-22 10:39:59 +00:00
Guy Harris
6e70ecddaa Fetch strings using tvb_get_string_enc() and the appropriate encoding.
svn path=/trunk/; revision=54903
2014-01-22 07:55:06 +00:00
Alexis La Goutte
a3fee176d4 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54902
2014-01-22 07:49:48 +00:00
Alexis La Goutte
a5e795812b Fix encoding arg (found by encoding arg tools)
svn path=/trunk/; revision=54901
2014-01-22 07:49:40 +00:00
Alexis La Goutte
923c5b3b86 Fix the second argument of some proto_item_add_subtree (function : dissect_vendor_tr111_suboption and dissect_vendor_cl_suboption)
It is a ett variable no hf variable

svn path=/trunk/; revision=54900
2014-01-22 07:49:31 +00:00
Guy Harris
90e6423c38 I don't see any specification of how a H221NonStandardIdentifier is
encoded, but let's say it's pure ASCII for now.

svn path=/trunk/; revision=54899
2014-01-22 07:33:57 +00:00
Anders Broman
ee88d38b4e Add a SCTP port range preference.
svn path=/trunk/; revision=54898
2014-01-22 06:13:17 +00:00
Guy Harris
d262ff8789 Use tvb_get_string_enc() with an explicit encoding; it's a + or a -, so
just treat it as ASCII.

svn path=/trunk/; revision=54896
2014-01-22 04:53:43 +00:00
Guy Harris
9ec41e3db2 The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it as
such.

Replace proto_tree_add_string(..., tvb_get_string_enc(same ...,
ENC_xxx)) with proto_tree_add_item(..., ENC_xxx).

svn path=/trunk/; revision=54895
2014-01-22 04:50:23 +00:00
Guy Harris
d85bca8969 Another probably-wrong tvb_get_string().
Also, add a URL for the PKCS #12 spec.

svn path=/trunk/; revision=54894
2014-01-22 04:39:31 +00:00
Guy Harris
051cb78cd9 To quote section B.5 "Keys for password integrity mode" of PKCS #12
v1.1: Personal Information Exchange Syntax:

	http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf

"When password integrity mode is used to protect a PFX PDU, a password
and salt are used to derive a MAC key.  As with password privacy mode,
the password is a Unicode string, and the salt is a byte string."

So, not having found any other references to salts as text strings, copy
it with tvb_memdup(), not tvb_get_string().

svn path=/trunk/; revision=54893
2014-01-22 04:27:15 +00:00
Guy Harris
19930d6f49 Clean up indentation and bracketing.
svn path=/trunk/; revision=54892
2014-01-22 04:14:05 +00:00
Guy Harris
c85b34ed66 The strings in question are generated as UTF-8 from the CBS encoding, so
process them as such.

svn path=/trunk/; revision=54891
2014-01-22 04:13:37 +00:00
Guy Harris
e163578906 Another tvb_get_string() replacement.
svn path=/trunk/; revision=54890
2014-01-22 02:41:13 +00:00
Guy Harris
c12dc67752 Strings in LDAP are generally UTF-8, although if we treat something only
as a string if every byte in it is a printable ASCII character, it's
ASCII.  Use tvb_get_string_enc() with an appropriate encoding.

svn path=/trunk/; revision=54889
2014-01-22 02:37:45 +00:00
Guy Harris
5e0641f271 Use tvb_get_string_enc() with an explicit encoding.
svn path=/trunk/; revision=54886
2014-01-22 02:04:15 +00:00
Guy Harris
e35ca75a68 It's one character, either + or -, hence ASCII.
svn path=/trunk/; revision=54885
2014-01-22 01:28:31 +00:00
Guy Harris
a75657bbd6 It's not a string, it's a byte array (bit array, really).
Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634.

svn path=/trunk/; revision=54884
2014-01-22 01:22:01 +00:00
Martin Kaiser
5c825d6a36 mp4 box type is always a 7bit ascii string
svn path=/trunk/; revision=54881
2014-01-21 22:16:05 +00:00
Guy Harris
ddb966fb2f The file's name has a lower-case "p" in "9p".
svn path=/trunk/; revision=54880
2014-01-21 20:13:40 +00:00
Guy Harris
87f4b376f1 Fix one half-changed tvb_get_string() call.
svn path=/trunk/; revision=54879
2014-01-21 20:13:17 +00:00
Guy Harris
4eb619b677 Always combine ENC_UTF_8 with ENC_NA.
svn path=/trunk/; revision=54878
2014-01-21 20:12:48 +00:00
Guy Harris
73598a7991 IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not
tvb_get_string().

svn path=/trunk/; revision=54877
2014-01-21 20:08:39 +00:00
Guy Harris
4b02416cc9 9p strings are, not surprisingly, encoded using UTF-8; replace
tvb_get_string() calls with tvb_get_string_enc() calls explicitly
specifying UTF-8.

svn path=/trunk/; revision=54876
2014-01-21 19:53:52 +00:00
Evan Huus
f4ab2b2b00 Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe
Kaplan for the report.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some
other cases in the same vein.

svn path=/trunk/; revision=54875
2014-01-21 18:48:01 +00:00
Guy Harris
4d9475e4ef Get rid of tvb_get_faked_unicode() - tvb_get_string_enc() does the job
better.

We don't need eventlog_get_unicode_string_length() in the eventlog
dissector, either - tvb_unicode_strsize() does the job just as well.

svn path=/trunk/; revision=54874
2014-01-21 09:56:34 +00:00
Pascal Quantin
35d0d0f1ae From Igor Slepchin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9675 :
RMT LCT dissector doesn't display 48-bit TOIs and TSIs properly

svn path=/trunk/; revision=54873
2014-01-21 08:59:47 +00:00
Bill Meier
0bc06ee3ab - Remove unneeded #includes;
- "Once-only" test not needed in proto_reg_handoff..();
- Set COL_PROTOCOL, clear COL_INFO at the begining of the dissector
   before fetching data from the tvb;
- Use tvb_reported_length;
- Use col_set_str/col_append_str where appropriate;
- Zigbee --> lwm;
- Fix typo;
- Reformat some whitespace for consistency.

ToDo:
- Review use of col_...() and expert...() under 'if (tree)';
- Review use of col_clear(..., COL_INFO) after text already added to COL_INFO;
- Review certain tvb fetches to ensure  no fetches using a negative offset;

svn path=/trunk/; revision=54871
2014-01-21 02:32:48 +00:00
Bill Meier
c540e33c49 Add properties ....
svn path=/trunk/; revision=54869
2014-01-21 01:24:13 +00:00
Martin Kaiser
6517e3ba4b don't use tvb_get_string(..., len) to get exactly len raw bytes
from a tvbuff

svn path=/trunk/; revision=54867
2014-01-20 23:30:01 +00:00
Martin Kaiser
ae82a1cafe make MMI strings filterable
svn path=/trunk/; revision=54866
2014-01-20 22:06:19 +00:00
Guy Harris
1d27123ab1 Longs are not guaranteed to be 64-bit. Use G_GINT64_MODIFIER to format
64-bit quantities.

svn path=/trunk/; revision=54863
2014-01-20 21:37:32 +00:00
Anders Broman
3a96d94c50 From Michal Labedzki:
Bluetooth/Ubertooth: Improvements: Support for new btsnoop format, almost finished btle and minor fixes.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606

svn path=/trunk/; revision=54862
2014-01-20 20:36:42 +00:00
Anders Broman
5fc0904093 packet-bootp.c: In function 'dissect_vendor_generic_suboption':
packet-bootp.c:3293: warning: unused parameter 'pinfo'
packet-bootp.c:3293: warning: unused parameter 'v_ti'
packet-bootp.c:3294: warning: unused parameter 'optend'

svn path=/trunk/; revision=54861
2014-01-20 20:30:41 +00:00
Anders Broman
f0fb43a621 From alexeyv:
Add decryption for resumed TLS sessions with a session ticket.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5963

svn path=/trunk/; revision=54860
2014-01-20 20:26:04 +00:00
Anders Broman
6402d8590e Add generic dissection of unknown vendor sub options.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9594

svn path=/trunk/; revision=54859
2014-01-20 20:03:49 +00:00
Evan Huus
77e4a2f09c Fix 32/64 casting and add a note where the loss of precision might actually be a
problem for 32-bit platforms.

svn path=/trunk/; revision=54858
2014-01-20 19:32:43 +00:00
Evan Huus
f5931c7559 From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612
AMQP 1.0 Dissector

svn path=/trunk/; revision=54857
2014-01-20 19:13:42 +00:00
Alexis La Goutte
d2410336b8 From Lubos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9638
New Dissector For Lightweight Mesh protocol

A dissector for ATMEL Lightweight Mesh protocol (lwm).
The protocol is carried on the top of 802.15.4 frame.

From me:
* Add Modelines info
* Fix indent (use 4 spaces)
* Remove trailing whitespace

svn path=/trunk/; revision=54856
2014-01-20 18:35:45 +00:00
Anders Broman
95ed1b4977 As spotted by Joerg; make a HFILL_INIT(hf) macro and use it to init the private part of the hf structure.
svn path=/trunk/; revision=54843
2014-01-19 09:40:04 +00:00
Pascal Quantin
6429497015 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 :
SMPP: source_telematics_id value length is 1 byte

svn path=/trunk/; revision=54837
2014-01-17 22:18:50 +00:00
Pascal Quantin
f63d80c2e4 From Fabio Tarabelloni via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9650 :
ZigBee ZCL Appliance Identification: fix endianness of Company ID, Brand ID and Product Type ID

svn path=/trunk/; revision=54836
2014-01-17 21:52:55 +00:00
Anders Broman
493ba3e367 Try to fix warning: initializer element is not computable at load time.
svn path=/trunk/; revision=54832
2014-01-17 18:58:50 +00:00
Anders Broman
a49fee443b Fix a bug intrduced in http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54820
svn path=/trunk/; revision=54831
2014-01-17 18:55:49 +00:00
Martin Mathieson
62249477b6 Remove #include and make the situation with snow3g clearer in a comment. May need further removal, depending upon concensus on wireshark-dev
svn path=/trunk/; revision=54827
2014-01-16 12:02:30 +00:00
Evan Huus
60045cae1c Implement basic support for SPXII decoding (at least we get the payload offsets
right now).

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9552

svn path=/trunk/; revision=54823
2014-01-15 23:56:41 +00:00
Evan Huus
1c6679c5ec Dissect SPXII flag bits.
First part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9552

svn path=/trunk/; revision=54822
2014-01-15 23:09:36 +00:00
Evan Huus
622d9cb953 Add modelines and fix one indentation issue.
svn path=/trunk/; revision=54821
2014-01-15 23:00:07 +00:00
Anders Broman
efbecb3e9a Fix a couple of
warning: initializer element is not computable at load time

svn path=/trunk/; revision=54820
2014-01-15 19:29:03 +00:00
Anders Broman
1f8d2e25d2 Update to version V12.3.0 (2013-12).
svn path=/trunk/; revision=54815
2014-01-15 07:13:23 +00:00
Guy Harris
d15a6d0add Don't cast away constness.
svn path=/trunk/; revision=54814
2014-01-15 03:37:06 +00:00
Guy Harris
f862fc40ba Don't cast away constness.
svn path=/trunk/; revision=54800
2014-01-14 18:35:36 +00:00
Guy Harris
d99e0b13d4 Regenerate ANSI TCAP dissector from the changes in r54499.
svn path=/trunk/; revision=54799
2014-01-14 18:34:01 +00:00
Guy Harris
570a36436c Consistently use "guint8" for "8-bit byte".
Constify.

For routines that manipulate sequences of 8-bit bytes, have them take
guint8 pointers rather than void pointers.

Don't cast away constness.

svn path=/trunk/; revision=54795
2014-01-14 18:03:54 +00:00
Guy Harris
7a559d2876 Don't cast away constness.
svn path=/trunk/; revision=54794
2014-01-14 17:49:50 +00:00
Guy Harris
13176da15b Don't cast away constness.
svn path=/trunk/; revision=54793
2014-01-14 17:47:31 +00:00
Guy Harris
0a99ee25d5 Don't make claims of constness that can't be guaranteed in terms the C
compiler can verify.

svn path=/trunk/; revision=54792
2014-01-14 17:45:03 +00:00
Alexis La Goutte
85ab202c08 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

svn path=/trunk/; revision=54791
2014-01-14 17:44:21 +00:00
Alexis La Goutte
6b6d709afc Fix unused const variable found by Clang 3.4
svn path=/trunk/; revision=54790
2014-01-14 17:44:07 +00:00
Pascal Quantin
a48b6f4aac Upgrade LTE RRC dissector to v11.6.0
svn path=/trunk/; revision=54789
2014-01-14 16:51:10 +00:00
Pascal Quantin
330654baf8 SNOW3G is not available on default Wireshark
svn path=/trunk/; revision=54788
2014-01-14 16:48:43 +00:00
Pascal Quantin
eabf15f80a Fix dissection of 3GPP2 SMS encoded in UCS2
svn path=/trunk/; revision=54787
2014-01-14 16:23:38 +00:00
Martin Mathieson
293f8ca247 Make sure we allocate bytes for snow3g at least rounded up to next 4 byte boundary
svn path=/trunk/; revision=54786
2014-01-14 16:22:44 +00:00
Martin Mathieson
b948c75dfe Update a comment
svn path=/trunk/; revision=54785
2014-01-14 15:11:35 +00:00
Martin Mathieson
58e8800136 Add snow3g integrity (not quite working for me), but rework how integrity and ciphering functions and conditional compilation is done
svn path=/trunk/; revision=54784
2014-01-14 15:07:20 +00:00
Pascal Quantin
b0d4e7a34b UCS2 encoded SMS is directly read from data -> remove PROTO_ITEM_SET_GENERATED()
svn path=/trunk/; revision=54783
2014-01-14 14:01:03 +00:00
Martin Mathieson
b01a99c385 Provide hook for calling EEA1 implementation (Snow3G). Implementation not supplied due to licensing conditions. TODO: EIA1.
svn path=/trunk/; revision=54782
2014-01-14 11:09:47 +00:00
Guy Harris
e2b668efe7 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.

svn path=/trunk/; revision=54781
2014-01-14 10:50:26 +00:00
Guy Harris
ecdc864656 Don't cast away constness.
svn path=/trunk/; revision=54780
2014-01-14 08:32:50 +00:00
Guy Harris
e1b57afbc9 Don't cast away constness.
svn path=/trunk/; revision=54779
2014-01-14 08:30:45 +00:00
Guy Harris
9232db14c7 But *do* cast const void * to the appropriate type.
svn path=/trunk/; revision=54778
2014-01-14 08:30:24 +00:00
Guy Harris
1ec9417a43 Don't cast away constness.
svn path=/trunk/; revision=54777
2014-01-14 08:26:24 +00:00
Guy Harris
6aa49e37e0 Don't assign away constness.
svn path=/trunk/; revision=54776
2014-01-14 08:22:38 +00:00
Guy Harris
bd165ab19a Don't cast away constness.
svn path=/trunk/; revision=54775
2014-01-14 08:14:28 +00:00
Guy Harris
4a82c3b60b Don't cast away constness.
svn path=/trunk/; revision=54774
2014-01-14 08:12:45 +00:00
Guy Harris
dc71034565 Don't cast away constness.
svn path=/trunk/; revision=54773
2014-01-14 08:09:33 +00:00
Guy Harris
382e2c895c gsize, not gusize. Whatever.
svn path=/trunk/; revision=54772
2014-01-14 07:59:58 +00:00
Guy Harris
8b2aced72c 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.)

svn path=/trunk/; revision=54771
2014-01-14 07:58:18 +00:00
Guy Harris
aaeb6a467b Don't cast away constness.
svn path=/trunk/; revision=54770
2014-01-14 07:56:43 +00:00
Guy Harris
dd152d81af Don't cast away constness.
svn path=/trunk/; revision=54769
2014-01-14 05:49:04 +00:00
Guy Harris
4a7636a6f8 Don't cast away constness.
svn path=/trunk/; revision=54768
2014-01-14 05:47:50 +00:00
Guy Harris
c6c1887a0b 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.

svn path=/trunk/; revision=54767
2014-01-14 05:39:57 +00:00
Guy Harris
e1f6ad8387 Don't cast away constness.
svn path=/trunk/; revision=54766
2014-01-14 05:29:02 +00:00
Guy Harris
0f40fd837c Don't cast away constness.
svn path=/trunk/; revision=54765
2014-01-14 05:25:51 +00:00
Guy Harris
720cfe49c8 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.

svn path=/trunk/; revision=54764
2014-01-14 05:23:48 +00:00
Guy Harris
547efd4dc9 Cast away constness.
svn path=/trunk/; revision=54763
2014-01-14 05:17:06 +00:00
Guy Harris
1980bb74d9 Constification.
svn path=/trunk/; revision=54762
2014-01-14 04:09:21 +00:00
Guy Harris
1b0cfd415c Don't cast away constness.
svn path=/trunk/; revision=54761
2014-01-14 04:05:23 +00:00
Guy Harris
6a4bd7a91e Don't cast away constness.
svn path=/trunk/; revision=54760
2014-01-14 04:01:59 +00:00
Guy Harris
6a9b99cf98 And more constification.
svn path=/trunk/; revision=54759
2014-01-14 04:01:34 +00:00
Guy Harris
ccbebb0ee3 More constification.
svn path=/trunk/; revision=54758
2014-01-14 03:56:36 +00:00
Guy Harris
c1b602584d Don't make promises of constness that we can't honor.
svn path=/trunk/; revision=54757
2014-01-14 03:24:37 +00:00
Guy Harris
60f06e558a Don't cast away constness when you don't have to.
svn path=/trunk/; revision=54756
2014-01-14 03:16:27 +00:00
Guy Harris
f7b0675bc6 Clean up references to an address and squelch some warnings.
svn path=/trunk/; revision=54754
2014-01-14 02:30:05 +00:00
Guy Harris
7b32b5c14a Don't cast away constness.
svn path=/trunk/; revision=54753
2014-01-14 02:25:20 +00:00
Guy Harris
6b8e8d3fea Make a routine not used outside the SNMP dissector static.
svn path=/trunk/; revision=54751
2014-01-14 02:06:42 +00:00
Pascal Quantin
41a13add47 Upgrade LPP dissector to v11.5.0
svn path=/trunk/; revision=54737
2014-01-13 22:57:31 +00:00
Guy Harris
7ef949bc39 No reason for decode_bgp_rd()'s return value to be non-const, so make it
const.

svn path=/trunk/; revision=54734
2014-01-13 22:38:56 +00:00
Alexis La Goutte
4a09abdf67 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54732
2014-01-13 22:25:13 +00:00
Alexis La Goutte
86f6c85860 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54731
2014-01-13 22:25:03 +00:00
Alexis La Goutte
4cf9cd343f 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

svn path=/trunk/; revision=54729
2014-01-13 22:24:53 +00:00
Alexis La Goutte
10345a6b2e 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)

svn path=/trunk/; revision=54728
2014-01-13 22:24:32 +00:00
Guy Harris
020230e865 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.

svn path=/trunk/; revision=54724
2014-01-13 21:36:43 +00:00
Guy Harris
7f5567a605 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.

svn path=/trunk/; revision=54723
2014-01-13 21:23:46 +00:00
Guy Harris
c463f6cc88 Make a routine not used outside this file static.
svn path=/trunk/; revision=54719
2014-01-13 20:17:20 +00:00
Guy Harris
7cff496408 Make a routine not used outside this file static.
svn path=/trunk/; revision=54718
2014-01-13 20:14:00 +00:00
Guy Harris
6df963eff0 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.

svn path=/trunk/; revision=54717
2014-01-13 20:12:14 +00:00
Guy Harris
aec280d874 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.

svn path=/trunk/; revision=54714
2014-01-13 19:49:12 +00:00
Guy Harris
39fe54ac35 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.

svn path=/trunk/; revision=54713
2014-01-13 19:32:10 +00:00
Guy Harris
7620abccdc Make routines not used outside packet-dcerpc-lsa.c static.
svn path=/trunk/; revision=54712
2014-01-13 19:29:21 +00:00
Jörg Mayer
1242a77e74 Change level off TCP/RST expertitem from chat to warn. Add a comment
that RST is still an indicator for network errors/problems.

svn path=/trunk/; revision=54709
2014-01-13 10:51:37 +00:00
Pascal Quantin
527071fb0d 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

svn path=/trunk/; revision=54707
2014-01-12 20:52:19 +00:00
Martin Kaiser
658e0d82da remove unnecessary if(tree) statements
svn path=/trunk/; revision=54706
2014-01-12 17:57:21 +00:00
Martin Kaiser
b3df31324b Coverity 280438: missing break
svn path=/trunk/; revision=54705
2014-01-12 17:49:30 +00:00
Gerald Combs
8989899e92 [Automatic manuf, services and enterprise-numbers update for 2014-01-12]
svn path=/trunk/; revision=54702
2014-01-12 15:03:43 +00:00
Michael Mann
bdfabe5979 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

svn path=/trunk/; revision=54701
2014-01-12 03:17:51 +00:00
Michael Mann
11a61d757d 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

svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Michael Mann
c071a1c728 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

svn path=/trunk/; revision=54699
2014-01-12 00:50:41 +00:00
Stig Bjørlykke
640e6f44ec 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.

svn path=/trunk/; revision=54693
2014-01-10 18:58:56 +00:00
Martin Mathieson
830509b7dc Update a comment and fix some indentation
svn path=/trunk/; revision=54692
2014-01-10 17:56:55 +00:00
Martin Mathieson
92b1a4a112 Move UEId to the beginning of summary shown in info column, plus only look for existing reassembly info when not starting a new SDU
svn path=/trunk/; revision=54691
2014-01-10 12:51:57 +00:00
Martin Kaiser
5843e95163 use a value string for the emi
correct the dot offset
other minor cleanup

svn path=/trunk/; revision=54689
2014-01-10 09:23:36 +00:00
Martin Kaiser
8a99c0428c dissect Digital Only Token and retention limit
svn path=/trunk/; revision=54688
2014-01-10 09:15:08 +00:00
Martin Kaiser
80ed2d24bd correct a typo in a filter string
svn path=/trunk/; revision=54687
2014-01-10 08:48:38 +00:00
Pascal Quantin
70dc6197ec From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9472 :
ANSI IS-637 SMS enhancements for CMAS (TIA-1149) and header dissection

svn path=/trunk/; revision=54684
2014-01-09 21:58:09 +00:00
Michael Mann
f42fa7abf1 USB: Add DFU dissector. Bug 9610 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610)
From Michal Labedzki

svn path=/trunk/; revision=54683
2014-01-09 21:42:36 +00:00
Pascal Quantin
944db5d447 Set explicitly P2P direction for received SMS
svn path=/trunk/; revision=54682
2014-01-09 21:29:07 +00:00
Michael Mann
84dc9e9b4b Revert "from me" changes of r54676. Checks for NULL were functional logic, not trying to NULL protect proto_item_append_text.
svn path=/trunk/; revision=54681
2014-01-09 20:19:43 +00:00
Martin Kaiser
0fa16ed92a From Marko Hrastovec
dissect all elements of category 48 messages

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9629

svn path=/trunk/; revision=54680
2014-01-09 13:45:51 +00:00
Martin Kaiser
e830c290da From Marko Hrastovec
rename RE field len to make it generic for all categories
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9624

svn path=/trunk/; revision=54679
2014-01-09 13:02:27 +00:00
Guy Harris
993a4d5b7c Mark an unused parameter as such.
svn path=/trunk/; revision=54677
2014-01-09 03:01:37 +00:00
Michael Mann
5ff31ef33d Remove some global variables. Bug 9471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9471)
From Michael Lum
From me: Remove a few proto_item* NULL checks because it's done by the underlying function.

svn path=/trunk/; revision=54676
2014-01-09 02:49:18 +00:00
Martin Kaiser
57c4d97664 use a DVB string for the text field in the extended event descriptor
check for text length 0 while we're at it

svn path=/trunk/; revision=54666
2014-01-08 18:42:26 +00:00
Martin Kaiser
c05722e316 remove duplicate editor modelines
it's enough to have them at the end of the file

svn path=/trunk/; revision=54665
2014-01-08 18:21:33 +00:00
Martin Kaiser
5460e0960b From Antony Bridle
Added dissection capabilities for ASTERIX Category 062 Reserved
Expansion Field.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9624

svn path=/trunk/; revision=54664
2014-01-08 18:16:36 +00:00
Martin Kaiser
d18311376a merge two if statements
svn path=/trunk/; revision=54661
2014-01-08 13:57:02 +00:00
Martin Kaiser
10da33247d Coverity 280379
if the key is missing, it's always a request

svn path=/trunk/; revision=54660
2014-01-08 13:56:24 +00:00
Martin Kaiser
f9385077ea no need for if (tree)
svn path=/trunk/; revision=54658
2014-01-08 12:49:45 +00:00
Stig Bjørlykke
a7c8e678bf Added a check for valid algorithm id.
svn path=/trunk/; revision=54653
2014-01-08 08:19:51 +00:00
Michael Mann
92a567f20d Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code.
svn path=/trunk/; revision=54647
2014-01-08 04:55:59 +00:00
Michael Mann
bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
This is a VERY PRELIMINARY version of tfshark.  It's an attempt to jumpstart FileShark and its architecture.  Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)

This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture.  And those layers will slowly be added in time (patches always welcome!).

svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
Jakub Zawadzki
d28084d183 Move UAT xton() to wsutil library
Use ws_xton() in few more places.

svn path=/trunk/; revision=54642
2014-01-08 00:28:13 +00:00
Evan Huus
62796c01f0 From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610

USB: Dissect Application-specific Interface Class/Subclass/Protocols

svn path=/trunk/; revision=54640
2014-01-07 23:38:50 +00:00
Evan Huus
147e185020 From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610

USB: Update Standard Descriptor Type numbers to 3.1 Specification

svn path=/trunk/; revision=54636
2014-01-07 22:42:50 +00:00
Evan Huus
8dae67429c Don't use #defines for errno values, just build the value-string directly. They
weren't used and were causing build failures due to redefinition in certain
environments.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9614

svn path=/trunk/; revision=54635
2014-01-07 22:39:15 +00:00
Jakub Zawadzki
abda30e9e6 Fix bug #9618: Invalid utf8 causes JSON dissector assertion failure "g_utf8_validate"
Validate JSON UTF-8 characters, replace with '?' when invalid.

svn path=/trunk/; revision=54633
2014-01-07 22:17:32 +00:00
Jakub Zawadzki
d1dcee936b Move defines for helping with UTF-16 surrogate pairs to wsutil/unicode-utils.h
tvbuff version was moved, but with 'or' optimization from packet-json.

svn path=/trunk/; revision=54632
2014-01-07 21:55:49 +00:00