Commit Graph

55711 Commits

Author SHA1 Message Date
Bill Meier 08475ff673 README.heuristic: rework example code.
Specifically: show the use of tcp_dissect_pdus()
   for a TCP heuristic dissector

Change-Id: I02f184b2c8ef6ed128ef3d0bc59eed759aae54bb
Reviewed-on: https://code.wireshark.org/review/5399
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-21 22:13:06 +00:00
Alexis La Goutte fecea9745e VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer
Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d
Reviewed-on: https://code.wireshark.org/review/5401
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:57:47 +00:00
Irene Ruengeler c07e9fe450 Add minimize and maximize buttons to the SCTP analysis windows.
As suggested by Jeff Morriss.

Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64
Reviewed-on: https://code.wireshark.org/review/5361
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:52:22 +00:00
Michael Mann d7e277aa08 CANopen bugfixes
1. Fixed endianess in CANopen dissector.
According to CiA 301, 7.1.1. (p. 26):
"For numerical data types the encoding is little endian style."

2. Fixed NMT type string in CANopen dissector
NMT function code should not display 'EMERGENCY'

3. Fixed time stamp decoding

* Offset increment was too low for data type size
* Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded.

4. Fix: Use correct description string for NMT error control state bits
canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State".

5. Fix nmt_guard_state value_string array
CiA 301 desribes only 4 valid values. All other were deleted.
0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301.

6. Shortened EMERGENCY to EMCY

The term EMCY is the standard abbreviation used in CiA standard for Emergency service.

7. Fix: Allow SYNC and NMT error frames without any payload
NMT node guard remote requests do note have a payload,
SYNC frames only have an optional payload (counter)

If item length is set to -1, decode will cause a 'Malformed Packet' error.

8.  Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope

Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235
Reviewed-on: https://code.wireshark.org/review/5425
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:51:10 +00:00
AndersBroman f2fc562eda Replace tvb_length()
Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
Reviewed-on: https://code.wireshark.org/review/5431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-21 15:05:33 +00:00
Jeff Morriss 96fb34706b Remove some leftover debug printfs.
Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa
Reviewed-on: https://code.wireshark.org/review/5417
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-21 13:09:53 +00:00
Michał Orynicz 1cde318117 Fix for very big pid and tid numbers in logcat_text
There can be no space after pid colon if tid is big enough
in logcat long format.

Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc
Reviewed-on: https://code.wireshark.org/review/5411
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21 07:50:40 +00:00
Michał Orynicz 1d8673c0df Move text logcat regex strings to shared header
To avoid further duplication of work and bugfixing,
move regex strings to wiretap/logcat_text.h and include
this file in epan/dissectors/packet-logcat-text.c

Change-Id: I82773cda0e3240844139b104c68738ec82788014
Reviewed-on: https://code.wireshark.org/review/5410
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21 07:45:58 +00:00
Jeff Morriss 1b9dd7547c Fix the build: dissect_a21_ie_common() can't be static any more.
Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef
Reviewed-on: https://code.wireshark.org/review/5419
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-21 01:31:07 +00:00
Guy Harris 1df0d9cbfa Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.
Wrap the declaration for C++ while we're at it.

Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e
Reviewed-on: https://code.wireshark.org/review/5418
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-21 00:58:07 +00:00
Alexis La Goutte 97323982a4 A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d
Reviewed-on: https://code.wireshark.org/review/5415
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20 21:29:36 +00:00
Alexis La Goutte 5e932ada7b EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a
Reviewed-on: https://code.wireshark.org/review/5414
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20 21:28:53 +00:00
Michael Mann e77261f659 Eliminate proto_tree_add_text from some dissectors.
Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5
Reviewed-on: https://code.wireshark.org/review/5407
Petri-Dish: Michael Mann <mmann78@netscape.net>
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-11-20 16:09:09 +00:00
AndersBroman 9611e751ae Replace tvb_length...() calls.
Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330
Reviewed-on: https://code.wireshark.org/review/5412
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20 15:12:57 +00:00
Bill Meier 9145acb68a uat: tighten up dec/hex uat field validity checking
Specifically:
- Use the proper code for testing strtol() result;
- Also: Values greater than 32-bits treated as an error
   (on LP64 architectures);

Change-Id: I56e8e734fbb9a22dbd9ed4112e24327ffd7ee3c0
Reviewed-on: https://code.wireshark.org/review/5394
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-20 13:47:13 +00:00
Michael Mann ead585fda7 Give better hints as to where the "expert info" fields go.
Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369
Reviewed-on: https://code.wireshark.org/review/5406
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20 12:29:10 +00:00
Pascal Quantin f7f19f0291 IrDA: always initialize buffer before accessing it
Bug: 10716
Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9
Reviewed-on: https://code.wireshark.org/review/5398
Tested-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: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-20 12:28:29 +00:00
Balint Reczey bcc4c7fad6 Fix global plugin folder when it is set as an absolute path
This fixes regression in creating Debian packages caused by
80b36cdbde

Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709
Reviewed-on: https://code.wireshark.org/review/5316
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-20 11:26:11 +00:00
Michał Orynicz 6fbcc18742 Fix text logcat for changes in android L
In L, in line "-- beginning of /<buffer>" the "/" was removed.
This commit accomodates text logcat to that change.

Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459
Reviewed-on: https://code.wireshark.org/review/5405
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-20 11:06:46 +00:00
Alexis La Goutte 087518b326 MIP6: Access network identifier option is not full decoded
* Add subtype Geo Location (2) and Operator Identifier (3)
* Use also offset to calculate the length
* Remove proto_tree_add_text

Issue reported by Ravindranath K M

Bug:10712
Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94
Reviewed-on: https://code.wireshark.org/review/5397
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-20 10:52:45 +00:00
Guy Harris d23247e7a9 White space tweaking to match what's in Samba git.
(Samba git also needs some white space tweaking; this only changes the
cases where we're not obviously "better".)

Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac
Reviewed-on: https://code.wireshark.org/review/5403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-20 00:55:06 +00:00
Alexis La Goutte 4fdabdcfe7 SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede
Reviewed-on: https://code.wireshark.org/review/5402
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-19 22:28:28 +00:00
Gerald Combs 06dc2a7537 voip_calls: Fix tap callbacks.
We don't need to call the VoIP tap reset and draw callbacks repeately.
Do so only once from the RTP tap. Packet callbacks should return a
gboolean.

Clean up some function names and make some static.

Change-Id: I5c934ce8ce7f279861e8cc73235bbfc27d7fe622
Reviewed-on: https://code.wireshark.org/review/5396
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-19 17:14:52 +00:00
Bill Meier cb090e81ec [pedantic] Replace usage of 'long' and 'long long'
Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208
Reviewed-on: https://code.wireshark.org/review/5395
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-19 16:31:42 +00:00
Michael Tüxen 67ab27a15b Add support for PAD chunks.
Add support for PAD chunks as defined in RFC 4820.

Change-Id: I66a83d5d133429154fe40ccef26687c8350463cf
Reviewed-on: https://code.wireshark.org/review/5393
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-11-19 14:58:54 +00:00
Michael Tüxen d7179ac0ff Fix the length reported as value length.
The length reported as value length for unknown chunks
was actually the chunk length. Therefore it was off by 4.

Change-Id: Ieea79d2c51b4729fc139395174625d1f362d1ee5
Reviewed-on: https://code.wireshark.org/review/5392
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-11-19 14:38:30 +00:00
Michael Mann c62dac1a77 Eliminate proto_tree_add_text from packet-mate.c
Change-Id: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3
Reviewed-on: https://code.wireshark.org/review/5350
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-11-19 12:47:06 +00:00
Graham Bloice 61b0638e94 Remove Windows linker flags from the CMake link flags test as the
test doesn't actually pass the flags to the VS linker.

Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8
Reviewed-on: https://code.wireshark.org/review/5384
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-19 11:19:31 +00:00
Stig Bjørlykke 39b0c2def0 Wiretap: Added file_seek SEEK_END support.
This is needed for Lua File:seek("end").

Change-Id: I28fb23f2f29ca8083c77bf065db8816e039ae5a1
Reviewed-on: https://code.wireshark.org/review/4722
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-19 08:41:34 +00:00
Gerald Combs cfa0e5fd53 voip_calls: Regression fixes.
Fix struct initialization logic. Clear a GQueue instead of deleting it.
Don't crash if we have no sequence diagram items. Make sure we show all
flows and not just invites. Zero allocated memory in a couple of places.

Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28
Reviewed-on: https://code.wireshark.org/review/5390
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-18 23:37:35 +00:00
Martin Kaiser dc5b8f1093 dissect TA(1)
Change-Id: If618b0c3dc0502f5a31dcc580b9116daacb40239
Reviewed-on: https://code.wireshark.org/review/5389
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-11-18 22:38:28 +00:00
Sergey Avseyev 7cdfe52227 Update Couchbase dissector:
* Register new commands:
    * 0x5c: DCP_NOOP
    * 0x5d: DCP_BUFFER_ACKNOWLEDGEMENT
    * 0x5e: DCP_CONTROL
    * 0x5f: DCP_RESERVED4

Change-Id: I22d8eb8f6628e07b2e2ab2bc137688329eead1be
Reviewed-on: https://code.wireshark.org/review/5385
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18 18:53:11 +00:00
Pascal Quantin e97d235efc SPDY: do not try to access an uninitialized tvb
Coming when data length = 0

Bug: 10704
Change-Id: Ibd0730be661d966aa0429480dba97ed7d3e5c471
Reviewed-on: https://code.wireshark.org/review/5377
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18 11:43:05 +00:00
Alexis La Goutte 4b96030d34 802.11: Remove proto_tree_add_text
Change-Id: I40d351e3317ff7e207e5c68a39aaedb73faf54f9
Reviewed-on: https://code.wireshark.org/review/5281
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18 11:26:51 +00:00
Guy Harris c2f971dd71 Fix indentation.
Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b
Reviewed-on: https://code.wireshark.org/review/5380
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-18 05:17:11 +00:00
Pascal Quantin 36837a2f5a MIPv6: display Experimental Mobility Message Data as such
Bug: 10703
Change-Id: I9b16f503418d7464234be3c772b5dae3fb5eb7a9
Reviewed-on: https://code.wireshark.org/review/5378
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-18 04:49:59 +00:00
Gerald Combs 1dec509a88 voip_calls: Move to ui.
Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t.
Remove unused function definitions.

Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2
Reviewed-on: https://code.wireshark.org/review/5379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-18 00:48:34 +00:00
Gerald Combs a07f0817d7 voip_calls: Get rid of global variables.
Move the members of voip_rtp_tapinfo_t to voip_calls_tapinfo_t. Move a
bunch of formerly static variables there as well. Note that we might
want to make them private again at some point. Remove launch_count. It
appeared to be unused.

Wrap the individual registration routines in voip_calls_init_all_taps.
Wrap the removal routines in voip_calls_remove_all_tap_listeners.

Move voip_calls_get_info() to voip_calls_dlg.c. Make it static.

Change-Id: I58f9d91f55cfb5e4b0c048a5a1d5d4b947f4641b
Reviewed-on: https://code.wireshark.org/review/5372
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17 21:56:00 +00:00
Alexis La Goutte 5c7c7018a0 802.11: Enhance Supported Operating Classes
* Use expert_info to display warning about length (Remove proto_tree_add_text)

Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50
Reviewed-on: https://code.wireshark.org/review/5369
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17 21:25:22 +00:00
Alexis La Goutte 4b63d9fbed 802.11: Enhance Extenede Channel Switch Announcement
* Use expert info to display warning about launch (remove proto_tree_add_text)
* Remove a check about Unknown data (Not need)

Change-Id: I3ec1d0f5b955019cfe43141df5f712eb1446dce3
Reviewed-on: https://code.wireshark.org/review/5368
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17 21:24:05 +00:00
Alexis La Goutte f4ad915be4 H248: Fix Dereference of null pointer found by Clang analyzer
Also fix some indent issue

Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000
Reviewed-on: https://code.wireshark.org/review/5370
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17 21:21:10 +00:00
Pascal Quantin da69b51c9e DECT: ensure that bfield_data buffer is always fully initiated
Bug: 10710
Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd
Reviewed-on: https://code.wireshark.org/review/5371
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17 21:16:24 +00:00
Joerg Mayer 7a7a7639f2 cmake:
Avoide rebuilding the guides each and every time.
  Don't print the single file guides to stdout.

Change-Id: Ie94fc4b24676e9abc7258c4ea1c7fd3049a96fb6
Reviewed-on: https://code.wireshark.org/review/5367
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-11-17 20:15:01 +00:00
Joerg Mayer 4a86d622b1 Use ntoh24 instead of less readable and less correct code.
Remove redundant / wrong comments.
Add two small (helpful) comments :-)

Change-Id: I9c5451587d744a8418e6a90139b771a055e93387
Reviewed-on: https://code.wireshark.org/review/5366
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-11-17 20:07:39 +00:00
Alexis La Goutte 82bb3630de LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I8c750ed9ad775b9be9d12050d200d7f1b4ddb86e
Reviewed-on: https://code.wireshark.org/review/5365
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17 18:53:42 +00:00
AndersBroman 3ce0167467 [BSSMAP] de_mid() used with wrong length.
Change-Id: Ia64f254d85845ff39eacc7a339fdfa646ff9bb50
Reviewed-on: https://code.wireshark.org/review/5364
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-17 12:39:55 +00:00
Pascal Quantin 3815b14a07 E212: fix bytes highlighting when dissecting the high nibble variant
Change-Id: I376dcb333f7768242dbdb73313870e1e22d959ff
Reviewed-on: https://code.wireshark.org/review/5362
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-17 10:16:51 +00:00
Michael Mann bea106c79f Eliminate proto_tree_add_text
Also some other cleanup to simplify dissector logic.

Change-Id: Ia84300b7eadafe292361014dd0e565ec250cae44
Reviewed-on: https://code.wireshark.org/review/5311
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-11-17 07:40:20 +00:00
Martin Kaiser f3f833ccec display filter: the body of a range should only be
a string, a field name or another range - not an unparsed element

Bug: 10690
Change-Id: I126143636c940cc73ed6467660f0a573209e2ae9
Reviewed-on: https://code.wireshark.org/review/5243
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-11-17 07:05:35 +00:00
Guy Harris 25f950eca9 Add tshark -G dissector-tables to dump a list of dissector tables.
That list doesn't show the entries in the dissector tables, just
information about the tables themselves.

Clean up some tshark man page issues while we're at it.

Change-Id: I70beee34110f5c0d58105944dd71105a8400f5ca
Reviewed-on: https://code.wireshark.org/review/5360
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-17 02:26:57 +00:00