summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-07-30Apply refactored "conversation" (tap) data to TShark.Michael Mann18-21/+30
I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI. Bug:6310 Change-Id: I722837df510a39dadc1f9a07a99275509516698c Reviewed-on: https://code.wireshark.org/review/3212 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-30GED125: remove a wrong comment regarding the default TCP portPascal Quantin1-1/+1
Change-Id: I53aa2053c65280385e13da875979ed09b37fb725 Reviewed-on: https://code.wireshark.org/review/3258 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-30Fix up some white space.Jeff Morriss1-12/+12
Change-Id: Ie8f1006d6b3a27fe0c8187ce99051c09dea09b66 (cherry picked from commit a3a5c33dad8669e37502f2ce4d0687f7ff7e87a1) Reviewed-on: https://code.wireshark.org/review/3257 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-29don't add nonprinting \000 characters to tftp option stringsMartin Kaiser1-4/+8
Change-Id: I81e43fac5176fdd0805001636991efb7f588a3c0 Reviewed-on: https://code.wireshark.org/review/3252 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-29remove unnecessary return; statementMartin Kaiser1-2/+0
Change-Id: Icefbaf632e888e84bcb2cc20ae3a6c4744b82fae Reviewed-on: https://code.wireshark.org/review/3251 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-29(trivial) modify, indent a commentMartin Kaiser1-1/+1
Change-Id: I64bb64787c83ffe712ffd348cceb5449690dd6d0 Reviewed-on: https://code.wireshark.org/review/3247 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-29Remove unused variableEvan Huus1-4/+2
Change-Id: I590d4c2d79ee44309cd512057c7eae6df15913e9 Reviewed-on: https://code.wireshark.org/review/3240 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29EPL: Fix for Write Multiple by indexLukas Emersberger1-14/+125
Write multiple by index now correctly resolves OD names. Change-Id: I4d2aad584a47e3682716b95bdda0bc49c3a29d96 Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com> Reviewed-on: https://code.wireshark.org/review/3223 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Lukas Emersberger <lukas.emersberger@br-automation.co.at> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Bug 10302 - BGP attribute AIGP (draft-ietf-idr-aigp) not decoded - FixMatthieu Texier1-0/+56
Change-Id: Ib8b3c5666932777218e33b74cca33b791c883fc9 Reviewed-on: https://code.wireshark.org/review/3226 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Fix possible uninitialized session key in netlogin authEvan Huus1-4/+4
Bug:10312 Change-Id: Ia2be812e81b54d6df5a928312cca86ecd95aa6b2 Reviewed-on: https://code.wireshark.org/review/3236 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Bluetooth: Fix OBEX over L2CAP detectionMichal Labedzki5-5/+6
There are two cases: 1. btl2cap -> btrfcomm -> btobex 2. btl2cap -> btobex Case 2 is rare, so according to its name and to avoid confusion I based on it. Bug:10316 Change-Id: Ibeabeaf2f8376425460c56bad8fb980b460dd940 Reviewed-on: https://code.wireshark.org/review/3225 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-28Use wmem for application IdsAndersBroman1-29/+33
Remove soft deprecated APIs Change-Id: Iecd2f552c1abb7bb2c6969073b3c245af22f4fcd Reviewed-on: https://code.wireshark.org/review/3230 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28Sort diameter.applicationId fix a typo.AndersBroman1-0/+4
Change-Id: Id585371df929cdff17f98dddbebf063fa000ff56 Reviewed-on: https://code.wireshark.org/review/3229 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-27Make value_string_ext const-correct.Kevin Cox6-43/+36
There is still some const-incorrect usage of them but those can be ironed out after this change has been made. Change-Id: Iba0631c804bdab34d7c0232b49967130e3370488 Reviewed-on: https://code.wireshark.org/review/3199 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>
2014-07-27Fix incorrect whitespace. Why this wasn't spotted during review?Joerg Mayer2-3/+3
Change-Id: I54be42e020e2febf2e15d5eb0e772153eae1ba32 Reviewed-on: https://code.wireshark.org/review/3213 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-27Added function dnp3_header_check() to check the validity of a DNP3Graham Bloice1-10/+40
packet as far as possible, called from both dissect_dnp3_tcp and dissect_dnp3_udp. Bug: 10287 Change-Id: Iaa988258b3614cb1b408dec41a987fbd61c9727c Reviewed-on: https://code.wireshark.org/review/3096 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-27[Automatic manuf, services and enterprise-numbers update for 2014-07-27]Gerald Combs2-15/+205
Change-Id: I07f7d2340c70fb3dbacf6d2792f5fab194212e22 Reviewed-on: https://code.wireshark.org/review/3208 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-27Fix yet another openflow underflow issue.Evan Huus1-0/+4
I thought I'd found all of these but I guess I hadn't; good thing the fuzz-bot kept looking. Bug:10314 Change-Id: I2cc209a6c87781d10cae28f2cb91400d759f5091 Reviewed-on: https://code.wireshark.org/review/3205 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-26Refactor "common" Conversation table functionality.Michael Mann22-9/+1336
Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality. The idea is to not have to modify the GUI when a dissector adds a new "conversation type" Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda Reviewed-on: https://code.wireshark.org/review/3113 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-26Allow severity levels of expert info items to be configured by the user.Michael Mann2-4/+157
UAT was the easiest way to do this and I like the "file format" of the data, but the presentation doesn't seem that great. Bug:10180 Change-Id: I7e6bc9e148bc47585a0a7eb8f96900a5c374e673 Reviewed-on: https://code.wireshark.org/review/3082 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-25OptoMMP DissectorJohn Miner3-0/+891
Change-Id: I754335b9944a9de169e37c16a3e37a86d35543a6 Reviewed-on: https://code.wireshark.org/review/3110 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-25Empty proto_reg_handoff_* are not needed, remove some.Jakub Zawadzki10-64/+0
Change-Id: I957b01aa00bbff3c48192388c7ad9e601d79c778 Reviewed-on: https://code.wireshark.org/review/3196 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-25Fixing a bug in add_ff_action_public_fields(), by removing the start ↵moraney.jalil1-3/+5
argument and defining it inside the function. Change-Id: I6205384b3bcf38128912baf413b4455357d25347 Reviewed-on: https://code.wireshark.org/review/3184 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-24add the flags to all FullBoxesMartin Kaiser1-5/+15
Change-Id: I6e0109bc1d1acf200fd0c1a9f8ddd3a3d98f5908 Reviewed-on: https://code.wireshark.org/review/3189 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-24start dissecting the MP4 stsd boxMartin Kaiser1-0/+46
Change-Id: I589a6ced098d1d224e86386f028c92fc0797164e Reviewed-on: https://code.wireshark.org/review/3188 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-24dissect the MP4 url boxMartin Kaiser1-0/+40
Change-Id: Ibeaf5ba5d104e7f9bc9291e83923f8675abf0099 Reviewed-on: https://code.wireshark.org/review/3187 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-24dissect the MP4 dref boxMartin Kaiser1-1/+44
Change-Id: I342f283bbab3052337e00502769150cf3f4a8800 Reviewed-on: https://code.wireshark.org/review/3186 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-24dissect the MP4 hdlr boxMartin Kaiser1-0/+45
Change-Id: I467bfae2db7d3a119b58505b43b3d9bb59615ee9 Reviewed-on: https://code.wireshark.org/review/3185 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-24IMAP: fix mixed indent (use 2spaces)Alexis La Goutte1-236/+280
Change-Id: Icaad98527c61cb5c87f84ec23d1d895079fe2515 Reviewed-on: https://code.wireshark.org/review/3182 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-24Micro-optimize tvbuff:Jakub Zawadzki1-24/+10
- compute_offset_and_remaining(...) is a little bit faster than check_offset_length(.., .length_val = -1); - tvb_find_guint8(), tvb_pbrk_guint8() - both function are limiting data to MIN((unsigned) maxlength, tvb_len) - do the same with less count of ifs. Change-Id: I7761d77b6282d800eea94852d5c6543aef4bc7ca Reviewed-on: https://code.wireshark.org/review/2829 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-24ssl: clarify meaning of StringInfo, cleanup PRFs, master_secretPeter Wu2-165/+166
It was not clear whether the data_len member of StringInfo refers to the allocated memory (as was done for session_ticket) or the length of the actual data. This is clarified in a comment. To keep the invariant "data_len refers to the length of meaningful data", some code has been moved just in case some intermediate code fails: - Setting session_ticket.data_len vs tvb_memcpy to session_ticket.data. - PRF functions would expect the data length as input to a paramter named "out". This is highly confusing, so another parameter has been added to signify the requested length, "out_len". This also helps holding up the invariant. - For prf() calls, out.data_len does not need to be initialized but passed as parameter. Other PRF-related changes: - Change the PRF functions to return a boolean instead of an int. - tls_hash: return void as it cannot fail and remove related error handling from callers. Fix a memleak of label_seed if tls_hash was successful. - tls_hash: add comments to clarify its functionality, whitespace. - ssl3_generate_export_iv could not fail, so make it void. Also added an out_len param to pass the target length. - In prf(), replaced if-conditions for SSL version by a switch. - In ssl_generate_keyring_material, the scope of some variable has been tightened. - ssl_session_init: explicitly set data_len to 0. This is strictly not necessary as the callers have already zeroed out the memory, but that has not been documented. Other changes related to master_secret (ssl_save_session[_ticket]): - Initialize master_secret.data_len to 0 in ssl_session_init as the master_secret is unusable at that point. - Remove the hack that tests whether master_secret.data is non-empty. - Replace hardcoded master_secret length (48) from wmem_alloc0(). - Introduce macro for master secret length, use this in SslDecryptSession, for parsing from keyfile and converting pre-master secret to master secret (prf). - Use (master_secret + 1) to refer to the part after the struct rather than adding the size manually to a gchar-casted master_secret. Change-Id: Ie1ea448db54e828b904568224486147a3d962522 Reviewed-on: https://code.wireshark.org/review/3030 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-24ssl,dtls: move Finished dissection to ssl-utilsPeter Wu4-107/+59
Change-Id: Ib4bd5712cb85cd2671f67fe035747b88d5b4f186 Reviewed-on: https://code.wireshark.org/review/3034 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de> 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>
2014-07-23MySQL: Add Client can handle expried passwords extended CapabilityAlexis La Goutte1-2/+8
Change-Id: I9464e7d188d8e8c027db94c214e692ff233a13fd Reviewed-on: https://code.wireshark.org/review/3178 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Daniël van Eeden <wireshark@myname.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-23ssl,dtls: move Session Ticket to ssl-utilsPeter Wu4-120/+72
Changes: - dtls: also support saving session tickets. - Drop the length check and let proto_tree_add_item throw exceptions on length errors. - Use proto_tree_add_item instead of proto_tree_add_uint. - Drop "TLS" from header field descriptions, the RFC does not name it as such and DTLS can also use it (a draft is in progress that extends DTLS with Session Tickets, draft-hummen-dtls-extended-session-resumption-01). Change-Id: I11195217368b7200821d11289b1c5870a1ffe637 Reviewed-on: https://code.wireshark.org/review/3029 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-23Fix (-W)documentation error found by ClangAlexis La Goutte1-4/+2
Change-Id: I2d2bbc211e98ad24a27c855031f670b7bdbd530e Reviewed-on: https://code.wireshark.org/review/3162 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-23ssl-utils: stop exporting some symbolsPeter Wu2-17/+8
Client/Server hello and Hello extensions are now dissected inside ssl-utils, no need to export them for the SSL or DTLS dissectors. Change-Id: I8f2405199f21616743fe74959f07cfa839565527 Reviewed-on: https://code.wireshark.org/review/3022 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-23ssl,dtls: move ClientHello to ssl-utilsPeter Wu4-365/+205
Changes to ClientHello dissection: - Move ssl_find_private_key (and its pre-req, ssl_set_server) outside ssl_dissect_hnd_cli_hello. It has not really something to do with dissection, but state tracking and decoder param feeding. - dtls: add expert info for bad cipher suites len. - ssl: remove bad cipher suites len text label which is also available as expert info. Attach expert info to a the length proto item (which is converted to use add_item instead of add_uint). - Remove `if (tree || ssl)` since expert info seems not to apply otherwise (this also needs changes in common and handshake dissection). - ssl: remove tvb_ensure_bytes_exist so we can dissect more compression methods and cipher suites. - Since DTLS has an additional Cookie field which TLS does not have, pass these additional header fields through a struct whose type is defined in ssl-utils. Change-Id: I41bef04c1c3353e582e30f561d1d246a744e1d60 Reviewed-on: https://code.wireshark.org/review/3021 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-23ssl,dtls: move ServerHello to ssl-utilsPeter Wu4-222/+99
Changes to ServerHello: - Get rid of session parameter as the SslDecryptSession already provides a reference to SslSession. Done for the new ssl_dissect_hnd_srv_hello and ssl_dissect_hnd_hello_ext functions. - No need to generate the keyring here, decryption is only needed after ChangeCipherSpec and the keyring will be generated there provided that there are enough params (cipher, version, master-secret, etc.) - Get rid of labels and goto in favor of if/else. - DTLS: SSL_HAVE_SESSION_KEY is implicitly set when ssl_generate_keyring_material succeeds, no need to set it. Remove it. - Remove `if (tree || ssl)` since expert info seems not to apply otherwise (this also needs changes in common and handshake dissection). (Expert info from the TLS extensions, not the ServerHello itself.) Other changes: - ClientHello: renamed some fields shared with ServerHello. Change-Id: I466b905d990489e03250bac97bf9d862ff82ce6c Reviewed-on: https://code.wireshark.org/review/3020 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-23Fix email address and product name in Redback dissectorFlorian Lohoff1-2/+2
Change-Id: I777c164d24282a1de3082b33d5e89272a78bde6b Reviewed-on: https://code.wireshark.org/review/3177 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-23Add dissecting of IPv6 in Redback Smartedge CapturesFlorian Lohoff1-0/+9
Change-Id: I028d294235a4e1d55096df8face48c4a74710506 Reviewed-on: https://code.wireshark.org/review/3176 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-23Fix decoding of PPP frames from Redback Smartedge traceFlorian Lohoff1-1/+1
Change-Id: I2eed4da20bc1f87dc1c4a3a6357a8f5692893939 Reviewed-on: https://code.wireshark.org/review/3175 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-22Update MySQL Capability flagsDaniel van Eeden1-26/+36
Change-Id: I62d0a26ec1c81efa2ee8dbefcbdb308155f64ad5 Reviewed-on: https://code.wireshark.org/review/3136 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-22better visibility for vx11Marcel Essig1-2/+18
Change-Id: I18d51e15eb38f28cc7333f0adb17fbfd22ba09a5 Reviewed-on: https://code.wireshark.org/review/3150 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-21[WIP] Add a conversation dialog.Gerald Combs2-11/+18
Items are sorted by value. Move common conversation code to ui/conversation_hash.[ch]. Add a conversation_type_e enum along with convenience functions for fetching titles, tap names, etc. We have a single main dialog instead of a main dialog + individual protocol dialogs. It de-clutters the statistics menu and results in simpler code. Conversation type tabs can be added and removed within the dialog itself. The tab list is sticky and saved with the current profile when the dialog closes. Data can be copied as CSV or YAML. Add a FilterAction class and a corresponding filterAction slot to MainWindow. Use it for the Conversations context menu. Add an addressResolutionChanged signal and related plumbing. Get rid of the iterator members in the conversation item struct. Update the GTK+ code accordingly. Excercise for the reader: - Update TShark to use the common hash code. Ping-Bug: 9231 Ping-Bug: 8703 Ping-Bug: 6727 Change-Id: I8728d771fc5b1a85937bed9d898e53c3ecc3a544 Reviewed-on: https://code.wireshark.org/review/2987 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-21simplify the tree handling a bitMartin Kaiser1-11/+7
Change-Id: I887000ac2bb273a0cc0c41709e346e1cf52140d9 Reviewed-on: https://code.wireshark.org/review/3149 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-21display unused bytes as raw bytes not as ASCII stringMartin Kaiser1-2/+2
Change-Id: I50c1ef94aff4d1067b6561c5a06a397216e49ee2 Reviewed-on: https://code.wireshark.org/review/3148 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-21Add auth plugin to server greeting infoDaniël van Eeden1-0/+13
Change-Id: I862203c9be0cd10c72599609631629bf976a7a22 Reviewed-on: https://code.wireshark.org/review/3137 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: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-20start support for the Japanese language in the Qt versionMartin Kaiser1-0/+1
just the framework and some simple translations Change-Id: I7653a9c6ab26b391bfe2942d088d233996030576 Reviewed-on: https://code.wireshark.org/review/3134 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-20[Automatic manuf, services and enterprise-numbers update for 2014-07-20]Gerald Combs2-25/+260
Change-Id: Idba0c6dc0329be1ad41e3c38139c9ed69b4e45e5 Reviewed-on: https://code.wireshark.org/review/3131 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-20Use forward slashes in paths to runlex.shРоман Донченко2-2/+2
This gets rid of "MS-DOS style path detected" warnings from Cygwin. Change-Id: Id10429669704aa371dbf56a9398947c8002260ad Reviewed-on: https://code.wireshark.org/review/3024 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 08:37:06 +0000