summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-07-20va_list can't be NULL on ARM.Steev Klimaszewski1-7/+29
Bug: 10209 Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa Signed-off-by: Steev Klimaszewski <threeway@gmail.com> Signed-off-by: Balint Reczey <balint@balintreczey.hu> Reviewed-on: https://code.wireshark.org/review/2464 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-19use proto_tree_add_item()Martin Kaiser1-218/+122
Change-Id: I7642295721e886eef4682c602ad96b61bc85b3b6 Reviewed-on: https://code.wireshark.org/review/3128 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19simplify APPEND_OUI_NAMEMartin Kaiser1-6/+2
Change-Id: I83aef5ebc92a7218f59bd77338058d98ffa2ed6b Reviewed-on: https://code.wireshark.org/review/3127 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19remove the NULL check in APPEND_BOOLEAN_FLAGMartin Kaiser1-3/+2
Change-Id: I15742ce73d3445ec47369d35dd0da6715b7079cf Reviewed-on: https://code.wireshark.org/review/3126 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19add editor modelinesMartin Kaiser1-842/+855
reformat Change-Id: Idce9d34c41ce2bcbc4d5efa4699decd7f3068199 Reviewed-on: https://code.wireshark.org/review/3125 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19simplify the tree handling a bitMartin Kaiser1-11/+8
Change-Id: Ie6a9c033d2de3231f810a33b032ab06fee3f68a0 Reviewed-on: https://code.wireshark.org/review/3124 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19fix bug 9100Martin Kaiser1-26/+30
object and package containers may have multiple entries Change-Id: I032e78057aadbbe67925d07881da9f1182a24058 Reviewed-on: https://code.wireshark.org/review/3121 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19remove some more unnecessary initializationsMartin Kaiser1-7/+7
Change-Id: I74b082b7644f36efc3dc220ff92f1bfff524c408 Reviewed-on: https://code.wireshark.org/review/3119 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19no need to initialize these pointersMartin Kaiser1-6/+6
Change-Id: I0791ca2fc9a7a87dafbdf15f51d9f1a9d12aa89e Reviewed-on: https://code.wireshark.org/review/3118 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19use gboolean for detected_dropMartin Kaiser1-3/+3
Change-Id: Ice0c68541604c5566cc807c17faf534cd6628262 Reviewed-on: https://code.wireshark.org/review/3117 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19add H.265 stream typeMartin Kaiser1-0/+1
Change-Id: Ic8e17f949f245ad6fe26fb8078e0545fe5b35daa Reviewed-on: https://code.wireshark.org/review/3116 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-19Add casts to squelch compiler warnings.Guy Harris2-3/+3
Change-Id: I100ec30e1e9ac204e3c9225278adc8a26992542a Reviewed-on: https://code.wireshark.org/review/3114 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-19Revert part of 5cc2ab74af486611def7bcc14105c1a0257b41deEvan Huus1-1/+1
nghttp2ver.h is a local header, so use "" not <> Change-Id: I62d1aebdc7c4b66035fccbba71ec9ca2edf1f07f Reviewed-on: https://code.wireshark.org/review/3112 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-19HTTP2: Update to nghttp2 lib 0.5.0Alexis La Goutte5-17/+14
Change-Id: Ia63c066e482f633ef5096f2341d74de749422102 Reviewed-on: https://code.wireshark.org/review/3104 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18Add some expert info to the MAC Control dissectorMichael Mann1-5/+35
Partial-bug: 6121 Change-Id: If7a367671cf55793799e0d72f8846bd6fe2a2222 Reviewed-on: https://code.wireshark.org/review/3038 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18WebSocket: increase max unmask payload size to 256K and indicate that packet ↵Pascal Quantin1-3/+6
is truncated is going above the new limit Bug: 10283 Change-Id: Iea5401d02bcf50a3427dce5f2b817c3b73a7dc11 Reviewed-on: https://code.wireshark.org/review/3098 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18DNS: Add new opcode EDNS EXPIRE (9) for EDNS options (RFC7314)Alexis La Goutte1-2/+4
Change-Id: I2db7bf6a80a34540aa90a3362566ac399b1c3644 Reviewed-on: https://code.wireshark.org/review/3101 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18Add better assertions for comparing integers.Kevin Cox1-0/+45
Adds DISSECTOR_ASSERT_CMPINT() family of assertions which show the value of each side of the comparison upon failure. Change-Id: Ie6f2ba46d62fc864c08eb432c403fab8f1932d91 Reviewed-on: https://code.wireshark.org/review/3103 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-18Add casts to make the buildbot happy.AndersBroman1-7/+7
Change-Id: Ia77b86c83a6458210f913a691b707b7aa1b911d7 Reviewed-on: https://code.wireshark.org/review/3100 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-18Split LBMR tap into 5 separate taps. Make the associated tap data use ↵David Ameiss3-270/+350
fixed-length fields. The idea is to allow user-written tap listeners easier access to the tap data. Also correct the conditions (in packet-lbmc.c) under which a subdissector would be called, if present. Change-Id: I5244cfbd17314058f7d3b9f42d647e0e6c375e14 Reviewed-on: https://code.wireshark.org/review/3007 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-18Support of draft-ietf-idr-flow-spec-v6 and some cosmetic improvmentsMatthieu Texier1-17/+90
Change-Id: Ieaf23c84d67ccdfdcb167afb382c86797bc1cd2b Reviewed-on: https://code.wireshark.org/review/3006 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-18ssl-utils: change some references from ietf drafts to rfcsHauke Mehrtens1-4/+4
Change-Id: I41a93a2818228ff6e5f005df5135996e687498af Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/3097 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-17Escape some characters like \n when appending textMichael Tüxen8-16/+14
This patch escapes some characters like \n when showing text contained in a packet by appending it to a protocol item. Change-Id: Ice0040040ec7ab573dd9a412f8c0c197a566a031 Reviewed-on: https://code.wireshark.org/review/3095 Petri-Dish: Michael Tüxen <tuexen@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-07-17When DNP3 heuristics are disabled, relax the conditions onGraham Bloice1-2/+2
accepting a packet as DNP3. Bug: 10287 Change-Id: I222ec885186447c8a72eaf11cebacff8b9b79fad Reviewed-on: https://code.wireshark.org/review/3092 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-16Fix assertion error when no header field was decompressedTatsuhiro Tsujikawa1-0/+4
bug: 10279 Change-Id: Ibf88b1622318692ccf3904aede5d964e6028bdc7 Reviewed-on: https://code.wireshark.org/review/3087 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-16Fix regression related to OSPF related enum order definitionsJim Young1-12/+16
bug: 10271 Change-Id: Id2de856104d7506583e94893501cff23de3ec212 Reviewed-on: https://code.wireshark.org/review/2976 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-16TLS: Update to the final RFC (7301) for ALPNAlexis La Goutte1-1/+2
Change-Id: I16b3f6ec7cc4d356a6cb6090866691ddd2e708b6 Reviewed-on: https://code.wireshark.org/review/3056 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-16Don't use __func__, use G_STRFUNC.Guy Harris2-7/+7
Not all compilers we use support __func__. Change-Id: I61194e1073c87e67f821e14698ea21b73d63983c Reviewed-on: https://code.wireshark.org/review/3071 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-15ssl: move decoder init from ClientKeyExchange to ChangeCipherSpecPeter Wu4-21/+72
My previous change removed master-key retrieval in the Server Hello. This broke decryption when ClientKeyExchange is missing. That was done because decryption is only needed after ChangeCipherSpec. This patch moves the remaining initialization in ClientKeyExchange to ChangeCipherSpec. In theory this could fix decryption of DTLS traffic when an abbreviated handshake is used (and thus keyring material is never generated in ClientKeyExchange since it is not called). It also avoids saving a session ticket with an empty key which can happen when no RSA key is present, but the NewSessionTicket message is received. This could lead to garbage decryption. Change-Id: If0f475232c270b1d7b006c1f9af0e8d8098c6b65 Reviewed-on: https://code.wireshark.org/review/3019 Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15ssl: unify common Hello dissection to ssl-utilsPeter Wu4-223/+106
Based on DTLS code with changes merged from SSL. Changes: - Ignore large Session IDs, this was not harmful though since the backing storage was 256 bytes in size. - {ssl,dtls}.handshake.random: fixed description, it is not used like a SSLv2 random challenge. - dtls: also debug print client/server for random - SSL: the common dissector now returns an offset rather than dissected length. - dtls: display actual Session ID bytes in the UI rather than the text "Session ID (32 bytes)". The length field is already visible in the preceding field. Also changed is the handling of key material generation. The SSL dissector previously generated key material based on the Session ID, Session Ticket or a key logfile. (DTLS did not have this functionality.) As decryption is needed only after ChangeCipherSpec, I have removed it from the ServerHello handling. This will break decryption when a ClientKeyExchange message is missing, but it will be restored proper in a next patch. (By the way, there was an inverted if-condition bug in DTLS that could break decryption by not restoring the master key matching a SID. This is gone in the refactoring because the faulty code is removed.) Change-Id: Ida3de88adefe3f7691f85936c496977426c4d96e Reviewed-on: https://code.wireshark.org/review/3018 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-1/+3
Change-Id: I48f488a75f53d077a213f7b9379960985ce3bf08 Reviewed-on: https://code.wireshark.org/review/3055 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15HTTP2: Fix double freeAlexis La Goutte1-0/+7
Found by Clang Analyzer Backport from https://github.com/tatsuhiro-t/nghttp2/commit/62423f5949001c375c8e325296c74c92d1be0965 Signed-off-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> Change-Id: Ic70f74b55ab80ca0b8d5042f07a29c9d14af4fe2 Reviewed-on: https://code.wireshark.org/review/3058 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15MAUSB dissection of control transfer responsesSean O. Stalley3-1/+23
The MAUSB dissector can now dissect transfer responses for control endpoints. Change-Id: Ic488ccb308365d072bbbf0eaf128b198caf74eca Reviewed-on: https://code.wireshark.org/review/2960 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15Moved USB Setup Response Dissection into own functionSean O. Stalley1-40/+73
USB Setup Responses are now dissected in their own function. Before they were dissected inline in the usb_dissect_common() function. (just copied code). Also replaced proto_tree_add_text() with proto_tree_add_item() for generic setup response data. Change-Id: Ia3943334cccc0a1813e0c906196307f99561ad21 Reviewed-on: https://code.wireshark.org/review/2959 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I908e08e491bae6c7532e02269d8ed004ad0cee91 Reviewed-on: https://code.wireshark.org/review/3053 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15Make the state variable an enum, and add a case for the IN_SKIP value.Guy Harris1-2/+10
Also indicate what the states mean. Change-Id: Ie1701bb2fb33334bcd66d325d1368c2a15cbb7e8 Reviewed-on: https://code.wireshark.org/review/3061 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-15Fix up library names when using CMake on WindowsGraham Bloice1-2/+5
Change-Id: I3573e69eb54044bb915161756dbb8f18cc769061 Reviewed-on: https://code.wireshark.org/review/2957 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-14Add application/atom+xml as an XML document type.Guy Harris1-0/+1
Change-Id: I9fcf438f3cafcb3ab3a5b6dc0f72ed2561e5a94f Reviewed-on: https://code.wireshark.org/review/3049 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-14Treat CR-LF at the end of a line like LF.Guy Harris1-1/+14
That way, if we're reading a Windows-format file on UN*X, we handle it the same way we'd handle a UN*X-format file. This handles bug 10272 for the preference file and the "recent" files; there are other configuration files that may need code changes as well. Change-Id: Iec15a8fac276929ce8b53ae16070e9f2855f574c Reviewed-on: https://code.wireshark.org/review/3042 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-14Fix buildbot issues with commit f8f3239bb03487de1844ab0f6df0ba693322ce4bGraham Bloice1-2/+2
from change 3016. Change-Id: I67363462f1c4e1ca69695573892692c458c620c6 Reviewed-on: https://code.wireshark.org/review/3040 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-14Add default ciphering and integrity algorithms to use for when control ↵Martin Mathieson1-3/+46
messages are not available, e.g. when handing in to a target cell. Change-Id: I35830fe04df5e5778c15cdb782982b2fbcda67ea Reviewed-on: https://code.wireshark.org/review/3016 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-07-13[Automatic manuf, services and enterprise-numbers update for 2014-07-13]Gerald Combs3-26/+251
Change-Id: I2aa66d261040f9f3e86103c820c914c371a70d1f Reviewed-on: https://code.wireshark.org/review/3031 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-12proto_register_zbee_zcl_appl_evtalt: correct formattingРоман Донченко1-4/+2
The original formatting, besides looking silly, also prevents the function from being picked up by make-dissector-reg. Change-Id: I06e37b0e862064275b07976295eca8f0288a0974 Reviewed-on: https://code.wireshark.org/review/3025 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 07:48:55 +0000