aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-05-26Report syntax errors in UAT prefs parsingPeter Wu7-26/+64
Add the cause for a syntax error while parsing UATs. Example output: $ tshark -ouat:ssl_keys:, tshark: Invalid -o flag "uat:ssl_keys:,": ssl_keys:1: No IP address given. $ tshark -ouat:unknown:, tshark: Invalid -o flag "uat:unknown:,": Unknown preference Change-Id: I549406c4e31a81d29f487ef47bdb3c22da084947 Reviewed-on: https://code.wireshark.org/review/21748 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-26WSUG: Add a TCP Analysis section.Gerald Combs3-7/+197
Try to document as accurately as possible the circumstances under which each TCP analysis flag is added. Update some TCP debugging code. Change-Id: I793756f73b8ade328e150acf32bc203792e29449 Reviewed-on: https://code.wireshark.org/review/21749 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-25Modbus: Add dissection of each bit for holding coils and discrete inputsGraham Bloice1-23/+65
Bug: 13734 Change-Id: Ifd89bc1055edd7c123395ce0511594fc88d151a2 Reviewed-on: https://code.wireshark.org/review/21759 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25Added IEEE CID support to the make-manuf script. These prefixes are ↵Brandon Enochs1-3/+32
commonly used in IEEE 802.11 MAC address randomization. Change-Id: I94ed29d31c81df0e4f514d7c354073182c116f75 Reviewed-on: https://code.wireshark.org/review/21737 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25GTK: Don't allow extcap capture filters to be verified.Michael Mann1-0/+5
There isn't an API to do it and if WinPcap isn't present it can cause a crash. Change-Id: I5338f854acb26f0822ac027e6c853a550da3f7b1 Reviewed-on: https://code.wireshark.org/review/21758 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25Don't try to compile capture filter if pcap_compile isn't available.Michael Mann2-6/+24
This is most likely due to WinPcap not being installed. Bug: 13672 Change-Id: Ic7069f98c7f8068cdc5045204c2e23ab56b3f7eb Reviewed-on: https://code.wireshark.org/review/21757 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25FP - Fixed bug in heur PCH dissectorDarienSpencer651-4/+4
Calculated length in bits ( * 8 ) then checked as bytes Change-Id: Ic9ef94bcdce40fc6463bf472d1e3a4a3cf05b1ba Reviewed-on: https://code.wireshark.org/review/21755 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-05-25checkAPIs.pl: Add check to make sure tvb_get_ function isn't used in ↵Michael Mann1-2/+19
proto_tree_add_xxx Check for situations for things like proto_tree_add_uint, where the "uint" passed is a call to tvb_get_ntohl(). For that, proto_tree_add_item should be used. Change-Id: Ibe14678bd66b05f612b125ca289f671c499a2990 Reviewed-on: https://code.wireshark.org/review/21685 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25packet-lpp.c: Create temporary variables for some proto_tree_add_uint ↵Michael Mann2-76/+92
calculations. Pacify checkAPIs.pl Change-Id: I03be9eaa4f47df48d8809d205997ee4db47707b7 Reviewed-on: https://code.wireshark.org/review/21743 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25packet-lte-rrc.c: Create temporary variables for some proto_tree_add_uint ↵Michael Mann2-6/+12
calculations. Pacify checkAPIs.pl Change-Id: I1801bd92aeb34e3e3240b15cef024718062852d7 Reviewed-on: https://code.wireshark.org/review/21744 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25umts_fp: Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-0/+1
Change-Id: I9b35429d7599c95e0231cec835ac3cd1fca6b06b Reviewed-on: https://code.wireshark.org/review/21752 Reviewed-by: sswsdev <sswsdev@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
Change-Id: Ia3f467e7cbec0a253da42b4d549de75330c91366 Reviewed-on: https://code.wireshark.org/review/21751 Reviewed-by: sswsdev <sswsdev@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-25RADIUS: Add support for extended attributes (RFC 6929)João Valverde4-66/+144
Bug: 13176 Change-Id: I22cdce01d8e7d5b69c2013684a98a9a48acc0d13 Reviewed-on: https://code.wireshark.org/review/21727 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>
2017-05-25icq: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-5/+2
Change-Id: Ic009ea5bce2f349ede407e0bed3a8640262433d2 Reviewed-on: https://code.wireshark.org/review/21753 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>
2017-05-25Simplify proto_tree_add_bytes_format[_value]Michael Mann1-30/+6
Call proto_tree_add_bytes first so it can do all of the basic field checks that were being duplicated. Change-Id: Idc9a3cbf9498aa612a39cc80e3381eba52ce9fa4 Reviewed-on: https://code.wireshark.org/review/21750 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-24packet-icq.c: Use more FT_UINT_STRINGMichael Mann1-82/+58
Makes it simpler than proto_tree_add_string + tvb_get_string_enc combo. Change-Id: Id25d1cc1ed727a6211d9ce113d54dd29c9bbdfcb Reviewed-on: https://code.wireshark.org/review/21745 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-24packet-gsm_a_rr.c: proto_tree_add_uint -> proto_tree_add_bits_itemMichael Mann1-8/+8
Change-Id: Iacf9328ddaa51f9459fd19752bcde70d9312e425 Reviewed-on: https://code.wireshark.org/review/21746 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-24NBAP: Create E-DCH channel infoDarienSpencer652-32/+44
Adding missing creation and insertion of the E-DCH channel info the the FP conversation info struct Change-Id: Ic7dfb5b9579133ff84b2fc4fff73a3560055dcca Reviewed-on: https://code.wireshark.org/review/21742 Reviewed-by: S. Shapira <sswsdev@gmail.com> 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>
2017-05-24SMB2: set session server port in partial captureAurelien Aptel1-0/+5
When dissecting a capture that does not have a session setup exchange, assume tree connect response packets are coming from the server and set the port accordingly. This is needed for decryption because the decryption key is different depending on which side the message was created on. We need to set the server port to know if a packet was made on the server. Change-Id: I80229ed6d69821bc0c76808e57bdb2fc53fcceb3 Reviewed-on: https://code.wireshark.org/review/21741 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>
2017-05-23[RANAP] Pretify info column.AndersBroman2-0/+681
Change-Id: I7f1832cd818d76843e00b689883e28ed46633585 Reviewed-on: https://code.wireshark.org/review/21739 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-23Revert "Fix issue with dissecting multiple DT1 packets in the frame"Anders Broman1-2/+2
Bug: 13651 This reverts commit daefa86695ecb6f859615ccd1bee6269e2c568a5. Change-Id: I50eee7ae99bc471d95365a8da0271188d826ac46 Reviewed-on: https://code.wireshark.org/review/21738 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-22UMTS FP: Fixed heuristic FACH dissectorsswsdev1-8/+8
Dissector was not adding the correct TB size & TB count to the conversation info for the longer RACH variant (52 bytes long) Change-Id: Iace894929684af3e0eb9804cbc57cdc169f136a9 Reviewed-on: https://code.wireshark.org/review/21736 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>
2017-05-22ZigBee: Add attribute and command names from Events clusterKenneth Soerensen2-0/+235
Bug: 13360 Change-Id: Ie6c5cb4d592490716204ff56dea11e92e071f740 Reviewed-on: https://code.wireshark.org/review/21662 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>
2017-05-22[RANAP] Update to 3GPP TS 25.413 V14.0.0 (2017-03)AndersBroman8-302/+604
Change-Id: I5d448a4daf438b05a30473e999574803e5d6ade9 Reviewed-on: https://code.wireshark.org/review/21730 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-22packet-dccp.c: Don't use tvb_get_ptr for getting a uint number.Michael Mann1-18/+28
Use the tvb_get_ntohXXX instead. Change-Id: I8d5c6ac2f2c8b1ac9237297f06709513fc2c9113 Reviewed-on: https://code.wireshark.org/review/21733 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-22packet-h261.c: Use proto_tree_add_itemMichael Mann1-13/+9
Change-Id: Ifbb69d0bd2a71c4dd022c6dbae2ed84c2bf5f912 Reviewed-on: https://code.wireshark.org/review/21732 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-22packet-rfc2190.c: Use proto_tree_add_item instead of proto_tree_add_xxx.Michael Mann1-38/+103
Use hf_ fields with bitmasks instead of manually computing bits. Change-Id: I342ac9288155647fc6600223f892513bab351a7c Reviewed-on: https://code.wireshark.org/review/21731 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-22packet-megaco.c: Rename my_proto_tree_add_string -> megaco_tree_add_string.Michael Mann1-9/+9
It can trip up some of the check*.pl scripts and makes it clearer it's very megaco specific. Change-Id: Idb8ee104f59e07d5cfabd7aaedf23f915fad51b3 Reviewed-on: https://code.wireshark.org/review/21734 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-22Create temporary variables for some proto_tree_add_<datatype> calculations.Michael Mann3-13/+18
checkAPIs.pl doesn't like tvb_get_* parameters because it thinks proto_tree_add_item should be used. This is just to pacify the check. Change-Id: I2df1233fe8c7976c257197079c06d24e472303b5 Reviewed-on: https://code.wireshark.org/review/21735 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-21dnp3: fix parser when a packed variation is used with prefix value qualifierEric Wetzel1-5/+15
Bug: 13733 Change-Id: I4d490793b54816e731d72bf1317d3779a05ae011 Reviewed-on: https://code.wireshark.org/review/21722 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-05-21[Automatic update for 2017-05-21]Gerald Combs12-363/+606
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4a0774a6aa3ecb101b7ca0a87571544dc936012d Reviewed-on: https://code.wireshark.org/review/21723 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-05-21QUIC: fix some indent issueAlexis La Goutte1-5/+5
Change-Id: If259cb4c37b10aca9f5b8e16f409acc8412f0622 Reviewed-on: https://code.wireshark.org/review/21719 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-20Revert "Change exports from Q.932 to use VALS_WITH_TABLE in the same way as ↵Pascal Quantin4-58/+69
QSIG" This reverts commit d3b72329359103f298e4f633b8c83fe2ce3c7517. Revert "Fix debian symbols check after Q.932 symbols removal" This reverts commit 3bc43e377076d1097321e2f7ffc89f52ee33afa0. Change-Id: Ib0623ab289613f48c73d38d038131a69cbf2190b Reviewed-on: https://code.wireshark.org/review/21720 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-05-20If we don't have an ARUUID, don't use it as if we do.Guy Harris1-8/+14
Don't use random on-the-stack data as a UUID. Change-Id: I77961e1404ad73a484a7fc865bc54219dc239b4d Reviewed-on: https://code.wireshark.org/review/21721 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-20UMTS FP: Refactored FP Conversation Info structsswsdev6-335/+431
Moved some fields which are only relevant to HS-DSCH / E-DCH channel into appropriate 'channel specific' structs. Also renamed "dchs_in_flow_list" to "dch_ids_in_flow_list" Change-Id: I7bdeb74c7b1eda0872c0243f0e5f229df2691866 Reviewed-on: https://code.wireshark.org/review/21707 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-20Show structures as FT_NONE, not FT_STRING.Guy Harris1-17/+34
Change-Id: I51577b6a92ff2401671065b1e6313db9a438c675 Reviewed-on: https://code.wireshark.org/review/21718 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-19Openflow(v6): enhance display of Port and Port DescriptionAlexis La Goutte1-0/+5
Change-Id: I6252989f5f57d68049da825da194e0443b91ae09 Reviewed-on: https://code.wireshark.org/review/21702 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-19Qt: Add check for packet bytesStig Bjørlykke1-0/+8
Disable menu items handling packet bytes if not having any. Bug: 13723 Change-Id: I9cdb1185910f865c61a8ee74e3cf3177159bf315 Reviewed-on: https://code.wireshark.org/review/21710 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-05-19Qt: Check for no tvb in Show Packet BytesStig Bjørlykke1-0/+3
Bug: 13723 Change-Id: I145fe93fc05a9cfdc6c0fc949274a1e88dcf2f1e Reviewed-on: https://code.wireshark.org/review/21709 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-05-19msnip: Verify pinfo->dst is a valid IPv4 addressBjörn Ruytenberg1-2/+2
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1678 Bug: 13725 Change-Id: Ib61733200658b4cca0bb0f45e5445b0ed3c12ab0 Reviewed-on: https://code.wireshark.org/review/21712 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-19IS-IS: Add support for CRYPTO_AUTH authentication typeDhiru Kholia7-8/+39
CRYPTO_AUTH (generic cryptographic authentication) is documented in RFC 5310, https://tools.ietf.org/html/rfc5310. Sample IS-IS .pcap files using CRYPTO_AUTH (HMAC-SHA1/HMAC-SHA256) can be found at https://c0decafe.de/svn/codename_loki/test/. Bug: 13727 Change-Id: If25edc5985e13de56ab6bade570f06e0e9db276c Reviewed-on: https://code.wireshark.org/review/21697 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19TLS: Add Reserved Extension type from GREASEAlexis La Goutte2-0/+32
See https://tools.ietf.org/html/draft-ietf-tls-grease Change-Id: I305a35c50f6aa94f94f20974babb7c871393f9e7 Reviewed-on: https://code.wireshark.org/review/21706 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19TLS: add Reserved Supported Group from GREASEAlexis La Goutte1-0/+16
See https://tools.ietf.org/html/draft-ietf-tls-grease Change-Id: Iaf5ec11eba3b28cff5d292326166eae26fabda99 Reviewed-on: https://code.wireshark.org/review/21705 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19TLS: Update list of Supported Groups RegistryAlexis La Goutte1-2/+2
https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 Change-Id: I5beca54eb4dc644647b0f40ec005d8e3bf23222f Reviewed-on: https://code.wireshark.org/review/21704 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19TLS: Update draft tls-chacha20poly1305 to RFC 7905Alexis La Goutte1-25/+1
and also remove some blankline Change-Id: I5e66a64c95697f8e92d346b7b4c8956eadf967d3 Reviewed-on: https://code.wireshark.org/review/19955 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19TLS: Add Reserved cipher from GREASEAlexis La Goutte1-0/+22
See https://tools.ietf.org/html/draft-ietf-tls-grease Change-Id: I890e33a6b5afb51d768b0264023b51682642f867 Reviewed-on: https://code.wireshark.org/review/19871 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19Fix debian symbols check after Q.932 symbols removalPeter Wu1-4/+0
Change-Id: Ib68c11220b67f31f69c8fc1524f8492caa577f57 Fixes: v2.3.0rc0-3576-gd3b7232935 ("Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG") Reviewed-on: https://code.wireshark.org/review/21708 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-19Openflow(v6): Display reserved field for Port Description flagAlexis La Goutte1-0/+30
Change-Id: I2d09e47fe54df7b0e5f89395b93c25d769566f42 Reviewed-on: https://code.wireshark.org/review/21703 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>
2017-05-19SDP: Handle incomplete media attributesJaap Keuter1-6/+10
Media attributes have a format of name:value, where, if the value is missing the colon is missing too. Sometimes the colon is there, while the value is missing. Even though this is in error, continue dissecting the other attributes. Bug: 13698 Change-Id: I369b6db657b33a368f4b12134412100774105615 Reviewed-on: https://code.wireshark.org/review/21699 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-19afp: fix indent (use tab)Alexis La Goutte1-1/+1
Change-Id: I774942860a5d82cfa9003e0363561374caa095ae Reviewed-on: https://code.wireshark.org/review/21701 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 23:30:12 +0000