metze/wireshark/wip.git
5 years agoSplit the low-level print stream code into a separate file.
Guy Harris [Sat, 22 Nov 2014 03:22:54 +0000 (19:22 -0800)]
Split the low-level print stream code into a separate file.

Put the low-level print stream code from epan/print.c into
epan/print_stream.c, leaving the higher-level stuff in print.c

Change-Id: Iae961f168ec655a29f434257b1af0937fca9f025
Reviewed-on: https://code.wireshark.org/review/5436
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoREADME.heuristic: rework example code.
Bill Meier [Wed, 19 Nov 2014 18:52:52 +0000 (13:52 -0500)]
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>
5 years agoVoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Wed, 19 Nov 2014 20:34:50 +0000 (21:34 +0100)]
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>
5 years agoAdd minimize and maximize buttons to the SCTP analysis windows.
Irene Ruengeler [Mon, 17 Nov 2014 07:51:12 +0000 (08:51 +0100)]
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>
5 years agoCANopen bugfixes
Michael Mann [Fri, 21 Nov 2014 15:43:40 +0000 (10:43 -0500)]
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>
5 years agoReplace tvb_length()
AndersBroman [Fri, 21 Nov 2014 14:54:59 +0000 (15:54 +0100)]
Replace tvb_length()

Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
Reviewed-on: https://code.wireshark.org/review/5431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoRemove some leftover debug printfs.
Jeff Morriss [Fri, 21 Nov 2014 00:35:25 +0000 (19:35 -0500)]
Remove some leftover debug printfs.

Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa
Reviewed-on: https://code.wireshark.org/review/5417
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoFix for very big pid and tid numbers in logcat_text
Michał Orynicz [Thu, 20 Nov 2014 12:16:33 +0000 (13:16 +0100)]
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>
5 years agoMove text logcat regex strings to shared header
Michał Orynicz [Thu, 20 Nov 2014 12:09:31 +0000 (13:09 +0100)]
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>
5 years agoFix the build: dissect_a21_ie_common() can't be static any more.
Jeff Morriss [Fri, 21 Nov 2014 01:30:32 +0000 (20:30 -0500)]
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>
5 years agoInclude "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.
Guy Harris [Fri, 21 Nov 2014 00:57:24 +0000 (16:57 -0800)]
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>
5 years agoA21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
Alexis La Goutte [Thu, 20 Nov 2014 19:04:42 +0000 (20:04 +0100)]
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>
5 years agoEPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
Alexis La Goutte [Thu, 20 Nov 2014 19:04:26 +0000 (20:04 +0100)]
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>
5 years agoEliminate proto_tree_add_text from some dissectors.
Michael Mann [Tue, 18 Nov 2014 01:04:30 +0000 (20:04 -0500)]
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>
5 years agoReplace tvb_length...() calls.
AndersBroman [Thu, 20 Nov 2014 15:07:55 +0000 (16:07 +0100)]
Replace tvb_length...() calls.

Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330
Reviewed-on: https://code.wireshark.org/review/5412
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agouat: tighten up dec/hex uat field validity checking
Bill Meier [Wed, 19 Nov 2014 03:53:32 +0000 (22:53 -0500)]
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>
5 years agoGive better hints as to where the "expert info" fields go.
Michael Mann [Sun, 16 Nov 2014 20:15:52 +0000 (15:15 -0500)]
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>
5 years agoIrDA: always initialize buffer before accessing it
Pascal Quantin [Wed, 19 Nov 2014 19:10:15 +0000 (20:10 +0100)]
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>
5 years agoFix global plugin folder when it is set as an absolute path
Balint Reczey [Fri, 14 Nov 2014 20:39:00 +0000 (21:39 +0100)]
Fix global plugin folder when it is set as an absolute path

This fixes regression in creating Debian packages caused by
80b36cdbde90ac9639938a14e8fd90a79602666a

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>
5 years agoFix text logcat for changes in android L
Michał Orynicz [Thu, 20 Nov 2014 08:55:40 +0000 (09:55 +0100)]
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>
5 years agoMIP6: Access network identifier option is not full decoded
Alexis La Goutte [Wed, 19 Nov 2014 18:18:39 +0000 (19:18 +0100)]
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>
5 years agoWhite space tweaking to match what's in Samba git.
Guy Harris [Thu, 20 Nov 2014 00:53:36 +0000 (16:53 -0800)]
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>
5 years agoSBC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Wed, 19 Nov 2014 20:35:14 +0000 (21:35 +0100)]
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>
5 years agovoip_calls: Fix tap callbacks.
Gerald Combs [Wed, 19 Nov 2014 17:03:44 +0000 (09:03 -0800)]
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>
5 years ago[pedantic] Replace usage of 'long' and 'long long'
Bill Meier [Wed, 19 Nov 2014 16:25:17 +0000 (11:25 -0500)]
[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>
5 years agoAdd support for PAD chunks.
Michael Tüxen [Wed, 19 Nov 2014 14:57:48 +0000 (15:57 +0100)]
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>
5 years agoFix the length reported as value length.
Michael Tüxen [Wed, 19 Nov 2014 14:35:36 +0000 (15:35 +0100)]
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>
5 years agoEliminate proto_tree_add_text from packet-mate.c
Michael Mann [Sun, 16 Nov 2014 18:10:37 +0000 (13:10 -0500)]
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>
5 years agoRemove Windows linker flags from the CMake link flags test as the
Graham Bloice [Tue, 18 Nov 2014 15:59:44 +0000 (15:59 +0000)]
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>
5 years agoWiretap: Added file_seek SEEK_END support.
Stig Bjørlykke [Thu, 16 Oct 2014 11:58:58 +0000 (13:58 +0200)]
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>
5 years agovoip_calls: Regression fixes.
Gerald Combs [Tue, 18 Nov 2014 21:13:35 +0000 (13:13 -0800)]
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>
5 years agodissect TA(1)
Martin Kaiser [Sun, 16 Nov 2014 17:09:57 +0000 (19:09 +0200)]
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>
5 years agoUpdate Couchbase dissector:
Sergey Avseyev [Tue, 18 Nov 2014 18:11:22 +0000 (21:11 +0300)]
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>
5 years agoSPDY: do not try to access an uninitialized tvb
Pascal Quantin [Mon, 17 Nov 2014 21:49:24 +0000 (22:49 +0100)]
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>
5 years ago802.11: Remove proto_tree_add_text
Alexis La Goutte [Thu, 30 Oct 2014 08:16:51 +0000 (09:16 +0100)]
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>
5 years agoFix indentation.
Guy Harris [Tue, 18 Nov 2014 05:16:19 +0000 (21:16 -0800)]
Fix indentation.

Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b
Reviewed-on: https://code.wireshark.org/review/5380
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoMIPv6: display Experimental Mobility Message Data as such
Pascal Quantin [Mon, 17 Nov 2014 22:22:08 +0000 (23:22 +0100)]
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>
5 years agovoip_calls: Move to ui.
Gerald Combs [Tue, 18 Nov 2014 00:43:39 +0000 (16:43 -0800)]
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>
5 years agovoip_calls: Get rid of global variables.
Gerald Combs [Sun, 16 Nov 2014 19:32:11 +0000 (11:32 -0800)]
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>
5 years ago802.11: Enhance Supported Operating Classes
Alexis La Goutte [Mon, 17 Nov 2014 18:10:14 +0000 (19:10 +0100)]
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>
5 years ago802.11: Enhance Extenede Channel Switch Announcement
Alexis La Goutte [Mon, 17 Nov 2014 18:03:46 +0000 (19:03 +0100)]
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>
5 years agoH248: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Mon, 17 Nov 2014 20:43:36 +0000 (21:43 +0100)]
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>
5 years agoDECT: ensure that bfield_data buffer is always fully initiated
Pascal Quantin [Mon, 17 Nov 2014 20:59:14 +0000 (21:59 +0100)]
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>
5 years agocmake:
Joerg Mayer [Mon, 17 Nov 2014 20:12:54 +0000 (21:12 +0100)]
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>
5 years agoUse ntoh24 instead of less readable and less correct code.
Joerg Mayer [Mon, 17 Nov 2014 20:05:11 +0000 (21:05 +0100)]
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>
5 years agoLLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 17 Nov 2014 16:10:36 +0000 (17:10 +0100)]
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>
5 years ago[BSSMAP] de_mid() used with wrong length.
AndersBroman [Mon, 17 Nov 2014 12:36:17 +0000 (13:36 +0100)]
[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>
5 years agoE212: fix bytes highlighting when dissecting the high nibble variant
Pascal Quantin [Mon, 17 Nov 2014 09:44:36 +0000 (10:44 +0100)]
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>
5 years agoEliminate proto_tree_add_text
Michael Mann [Fri, 14 Nov 2014 20:12:06 +0000 (15:12 -0500)]
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>
5 years agodisplay filter: the body of a range should only be
Martin Kaiser [Tue, 11 Nov 2014 20:05:03 +0000 (21:05 +0100)]
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>
5 years agoAdd tshark -G dissector-tables to dump a list of dissector tables.
Guy Harris [Mon, 17 Nov 2014 02:25:56 +0000 (18:25 -0800)]
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>
5 years agoEliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a few places.
Michael Mann [Fri, 14 Nov 2014 20:13:05 +0000 (15:13 -0500)]
Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a few places.

Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7
Reviewed-on: https://code.wireshark.org/review/5312
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: Evan Huus <eapache@gmail.com>
5 years agoRemove some ununused/unmatched <resources/> tags.
Jeff Morriss [Sun, 16 Nov 2014 17:17:40 +0000 (12:17 -0500)]
Remove some ununused/unmatched <resources/> tags.

Change-Id: I0f8e4381b27d1defeb5980692823d297d2f48bab
Reviewed-on: https://code.wireshark.org/review/5349
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoPortableApps: ensure that the personal folder is set to the App directory
Pascal Quantin [Sun, 16 Nov 2014 20:58:36 +0000 (21:58 +0100)]
PortableApps: ensure that the personal folder is set to the App directory

Otherwise the portable version ends up loading the user local personal profile

Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e
Reviewed-on: https://code.wireshark.org/review/5351
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoBATMAN: fix indent and encoding args
Alexis La Goutte [Sun, 16 Nov 2014 15:12:40 +0000 (16:12 +0100)]
BATMAN: fix indent and encoding args

use tabs for indent and use fix-encoding-args tools

Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8
Reviewed-on: https://code.wireshark.org/review/5340
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
5 years agoMake sure the NLPID appears in the protocol tree.
Guy Harris [Sun, 16 Nov 2014 23:21:12 +0000 (15:21 -0800)]
Make sure the NLPID appears in the protocol tree.

For protocols for which the NLPID is not considered part of the PDU, put
the NLPID into the protocol tree ourselves.

Bug: 10706
Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25
Reviewed-on: https://code.wireshark.org/review/5358
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix a comment to reflect reality.
Guy Harris [Sun, 16 Nov 2014 22:59:23 +0000 (14:59 -0800)]
Fix a comment to reflect reality.

Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0
Reviewed-on: https://code.wireshark.org/review/5357
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAdd unused-const-variable (enable by default on new clang release)
Alexis La Goutte [Sun, 2 Nov 2014 15:15:31 +0000 (16:15 +0100)]
Add unused-const-variable (enable by default on new clang release)

Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4
Reviewed-on: https://code.wireshark.org/review/5068
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
5 years agomcast_stream: fix indent (use 4 spaces)
Alexis La Goutte [Sun, 16 Nov 2014 15:28:51 +0000 (16:28 +0100)]
mcast_stream: fix indent (use 4 spaces)

Add also modelines info

Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648
Reviewed-on: https://code.wireshark.org/review/5344
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agortp_stream: fix indent (use 4 spaces)
Alexis La Goutte [Sun, 16 Nov 2014 15:42:32 +0000 (16:42 +0100)]
rtp_stream: fix indent (use 4 spaces)

Add also modelines info

Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847
Reviewed-on: https://code.wireshark.org/review/5345
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoBATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 16 Nov 2014 15:15:27 +0000 (16:15 +0100)]
BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956
Reviewed-on: https://code.wireshark.org/review/5341
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoRADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 16 Nov 2014 15:00:35 +0000 (16:00 +0100)]
RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83
Reviewed-on: https://code.wireshark.org/review/5339
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years ago[Automatic manuf, services and enterprise-numbers update for 2014-11-16]
Gerald Combs [Sun, 16 Nov 2014 16:06:50 +0000 (08:06 -0800)]
[Automatic manuf, services and enterprise-numbers update for 2014-11-16]

Change-Id: Ie677285f75a7ef0390d93469a4f97eaad813fdc0
Reviewed-on: https://code.wireshark.org/review/5346
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agobtavdtp: Add missing break;
Alexis La Goutte [Sun, 16 Nov 2014 14:27:06 +0000 (15:27 +0100)]
btavdtp: Add missing break;

Issue found by Clang Analyzer:
Value stored to 'codec_dissector' is never read

Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd
Reviewed-on: https://code.wireshark.org/review/5330
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
5 years agoRemove file_type_subtype member from packet_info.
Michael Mann [Sun, 16 Nov 2014 02:24:27 +0000 (21:24 -0500)]
Remove file_type_subtype member from packet_info.

Just pass the necessary data to the frame dissector.

Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908
Reviewed-on: https://code.wireshark.org/review/5328
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years ago"Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious...
Michael Mann [Sat, 15 Nov 2014 23:47:06 +0000 (18:47 -0500)]
"Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info)

Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c
Reviewed-on: https://code.wireshark.org/review/5326
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoRemove ipproto member of packet_info.
Michael Mann [Sun, 16 Nov 2014 01:35:51 +0000 (20:35 -0500)]
Remove ipproto member of packet_info.

All situations can be handled with "shimmed" dissector functions.

Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
Reviewed-on: https://code.wireshark.org/review/5327
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoDNS: NAPTR RR Replacement Length is incorrect
Alexis La Goutte [Fri, 14 Nov 2014 16:42:44 +0000 (17:42 +0100)]
DNS: NAPTR RR Replacement Length is incorrect

It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length.

Issue found by Boaz

Bug:10700
Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42
Reviewed-on: https://code.wireshark.org/review/5300
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoVoIP calls: Fixup whitespace.
Gerald Combs [Sat, 15 Nov 2014 18:36:16 +0000 (10:36 -0800)]
VoIP calls: Fixup whitespace.

Set modelines and reindent to match the files in the top-level ui
directory.

Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
Reviewed-on: https://code.wireshark.org/review/5325
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoVoIP calls: Start separating common and GTK+-dependent code.
Gerald Combs [Sat, 15 Nov 2014 17:18:06 +0000 (09:18 -0800)]
VoIP calls: Start separating common and GTK+-dependent code.

Remove more calls to voip_calls_get_info. Get rid of the global cfile.
Lowercase more function names.

Change-Id: Ieda779779cce9f05e07c54314bceab4a18bae22f
Reviewed-on: https://code.wireshark.org/review/5324
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agopaquet-mq: Eliminiate proto_tree_add_text
Robert Grange [Sat, 15 Nov 2014 10:35:09 +0000 (11:35 +0100)]
paquet-mq: Eliminiate proto_tree_add_text

Eliminate proto_tree_add_text for Expert Info
Improve PCF Parameters numeric value display

Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305
Reviewed-on: https://code.wireshark.org/review/5080
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoVoIP calls: Use our tap offsets.
Gerald Combs [Sat, 15 Nov 2014 02:43:28 +0000 (18:43 -0800)]
VoIP calls: Use our tap offsets.

Add convenience functions to convert between tap IDs and tapinfo
pointers. Use them to get rid of some calls to voip_calls_get_info().

Lowercase function names. Remove more exit()s.

Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9
Reviewed-on: https://code.wireshark.org/review/5321
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years ago0.0 is a double, 0.0f is a float.
Guy Harris [Sat, 15 Nov 2014 03:37:32 +0000 (19:37 -0800)]
0.0 is a double, 0.0f is a float.

Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0
Reviewed-on: https://code.wireshark.org/review/5320
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix a pointer type.
Gerald Combs [Sat, 15 Nov 2014 03:30:42 +0000 (19:30 -0800)]
Fix a pointer type.

Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260
Reviewed-on: https://code.wireshark.org/review/5319
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoLLDP: Dissector for Hytec specific extensions added
Gregor Miernik [Tue, 4 Nov 2014 10:53:39 +0000 (11:53 +0100)]
LLDP: Dissector for Hytec specific extensions added

It provides dissection of objects with additional neighbor and link information
defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC).
Also OUI of "Hytec Geraetebau GmbH" added.

Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7
Reviewed-on: https://code.wireshark.org/review/5107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoVoIP calls: Clean up tap registration and removal.
Gerald Combs [Fri, 14 Nov 2014 21:53:58 +0000 (13:53 -0800)]
VoIP calls: Clean up tap registration and removal.

Start moving away from a global voip_calls_tapinfo_t. Pass the
voip_calls_tapinfo_t struct address to each registration and removal
routine.

All of the tap registration and removal routines are called at the same
time. Replace the individual registration tracking booleans with a
central one.

Calling exit() from the GUI is rude. Don't do that.

Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24
Reviewed-on: https://code.wireshark.org/review/5318
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoEliminate proto_tree_add_text from some plugin dissector files.
Michael Mann [Fri, 14 Nov 2014 20:18:23 +0000 (15:18 -0500)]
Eliminate proto_tree_add_text from some plugin dissector files.

Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706
Reviewed-on: https://code.wireshark.org/review/5313
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoVoIP calls tap ID cleanup.
Gerald Combs [Fri, 14 Nov 2014 21:15:38 +0000 (13:15 -0800)]
VoIP calls tap ID cleanup.

Remove all of the public dummy members from voip_calls_tapinfo_t. Use
pointer arithmetic to generate private, unique IDs instead.

We weren't removing the SUA listener. Do so. Use the correct M3UA ID.

Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b
Reviewed-on: https://code.wireshark.org/review/5315
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoDo the "-z help" processing separately, and do it for Wireshark as well.
Guy Harris [Fri, 14 Nov 2014 23:59:38 +0000 (15:59 -0800)]
Do the "-z help" processing separately, and do it for Wireshark as well.

Yes, Wireshark does a bunch of GUI stuff, and then takes the window down
before printing the help, but the same is true for some command-line
error messages as well.

Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84
Reviewed-on: https://code.wireshark.org/review/5317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoIt's not missing, it's passed on.
Guy Harris [Fri, 14 Nov 2014 20:29:04 +0000 (12:29 -0800)]
It's not missing, it's passed on.

Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
Reviewed-on: https://code.wireshark.org/review/5314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoUpdate Debian symbol files.
Guy Harris [Fri, 14 Nov 2014 20:24:51 +0000 (12:24 -0800)]
Update Debian symbol files.

Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
Reviewed-on: https://code.wireshark.org/review/5310
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAdd a name field to tap_param, for use in error messages.
Guy Harris [Fri, 14 Nov 2014 20:21:12 +0000 (12:21 -0800)]
Add a name field to tap_param, for use in error messages.

Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b
Reviewed-on: https://code.wireshark.org/review/5309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoThe registered -z parameter string shouldn't end with a comma.
Guy Harris [Fri, 14 Nov 2014 20:05:31 +0000 (12:05 -0800)]
The registered -z parameter string shouldn't end with a comma.

If it ends with a comma, then, if you don't provide any parameters, you
get a "no such -z statistic" message followed by a list of available
statistics.

If it doesn't end with a comma, then, if you don't provide any
parameters *and* a parameter is required, you get a usage message, which
is more useful - and, in many of those cases, a parameter *isn't*
required.

Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2
Reviewed-on: https://code.wireshark.org/review/5308
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAdd an optional flag and a type for UUID parameters for stat taps.
Guy Harris [Fri, 14 Nov 2014 19:25:04 +0000 (11:25 -0800)]
Add an optional flag and a type for UUID parameters for stat taps.

For future use, with common code to parse the -z argument.

Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a
Reviewed-on: https://code.wireshark.org/review/5307
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoUpdate my e-mail address again.
Stephen Fisher [Fri, 14 Nov 2014 19:17:36 +0000 (12:17 -0700)]
Update my e-mail address again.

Change-Id: I0083bbf84658dbb0d4cef91e9e8f5855b8a2ba4f
Reviewed-on: https://code.wireshark.org/review/5306
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
5 years agoThere's nothing GTK+ about TShark.
Guy Harris [Fri, 14 Nov 2014 18:55:50 +0000 (10:55 -0800)]
There's nothing GTK+ about TShark.

Remove gtk from routine names in CLI taps.

Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8
Reviewed-on: https://code.wireshark.org/review/5305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoRename stat_cmd_args.[ch] to stat_tap_ui.[ch].
Guy Harris [Fri, 14 Nov 2014 18:51:40 +0000 (10:51 -0800)]
Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].

The intent is to handle more than just command-line arguments; reflect that.

Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
Reviewed-on: https://code.wireshark.org/review/5304
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAllow SCTP graphs to resize with the window they're in.
Irene Ruengeler [Fri, 14 Nov 2014 09:06:51 +0000 (10:06 +0100)]
Allow SCTP graphs to resize with the window they're in.

Bug: 10698
Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb
Reviewed-on: https://code.wireshark.org/review/5284
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
5 years agotap_ui -> stat_tap_ui.
Guy Harris [Fri, 14 Nov 2014 18:42:26 +0000 (10:42 -0800)]
tap_ui -> stat_tap_ui.

The old routine had stat_ in the name, as the expectation was that they
were for statistics taps; that's still the expectation, so have stat_ in
the data structure and routine names.

Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
Reviewed-on: https://code.wireshark.org/review/5303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoUse G_GUINT64_FORMAT to format a guint64.
Guy Harris [Fri, 14 Nov 2014 18:35:42 +0000 (10:35 -0800)]
Use G_GUINT64_FORMAT to format a guint64.

A 64-bit integer isn't necessarily a long, it might be a long long.  Use
G_GUINT64_FORMAT to format it.

Make it a guint64 while we're at it - the field is a FT_GUINT64.

Change-Id: I7ee855905ea77347576005441824b1c4630f5659
Reviewed-on: https://code.wireshark.org/review/5302
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFor tap UIs, register a list of parameters and some menu information.
Guy Harris [Fri, 14 Nov 2014 18:31:04 +0000 (10:31 -0800)]
For tap UIs, register a list of parameters and some menu information.

The intent here is to centralize more UI information so that we can move
more tap UI stuff to common code.  This is a beginning.

Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30
Reviewed-on: https://code.wireshark.org/review/5301
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agohiqnet: Improve dissection for hiqnet over TCP or UDP
Bill Meier [Thu, 13 Nov 2014 04:38:40 +0000 (23:38 -0500)]
hiqnet: Improve dissection for hiqnet over TCP or UDP

-- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly
    handle hiqnet PDUS is a TCP stream of data;

-- Handle possible multiple hiqnet PDUs in a UDP payload.

-- Add Fixme: re multiple hiqnet PDUs in a frame.

Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a
Reviewed-on: https://code.wireshark.org/review/5267
Reviewed-by: Raphaël Doursenaud <rdoursenaud@free.fr>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
5 years agohiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.
Bill Meier [Thu, 13 Nov 2014 03:04:37 +0000 (22:04 -0500)]
hiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.

Specifically: Use proto_tree_add_bitmask() to show the "flags" and
              "categories" bitfields (instead of building the fields
              display "by hand").
              The bitfield display changed as follows:
              - A bitfield with all bits=0 will have a detailed
                dissection tree; (for both 'flags' & 'categories');
              - The 'categories' individual bitfields are now
                displayed as FT_BOOLEAN (not FT_UINT32).

Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae
Reviewed-on: https://code.wireshark.org/review/5266
Reviewed-by: Bill Meier <wmeier@newsguy.com>
5 years ago[S1AP) Wrong tree used
AndersBroman [Fri, 14 Nov 2014 14:39:45 +0000 (15:39 +0100)]
[S1AP) Wrong tree used
s1ap.cnf:547:14: error: variable 'subtree' set but not used

Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e
Reviewed-on: https://code.wireshark.org/review/5299
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years ago[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID
AndersBroman [Fri, 14 Nov 2014 13:53:02 +0000 (14:53 +0100)]
[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID

Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb
Reviewed-on: https://code.wireshark.org/review/5298
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFix declaration in btavrcp
Michal Labedzki [Fri, 14 Nov 2014 12:39:29 +0000 (13:39 +0100)]
Fix declaration in btavrcp

Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386
Reviewed-on: https://code.wireshark.org/review/5297
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoBluetooth: Ubertooth: Update to the latest firmware
Michal Labedzki [Wed, 12 Nov 2014 11:00:46 +0000 (12:00 +0100)]
Bluetooth: Ubertooth: Update to the latest firmware

Changelog:
- add some assign numbers
- implement new type of usb_rx_packet: LE_PROMISC

Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df
Reviewed-on: https://code.wireshark.org/review/5289
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
5 years ago[BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".
AndersBroman [Fri, 14 Nov 2014 11:54:33 +0000 (12:54 +0100)]
[BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".

Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64
Reviewed-on: https://code.wireshark.org/review/5295
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE
Pascal Quantin [Fri, 14 Nov 2014 09:07:52 +0000 (10:07 +0100)]
NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE

Bug: 10699
Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e
Reviewed-on: https://code.wireshark.org/review/5285
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>
5 years agoTranslations: Update Polish translation
Michal Labedzki [Sun, 2 Nov 2014 17:55:40 +0000 (18:55 +0100)]
Translations: Update Polish translation

All messages are translated now.

Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania
i wytykania błędów.

Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6
Reviewed-on: https://code.wireshark.org/review/5293
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>