summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-09-07extcap: Add tool-specified helppageRoland Knall7-29/+59
Allow the tool to provide a link to a helppage, displayed by clicking on help in the configuration dialog. The URL will be opened using an URL based service, therefore local as well as remote URLs are possible. Change-Id: I58b30244e97919d5cf6892faf96536ddc30fb5a7 Reviewed-on: https://code.wireshark.org/review/17549 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-07M2AP: fix dissection of procedure codesPascal Quantin3-38/+39
Change-Id: I6c8f01e65a16561ff78593edc263fb26d99c182b Reviewed-on: https://code.wireshark.org/review/17552 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-07M3AP: display short protocol name in protocol columnPascal Quantin2-2/+2
Change-Id: I7575caad67101d394c2c80d4bfd81f83389043aa Reviewed-on: https://code.wireshark.org/review/17551 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-07QUIC: Add preference to force decode all payloadAlexis La Goutte1-1/+7
For debugging... Change-Id: I23eb70c89ac95371e1d7b05a52ffeed4f993a52a Reviewed-on: https://code.wireshark.org/review/17135 Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-07Further ws_strto* cleanups.Guy Harris1-10/+10
Make pkt_len unsigned. Improve the error message for ws_strtou32() failure. Change-Id: I080b4fc132c8e405bc1dbd87fc717c2b337517bc Reviewed-on: https://code.wireshark.org/review/17547 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-07OCFS2: dissector incorrectly takes pdu length as little endianMakoto Shimamura1-1/+1
This patch fixes incorrect endian conversion in pdu length. Actually pdu length is big endian. Ping-Bug: 12122 Change-Id: I9f8827293e684a5b4c957138f5879efdd140c500 Reviewed-on: https://code.wireshark.org/review/17533 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07vms: use ws_strtoi function.Dario Lombardo1-1/+7
Change-Id: I30c32a6fc4200da5a150769b84f91b4d193f8f5d Reviewed-on: https://code.wireshark.org/review/17536 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07OCFS2: dissector incorrectly treats keepalive messages as unknown typeMakoto Shimamura1-2/+13
Keepalive req/resp messages are shown as "Unknown type (0x00)" in info column. This patch fixes them to "Keepalive Request" and "Keepalive Response". Ping-Bug: 12122 Change-Id: If09192067736b78c7785ba1ff05ae62a05d3dc23 Reviewed-on: https://code.wireshark.org/review/17497 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07Add some notes about XLC, HP C, and Sun/Oracle C.Guy Harris1-0/+26
Change-Id: I2f65face2aa7354ec350aed308402bb719bd619f Reviewed-on: https://code.wireshark.org/review/17546 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-07Place variable declarations where they're used.Gerald Combs1-5/+8
Fix ../../ui/io_graph_item.h:251:29: warning: will never be executed [-Wunreachable-code] guint64 t, pt; /* time in us */ ^ Change-Id: I0e861e892c2c03151d9f98e31ac68ce296baa26a Reviewed-on: https://code.wireshark.org/review/17545 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-07Autotools: Distribute packaging/wix.Gerald Combs3-2/+24
…otherwise you can't compile from the tarball on Windows. Change-Id: I99c73b09d9468f0da753c05451fa54348680963f Reviewed-on: https://code.wireshark.org/review/17543 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-06X2AP: prettify info columnPascal Quantin2-103/+102
Change-Id: I1630199383e0b83bf14e8d9850870268d7db777c Reviewed-on: https://code.wireshark.org/review/17542 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-06X2AP: upgrade dissector to v13.4.0Pascal Quantin12-4149/+12999
Change-Id: I97250d022a40ac888522f885968e7cd3c86e3485 Reviewed-on: https://code.wireshark.org/review/17540 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>
2016-09-06ciscodump: fix line parsing and fix memleak.Dario Lombardo1-1/+2
Change-Id: I4aee51d7def06317a543fdc8fa05120af0e68453 Reviewed-on: https://code.wireshark.org/review/17531 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-06Always set *cint before returning.Guy Harris1-0/+1
Change-Id: I333aef7d3fe4ad3bf7c2a4d7318766fcbd2e4cd2 Reviewed-on: https://code.wireshark.org/review/17539 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Suppress another warning if told not to report failures.Guy Harris1-2/+17
That's another failure that can occur if you're trying to load a libwireshark plugin in a program that doesn't use libwireshark if, for example, references to an undefined symbol don't prevent the module from being loaded in the first place. Change-Id: I21629c0094fdca7dfbd88f39b7e6c10fb600b401 Reviewed-on: https://code.wireshark.org/review/17537 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06ssl: fix TLS renegotiation, add test for thisPeter Wu3-4/+70
A handshake starts a new session, be sure to clear the previous state to avoid creating a decoder with wrong secrets. Renegotiations are also kind of transparant to the application layer, so be sure to re-use an existing SslFlow. This fixes the Follow SSL stream functionality which would previously ignore everything except for the first session. The capture file contains a crafted HTTP request/response over TLS 1.2, interleaved with renegotiations. The HTTP response contains the Python script used to generate the traffic. Surprise! Change-Id: I0110ce76893d4a79330845e53e47e10f1c79e47e Reviewed-on: https://code.wireshark.org/review/17480 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-06strtoi(.c): fix extra ';' outside of a function [-Wextra-semi]Alexis La Goutte1-6/+6
Change-Id: I2d92678b2117da732be309c2d430d0c97c7a7eed Reviewed-on: https://code.wireshark.org/review/17528 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-06checkAPI: move atoi from deprecated to soft-deprecated list.Dario Lombardo1-2/+7
atoi must lie in soft-deprecated list until close to complete removal. Change-Id: Ia26ada56114559637fdc598913ee93523ed9434d Reviewed-on: https://code.wireshark.org/review/17529 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-06ssl: really fix session resumption expert infoPeter Wu4-9/+20
In a two-pass dissection with renegotiated sessions, the is_session_resumed flag is not updated according to the current protocol flow. Fix this by performing detection of abbreviated handshakes in all cases, do not limit it to the decryption stage (where ssl != NULL). Reset the resumption assumption after the first ChangeCipherSpec (normally from the server side, but explicitly add this in case client packets somehow arrive earlier in the capture). This should not have a functional effect on normal TLS captures with Session Tickets. Bug: 12793 Change-Id: I1eb2a8262b4e359b8c1d3d0a1e004a9e856bec8c Reviewed-on: https://code.wireshark.org/review/17483 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-06zvt: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I68b4fa08a7f65b92e56a6e72a6bb113e72ee33da Reviewed-on: https://code.wireshark.org/review/17524 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-06SMB2: Always display reserved fieldAlexis La Goutte1-0/+1
Change-Id: Ic26603488cb020da3885f5bc97c65aae18fdf191 Reviewed-on: https://code.wireshark.org/review/17517 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-06smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I714e2ea4808213901a8be64e65a0cb37c3002372 Reviewed-on: https://code.wireshark.org/review/17516 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-06caputils: add conditional unused (_U_).Dario Lombardo1-1/+5
Change-Id: I50ccedd876bf78961397b55e5a707c98900f7b9f Reviewed-on: https://code.wireshark.org/review/17457 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-06extcap:Replace self-organized lists with glib onesRoland Knall3-491/+279
Replace the error-prone next/prev handling with GList and GHashTable Cleanup extcap_parser to only expose necessary functions Remove token know-how from extcap Change-Id: I7cc5ea06f58ad6c7a85ac292f5d2cb3d33e59833 Reviewed-on: https://code.wireshark.org/review/17496 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-06We now support C++/C99-style comments.Guy Harris1-1/+1
Change-Id: I175a6b0060235c2dfc7a5b3dc4ab62843d242e94 Reviewed-on: https://code.wireshark.org/review/17514 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Allow a lot more C99 featuresPeter Wu5-43/+33
Flexible array members are supported by gcc, clang and even MSVC2013. Note, so far it was only used in the Windows-specific airpcap.h. Trailing commas in enum declaration are already in use since for these dissectors (commit ID is the first occurrence): epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08 epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40 epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8 Inline functions using the "inline" keyword are supported via all glib versions we support (if it is missing, glib will define a suitable inline macro). Other c99 functions listed in the README.developer document were found to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013. Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a Reviewed-on: https://code.wireshark.org/review/17421 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Use ws_strtoi32() in get_natural_int().Guy Harris1-10/+14
Change-Id: I9a95239de8db18cff0f6c62cb526f3ef0cb29f01 Reviewed-on: https://code.wireshark.org/review/17513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Return the maximum or minimum value for ERANGE.Guy Harris1-5/+57
That way, for signed values, the caller knows whether ERANGE means "too large" or "too small"; this is analogous to what the C routines return. Change-Id: Ifc1fc4723733be606487093f8aa77ae2d89d2c40 Reviewed-on: https://code.wireshark.org/review/17512 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Check for signs in unsigned numbers and fail if we see one.Guy Harris1-0/+7
-1 is not an unsigned number. For that matter, neither is +1; "unsigned" means "without a sign", and they both have signs. ANSI C's strto{whatever} routines - even the ones that supposedly are for "unsigned" values - and the GLib routines modeled after them allow a leading sign, so we have to check ourselves. Change-Id: Ia0584bbf83394185cde88eec48efcdfa316f1c92 Reviewed-on: https://code.wireshark.org/review/17511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Use get_positive_int() to parse signed positive arguments.Guy Harris1-3/+3
Change-Id: I323b2c203b49a6921251583772bdb3c3afacd31b Reviewed-on: https://code.wireshark.org/review/17510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Return after calling cmdarg_err().Guy Harris1-0/+1
cmdarg_err() prints a message, but it doesn't exit. Change-Id: I887d96bce483f873a4375cb6b5254915d014f1b1 Reviewed-on: https://code.wireshark.org/review/17509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Use get_positive_int() to parse signed positive arguments.Guy Harris1-11/+22
Clean up indentation while we're at it. Change-Id: Ie7223f96c758bd71d2435203635db9c2b28e2249 Reviewed-on: https://code.wireshark.org/review/17508 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-05Use get_positive_int() to parse signed positive arguments.Guy Harris1-13/+16
Change-Id: Id17b56704f484abdf047a3d1b0775f7fa46eb380 Reviewed-on: https://code.wireshark.org/review/17507 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-05Have scan_plugins() take an argument specify what to do on load failures.Guy Harris13-55/+98
That's a less gross hack to suppress load failures due to not having libwiretap than providing a no-op failure-message routine, as it at least allows other code using a failure-message routine, such as cmdarg_err() and routines that call it, to be used. We really should put libwiretap and libwireshark plugins into separate subdirectories of the plugin directories, and avoid even looking at libwireshark plugins in programs that don't use libwireshark. Change-Id: I0a6ec01ecb4e718ed36233cfaf638a317f839a73 Reviewed-on: https://code.wireshark.org/review/17506 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-05Report an error if the channel type isn't valid.Guy Harris1-0/+1
Change-Id: Ie9d47da4b1758cbf475989a04847853a714e1447 Reviewed-on: https://code.wireshark.org/review/17503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-05ISAKMP: Fix handling of cert requests without CAMirko Parthey1-0/+3
Check IKEv1 Certificate Request Payloads for an empty Certificate Authority field, which is allowed by RFC 2408. Suppress dissection of this field if it is indeed empty. Change-Id: Ifb997e460a4c12003215fde86c374cfc769c5d72 Reviewed-on: https://code.wireshark.org/review/17501 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>
2016-09-05checkAPI: add deprecated atoi.Dario Lombardo1-0/+1
Instead use ws_strtoi/u functions. atoi() doesn't make any kind of check so it should be avoided. ws_strtoi/u should be used instead of strtol & co., but they're still acceptable for some cases that deviate from the basic usage. Change-Id: I145ff4d8f893852e024c4ea8fc6a836b15bd2b0d Reviewed-on: https://code.wireshark.org/review/17502 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-05wsutil: add string to integer conversion utilities.Dario Lombardo4-0/+188
In the current code many functions have been used for convertion (strtol, atoi, g_ascii_strtoll, etc). Those utilities want to be the only, shared, way to convert integers. Change-Id: I22ba1bf54e144e73a4728612a4437de5a2d339e2 Reviewed-on: https://code.wireshark.org/review/17414 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-04S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 ↵Pascal Quantin2-89/+100
and IPv6 Change-Id: I8c257d79b4e842da6853ea3c53ae479f33a8047a Reviewed-on: https://code.wireshark.org/review/17491 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>
2016-09-04zvt: dissect Initialisation messageMartin Kaiser1-5/+16
It contains the same password field that appears in the Registration message. Make this field generic and reuse it here. Change-Id: I7be9a99b5da1713937ffca5624be66150ff453d1 Reviewed-on: https://code.wireshark.org/review/17489 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-04zvt: start dissecting Intermediate Status InformationMartin Kaiser1-1/+22
Change-Id: I351621f1def5ad6da577a9b0d1b2c5ab49018564 Reviewed-on: https://code.wireshark.org/review/17488 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-04zvt: dissect the currency code bitmapMartin Kaiser1-6/+19
add the value for euro Change-Id: Id8624e356ad4fcddcf77483a721428782c6bb0b2 Reviewed-on: https://code.wireshark.org/review/17487 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-04[Automatic update for 2016-09-04]Gerald Combs12-368/+610
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I11d066907492642f5baaa38a79b8bcd086a579c4 Reviewed-on: https://code.wireshark.org/review/17484 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-04ANSI_A: Rationalize test expession (CID-1372216 ... 1372267)Jaap Keuter1-2/+4
Implement the same changes in the ELEM_TLV() and ELEM_TV() macros as in packet-gsm_a_common.h, to remove superfluous code and squelch about 50 Coverity issues. Change-Id: I262dc60fdfa3482876d8525b34f6b1dbbe371257 Reviewed-on: https://code.wireshark.org/review/17478 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>
2016-09-04ssl,http: rename http-over-ssl to http-over-tlsPeter Wu6-7/+19
This name is displayed in the SSL prototcol tree (Application Data Protocol: http-over-tls), rename to avoid possible user confusion. Modify the SSL dissector such that both "http" and "http-over-tls" invoke the same dissector function. Change-Id: I2d52890a8ec8fa88b6390b133a11df607a5ec3dc Reviewed-on: https://code.wireshark.org/review/17481 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-04irda: restore a line removed by mistake in ge4c059fPascal Quantin1-1/+1
Bug: 12821 Change-Id: If6423c7f8443eccd6ddb4b699bbc327a965d0d74 Reviewed-on: https://code.wireshark.org/review/17477 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-04SMB2: dissect the buffer of getinfo quota requestUri Simchoni1-2/+108
Source: [MS-SMB2] 2.2.37.1 Change-Id: I526066700a88398366f31cd51552f9fa8bb761b8 Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17447 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>
2016-09-03M2AP: fix registration of extensions in proper dissector tablePascal Quantin2-4/+6
Change-Id: If529448539f9e8d740fd20009221e9221db83b2b Reviewed-on: https://code.wireshark.org/review/17475 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-03S1AP: add more LTE-RRC transparent containers dissectionPascal Quantin6-3102/+3499
Change-Id: I08246d3fa97ceafefd3a1ab5c36de50a5728fd19 Reviewed-on: https://code.wireshark.org/review/17474 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 23:18:37 +0000