Commit Graph

50834 Commits

Author SHA1 Message Date
Guy Harris 9628624867 Get rid of trailing periods in some error messages for consistency; the
others don't have trailing periods, and the caller adds a period as
desired.

svn path=/trunk/; revision=54199
2013-12-17 21:51:45 +00:00
Jakub Zawadzki c8716a45ee Put sign_ext.h in Makefile.
svn path=/trunk/; revision=54198
2013-12-17 21:38:59 +00:00
Jakub Zawadzki 0de43ce2dd Create sign extension routines in <wsutil/sign_ext.h>, use it in few places.
svn path=/trunk/; revision=54197
2013-12-17 21:36:33 +00:00
Michael Mann 6db9eb0b73 Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)
Also removed tree check in Modbus dissector because dissector_try_string() is being called under it.

#BACKPORT(1.10)

svn path=/trunk/; revision=54193
2013-12-17 20:06:03 +00:00
Alexis La Goutte c03bcb5694 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8805
Wireshark not recognizing skinny version 19

Allow Wireshark to decode skinny version 19 (0x13)
Only allow, no found spec to support all feature/packet of skinny 19

Also fix a encoding arg

svn path=/trunk/; revision=54189
2013-12-17 18:53:01 +00:00
Alexis La Goutte e9946f0130 Make Ubuntu Buildbot happy
Fix following error:
../../../ui/qt/sctp_chunk_statistics_dialog.cpp: In member function ‘void SCTPChunkStatisticsDialog::fillTable(bool)’:
../../../ui/qt/sctp_chunk_statistics_dialog.cpp:145:29: error: ignoring return value of ‘char* fgets(char*, int, FILE*)’, declared with attribute warn_unused_result [-Werror=unused-result]

svn path=/trunk/; revision=54188
2013-12-17 18:43:34 +00:00
Alexis La Goutte f1a440b539 Remove trailing whitespace and add modelines
svn path=/trunk/; revision=54187
2013-12-17 18:43:24 +00:00
Michael Mann 69ac243b07 General cleanup of ZBEE ZCL dissector. Removed unnecessary casts and wrapping functions.
Tried to remove zcl_cluster_id global, but it's used in a function that is called by other dissectors that I'm not sure if they are expecting the zcl_cluster_id to be "saved" (or if -1 could be passed in for cluster id from those dissectors).  Removed as many uses of it as possible if someone knows the dissectors better to make that call.

svn path=/trunk/; revision=54186
2013-12-17 17:32:20 +00:00
Michael Mann 79d336c664 Handle signed integers > 32 bits. Bug 8454 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8454)
svn path=/trunk/; revision=54183
2013-12-17 16:50:33 +00:00
Martin Mathieson 1b4ea6bb68 Preferences to control whether deciphering should be done for signalling and user plane
svn path=/trunk/; revision=54182
2013-12-17 16:40:42 +00:00
Bill Meier 87e2aa3383 From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571

From me: Fixed in a slightly different manner than sugested in the patch attached to the bug.



svn path=/trunk/; revision=54181
2013-12-17 15:02:47 +00:00
Martin Mathieson e79de9873d First working version of deciphering with AES (EEA2). Lots of improvements still to make
svn path=/trunk/; revision=54180
2013-12-17 14:49:21 +00:00
Pascal Quantin d319ad5d92 Do not modify the bytes given to proto_tree_add_uint_format_value() in case there is a mask present in hf definition.
Otherwise the bits displayed in the tree are not the right ones.

svn path=/trunk/; revision=54179
2013-12-17 13:31:58 +00:00
Evan Huus 30447ecd8f Fix preprocessor macro and indentation.
svn path=/trunk/; revision=54178
2013-12-17 13:21:26 +00:00
Pascal Quantin 894d8d096b Fix a crash when calling try_val_to_str_ext()
svn path=/trunk/; revision=54177
2013-12-17 13:11:44 +00:00
Alexis La Goutte 3d6c71e906 Fix indent (use 4 spaces) and add modelines
svn path=/trunk/; revision=54176
2013-12-17 13:06:11 +00:00
Pascal Quantin 2f3a943f0a Fix a typo and check that handle exists before calling call_dissector()
svn path=/trunk/; revision=54175
2013-12-17 11:34:45 +00:00
Pascal Quantin 0f6429c3bf Fix the offset when dissecting a Signal reserved field
svn path=/trunk/; revision=54174
2013-12-17 11:28:48 +00:00
Pascal Quantin 0db718781b Comment a useless increment
svn path=/trunk/; revision=54173
2013-12-17 10:54:57 +00:00
Alexis La Goutte bde542ba74 From Fabio Tarabelloni via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9547
Zbee ZCL wrong cmdID in DefaultRespons

Default Response command generated by Specific command cluster contains wrong cmdId decoding. The value shows the cross-cluster command id but not the specific cluster command id name.
Draft of solution is already created (now is under test). The idea is to add a cmdId function callback in zbee_zcl_init_cluster in order to call it when wireshark has to decode specific cluster cmd in default response.

svn path=/trunk/; revision=54171
2013-12-17 10:43:08 +00:00
Alexis La Goutte 7e2353f5d4 Make translatable ready SCTP Graph for Qt
svn path=/trunk/; revision=54170
2013-12-17 10:22:00 +00:00
Irene Rüngeler 7eb50571f4 Find the right frame when plottable was clicked.
svn path=/trunk/; revision=54167
2013-12-17 09:51:34 +00:00
Irene Rüngeler 25a74d3f2a Fill the chunk statistics. Read line with fgets instead of getline.
svn path=/trunk/; revision=54166
2013-12-17 08:56:47 +00:00
Irene Rüngeler 555b8a581a Add the header files only once.
svn path=/trunk/; revision=54165
2013-12-17 08:54:54 +00:00
Anders Broman a1f179c4f5 Make local functions static. Include *.h when needed.
svn path=/trunk/; revision=54164
2013-12-17 06:10:41 +00:00
Martin Mathieson 5c085177fe Intialise a variable to avoid a (bogus) warning with my version of gcc
svn path=/trunk/; revision=54163
2013-12-16 23:26:09 +00:00
Martin Mathieson f9abd6f9e0 Fix compilation for when HAVE_LIBGCRYPT is not defined
svn path=/trunk/; revision=54162
2013-12-16 23:21:31 +00:00
Guy Harris 7851e21345 Fix compiler warnings.
svn path=/trunk/; revision=54161
2013-12-16 23:08:09 +00:00
Guy Harris e4a880b819 Get rid of unused variable.
svn path=/trunk/; revision=54160
2013-12-16 23:00:58 +00:00
Guy Harris 8bbff418d3 Fix typo in formatting string (%%s should be %s).
Mark unused argument as such.

svn path=/trunk/; revision=54159
2013-12-16 22:43:10 +00:00
Guy Harris 068008f04f Use proto_tree_add_item() in preference to fetching the string and
adding it with proto_tree_add_string().  Use tvb_get_string_enc() rather
than tvb_get_unicode_string() to fetch strings.

We assume a UTF-16 encoding for all "Unicode" strings.

Use tvb_strsize() and tvb_unicode_strsize() to get the lengths of
null-terminated strings.

Get rid of unused ett_nt_unicode_string variable.

svn path=/trunk/; revision=54158
2013-12-16 22:39:41 +00:00
Michael Mann 54c272466f ANSI A-interface enhancements. Bug 9471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9471)
From Michael Lum:
1. Allow mobile ID and service option to be shown in the INFO line for various messages.
2. proto_tree_add_text -> proto_tree_add_item conversions.

From me:
1. Even more proto_tree_add_text -> proto_tree_add_item conversions.

svn path=/trunk/; revision=54157
2013-12-16 21:39:44 +00:00
Bill Meier 09ce0cf43c From Peter Lemenkov:
"This patch removes misleading dereferencing operator from the
  array's name. E.g. consider the following declaration:

  guint32 ipaddr[4];

  ipaddr points to the address of an array of guint32's, while &ipaddr
  points to the first' guint32 object. E.g. &ipaddr == &ipaddr[0]. The
  value is the same, but has different type which is necessary
  sometimes. However inet_pton treats latest argument as void*, and
  this information is left anyway. So no need to bother with types and
  let's just pass pointer to the array."

  https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12304

From me: Remove dereferencing operator from 'ipaddr' in two calls to
         wmem_memdup().

svn path=/trunk/; revision=54156
2013-12-16 20:38:20 +00:00
Bill Meier 0afeb2ae95 Change editor modelines value for 'indent-tabs-mode' from 'true' to 't'
so emacs doesn't complainab 'unsafe value'.

svn path=/trunk/; revision=54153
2013-12-16 20:22:50 +00:00
Martin Mathieson 94b225a3ab Now calling function that will decipher payloads, if possible, and return a new tvb. Actual deciphering still to come...
svn path=/trunk/; revision=54149
2013-12-16 18:53:14 +00:00
Bill Meier d2e947f442 Fix alignment issue in GTK2 flowgraph "packet choice" window.
(Issue reported by Alexis Lagoutte).

##Backport 1.10

svn path=/trunk/; revision=54148
2013-12-16 18:44:04 +00:00
Martin Kaiser 71b281ae8c when the default character table is used,
don't add af hf entry with len 0 to the tree
add a text element instead

svn path=/trunk/; revision=54145
2013-12-16 16:49:37 +00:00
Michael Mann b71335c699 Fix PGN value computation
svn path=/trunk/; revision=54144
2013-12-16 16:32:51 +00:00
Martin Mathieson c1a20e5300 Reorganise main dissection function to that sequence analysis is done before signalling data payload
svn path=/trunk/; revision=54143
2013-12-16 15:03:41 +00:00
Martin Mathieson e78173d830 Look up key (now by UEId, not RNTI) and display in security tree where known.
svn path=/trunk/; revision=54142
2013-12-16 11:47:04 +00:00
Martin Mathieson 74d627dfae Add configuration of UE keys (by RNTI). Still to show and use this info...
svn path=/trunk/; revision=54141
2013-12-16 11:18:53 +00:00
Martin Kaiser a6a53d250d no need for if(tree)
svn path=/trunk/; revision=54140
2013-12-16 10:10:29 +00:00
Martin Kaiser 9e5143f1a7 TABs -> spaces, add editor modelines
svn path=/trunk/; revision=54139
2013-12-16 10:06:09 +00:00
Martin Kaiser a1defaa4e2 From Wesley
fix "decode as" for time protocol
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9563

svn path=/trunk/; revision=54138
2013-12-16 08:20:22 +00:00
Anders Broman df30bf95ea Make local functions static.
svn path=/trunk/; revision=54137
2013-12-16 06:03:17 +00:00
Anders Broman 2363dd4e68 Make local functions static.
svn path=/trunk/; revision=54136
2013-12-16 05:56:42 +00:00
Jakub Zawadzki c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Guy Harris 59dddc25ec In dissect_ndr_byte_array(), use the field index from the dcerpc_info
structure, rather than a fixed field.  Get rid of that fixed field, as
it's no longer needed.

Use dissect_ndr_byte_array() rather than dissect_ndr_char_cvstring() in
a case where we have an opaque byte array.

Have dissect_ndr_cvstring() and dissect_ndr_vstring() - and, therefore,
routines that call them, such as dissect_ndr_cstring(),
dissect_ndr_char_cvstring(), dissect_ndr_char_vstring(), and
dissect_ndr_wchar_vstring() - require that the field being used by an
FT_STRING field.  Manually fix a case where the PIDL generator makes
such a field FT_NONE rather than FT_STRING.  Also handle EBCDIC, just in
case we happen to see a packet with EBCDIC strings.

Use tvb_get_string_enc(), rather than tvb_get_unicode_string() or
tvb_get_string(), in dissect_ndr_cvstring() and dissect_ndr_vstring().

svn path=/trunk/; revision=54134
2013-12-15 19:48:15 +00:00
Martin Kaiser afc0d8af03 use ISO 8859-5 for DVB-SI
svn path=/trunk/; revision=54133
2013-12-15 19:19:30 +00:00
Martin Kaiser a07c0ff146 add support for ISO 8859-5
svn path=/trunk/; revision=54132
2013-12-15 19:13:31 +00:00