To quote Icf0831717de10fc615971fa1cf75af2f1ea2d03d:
HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT
character as tabbing to 4-space tab stops, or that even are configurable
but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are
broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever
expect anybody to look at your file with a UN*X tool, and every text
file will probably be looked at by a UN*X tool at some point, so Don't
Do That.
Adjust indentation to reflect the mode lines.
Change-Id: Ic829541c696e0ddbc45cc109009319859c799066
Reviewed-on: https://code.wireshark.org/review/14340
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This error occurs every run of wireshark if adb is not running.
This is a bit noisy, so androiddump is made less verbose.
Bug: 12185
Change-Id: Ia7d0b0aba95e90a7f602c2e340f6344d09205b32
Reviewed-on: https://code.wireshark.org/review/14288
Reviewed-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: Dario Lombardo <lomato@gmail.com>
This new function abstracts the creation of a list of the local
interfaces that will be used by future extcaps to generate specific
filters. Sshdump now uses it to create a pcap filter.
Change-Id: I5b75a266f81104b3c9bcb3e51de246b7cc8785ce
Reviewed-on: https://code.wireshark.org/review/14092
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Do the same thing editcap does; we need to know, for example, whether we
were invoked with elevated privileges, so we know whether to pay
attention to environment variables when loading plugins.
Fix program name, and add a comment from editcap, while we're at it.
Change-Id: Ia092331de129d86783a2600be21cff746d4ed5e3
Reviewed-on: https://code.wireshark.org/review/14334
Reviewed-by: Guy Harris <guy@alum.mit.edu>
new AUTHORS file can be created with "gen-authors" build parameter
The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src. This preserves the features authors worked on. For authors that didn't list features, they may be converted to just getting information from git.
Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451
Reviewed-on: https://code.wireshark.org/review/14231
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Also required mergecap to look for plugins to initialize wiretap option blocks.
Change-Id: I4208d1028dd0f94f185393801d72025329266cb7
Reviewed-on: https://code.wireshark.org/review/14300
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Don't treat it like a GList
Bug: 12220
Change-Id: I057649a26d135516c6e8d4fb028c6cb9dcda2e7c
Reviewed-on: https://code.wireshark.org/review/14326
Reviewed-by: Michael Mann <mmann78@netscape.net>
the version indicates IPv6.
This handles a case of Linux cooked capture with ethertype set as IPv4 for
IPv6 packets.
Change-Id: Ie79f1a631980a224a7b51963f9174e75ffb69a47
Reviewed-on: https://code.wireshark.org/review/14321
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>
1. Count vendor commands once
2. Fill Event column in case of Command Status/Command Complete
types while displaying command
3. Add missing Status from Connect Complete event
4. Add missing Command Complete events opcodes
Change-Id: Ie5a0e373f92f62fcb890cef7ab54762df3bb8a35
Reviewed-on: https://code.wireshark.org/review/14315
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>
Due to RFC5444 <msg-size> is a 16-bit unsigned integer field.
Bug was reported by Matthias Tafelmeier
Bug: 12227
Change-Id: I6d041015b386be7a8e02a87d0fe29e2670b1ab6e
Reviewed-on: https://code.wireshark.org/review/14320
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Whatever do_file_close returns is oke, so explicitly ignore it.
Change-Id: Ie241cd204361e10e91bda747530d399ad8587be1
Reviewed-on: https://code.wireshark.org/review/14294
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Before, the parameter ids were handled incorrectly. A vendor specific
parameter definition was used for all the vendors. This is wrong for
ids starting at 0x8000. This commits aims to fix that problem and
make easier the addition of new parameters or vendors.
Change-Id: I0d40aa8cbfa44d5bb2928075001fe39e6f14abc2
Reviewed-on: https://code.wireshark.org/review/14007
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>
Fix Typo and change session id to decimal.
Fix ENC_NA
Change-Id: I72bded27ee79a1f5b91202767ac750c82ac029d3
Reviewed-on: https://code.wireshark.org/review/14304
Reviewed-by: Michael Mann <mmann78@netscape.net>
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: Anders Broman <a.broman58@gmail.com>
Use pkg-config if a zlib.pc file is available.
Remove the now redundant AC_TRY_LINK_FUNC test (there are no linker flags
for GTK+ here).
Change-Id: I7de744749eba7231ae0097b975144b76ffcf1bdb
Reviewed-on: https://code.wireshark.org/review/14263
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Presumably the intent is to have the two dissectors share the tables in
question; if so, it's best done by defining the tables in one and only
one C file and declaring it in a header file included by both C files -
that 1) ensures the declaration and definition stay in sync and 2) keeps
the OS X build from failing.
Change-Id: Id2e7e5b7270c7109ffb091b2e16a631b83dde212
Reviewed-on: https://code.wireshark.org/review/14309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Issue reported by Ted Wards
Bug:12223
Change-Id: I38adba8ee3d48788afce20d969d708c7635c8703
Reviewed-on: https://code.wireshark.org/review/14302
Reviewed-by: Michael Mann <mmann78@netscape.net>
Issue reported by Dávid Major
Change-Id: I4dfd6f853205386bc6dbb15357b2b9e5d5b8ea0e
Reviewed-on: https://code.wireshark.org/review/14297
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
Change-Id: I69c949821395e3272cbb5bc7c7a142b5482f9d52
Reviewed-on: https://code.wireshark.org/review/14219
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: Jaap Keuter <jaap.keuter@xs4all.nl>
This commit adds additional AVPs from RFC 5515 to L2TP.
Bug: 12208
Change-Id: I389342d05375a41ae834197978e9babab9b7b674
Reviewed-on: https://code.wireshark.org/review/14290
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>
Get rid of unnecessary assignment while we're at it.
Change-Id: I46dd0b3d64d7e38553ea243b79f71a58cda68653
Reviewed-on: https://code.wireshark.org/review/14299
Reviewed-by: Guy Harris <guy@alum.mit.edu>
While we're at it, do more formatting consistency cleanups, and show the
I format bit in hex as we do with the format bits in other formats.
Change-Id: I53842e948311aa0b332a60a413904901428b13f1
Reviewed-on: https://code.wireshark.org/review/14298
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Give all ett_ variables ett_llcgprs_ names.
Make function formatting a bit more consistent.
Show the format bits in hex for all formats.
Change-Id: I7e7127a22384688b973a683c93eff442a88fb3b5
Reviewed-on: https://code.wireshark.org/review/14295
Reviewed-by: Guy Harris <guy@alum.mit.edu>
First dissect the address field, then dissect the control field, then
dissect the FCS if present, then dissect the info field.
That makes the dissection more like the dissection of other protocols
with an FCS at the end, and means that we don't throw an exception too
early.
Remove the "MLT CHANGES" comments - if somebody cares who did what, they
can browse the commit history; it's not as if the version prior to those
changes was somehow the "pure" version and that we need to keep the
changes carefully demarcated.
Get rid of no-longer-necessary variable.
Change-Id: I249440971e64ecbb0959ebbea1b2897a2e12375a
Reviewed-on: https://code.wireshark.org/review/14293
Reviewed-by: Guy Harris <guy@alum.mit.edu>
rpc_call cannot be NULL at this point, so don't check for it,
especially not incorrectly.
Change-Id: I90fcb064ce479d71edf3b4cb0ebea9a5ab623119
Reviewed-on: https://code.wireshark.org/review/14268
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Icb61c724cd8ba91065a24f03295fd4468483569d
Reviewed-on: https://code.wireshark.org/review/14261
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Don't fall through and re-dissect the control byte of an S frame as if
it were a UI frame.
Change-Id: I17cf12f920bf066f87f70be5efe78dc531beb3f9
Reviewed-on: https://code.wireshark.org/review/14284
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Leave the job of computing the captured length up to the tvbuff code.
Change-Id: If88e813ba7dee3516baf958b9fead26374d915ad
Reviewed-on: https://code.wireshark.org/review/14276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
"llc_data_length" is what's left of "length" after the CRC is removed;
'llc_data_captured_length" is what's left of "captured_length" after the
CRC is removed.
Change-Id: I9371a5d3004632d684093b2650fa0bf8fc1f9bde
Reviewed-on: https://code.wireshark.org/review/14275
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pino Toscano