Commit Graph

55035 Commits

Author SHA1 Message Date
Alexis La Goutte cf201b03ac UI (simple_dialog): fix warning: redundant redeclaration of .. [-Wredundant-decls]
simple_dialog.h:78:13: warning: redundant redeclaration of ‘simple_message_box’ [-Wredundant-decls]
simple_dialog.h:85:13: warning: redundant redeclaration of ‘vsimple_error_message_box’ [-Wredundant-decls]
simple_dialog.h:90:13: warning: redundant redeclaration of ‘simple_error_message_box’ [-Wredundant-decls]

Change-Id: I8f6363fc8ec46ba24895e5236368544f64354e42
Reviewed-on: https://code.wireshark.org/review/4460
Petri-Dish: 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-10-06 21:15:25 +00:00
Gerald Combs 798eb97053 Qt: Packet list column sorting.
Sorting behavior should be identical to GTK+.

Pass the correct position to beginInsertRows. Add a list of to-do items
to packet_list.cpp.

Change-Id: Ie6ab4b9f2d780a2af430d0f90529edca5485dada
Reviewed-on: https://code.wireshark.org/review/4481
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06 21:10:11 +00:00
Bill Meier 5051ae1cbe Convert "4 space tabs" to spaces; Adjust editor modelines.
Change-Id: I8d61d959c79e6aa9875c58680c54a331d18079cc
Reviewed-on: https://code.wireshark.org/review/4504
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 18:29:40 +00:00
Bill Meier 24d50bc290 Adjust indentation to match editor modelines; Do other minor whitespace changes.
Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353
Reviewed-on: https://code.wireshark.org/review/4502
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:12:33 +00:00
Bill Meier c822eeabe4 packet-rpcap.c: Don't use mixed space/tab indentation;
Change-Id: I21409a02fabc28951d9c15be7a160295f5fb35ca
Reviewed-on: https://code.wireshark.org/review/4501
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:11:53 +00:00
Bill Meier 2d6621a6d2 Adjust editor modelines to match actual format of the file; Adjust some whiotespace.
Change-Id: If930f2c266b61c9348063eab0189af2582b0a331
Reviewed-on: https://code.wireshark.org/review/4500
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:10:59 +00:00
Bill Meier 2005fc6e78 Convert (what appear to be) "4 space tabs"; Adjust editor-modelines; Do some minor reformatting.
Change-Id: Ie078c826ed38a0d682f61fb3e95450b47a9d2c31
Reviewed-on: https://code.wireshark.org/review/4499
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:10:35 +00:00
Bill Meier 3377eca702 packet-g723.c: Remove some boilerplate comments.
Change-Id: Ib322b33c304674835170e1ae2006aabf0f44fd9d
Reviewed-on: https://code.wireshark.org/review/4498
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:10:13 +00:00
Bill Meier 3af9e3364c packet-hclnfsd.c: Reformat hf[] entries; Adjust some whitespace.
Change-Id: I84368080d12cb5001dd7847add0ec96608080604
Reviewed-on: https://code.wireshark.org/review/4497
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:09:48 +00:00
Bill Meier 97e6c59e3e packet-q931.c: Reformat hf[] entries; Convert apparent "4-space tabs" to spaces. Adjust editor modelines.
Change-Id: Iaeb321f0facfc6b3176677779e6cdf5c92226dec
Reviewed-on: https://code.wireshark.org/review/4496
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:09:22 +00:00
AndersBroman 4d930724ff Dissect 3GPP AVP Presence-Reporting-Area-Elements-List.
Change-Id: Ic7b99d41a275fb6f50758ea87763844f24be537c
Reviewed-on: https://code.wireshark.org/review/4495
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-06 17:04:39 +00:00
Evan Huus 9128e43745 tcp: default no-subdissector-on-error to TRUE
Dissectors that need this set break badly when it isn't. Dissectors which don't
need this set will still generally be understandable without it, since e.g.
retransmissions will link to the original packet at the TCP layer, and
presumably the subdissector payload is exactly the same in that case.

Change-Id: I2871c2a90c601637bdfb8cffaa34a7407995c603
Ping-Bug: 10525
Ping-Bug: 10289
Reviewed-on: https://code.wireshark.org/review/4487
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-06 15:22:45 +00:00
AndersBroman 47de5a1fa0 Expand dissection of 8.108 Presence Reporting Area Action.
Change-Id: I2ad57d8cdb6758f01146b37ac924e2d8f2141546
Reviewed-on: https://code.wireshark.org/review/4491
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-06 13:43:53 +00:00
Tomasz Moń 9c1225f735 Modify multicheck to accept parent parameter.
This makes it possible for multicheck to become a tree-like structure.

Example:
arg {number=4}{call=--devices}{display=Devices}{tooltip=Device selector}{type=multicheck}
value {arg=4}{value=dev1}{display=Parent Device}{enabled=t}{default=t}
value {arg=4}{value=dev2}{display=Child Device}{parent=dev1}{enabled=t}
value {arg=4}{value=dev3}{display=Another Parent Device}{enabled=t}
value {arg=4}{value=dev4}{display=Non-clickable Child Device}{parent=dev3}
value {arg=4}{value=dev5}{display=Non-clickable Child of Child}{parent=dev4}

Change-Id: I59dd7208ca0ec90cccfc49ae049559cdc6c69a4b
Reviewed-on: https://code.wireshark.org/review/4192
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-06 09:51:56 +00:00
Bill Meier 0784451200 Adjust some whitespace to match editor modelines.
Change-Id: I9fda7de49255857cc1cf270d6202c85573d91674
Reviewed-on: https://code.wireshark.org/review/4490
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 03:42:51 +00:00
Bill Meier 07698d536b Adjust some whitespace to match editor modelines.
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3
Reviewed-on: https://code.wireshark.org/review/4489
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 02:55:49 +00:00
Bill Meier 0111e46193 plugins: Add editor modelines; Adjust whitespace as needed.
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088
Reviewed-on: https://code.wireshark.org/review/4488
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 01:42:32 +00:00
Martin Kaiser 9e776a1ed1 mpeg-pes: don't modify source and destination address colums
the mpeg-pes dissector replaced source or destination address with
decoding timestamp, presentation timestamp or pack data rate
these values don't belong into address columns and erase the IP
addresses when mpeg-pes is transmitted over IP

the timestamps etc can be displayed in a user-defined column if required

this patch is part of
Bug: 10505

Change-Id: I1bf561648f848eb18818862edd138724abfc8e88
Reviewed-on: https://code.wireshark.org/review/4472
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-05 20:25:14 +00:00
Bill Meier ad6134bb4b docsis: Add editor modelines; Adjust whitespace; Remove boilerplate comments.
Change-Id: I78f9815616f4fc3c14204339c5826f0ca7d0680e
Reviewed-on: https://code.wireshark.org/review/4485
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:19:53 +00:00
Bill Meier 0b18d6cb77 Add editor modelines; Adjust whitespace as needed.
Change-Id: I6e70c933ae61a97377235d67b2f6a1b3d67dc155
Reviewed-on: https://code.wireshark.org/review/4484
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:19:02 +00:00
Bill Meier e2bdfa101b Reformat hfi entries; Add editor modelines; Adjust whitespace.
Change-Id: Iead53f92cc847d04c32f4a307d45f9748c49a69c
Reviewed-on: https://code.wireshark.org/review/4483
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:18:30 +00:00
Bill Meier 1e1d1deca5 packet-igap.c: Reformat hf[] entries; Add editor modelines.
Change-Id: I0ac4f2eb7f2b93aab864c6f43dee057774048165
Reviewed-on: https://code.wireshark.org/review/4482
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05 20:18:07 +00:00
Guy Harris 560e06d0de Read the record length in common code.
Instead of reading the 16-byte blob and record length at the same time,
just read the 16-byte blob, and then fall through to the record-length
reading code.

Change-Id: Ib2819a2d654e2670233821882bac79d7cd656b12
Reviewed-on: https://code.wireshark.org/review/4480
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-05 18:47:18 +00:00
Gerald Combs 66d9ca3e5f [Automatic manuf, services and enterprise-numbers update for 2014-10-05]
Change-Id: Ib90638f6382b2112f0f49a2d8f5d2d10b4d3c520
Reviewed-on: https://code.wireshark.org/review/4474
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-05 15:06:11 +00:00
Pascal Quantin dbcd94d33a DLT User: add ability to export PDUs
It can be really useful to share hand crafted captures without the need to configure the DLT User table

Change-Id: Iefab00b741f95b1f3a3247cb28ed01a367fa4ff4
Reviewed-on: https://code.wireshark.org/review/4469
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-05 07:07:59 +00:00
Guy Harris e731bc7707 Fix a comment.
Change-Id: I875888753859488ed810cedb5656bd870bee7122
Reviewed-on: https://code.wireshark.org/review/4471
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-05 05:43:05 +00:00
Guy Harris e7dcf1b12d Improve comments, and add some #defines, to make it clearer what the code does.
Change-Id: I2cd8973bdce171053664cf4ed06a37bdd9b30353
Reviewed-on: https://code.wireshark.org/review/4470
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-05 05:31:53 +00:00
Alexis La Goutte a13a2e6779 DSR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ifd694dc9a72cde787c00820ec5a02cc33d5157e0
Reviewed-on: https://code.wireshark.org/review/4466
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-04 21:33:46 +00:00
Alexis La Goutte 5377deeef8 LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I616e57c84c5721213ee12a41b63595547ab15f72
Reviewed-on: https://code.wireshark.org/review/4465
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-04 21:27:44 +00:00
Alexis La Goutte 249d075cdd EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I88b90302df0202d38b7c089cf243e7860766e653
Reviewed-on: https://code.wireshark.org/review/4464
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:34:39 +00:00
Alexis La Goutte 973e09c635 GSM-SMS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: If0700726bf9a7359313d0cb69d959471c0ea9580
Reviewed-on: https://code.wireshark.org/review/4463
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:33:37 +00:00
Alexis La Goutte 8e172773f4 Juniper: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9178a3de683dda661ed68ef6d743036a9f8aa39e
Reviewed-on: https://code.wireshark.org/review/4462
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:27:13 +00:00
Alexis La Goutte 4d6264201c RSVP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iccfeaa514cd60f02bb37e210c5f714bcb616521b
Reviewed-on: https://code.wireshark.org/review/4461
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:26:24 +00:00
Michael Mann 3d7e5a6b9d Eliminate proto_tree_add_text from packet-gsm_a_bssmap.c
Also remove other_decode_bitfield_value calls.

Change-Id: I056fe74fbd547b690cd5ed60e3e8777df9474704
Reviewed-on: https://code.wireshark.org/review/4468
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 20:23:08 +00:00
Alexis La Goutte fa5b76f5dc GTK (hostlist_table) fix indent (use 4 spaces) and modelines info
Change-Id: I072de752df0c0e41be663889dafd0f5860a29c37
Reviewed-on: https://code.wireshark.org/review/4458
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:19:29 +00:00
Alexis La Goutte 6d445524bc GTK (hostlist_table) warning: comma at end of enumerator list [-Wpedantic]
Change-Id: I83e930b3179ce954fa4c09d1f46cc833517aa1f6
Reviewed-on: https://code.wireshark.org/review/4457
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:18:27 +00:00
Alexis La Goutte 75727dca26 Qt (manage interface): fix warning: comma at end of enumerator list [-Wpedantic]
Change-Id: I728a50e47fd0d8eea77bc1cdebe2a155184ea953
Reviewed-on: https://code.wireshark.org/review/4456
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:17:19 +00:00
Alexis La Goutte acc19b7679 extcap: warning: no previous prototype for ‘extcap_free_arglist’ [-Wmissing-prototypes]
Remove extcap_free_arglist (never used)

Change-Id: I1f751512be627380a992db63c3e4abd22b3aa486
Reviewed-on: https://code.wireshark.org/review/4455
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:16:36 +00:00
Alexis La Goutte bedad69641 CEPH: Fix comma at end of enumerator list [-Wpedantic]
Change-Id: I0c04a3d217e75986878b276a1ac82b427de38384
Reviewed-on: https://code.wireshark.org/review/4454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:15:33 +00:00
Alexis La Goutte ab6f9549f0 DCERPC (butc): fix warning: no previous prototype for ... [-Wmissing-prototypes]
Fix a typo in last patch and regenerate file

Change-Id: Id9083edd797af97d72a872187a0d0b5750e04547
Reviewed-on: https://code.wireshark.org/review/4453
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:14:28 +00:00
Alexis La Goutte f1ba16a2dc CP2179: Fix warning: no previous prototype for proto_register_cp2179 [-Wmissing-prototypes]
Move on top also prototype of proto_reg_handoff_cp2179

Change-Id: I00f23a88606426acd17d63104630a885682d3c02
Reviewed-on: https://code.wireshark.org/review/4452
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04 16:13:05 +00:00
Bill Meier ebfe8f6d28 Add editor modelines; Reformat as appropriate.
Change-Id: I8e9c58b75eea85877d22024201e5d8d0e9a3dbfd
Reviewed-on: https://code.wireshark.org/review/4459
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-04 15:34:02 +00:00
Tomasz Moń 20795925ff Update capture_opts in extcap_cleanup().
This fixes redundant extcap_pid handle close that could occur in
capture_opts_del_iface() which resulted in unhandled exception on
Windows.

Change-Id: I06b680fcb65cd6fd854a25fb1b01248dce3251a1
Reviewed-on: https://code.wireshark.org/review/4447
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-04 11:17:01 +00:00
Tomasz Moń 06926aed88 Wait for extcap to connect to pipe on Windows.
This prevents dumpcap from failing with timeout exceeded error message
with some extcaps (especially those that display UAC screen) by making
sure that extcap connects to pipe before dumpcap is even started.

Change-Id: I549da9217c7f4ae89509330ca4fa613a119a9523
Reviewed-on: https://code.wireshark.org/review/4428
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-04 11:12:08 +00:00
Guy Harris a7d6321d2d Use some macros to clean up the Snifer decompression code.
For code that's used in more than one place, use macros.  This combines
a bunch of checks into the output macros.

Change-Id: Ic32dce75e1c531fd28bfed180856e230277bfe58
Reviewed-on: https://code.wireshark.org/review/4451
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-04 02:59:48 +00:00
Tomasz Moń a6988b451f Fix memory leak and heap corruption on Windows.
LPSECURITY_ATTRIBUTES is type definition for pointer to SECURITY_ATTRIBUTES
structure.

Change-Id: I94a835bfd8f7eb76c808fac8286ca3f2db9b19c3
Reviewed-on: https://code.wireshark.org/review/4449
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-03 20:29:12 +00:00
Gerald Combs 8b7d27c8be WSDG: Update the Windows Qt download text.
Change-Id: I6fd027ff76b5b463f33992898965a3e037778071
Reviewed-on: https://code.wireshark.org/review/4443
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-03 15:54:05 +00:00
Bill Meier bb5daa6ae9 Add editor modelines; Adjust whitespace as needed.
Change-Id: I391cdf80a6e4ae5b0f4068e0500a90d013588f8a
Reviewed-on: https://code.wireshark.org/review/4442
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03 14:28:42 +00:00
Bill Meier 451de17929 packet-aim-messaging.c: Add editor modelines; reformat various (including hf[] entries).
Change-Id: Ie5973a717a80ba75b82e817cb9e30c3529afbb0c
Reviewed-on: https://code.wireshark.org/review/4441
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03 14:28:17 +00:00
Bill Meier b15914f5a1 packet-dcerpc-fileexp.c: Add editor modelines; reformat various (including hf[] entries).
Change-Id: I0d49f4c1c3a3960c3fdc9b1cd411c73097829c09
Reviewed-on: https://code.wireshark.org/review/4440
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03 14:27:49 +00:00