aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-22Fix retrieval of data link type supported by remote interfaces with ↵Pascal Quantin13-36/+88
authentication Make use of -A parameter when querying data link types supported by a given interface with dumpcap. Ensure to pass the authentication parameters configured for a remote interface when calling capture_get_if_capabilities() Bug: 11366 Change-Id: I4efea615084a82108e4a12a64e8c46817f30a5c6 Reviewed-on: https://code.wireshark.org/review/9690 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-22Ensure to copy the (un)resolved (source|destination) address columns before ↵Pascal Quantin2-35/+35
freeing epan memory Otherwise addresses like AT_STRINGZ using pinfo->pool are using an already freed memory block Bug: 11387 Change-Id: I615d6bf202d57a949e75ba06a39f8d3e464def2f Reviewed-on: https://code.wireshark.org/review/9744 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-22PCLI: Expand protocol supportLuke Mewburn3-43/+160
1. Implement "Decode As" for PCLI payload instead of assuming IP. Currently supported subdissectors are Ethernet and IP. 2. Implement multiple "flavors" of PCLI with different header formats: pcli: 4 byte CCCID pcli8: 8 byte header (including CCCID) pcli12: 4 byte CCCID, 8 byte NTP timestamp pcli20: 4 byte CCCID, 8 byte NTP timestamp, 8 byte case ID All flavors currently using "Decode As" for payload. 3. Optionally append CCCID to protocol item in tree using preference "pcli.summary_in_tree". 4. Obsolete preference "pcli.udp_port". Bug: 9266 Bug: 11220 Change-Id: Ie4bca06665985ef1eb77db767771a5a82357e242 Reviewed-on: https://code.wireshark.org/review/8608 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-21Translation (Qt): fix typoAlexis La Goutte1-1/+1
Duplicate names and also typo about service (=> Services) Found by yfdyh000 via Transifex Change-Id: I011b98a25828b8fc55b395d7ed5677da51a30f43 Reviewed-on: https://code.wireshark.org/review/9741 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-21Add manual name address resolution.Gerald Combs14-22/+474
Make it an editor frame instead of a dialog similar to the column editor and prototocol preference editor. Change-Id: If1a0cdf02dcab0eca98e8d39c94a3c2fe236df5a Reviewed-on: https://code.wireshark.org/review/9743 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-21coap: fix decoding of observe extensionHauke Mehrtens1-5/+11
The observe draft changed and now the option value does not contain the lifetime anymore, but the value encodes if a user wants to register or deregister. Change-Id: I3719101c2bed87c956eb24056be40c9a79dafac8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/9638 Reviewed-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: Michael Mann <mmann78@netscape.net>
2015-07-21Update symbols.Guy Harris1-1/+23
Change-Id: I92fc9ff73278656c717434c23560127c9c59eb06 Reviewed-on: https://code.wireshark.org/review/9742 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-21Do all the work of registering an ONC RPC-based protocol in rpc_init_prog().Guy Harris35-236/+340
Hand it a table of version/procedure table/hf-for-program-number triplets. Change-Id: I2acc03c2da83353165bd422d8537362201c814e2 Reviewed-on: https://code.wireshark.org/review/9740 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-21Be more careful about variable scope and quoting.Gerald Combs1-2/+2
Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5 Reviewed-on: https://code.wireshark.org/review/9738 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-21LTE RRC: fix a typoPascal Quantin2-2/+2
Let's have consistent naming for dissectors Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f Reviewed-on: https://code.wireshark.org/review/9737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-21MQ: fix dissection of Work Information Header Reserved fieldRobert Beardsworth1-2/+2
Bug: 11384 Change-Id: If8c2010b38f65b8ee8569e2d2eee1554d6fdee9c Reviewed-on: https://code.wireshark.org/review/9724 Reviewed-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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-21Don't make dummy RPC program entries.Guy Harris1-60/+38
Just hand the payload off to the data dissector. Change-Id: I59a61ec6352ef0b0c51382d68ca23b00010eb723 Reviewed-on: https://code.wireshark.org/review/9733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-20show_timer_ isn't used on OS X with Qt < 5.0.0.Guy Harris1-0/+2
Change-Id: I5b7a73dcc3bb0f11d24b6d1e9e9d2bcd1f333278 Reviewed-on: https://code.wireshark.org/review/9728 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-20Add a ProgressFrame to the RTP analysis dialog.Gerald Combs3-64/+48
Use it to show save file progress. Change-Id: Iff95b122825006352dc13cf4b7787e29b0d2c5f0 Reviewed-on: https://code.wireshark.org/review/9725 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-20Allow EUI-64s to be specified as numbers or byte strings.Guy Harris1-14/+31
They are, after all, really byte strings, just as MAC-48s/EUI-48s are. Clean up some of the integer <-> byte-string trickery a bit, using unions rather than pointer punning. Bug: 11380 Change-Id: I0d9aa3ca7bb6b7e4c75e49a11b13d3d0e5a04473 Reviewed-on: https://code.wireshark.org/review/9727 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-20Qt: Add option to back white line separator for packet list itemsMichal Labedzki7-2/+59
This uses one line (on bottom) of items and makes it white. Seen in Wireshark on some configurations of GTK 2 on Linux, so backports it to Qt for people who like it. In my opinion it helps if you use packet list background colors for frames and you have a lot of following frames with the same background color. Bug: 10954 Change-Id: Id8f58520d7224db4eb8181bcc04febd7416a8578 Reviewed-on: https://code.wireshark.org/review/7293 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>
2015-07-20Try to minimize sorting overhead.Gerald Combs1-1/+3
Process application events as little as possible while sorting. Change-Id: I9d779aebf6edaafc1e6af3a99b4a0dac682ea6b6 Reviewed-on: https://code.wireshark.org/review/9722 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-20Add general a busy progress indicator.Gerald Combs20-83/+166
Rename CaptureFileProgressFrame to ProgressFrame. It's not limited to capture files. Add "busy" routines there and in MainStatusBar. Show a busy indicator while sorting columns. Use toByteArray().constData instead of .data. I'm not sure if it matters in our case but it's more correct. Change-Id: Ibe35fee9b9dd3fabb5ff8ddcc21f6bf59dec4af6 Reviewed-on: https://code.wireshark.org/review/9720 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-20Protect dissector_get_(default_)string_handle() against NULL input stringPascal Quantin1-1/+4
Bug: 11381 Change-Id: Ib102a23b3d840144757ce692312ff13009c5c95e Reviewed-on: https://code.wireshark.org/review/9717 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>
2015-07-20MAC LTE: indicate explicitly that UL LCID 11 is used for Category 0 devicesPascal Quantin1-1/+1
Change-Id: Ia9a046c8aebdefad0303bed995c19f5408e4460b Reviewed-on: https://code.wireshark.org/review/9719 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-20Fix escaping of strings in UATs.Guy Harris3-5/+9
Not only must characters that aren't printable ASCII characters be escaped, backslashes must be escaped (as backslash is an escape introducer) and double-quotes must be escaped (as double-quotes encapsulate strings). When constructing a string to hand to uat_load_str(), escape pathnames, as they are likely to contain backslashes on Windows, could contain backslashes on UN*X, and could contain quotes on UN*X and possibly Windows. (Arguably, we should escape all the string arguments Bug: 11372 Change-Id: I594840327fa41895130903c3c612ba97d6c29df3 Reviewed-on: https://code.wireshark.org/review/9716 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-20GTPv2: always set direction before dissecting PCO IEPascal Quantin1-0/+30
Otherwise some protocol/container ID payload are skipped as their decoding depends on the direction that is unknown Bug: 11378 Change-Id: Ic14aa67fe4f262a9f3056e8f70f58afd78c59043 Reviewed-on: https://code.wireshark.org/review/9710 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>
2015-07-19coverity 1250812: fix a (very unlikely) integer overflowMartin Kaiser1-2/+10
Change-Id: I151cb2186c7dabbab1bef5cd35dabe19a3600dfd Reviewed-on: https://code.wireshark.org/review/9703 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-19Remove functions that got reintroduced by error in g21e5a95Pascal Quantin1-19/+0
Change-Id: I5e5956727641be3e377109dd032da76f6b21c481 Reviewed-on: https://code.wireshark.org/review/9707 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-19Fixup make-usb.pyGerald Combs1-3/+9
SourceForge (which is where the Linux USB project is hosted) is currently under maintenance. As a result this morning's update-numbers run clobbered usb.c. Add a minimum vendor and product count check to make-usb.py. Change-Id: Ia18bcd9c0eb365bd97b735795e9ad39cd85093a8 Reviewed-on: https://code.wireshark.org/review/9706 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-19Looks like automatic update 0907a6ebb824c1d9d0eaf34940627e0d4d940e7bJoerg Mayer1-0/+17399
didn't work as expected for epan/dissectors/usb.c Revert that file for now. Change-Id: I7ebbc860e2e4a93f086fc3e53138f3272814d5f0 Reviewed-on: https://code.wireshark.org/review/9705 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-19[Automatic update for 2015-07-19]Gerald Combs18-21112/+8408
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I43c44e68e802ed2ab595714ecaf072d941c852ad Reviewed-on: https://code.wireshark.org/review/9701 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-19Get rid of trailing whitespace.Guy Harris1-1/+1
Change-Id: Ifd39e84284be5701c67173da09be12266ef93e25 Reviewed-on: https://code.wireshark.org/review/9700 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-19Require dissectors for all ONC RPC calls and replies.Guy Harris35-382/+437
Either there's a known body for the call or reply, in which case we already have a dissector for it, or the body is empty, in which case we now have dissect_rpc_void() to dissect it, or the body is unknown or nobody's bothered writing it, in which case we use dissect_rpc_unknown() for now. This means that an attempt to look up the dissector for a known procedure will always succeed, so we can label it with the name rather than with "proc-N". It also means that we distinguish between "it's void" and "it's unknown", so that unknown values will get flagged as such. Change-Id: I748580c1dca61d1f0972396db1a3b0885fc0a541 Reviewed-on: https://code.wireshark.org/review/9699 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-18Cleanup pcapng.c fileHadriel Kaplan1-97/+168
Cleanup some pcapng.c comments, defines, etc. Change-Id: Id854c6ef033eb8cb99175ba62aa8733e21433463 Reviewed-on: https://code.wireshark.org/review/9698 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-18Enable decryption by defaultJoerg Mayer1-2/+2
Change-Id: Ife299ec6b56e6a158ed76413d7f2a8e760824a01 Reviewed-on: https://code.wireshark.org/review/9696 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-17Remove the debugging output; it's now attached to the bug.Guy Harris1-6/+0
Change-Id: I6a9252d2841fc44c6fdb6bd27517d60570afbae0 Reviewed-on: https://code.wireshark.org/review/9695 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17In the p < q test, first run tshark -V, to see the full dissection.Guy Harris1-2/+2
Change-Id: I7d82d34369d192e7da7d554f44f448e1613f850f Reviewed-on: https://code.wireshark.org/review/9694 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Dump the output of tshark in the p < q decryption test.Guy Harris1-2/+4
See what it prints on Windows. Change-Id: Id35d87595543eca3e5b5d80dbe9a7639e0a85994 Reviewed-on: https://code.wireshark.org/review/9693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17ssl-utils: do not check for empty keylog filenamesPeter Wu1-1/+1
If ssl.keylog_file is not configured, an empty string is set. In that case, do not attempt to open the keylog file. Change-Id: I2ba4b9dbc7cfb5009d2623c49a129e98734df80f Reviewed-on: https://code.wireshark.org/review/9688 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17WCCP - remove global variable used to store address information for ↵Michael Mann1-668/+867
computation later. Change-Id: I06841ec77cf9f34914b9dfe10b8cd35824b32b71 Reviewed-on: https://code.wireshark.org/review/9647 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann192-688/+441
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17STUN: Add missing error codesAlexis La Goutte1-1/+8
Bug:11350 Change-Id: I8876f7b088229b7b60b2e5d81b70e2e762cad044 Reviewed-on: https://code.wireshark.org/review/9644 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-17Pacify Windows buildbotsPascal Quantin2-2/+2
Change-Id: I6e1db78ca42d7995e0309dd5d43e2abaf1e3b55e Reviewed-on: https://code.wireshark.org/review/9691 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-17Qt/Bluetooth: Add HCI Summary dialogueMichal Labedzki16-59/+2031
HCI Summary dialogue collect HCI Opcodes, HCI Events, Hardware Errors, Statuses and Reasons. Also show occurrence of them. The top level item is group of items (by OGF or types), the second level item is in real command, event, hardware error, status or reason. The third level items are direct link to packet that contains second level item type. Change-Id: I6b6bd02533c4605a2dd2c1f5dfee46f72a0f3fdc Reviewed-on: https://code.wireshark.org/review/9676 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-07-17Add preference for disabling 'packet size limited during capture' message in ↵Michael Mann2-1/+23
Info column. Bug: 9827 Change-Id: I8fdba4827b164bd231981bfdd2e1bd0499f4f87c Reviewed-on: https://code.wireshark.org/review/9669 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17WCCP - Only populate address table once and presume first address table type ↵Michael Mann1-4/+8
is the one that should populate it. Ping-Bug: 11358 Change-Id: Ieed093b4aa263026772450f95dd5fa18280f9b76 Reviewed-on: https://code.wireshark.org/review/9648 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17Add new long options to GUIs to allow arbitrary protocols and heuristics to ↵Jim Young8-2/+192
be disabled via command-line Future: Allow multiple protocols to be disabled in one option statement (perhaps using a comma or colon delmited set of names in <proto_name>) instead of having to specify --disable-protocol <proto_name> multiple times. Change-Id: I9b8f960acf75298ebb098d9b667fca49dca52306 Reviewed-on: https://code.wireshark.org/review/9631 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17Don't register in a non-existent dissector table.Guy Harris4-4/+4
There's no "btrfcomm.channel" dissector table any more; there's a "btrfcomm.dlci" table. Change-Id: Ia7cdf45c04b6b116a67ef4b7dfdce509cdb15327 Reviewed-on: https://code.wireshark.org/review/9684 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17The pflog spec appears to have some host-endian field values. Since we ↵Michael Mann1-4/+17
don't know the platform the host could be, setup preference to decode fields as big or little endian. Bug: 10202 Change-Id: Ic550d75a853eca7abd162241b8426ab196ba0d12 Reviewed-on: https://code.wireshark.org/review/9671 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>
2015-07-17Report an error if we fail to open the keylog file.Guy Harris1-1/+6
That way, we don't just silently fail. Change-Id: I924f4387f6efdc342f6b02ed29796802567c1884 Reviewed-on: https://code.wireshark.org/review/9683 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Bluetooth: RFCOMM: Replace Decode by Channel by DLCIMichal Labedzki1-19/+19
Channel is not enough to decode streams over RFCOMM. DLCI is. DLCI is Channel and Direction bit that can be used to recognize which side RFCOMM service (channel) is - remote or local side. Direction bit is first bit in DLCI so: DLCI = Channel < 1 | Direction. Change-Id: I56a641cfd2d4495d119f08ded1aab5cead458e17 Reviewed-on: https://code.wireshark.org/review/9679 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>
2015-07-17Bluetooth: Add generic UUID table for DecodeByMichal Labedzki19-270/+223
Replace L2CAP Service, RFCOMM Service and AVCTP PID dissector table by shared Bluetooth Service UUID table. It also supports UUID16, UUID32 and UUID128 by hex-string, like for AVRCP: "110e". Change-Id: I473bc73d10939e8ed6dd55a6a92387c7a1ec125a Reviewed-on: https://code.wireshark.org/review/9678 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-17Qt: Fix DecodeAs for String tablesMichal Labedzki1-1/+3
It seems that string object die to early. Add space when it can live. Change-Id: I4e776134ce6782bd6e854ab2bc3c188e80530839 Reviewed-on: https://code.wireshark.org/review/9677 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-07-17Don't discard the echo command's output.Guy Harris1-1/+1
Change-Id: I957a0c1beeae4bbd8c32ed05f30525becaf37e95 Reviewed-on: https://code.wireshark.org/review/9682 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 09:57:32 +0000