Guy Harris [Tue, 7 Oct 2014 23:18:47 +0000 (16:18 -0700)]
No need for WTAP_ERR_CANT_READ.
Unlike the standard I/O routines, the code we introduced that supports
fast random seeking on gzipped files will always supply some specific
error code for read errors, so we don't need WTAP_ERR_CANT_READ.
Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard
I/O routines for that. Set errno to WTAP_ERR_CANT_WRITE before calling
fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails
without setting errno.
Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63
Reviewed-on: https://code.wireshark.org/review/4540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 7 Oct 2014 22:48:29 +0000 (15:48 -0700)]
Replace another file_read() call with wtap_read_bytes().
Change-Id: I7b5e82c3a2fc4b4c16bf466508546558c584c150
Reviewed-on: https://code.wireshark.org/review/4539
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 7 Oct 2014 22:07:25 +0000 (15:07 -0700)]
Close some memory leaks for bad K12 RF5 files.
Change-Id: Ic4272a5637463fdb4d23f80d81341a0e6ea33de3
Reviewed-on: https://code.wireshark.org/review/4538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Anish Bhatt [Tue, 7 Oct 2014 07:55:33 +0000 (00:55 -0700)]
[tools] add script to automatically generate bacnet vendors
Requires beautifulsoup4 for parsing, translitcodec for converting accents/diaeresis etc to regular text
Change-Id: I4d400f15916ee3ab07fa14b09fca12beac2010f3
Reviewed-on: https://code.wireshark.org/review/4518
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Evan Huus [Tue, 7 Oct 2014 21:24:17 +0000 (17:24 -0400)]
ANSI683: Fix mobile country code base
Fixes error:
Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value
(FT_UINT16) but is being displayed as BASE_NONE
Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d
Reviewed-on: https://code.wireshark.org/review/4536
Reviewed-by: Evan Huus <eapache@gmail.com>
Alexis La Goutte [Tue, 7 Oct 2014 06:40:03 +0000 (08:40 +0200)]
GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10
Reviewed-on: https://code.wireshark.org/review/4526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Tue, 7 Oct 2014 11:51:52 +0000 (07:51 -0400)]
Overhaul the filterability of packet-ansi_683.c
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl. Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector. That started the cleanup, and I did more while in the neighborhood.
Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c
Reviewed-on: https://code.wireshark.org/review/4521
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Anish Bhatt [Tue, 7 Oct 2014 05:34:02 +0000 (22:34 -0700)]
[iSCSI] Fix incorrect heuristic.
The only valid check for Expected Data Transfer Length is :
R and W MUST NOT both be 0 when the Expected Data Transfer Length and/or
Bidirectional Read Expected Data Transfer Length are not 0
Bug #10469
Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172
Reviewed-on: https://code.wireshark.org/review/4514
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Tue, 7 Oct 2014 16:18:32 +0000 (18:18 +0200)]
asn2wrs: Added support for #.SYNTAX_NEW
This allows syntaxes to be registered as "new" dissectors.
Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce
Reviewed-on: https://code.wireshark.org/review/4524
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Mon, 6 Oct 2014 13:17:46 +0000 (15:17 +0200)]
ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()
This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).
Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4
Reviewed-on: https://code.wireshark.org/review/4531
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Michał Orynicz [Thu, 2 Oct 2014 08:37:53 +0000 (10:37 +0200)]
Add proper decoding for type field in OBEX headers
Change type field type from byte sequence to string.
Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee
Reviewed-on: https://code.wireshark.org/review/4417
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Guy Harris [Tue, 7 Oct 2014 19:49:14 +0000 (12:49 -0700)]
Make the code a bit more like the pre-new-APIs code.
Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5
Reviewed-on: https://code.wireshark.org/review/4534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Tue, 7 Oct 2014 19:39:47 +0000 (12:39 -0700)]
1.99.0 → 1.99.1.
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6
Reviewed-on: https://code.wireshark.org/review/4532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Tue, 7 Oct 2014 16:30:09 +0000 (09:30 -0700)]
Revert "ASN1: Added support for using #.REGISTER_NEW"
This temporarily reverts commit
acc09c2aa248d892ee6b894b43c79cb060131b11.
Change-Id: I7a55c8c2da3f65e914b90648ee92c84efd57f1a0
Reviewed-on: https://code.wireshark.org/review/4525
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Mon, 6 Oct 2014 13:17:46 +0000 (15:17 +0200)]
ASN1: Added support for using #.REGISTER_NEW
This will register BER PDU-dissectors as "new".
Return number of bytes dissected from dissector_try_* functions.
Return number of bytes dissected in DissectorTable:try()
This will make it possible to get dissected length when using
dissector_try_*() and dissected ASN.1 length in Lua when using
DissectorTable:try() (as we already have for Dissector:call).
Change-Id: I8802a812bd484c1e8794c618b87e676003aea94a
Reviewed-on: https://code.wireshark.org/review/4493
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Gerald Combs [Tue, 7 Oct 2014 16:13:53 +0000 (09:13 -0700)]
Build 1.99.0.
Change-Id: Idc813297e5e27680b13a6b81adcf18ae4ef4d4e4
Reviewed-on: https://code.wireshark.org/review/4523
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Richard Sharpe [Sat, 4 Oct 2014 23:11:43 +0000 (16:11 -0700)]
Dissect an SVHDX Open Device Context that appears as an Extra Create Parameter
in a CREATE request. This helps understand HyperV over SMB 3.x stuff.
Bug: 10527
Change-Id: I1e206ed38e12fed419b1ac4a0793b91f9308f364
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-on: https://code.wireshark.org/review/4477
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Guy Harris [Tue, 7 Oct 2014 08:05:17 +0000 (01:05 -0700)]
Make the code a bit more like the pre-API change code.
Change-Id: I9a8bd2c7ce97993c1b72caf63254d024950f8b94
Reviewed-on: https://code.wireshark.org/review/4520
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Martin Kaiser [Sat, 4 Oct 2014 17:07:58 +0000 (19:07 +0200)]
- Handle strings that have an opening but no closing quote
fixes the endless loop reported in
Bug: 10521
- Fix a typo.
Change-Id: I17b4a15e780d1d6122841a308348518063f82a59
Reviewed-on: https://code.wireshark.org/review/4467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Tue, 7 Oct 2014 07:39:54 +0000 (00:39 -0700)]
Clean up white space.
Change-Id: I73f2406483c13c7917faed46db6fc1f5e2bc8fcd
Reviewed-on: https://code.wireshark.org/review/4517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 7 Oct 2014 07:30:35 +0000 (00:30 -0700)]
Fix a comment, clean up some whitespace.
Change-Id: I5d3d518eee2d61dd896b44c2a61d66057f3c2f7f
Reviewed-on: https://code.wireshark.org/review/4516
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Anish Bhatt [Tue, 7 Oct 2014 06:27:15 +0000 (23:27 -0700)]
[bacnet] update vendor list
Change-Id: I6b7bd3b3a110b8d393cd849c12890fff17446e54
Reviewed-on: https://code.wireshark.org/review/4515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Guy Harris [Tue, 7 Oct 2014 05:01:12 +0000 (22:01 -0700)]
Whitespace cleanups.
Change-Id: I92f983b2e04defab30eb31c14c484b9f0f582413
Reviewed-on: https://code.wireshark.org/review/4513
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Sun, 5 Oct 2014 17:27:15 +0000 (19:27 +0200)]
PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang Analyzer
packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined
packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined
packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined
packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined
packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value
packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized]
Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f
Reviewed-on: https://code.wireshark.org/review/4478
Reviewed-by: Evan Huus <eapache@gmail.com>
Alexis La Goutte [Sun, 5 Oct 2014 10:59:11 +0000 (12:59 +0200)]
idl2wrs (DCERPC DRSUAPI): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Add a check if the struct is not empty
budb and butc are also regenerate but no change
Change-Id: I0d8cfc827f5451f1cdbd924628a263af9d483a7b
Reviewed-on: https://code.wireshark.org/review/4473
Reviewed-by: Evan Huus <eapache@gmail.com>
Guy Harris [Tue, 7 Oct 2014 01:00:57 +0000 (18:00 -0700)]
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Mon, 6 Oct 2014 23:02:16 +0000 (16:02 -0700)]
Revert "Qt: Try to fix a Visual C++ encoding warning."
Revert gafa8c02 since it didn't work on Windows. Use a pragma to squelch
Visual C++ instead.
Qt's rich text renderer doesn't handle "'". Replace it with "'".
Remove a QDebug include.
Change-Id: I0e6308efda74a4bc0e67ce841a50a0a9b68f4a8b
Reviewed-on: https://code.wireshark.org/review/4511
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Mon, 6 Oct 2014 22:33:50 +0000 (15:33 -0700)]
Qt: Rename the "check for updates" slot.
The "Check for Updates..." action doesn't exist when
QMetaObject::connectSlotsByName is called. Rename
on_actionHelpCheckForUpdates_triggered to checkForUpdates so that we
don't get the warning
QMetaObject::connectSlotsByName: No matching signal for on_actionHelpCheckForUpdates_triggered()
at startup.
Change-Id: Icbd7eb98731023c323212e6ec3d3c98f1321e245
Reviewed-on: https://code.wireshark.org/review/4510
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Mon, 6 Oct 2014 22:03:56 +0000 (00:03 +0200)]
after an lupdate, I should also do an lrelease to keep the .ts file and
the .qm file in sync
Change-Id: I588f5ff7386bac13c8ce0bba82fee4807c490682
Reviewed-on: https://code.wireshark.org/review/4509
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Mon, 6 Oct 2014 21:54:45 +0000 (23:54 +0200)]
lupdate for Japanese
Change-Id: Ifa7af35cfc18f85cd547aa7621c5ca7305a9242d
Reviewed-on: https://code.wireshark.org/review/4508
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Mon, 6 Oct 2014 21:24:06 +0000 (23:24 +0200)]
From 竹下 恵 (Megumi Takeshita)
another update of the Japanese translation
the translation is fairly complete now, only some recently added items
are missing
Change-Id: Iacd4ee2da7a83681b6119c5d02a40156b441065b
Reviewed-on: https://code.wireshark.org/review/4507
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Gerald Combs [Mon, 6 Oct 2014 21:44:17 +0000 (14:44 -0700)]
Qt: QVector::length was added in Qt 5.2.
Use ::count instead.
Change-Id: Ic890ed8061b7e92eea65c3102de5219e5ac97a93
Reviewed-on: https://code.wireshark.org/review/4505
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Sat, 4 Oct 2014 15:39:12 +0000 (17:39 +0200)]
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>
Gerald Combs [Sun, 5 Oct 2014 19:23:33 +0000 (12:23 -0700)]
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>
Bill Meier [Mon, 6 Oct 2014 18:03:47 +0000 (14:03 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:55:18 +0000 (12:55 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:51:29 +0000 (12:51 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:46:31 +0000 (12:46 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:42:42 +0000 (12:42 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:24:01 +0000 (12:24 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:21:48 +0000 (12:21 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 16:16:15 +0000 (12:16 -0400)]
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>
AndersBroman [Mon, 6 Oct 2014 14:11:14 +0000 (16:11 +0200)]
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>
Evan Huus [Mon, 6 Oct 2014 01:25:19 +0000 (21:25 -0400)]
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>
AndersBroman [Mon, 6 Oct 2014 12:06:01 +0000 (14:06 +0200)]
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>
Tomasz Moń [Fri, 19 Sep 2014 17:34:07 +0000 (19:34 +0200)]
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>
Bill Meier [Mon, 6 Oct 2014 03:40:42 +0000 (23:40 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 02:14:57 +0000 (22:14 -0400)]
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>
Bill Meier [Mon, 6 Oct 2014 01:34:19 +0000 (21:34 -0400)]
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>
Martin Kaiser [Sun, 5 Oct 2014 10:18:49 +0000 (12:18 +0200)]
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>
Bill Meier [Sun, 5 Oct 2014 20:12:34 +0000 (16:12 -0400)]
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>
Bill Meier [Sun, 5 Oct 2014 19:57:05 +0000 (15:57 -0400)]
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>
Bill Meier [Sun, 5 Oct 2014 19:54:49 +0000 (15:54 -0400)]
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>
Bill Meier [Sun, 5 Oct 2014 19:51:54 +0000 (15:51 -0400)]
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>
Guy Harris [Sun, 5 Oct 2014 18:46:43 +0000 (11:46 -0700)]
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>
Gerald Combs [Sun, 5 Oct 2014 15:06:06 +0000 (08:06 -0700)]
[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>
Pascal Quantin [Sat, 4 Oct 2014 19:52:50 +0000 (21:52 +0200)]
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>
Guy Harris [Sun, 5 Oct 2014 05:42:35 +0000 (22:42 -0700)]
Fix a comment.
Change-Id: I875888753859488ed810cedb5656bd870bee7122
Reviewed-on: https://code.wireshark.org/review/4471
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 5 Oct 2014 05:18:27 +0000 (22:18 -0700)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 16:40:18 +0000 (18:40 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 16:35:10 +0000 (18:35 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 16:34:57 +0000 (18:34 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 16:00:30 +0000 (18:00 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:55:42 +0000 (17:55 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:55:23 +0000 (17:55 +0200)]
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>
Michael Mann [Sat, 4 Oct 2014 17:50:42 +0000 (13:50 -0400)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:27:47 +0000 (17:27 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:22:54 +0000 (17:22 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:21:53 +0000 (17:21 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:11:18 +0000 (17:11 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 15:05:38 +0000 (17:05 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 14:59:42 +0000 (16:59 +0200)]
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>
Alexis La Goutte [Sat, 4 Oct 2014 14:49:49 +0000 (16:49 +0200)]
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>
Bill Meier [Sat, 4 Oct 2014 15:28:35 +0000 (11:28 -0400)]
Add editor modelines; Reformat as appropriate.
Change-Id: I8e9c58b75eea85877d22024201e5d8d0e9a3dbfd
Reviewed-on: https://code.wireshark.org/review/4459
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tomasz Moń [Fri, 3 Oct 2014 17:27:04 +0000 (19:27 +0200)]
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>
Tomasz Moń [Thu, 2 Oct 2014 16:35:07 +0000 (18:35 +0200)]
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>
Guy Harris [Sat, 4 Oct 2014 02:59:15 +0000 (19:59 -0700)]
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>
Tomasz Moń [Fri, 3 Oct 2014 17:01:46 +0000 (19:01 +0200)]
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>
Gerald Combs [Fri, 3 Oct 2014 15:53:16 +0000 (08:53 -0700)]
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>
Bill Meier [Fri, 3 Oct 2014 14:13:07 +0000 (10:13 -0400)]
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>
Bill Meier [Fri, 3 Oct 2014 14:09:34 +0000 (10:09 -0400)]
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>
Bill Meier [Fri, 3 Oct 2014 13:04:57 +0000 (09:04 -0400)]
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>
AndersBroman [Fri, 3 Oct 2014 13:18:44 +0000 (15:18 +0200)]
LocationNumber digits is off by one(to many).
Bug 10522.
Change-Id: I7887f3ee229ac22d2aa37a3d8900d76d8b814ed0
Reviewed-on: https://code.wireshark.org/review/4439
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Fri, 3 Oct 2014 01:04:55 +0000 (21:04 -0400)]
Create field filters for gsm_rr_csn_HL_flag() usages.
Change-Id: I74f110b477a3bf7e0c374db3147604d50018deba
Reviewed-on: https://code.wireshark.org/review/4435
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Fri, 3 Oct 2014 00:02:13 +0000 (17:02 -0700)]
Re-enable the Wireshark test suite.
Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad
Reviewed-on: https://code.wireshark.org/review/4434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Thu, 2 Oct 2014 00:18:31 +0000 (17:18 -0700)]
CMake: Don't assume we have a "cat" command.
Use "copy /B" on Windows to create wireshark.pod, similar to
doc/Makefile.nmake.
Change-Id: I454afca0bd3497cca795ca18256dd7c4e2f224d4
Reviewed-on: https://code.wireshark.org/review/4415
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Thu, 2 Oct 2014 20:59:16 +0000 (13:59 -0700)]
Partially re-enable Wireshark tests.
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris
buildbots run the test script under Xtightvnc, which provides neither of
those. Only enable the tests on Windows and OS X for now.
Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d
Reviewed-on: https://code.wireshark.org/review/4430
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Bill Meier [Thu, 2 Oct 2014 21:47:19 +0000 (17:47 -0400)]
Add editor modelines & adjust indentation/whitespace as needed.
Change-Id: Ice2d93632cd42dfcef3bfbf0e15f2a8a147278fc
Reviewed-on: https://code.wireshark.org/review/4433
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Bill Meier [Thu, 2 Oct 2014 21:43:54 +0000 (17:43 -0400)]
Reformat hf[] entries; Add editor modelines & adjust whitespace.
Change-Id: I30b25db89d3fbae5f3913ede8bf7bd66fd2516da
Reviewed-on: https://code.wireshark.org/review/4432
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Bill Meier [Thu, 2 Oct 2014 21:26:35 +0000 (17:26 -0400)]
packet-nfs.c: (trivial) Add dropped/missing newline; Adjust some whitespace.
Change-Id: I2ef3af42a712ced6917d94e1dcf708b3f34d7e82
Reviewed-on: https://code.wireshark.org/review/4431
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Gerald Combs [Thu, 2 Oct 2014 21:15:05 +0000 (14:15 -0700)]
Fix the release notes.
The Bug Fixes section is empty, which creates an empty Docbook section,
which isn't allowed. Comment out its header for now.
AsciiDoc interprets single quoted text as emphasized, which probably
isn't what was intended. Use curly quote markup instead.
Add a link to the AsciiDoc cheat sheet.
Change-Id: Ib9746ea714f90a28a2f1204e97e9e185aaef3df6
Reviewed-on: https://code.wireshark.org/review/4429
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Lukas Emersberger [Mon, 22 Sep 2014 12:43:02 +0000 (14:43 +0200)]
epl: FIX PDO_Mapping
The subindex of the R/TPDO frames was interpreted false.
Now the subindex is correctly interpreted.
ASend SDO Write Multiple Parameter by Index interpreted
the mapping data false.
Change-Id: Icfb1896e96f5486c5479c1dd060eb1032695f9f6
Reviewed-on: https://code.wireshark.org/review/4397
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Wed, 1 Oct 2014 11:23:52 +0000 (13:23 +0200)]
Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 package
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys
Bug: 10476
Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e
Reviewed-on: https://code.wireshark.org/review/4401
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>
Michael Mann [Thu, 2 Oct 2014 15:18:00 +0000 (11:18 -0400)]
Create field filters for gsm_rr_csn_flag() usages.
Change-Id: I77b0c33c054397666f978a9ae175fa386cb87b59
Reviewed-on: https://code.wireshark.org/review/4419
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
AndersBroman [Thu, 2 Oct 2014 15:37:24 +0000 (17:37 +0200)]
Add dissection of IS-IS Router CAPABILITY TLV.
Bug 10520.
Change-Id: I8d8d56e36d90088af3cd7d2490f95c5f87c75423
Reviewed-on: https://code.wireshark.org/review/4420
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 2 Oct 2014 16:28:28 +0000 (09:28 -0700)]
Qt: Keep dialogs from blocking tests.
If WIRESHARK_QUIT_AFTER_CAPTURE is set, call exit(0). This keeps us from
emitting the aboutToQuit signal and doing things that might pop up
dialogs.
Change-Id: I6e986b6e7ad824d8b5258e34a12c32869f5b2d34
Reviewed-on: https://code.wireshark.org/review/4421
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Jeff Morriss [Wed, 1 Oct 2014 15:17:44 +0000 (11:17 -0400)]
Some Release Notes cleanup.
- Don't list bugs which were fixed in 1.12 as being fixed in 1.99. (We probably
should add some bugs to the bugs-fixed list.)
- Remove new-features list for everything prior to 1.12 (so we only list
improvements since 1.12).
- Fix bug link to bug 1814.
- Fix the wiki's URL (the wiki doesn't appear to support https today).
- Remove bugs 4445 and 9242 from the Known Problems list: they've been fixed.
Change-Id: Ideb9ddf24e429ee00c19ac975370aa4fe81e652b
Reviewed-on: https://code.wireshark.org/review/4403
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Michele Baldessari [Sat, 23 Aug 2014 07:10:13 +0000 (09:10 +0200)]
Extend X11 response parsing
Add support to parse screens, depths, visual-types and
pixel-formats in the X11 connection initial response.
v1->v2:
- Do not show unused bytes when their length is 0
- Fix up tabs
Change-Id: If62f0eab65a18e050fb3f830a6bd7574ab1f2de6
Reviewed-on: https://code.wireshark.org/review/4249
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Gerald Combs [Thu, 2 Oct 2014 02:16:12 +0000 (19:16 -0700)]
Temporarily disable the Qt tests added in g58cde5c.
Apparently what works for me doesn't work for the Buildbot users.
Change-Id: I7d3e4f2b89ae8ae3dadc8d92438c0e1923b97ace
Reviewed-on: https://code.wireshark.org/review/4416
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 1 Oct 2014 19:44:14 +0000 (12:44 -0700)]
Add tests for the Qt UI.
Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make
sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce
some time values so that the tests run faster.
Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711
Reviewed-on: https://code.wireshark.org/review/4407
Tested-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>