osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
41,670 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

14902 Commits

Author SHA1 Message Date
Martin Mathieson 18acb1c43e Pass in proper offset to dfilter_sip_status_line(). Was seeing problems 
with 180 + 200 responses in same frame (over TCP).

svn path=/trunk/; revision=43841
 2012-07-20 00:40:44 +00:00
Martin Kaiser bdb0898ff8 dissect the ISO 7816 class byte 
svn path=/trunk/; revision=43832
 2012-07-19 20:32:24 +00:00
Martin Kaiser eb6823f6ed use defines for the ISO 7816 instruction byte 
svn path=/trunk/; revision=43831
 2012-07-19 19:51:36 +00:00
Guy Harris defeb589d6 Rename ENC_HDRLEN to BSD_ENC_HDRLEN, to see if that squelches the false 
positive in the "you're passing an ENC_ value as a field value" check in
checkAPI.pl.

svn path=/trunk/; revision=43816
 2012-07-19 03:28:39 +00:00
Michael Mann 757361f4d4 Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5469. Added more comments to make the function of vnc_is_client_or_server_version_message() very clear. 
Also includes some minor cleanup of proto_tree_add_text -> proto_tree_add_item

svn path=/trunk/; revision=43814
 2012-07-19 00:29:11 +00:00
Guy Harris 7b1be4c91e Fix non-proto_tree_add_item() calls passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43812
 2012-07-18 23:44:15 +00:00
Guy Harris d91978600c Fix non-proto_tree_add_item() calls passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43810
 2012-07-18 23:37:59 +00:00
Guy Harris 4c3fd1012a Fix non-proto_tree_add_item() calls passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43808
 2012-07-18 23:34:59 +00:00
Guy Harris bdf148e3ea Fix non-proto_tree_add_item() calls passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43806
 2012-07-18 23:30:45 +00:00
Guy Harris 9667a4703b Fix non-proto_tree_add_item() calls passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43804
 2012-07-18 23:27:37 +00:00
Guy Harris 682d1f34b6 Fix non-proto_tree_add_item() calls passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43802
 2012-07-18 23:18:01 +00:00
Guy Harris 4f84db81e2 Fix a non-proto_tree_add_item() passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43800
 2012-07-18 23:06:20 +00:00
Guy Harris 754711b757 Fix a non-proto_tree_add_item() passing an ENC_ value as the last 
argument.

svn path=/trunk/; revision=43798
 2012-07-18 22:59:54 +00:00
Guy Harris 87ad190d49 exit() must not be used in dissectors. Use REPORT_DISSECTOR_BUG() and 
just return NULL instead.

svn path=/trunk/; revision=43797
 2012-07-18 22:57:04 +00:00
Guy Harris b40db9cf4c Add to the 802.11 pseudo-header a "this is already decrypted" flag, set 
it as appropriate in the code to read Network Instruments Observer
captures (rather than tweaking the "protected" flag in the packet data),
and use that flag in the 802.11 dissector.

Fix indentation while we're at it (tabs are not *ipso facto* 4 spaces).

svn path=/trunk/; revision=43795
 2012-07-18 22:10:34 +00:00
Guy Harris 1e7c2d7d51 Eliminate some gsize's I missed in the previous checkin. 
svn path=/trunk/; revision=43794
 2012-07-18 21:43:39 +00:00
Guy Harris d0df3d4c5a Nobody uses the return value of dissect_sender_array(), so don't have it 
return anything.

Don't use gsize for offsets in packets; the type used in Wireshark is
int.

svn path=/trunk/; revision=43793
 2012-07-18 21:22:10 +00:00
Guy Harris b695d863aa Set svn:keywords and svn:eol-style, and fix the EOL style (I'm on UN*X, 
so with svn:eol-style native, there should be no CRs).

svn path=/trunk/; revision=43792
 2012-07-18 20:56:24 +00:00
Michael Mann b16b7e951e Adds CliqueRM protocol (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2076) 
svn path=/trunk/; revision=43791
 2012-07-18 20:11:32 +00:00
Michael Mann e298722f5b svn path=/trunk/; revision=43789 2012-07-18 19:40:56 +00:00
Guy Harris bbe3a78d3a That comment might have confused the API checker into thinking we were 
calling abort(); try changing it.

svn path=/trunk/; revision=43788
 2012-07-18 18:50:29 +00:00
Balint Reczey 1f37a8cf14 Fix crash in PPP dissector 
Make sure that there is enough space allocated for PPP encapsulated CRTP
packet's header.
The bug can be triggered on an x86_64 system using the cpature file attached to
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056

svn path=/trunk/; revision=43784
 2012-07-18 15:14:45 +00:00
Pascal Quantin 2350d1aecf Put back r43768 that got removed by error in r43781 
svn path=/trunk/; revision=43783
 2012-07-18 08:37:46 +00:00
Anders Broman 0649041b1c Merge the rest of Jacob Nordgren and Rishie Sharmas work on 
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43782
 2012-07-18 07:47:05 +00:00
Anders Broman fccbea6702 Merge the rest of Jacob Nordgren and Rishie Sharmas work on 
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43781
 2012-07-18 07:45:19 +00:00
Guy Harris 9d470cceb9 Clean up indentation. 
svn path=/trunk/; revision=43780
 2012-07-18 04:45:41 +00:00
Evan Huus a234b68ff0 Fix some system header files that were #included with "" instead of <>. 
They made cppcheck unhappy.

svn path=/trunk/; revision=43779
 2012-07-18 02:47:56 +00:00
Martin Mathieson c0a913afda Match R9 versions of some more LTE protocols to registered dissector names. 
svn path=/trunk/; revision=43777
 2012-07-18 01:19:48 +00:00
Pascal Quantin c0a5bc9aa8 Fix copy/paste error 
svn path=/trunk/; revision=43775
 2012-07-17 21:36:34 +00:00
Jörg Mayer c8579ac82c - Make dns srv elemnts filterable (were: text only) 
- Don't suppress first character in srv service and protocol
  as some services don't use _ as first character

svn path=/trunk/; revision=43774
 2012-07-17 21:10:02 +00:00
Pascal Quantin 574f57d5ba From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7491 : 
DNP3 protocol dissector does not fully decode application layer object 50 variation 3

svn path=/trunk/; revision=43772
 2012-07-17 19:54:35 +00:00
Pascal Quantin e9de91f53e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7470 : 
Add support for OID 1.3.6.1.5.2.2

svn path=/trunk/; revision=43771
 2012-07-17 19:43:17 +00:00
Chris Maynard 2c773fad77 Fix Coverity CID 709726: Structurally dead code. Also, convert tabs to spaces. 
svn path=/trunk/; revision=43769
 2012-07-17 19:22:55 +00:00
Pascal Quantin c2883b7be2 Fix 'dereferencing type-punned pointer will break strict-aliasing rules' warning when compiling with gcc 4.1.3 
svn path=/trunk/; revision=43768
 2012-07-17 14:55:27 +00:00
Pascal Quantin c312f14022 More a few ASN.1 based dissectors from the dirty to celan lib (as they should compile without any error now) 
svn path=/trunk/; revision=43765
 2012-07-17 13:14:23 +00:00
Pascal Quantin babe622987 Use G_MININT32 instead of -2^31 so as to get rid of 'this decimal constant is unsigned only in ISO C90' warning 
svn path=/trunk/; revision=43764
 2012-07-17 13:12:50 +00:00
Jakub Zawadzki a8016f6a57 Fix bug #7488: Unable to correctly identify IEC 61850 MMS packets 
In r39066 was added 'final check to see if the next SPDU, if present, is also valid',
but it didn't properly check for tvb length which causes exception if there's no next SPDU.

svn path=/trunk/; revision=43763
 2012-07-17 13:01:17 +00:00
Anders Broman db3f6fe80c From Peter Paluch: 
recognize VLAN-bridge STP 

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

svn path=/trunk/; revision=43762
 2012-07-17 12:55:37 +00:00
Pascal Quantin 777bbfb20d Use same capitalization for Service request message as for other messages 
svn path=/trunk/; revision=43761
 2012-07-17 10:35:21 +00:00
Pascal Quantin 3a682212f5 Remove extra space after message name 
svn path=/trunk/; revision=43760
 2012-07-17 10:13:22 +00:00
Pascal Quantin ec17920a3e From Wayne Brassem via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7485 : 
Add support for IPv6 over PPP in Jmirror dissector

svn path=/trunk/; revision=43759
 2012-07-17 07:33:20 +00:00
Pascal Quantin a76f4990b8 Comment a few unused variables / functions 
svn path=/trunk/; revision=43754
 2012-07-16 15:54:53 +00:00
Jakub Zawadzki b0e44929a3 Gadu-Gadu: dissect more packets. 
svn path=/trunk/; revision=43753
 2012-07-16 14:34:35 +00:00
Alexis La Goutte c9690704be From Zdravko Velinov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7483 
Enhancements to the HP ERM protocol dissector 

I have done some reverse engineering of the HP ERM protocol. I had injected
some 802.1Q frames on a network that contained a HP ProCurve 5406zl switch,
then I examined the resulting encapsulated traffic. It was quite easy to spot
the VLAN identifier and the priority field because part of the header closely
resembled the 802.1Q header. There were just some minor differences in the
priority numbering between 802.1Q and HP ERM.


From me :
Add Modeline info
Fix Clang warning

svn path=/trunk/; revision=43752
 2012-07-16 14:23:28 +00:00
Anders Broman d8be496cd5 From Jacob Nordgren and Rishie Sharma: 
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43751
 2012-07-16 14:06:36 +00:00
Anders Broman 37fdb21ec2 From Jacob Nordgren and Rishie Sharma: 
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43750
 2012-07-16 13:54:20 +00:00
Anders Broman fe630ec1df From Jacob Nordgren and Rishie Sharma: 
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43749
 2012-07-16 13:11:20 +00:00
Bill Meier f41a04b7ab Minor cleanup, including: 
- Remove unneeded #includes;
- Simplify code slightly;
- Remove unused ett variable and related;
- Remove empty proto_reg_handoff...() functions;
- Fix a few cases of "set but unused".
- Do some whitespace changes.

svn path=/trunk/; revision=43748
 2012-07-16 12:34:33 +00:00
Jakub Zawadzki 1e95104860 proto_tree_add_boolean() takes value not ENC_ flag. 
svn path=/trunk/; revision=43747
 2012-07-16 12:09:19 +00:00
Bill Meier 66f163af90 (trivial) Explicitly initialize a static variable to NULL. 
svn path=/trunk/; revision=43746
 2012-07-16 11:47:55 +00:00
Anders Broman ac335fc5f4 From Jacob Nordgren and Rishie Sharma: 
Handle RRC_MESSAGE_TYPE_BCCH_FACH.

svn path=/trunk/; revision=43741
 2012-07-16 07:02:29 +00:00
Pascal Quantin 7deecbf36b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7479 : 
Provide an empty string when data pointer is not NULL (regression introduced in r43703)

svn path=/trunk/; revision=43724
 2012-07-15 15:26:57 +00:00
Chris Maynard e173f01c5c Be sure to assign the return value of tvb_length_remaining() to a signed integer and not an unsigned integer, and then check that value is > 0. 
svn path=/trunk/; revision=43720
 2012-07-15 14:31:40 +00:00
Chris Maynard 0d41b6edad tvb_length_remaining() can return -1, so check that it's > 0, and not != 0. If tvb_length_remaining() is > 0, then tvb_reported_length_remaining() should also be > 0, so I don't think there's a need for further checks there. 
svn path=/trunk/; revision=43719
 2012-07-15 14:29:06 +00:00
Chris Maynard 1ff8c1fcba Don't pass the return value of tvb_length_remaining() to fragment_add_check(), as it might have been -1. 
Fixes Coverity CID 280510: Improper use of negative value.

svn path=/trunk/; revision=43716
 2012-07-14 19:52:18 +00:00
Chris Maynard 590cec6962 tvb_length_remaining() can return -1, so be sure to deal with it if it does. Should fix a bunch of Coverity CID's. 
svn path=/trunk/; revision=43715
 2012-07-14 19:28:40 +00:00
Pascal Quantin adfe9d3ced Fix a few 'value stored is never read' warnings and a typo error 
svn path=/trunk/; revision=43714
 2012-07-14 18:54:32 +00:00
Pascal Quantin d6959d2715 As suggested by Richard Sharpe in http://www.wireshark.org/lists/wireshark-dev/201207/msg00111.html : 
Make the NTLMSSP Unknown message type string more explicit

svn path=/trunk/; revision=43713
 2012-07-14 18:31:08 +00:00
Chris Maynard a4ec2596bc If the offset is out of range, just assign to len to 0 so we don't end up passing a huge value to fragment_add(). 
Fixes Coverity CID 280246: Improper use of negative value.

svn path=/trunk/; revision=43712
 2012-07-14 16:29:45 +00:00
Ronnie Sahlberg a14d130713 Add support for SCSI SBC ORWRITE command 
svn path=/trunk/; revision=43711
 2012-07-14 08:00:03 +00:00
Ronnie Sahlberg 285ee0f9b5 Add support for SCSI SBC COMPARE_AND_WRITE opcode 
svn path=/trunk/; revision=43709
 2012-07-14 02:19:32 +00:00
Chris Maynard 33b0d13dec tvb_length_remaining() can return -1, so be sure to deal with it if it does. 
svn path=/trunk/; revision=43708
 2012-07-13 22:20:09 +00:00
Bill Meier 7320ebcfd9 Various minor cleanup, including: 
- remove unneeded #includes;
- remove some unneeded initializers;
- use tvb_reported_length() instead of tvb_length();
- use  val_to_str_const() instead of val_to_str();
- fix some typos;
- do some whitespace changes and some reformatting.

svn path=/trunk/; revision=43707
 2012-07-13 22:06:40 +00:00
Bill Meier b1eb22bd51 Minor cleanup; 
- Remove unneeded #includes;
 - Create/use value_string_ext for some value_string arrays;
 - Do some whitespace changes and reformat some lines.

svn path=/trunk/; revision=43706
 2012-07-13 21:59:25 +00:00
Chris Maynard 5e12ba51e6 If there's not enough data left for a timestamp, be sure there's at least some data to pass off to the generic data dissector. 
svn path=/trunk/; revision=43705
 2012-07-13 21:58:58 +00:00
Chris Maynard a099ae38f5 tvb_length_remaining() can return -1, so be sure to deal with it if it does. 
svn path=/trunk/; revision=43704
 2012-07-13 21:46:27 +00:00
Chris Maynard 472db7609c tvb_length_remaining() can return -1, so be sure to deal with it if it does. 
svn path=/trunk/; revision=43703
 2012-07-13 21:43:46 +00:00
Chris Maynard ad3c388b4b tvb_length_remaining() can return -1, so check if its return value is <= 0 when aborting and not just == 0. 
svn path=/trunk/; revision=43702
 2012-07-13 21:32:15 +00:00
Pascal Quantin ba376235da Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474 : 
Dissect LTE RADIUS AVP 3GPP-User-Location-Info

svn path=/trunk/; revision=43700
 2012-07-13 21:18:35 +00:00
Chris Maynard f8d42e6f61 tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer and don't check it against non-zero but greater than zero. 
svn path=/trunk/; revision=43699
 2012-07-13 21:14:43 +00:00
Chris Maynard a592bd657c tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer. Fixes Coverity CID 281367: Improper use of negative value. 
svn path=/trunk/; revision=43698
 2012-07-13 21:03:54 +00:00
Chris Maynard 7e3019c186 tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer. Fixes Coverity CID's 280233 and 280234. 
svn path=/trunk/; revision=43696
 2012-07-13 20:43:55 +00:00
Pascal Quantin ed47e7bae4 Remove unused filters found by checkhf.pl 
svn path=/trunk/; revision=43693
 2012-07-13 17:16:28 +00:00
Pascal Quantin e31dfd95ea From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7476 : 
UMA dissector incorrectly passes MAC addresses to wireshark core

svn path=/trunk/; revision=43692
 2012-07-13 17:04:43 +00:00
Chris Maynard 30e481a804 Update dissector to match asn1/pkcs1 sources. 
svn path=/trunk/; revision=43690
 2012-07-13 12:34:36 +00:00
Bill Meier e6818f164e Fix incorrect(duplicate) value in artnet_oem_code_vals[] value string array; 
{ 0x0ae0, "chainzone:RoundTable:0 DMX Inputs,
   ...
-  { 0x0ae0, "STC Mecatronica:DDR 2404 Digital Dimmer Rack:...
+  { 0x0b00, "STC Mecatronica:DDR 2404 Digital Dimmer Rack:...

Correct value obtained from Bug #7407 attachment #8684:
  "Art-Net OEM manufacturer codes for 1.4be specification"
     https://bugs.wireshark.org/bugzilla/attachment.cgi?id=8684

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

(Issue noticed because value_string_ext search was 'linear' for this array).


svn path=/trunk/; revision=43689
 2012-07-13 04:52:40 +00:00
Martin Mathieson 99bd7cfe44 Add a preference to that when the window scaling options are not 
visible, we can still configure a scaling factor and therefore get
better TCP sequence analysis and see better stream graphs.

A single preference is used for any/all streams for which the true value
isn't known.  I tried to make it obvious when showing the calculated
window size that it came fromt he preference setting.  The default value
for this preference is off, i.e. it won't change existing behaviour.

This was discussed a little at Sharkfest and raised on the developers
list last week.

svn path=/trunk/; revision=43686
 2012-07-12 23:57:51 +00:00
Bill Meier 5150511879 Do expert "telegrams lost" only of field is > 0; 
Don't call expert...() under 'if (tree)'

svn path=/trunk/; revision=43683
 2012-07-12 20:08:34 +00:00
Bill Meier d5b965176a Don't call subdissector / expert...() under 'if (tree)' 
Reformat hf[] entries.

svn path=/trunk/; revision=43682
 2012-07-12 19:36:35 +00:00
Bill Meier 859affc2bd Don't call subdissectors / expert...() / col...() under 'if (tree)' 
Also:
 Remove some uneeded initializers;
 Do some whitespace cleanup and re-formatting.

svn path=/trunk/; revision=43681
 2012-07-12 17:22:47 +00:00
Martin Mathieson 409cdcc5ed Speed up reading of out-header values, and add a couple of 'monitor' 
fields.

svn path=/trunk/; revision=43678
 2012-07-12 01:26:08 +00:00
Bill Meier 220958548c Fix compile error. 
svn path=/trunk/; revision=43674
 2012-07-11 20:52:52 +00:00
Bill Meier 26fd1cf862 Add some initializers to prevent some not really valid compiler warnings. 
svn path=/trunk/; revision=43673
 2012-07-11 20:49:35 +00:00
Bill Meier 38e9ae2805 Don't call col_...() and expert...() functions under 'if (tree)' 
svn path=/trunk/; revision=43672
 2012-07-11 20:44:22 +00:00
Bill Meier ac7b2df9e8 Don't call col...() and expert..() functions under 'if (tree)'; 
Reformat hf[] entries and various other.


svn path=/trunk/; revision=43671
 2012-07-11 20:40:13 +00:00
Bill Meier fad55cdecc Remove unneeded #includes; 
Rename header_fields[] tp hf[] as per convention;
Reformat hf[] entries;
Remove empty proto_reg_handoff...().

svn path=/trunk/; revision=43670
 2012-07-11 20:31:47 +00:00
Bill Meier 4248fa670a Explicit value_string array size specifier not required. 
svn path=/trunk/; revision=43669
 2012-07-11 20:26:24 +00:00
Pascal Quantin 9ee1981c7f From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7468 : 
DVB-CI/CI+: fix offset error in operator_info apdu

svn path=/trunk/; revision=43668
 2012-07-11 20:20:10 +00:00
Bill Meier e38f07f29a Don't call expert_...() under 'if (tree)'; 
Prefs callback not needed.

svn path=/trunk/; revision=43667
 2012-07-11 20:18:23 +00:00
Bill Meier 59e9b969e9 Fix [-Werror=sign-compare] compiler warning 
svn path=/trunk/; revision=43666
 2012-07-11 18:43:30 +00:00
Bill Meier 85504b052f Simplify code .... 
svn path=/trunk/; revision=43665
 2012-07-11 18:32:20 +00:00
Bill Meier 3b7e75852a Remove "comment to myself". 
svn path=/trunk/; revision=43664
 2012-07-11 16:24:01 +00:00
Bill Meier 0bace7313c General cleanup: 
- Fix potential array overflow;
- Calls to expert...() should not be under 'if (tree)';
- Don't use DISSECTOR_ASSERT for bad data; use expert...();
- Add some XXX comments about enum item values different than
   specified in the comments associated with the enum items;
- Init global 'mfgCommandFlag' as appropriate before use;
- Add missing hf[] entries;
- #if 0 various unused #defines and enums;
- Reduce (somewhat) repeated fetches of the same tvb data;
- Remove unneeded initializers;
- Don't use 'l' as a variable name;
- Reformat long lines, hf[] array entries and other;;
- Fix some indentation;

svn path=/trunk/; revision=43663
 2012-07-11 15:28:31 +00:00
Anders Broman 62f645715a failure cause is an OCTET STRING not a string. 
svn path=/trunk/; revision=43662
 2012-07-11 14:41:21 +00:00
Anders Broman 6dfa10bc57 Revert part of revision 43107 which broke sub dissection of 
Signal and events as a new tvb wasn't created. 
|BASE_EXT_STRING also removed.

svn path=/trunk/; revision=43661
 2012-07-11 14:40:35 +00:00
Guy Harris fb095f288f From Ben Bowen: 
Add additional named fields for IMAP.

svn path=/trunk/; revision=43651
 2012-07-10 19:43:55 +00:00
Pascal Quantin 1410207421 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 : 
Do not call tvb_ensure_length_remaining on an empty tvb

svn path=/trunk/; revision=43648
 2012-07-10 15:43:03 +00:00
Anders Broman 8ecd85f1ad Introduce a preference setting for application context version. 
svn path=/trunk/; revision=43641
 2012-07-10 11:39:06 +00:00
Pascal Quantin a0c58375be Move LPP and LPPe dissectors to the ASN.1 dirty library 
svn path=/trunk/; revision=43637
 2012-07-10 07:19:40 +00:00
Pascal Quantin 309e6646f7 Add LTE Positioning Protocol Extensions dissector 
Upgrade LTE Positioning Protocol to V10.5.0

svn path=/trunk/; revision=43628
 2012-07-09 20:55:09 +00:00