aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-18autotools: Generate Qt Resource Compiler source in /ui/qt dirJoão Valverde3-18/+39
Change-Id: I0acdc1ea4d2110111a5506104e5075962f580bd5 Reviewed-on: https://code.wireshark.org/review/14438 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-17ASTERIX: fix for wrong RE and SP fields in CAT048.Marko Hrastovec1-1/+1
Bug: 12267 Change-Id: I4871da19cb8b11e2df0de13993350a71168f7ab4 Reviewed-on: https://code.wireshark.org/review/14502 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-17[INAP] In dissect_returnErrorData in the .cnf file the parameter_pduAndersBroman2-7/+7
calls must return offset. Fixes https://ask.wireshark.org/questions/50998/issue-decoding-inap-systemfailure-parameter Change-Id: Idceb5f2576f8249d4a04b0a3612b5b1ef67f7093 Reviewed-on: https://code.wireshark.org/review/14501 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-03-17wsutil: Split locale information into tokens and format itJoão Valverde1-2/+24
The locale information returned by setlocale() can be a very long unbroken string. This makes the text dialog too wide without line wrapping and in some cases it spans outside the screen border. Add some commas to improve readability and help GTK+ render it properly. Change-Id: Ia7913550ada3ebaac9c783e9ac1b202dbe1563fc Reviewed-on: https://code.wireshark.org/review/11961 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-17extcap-base: remove print of version if no interfaces present.Dario Lombardo1-4/+6
When no interfaces are available (as with androiddump when adb is not running) version is not printed anymore, for a cleaner output. Change-Id: Ia150a58ff1c04e412ff29a540f18e1fe9612f633 Reviewed-on: https://code.wireshark.org/review/14289 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann260-715/+646
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16ssl: add more TLS extensionsHauke Mehrtens1-2/+4
These extensions were added in the last time. This just adds the basic part, wireshark is now able to translate the number into a string. these numbers are defined here: https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml Change-Id: I9d1f1a04318aa116930202aa0fadb59648bed78d Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/14484 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16More control frame dissection cleanups.Guy Harris1-16/+20
Get rid of most tests of tree, so we always step through the packet. Change-Id: I0b54aecd7e871d9d48fc03f387131f0f6034b42f Reviewed-on: https://code.wireshark.org/review/14496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-16Fix dissection of control frames.Guy Harris1-26/+42
Don't conditiionalize stuff that should always be done with a test of whether the protocol tree is being constructed or not. Don't add an extra bogus address field to CF-End frames. Bug: 12266 Change-Id: I0840d63480f9d7d8ffa434d984082a4a46a00d12 Reviewed-on: https://code.wireshark.org/review/14493 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-16Indicate where ACAP is specified.Guy Harris1-0/+1
Change-Id: I5a153b6d340f468b9835c3a0adee195807d7cae1 Reviewed-on: https://code.wireshark.org/review/14489 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-16No need to operate on full bit width (CID 1355344 / 1355348)Jaap Keuter1-2/+2
When giving the full bit width to sign extend there's nothing left, so return the value straight away (a NULL op). Change-Id: I48e6612b6a7c89c0a9ddad0974bb83e7c8e0c22d Reviewed-on: https://code.wireshark.org/review/14390 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> 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>
2016-03-16ssl: add extra supported ECC/DH groupsHauke Mehrtens1-0/+7
These new groups are defined by IANA here: https://www.iana.org/assignments/tls-parameters/tls-parameters.xml Change-Id: I29e0710d853e172c27b8989b21f7b29535bfc521 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/14485 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16ssl: update tls protocol number for draft-ietf-tls-chacha20-poly1305Hauke Mehrtens1-2/+22
This updates the protocol number to the latest draft. These numbers are now defined by the IANA here: https://www.iana.org/assignments/tls-parameters/tls-parameters.xml Change-Id: Ibb7eb532da86c092ec1476451fb85c1656163e13 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/14483 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-15[RADIUS] Fix up formatting.Jeff Morriss1-492/+524
Remove a couple useless if(tree)'s while in there. Change-Id: Ie8de360f4590806eab0a4704b410341918251586 Reviewed-on: https://code.wireshark.org/review/14488 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-15More "FT_BOOLEAN is 64-bit" fixes.Guy Harris5-8/+8
Change-Id: Iaacd492858ca2fb98c4947d587fbbd26fc102a7d Reviewed-on: https://code.wireshark.org/review/14486 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-15FT_BOOLEAN is now stored as a 64-bit value; treat it as such.Guy Harris2-9/+9
Always look and set the uinteger64 member of the union for FT_BOOLEAN values. Bug: 12236 Change-Id: I7b0166e564b9d6cbb80051a81714a4b4c5f740a2 Reviewed-on: https://code.wireshark.org/review/14481 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-15[nmake GTK] Use GENERATED_FILES, GENERATED_C_FILES is no more.AndersBroman1-1/+1
Change-Id: I94aebf396c219f89f73cd3857de7145b2d79b09f Reviewed-on: https://code.wireshark.org/review/14478 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-15[ASN1] Fix the nmake clean target.AndersBroman2-4/+7
Change-Id: Ia18cc03a4339cf4c9b43cb8d897c8c47382605c5 Reviewed-on: https://code.wireshark.org/review/14477 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-15u3v: set interface class/subclass by first clearly identified packetMoeller, Thies1-0/+9
In case no descriptors are in the trace, payload packets can only be identified, if a clearly identified STREAM or CONTROL packet sets class/subclass of the conversation Change-Id: I30be30df908ede468fadf56fdef20f9869ce6b56 Reviewed-on: https://code.wireshark.org/review/14467 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-15GTK: Revert most of g11b058eJoão Valverde2-32/+17
Don't distribute gresource, it's redundant binary data, make the distribution more similar to Qt instead. We may want to check that glib-compile-resources is in the PATH during configure. Change-Id: I82c57f8169be0cbcac14d4ca79df8dece6c4d7ff Reviewed-on: https://code.wireshark.org/review/14455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-15Qt: Make sure the proto tree handles all of its timers.Gerald Combs3-2/+7
Call QTreeWidget::timerEvent from ProtoTree::timerEvent, otherwise we turn into the candy factory episode in I Love Lucy. Do the equivalent in WirelessFrame while we're here. Neither QFrame or QWidget use timers, but there's no guarantee that this will be the case in the future. Bug: 12258 Change-Id: I3cb0096fe2ed87176fec8d7361260b5388d75530 Reviewed-on: https://code.wireshark.org/review/14470 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: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-15Dump out abi_logs/log.txt if abi-compliance-checker fails.Guy Harris1-1/+1
That seems to be where we're telling it to send its logs. Change-Id: Ic15370bc1af858b82f0964fcc35189039061ccb7 Reviewed-on: https://code.wireshark.org/review/14476 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-15IAX2: fix an infinite loopPascal Quantin1-2/+2
Bug: 12260 Change-Id: I29b23ff2d862027fd44c6dd4de3cbb304664fd05 Reviewed-on: https://code.wireshark.org/review/14473 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>
2016-03-14Add EditorConfig reference to README.developerJoão Valverde1-6/+23
Change-Id: I595e94bd0274e3ee3c1d8764fc6c93f28993c30f Reviewed-on: https://code.wireshark.org/review/14468 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-14What a difference a comma makes. CID-1355680Jaap Keuter1-1/+1
Split two media type strings with the properly placed comma. Change-Id: Ia6026879b63b9f51c3f2e61d8709f43716f0c6e2 Reviewed-on: https://code.wireshark.org/review/14472 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-14CIP: Restore path information to Info columnD. Ulis3-27/+27
When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14Try to suppress a compiler feature that goes wrong.Guy Harris1-0/+16
-Warray-bounds + the macros for strcmp() = pain. Either the macro is doing something wrong or the compiler is confused, because if( strcmp(argv[i],"--")==0 ) dashdash = 1; should not produce array index 3 is past the end of the array (which contains 3 elements) Either 1) the macro is blithely running past the end of "--", which does, indeed, contain only 3 elements, or 2) the compiler mistakenly believes that the code generated by the macro is running past the end of "--" when it isn't. Change-Id: I4183e29272ba9e05b3b370efd90102f2226df7c3 Reviewed-on: https://code.wireshark.org/review/14469 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14OS X: Remove GTK+ packaging.Gerald Combs53-4031/+48
Remove the GTK+-specific bits from packaging/macosx. Change-Id: I8f7d909f971e60723e421005fdf46de967c69533 Reviewed-on: https://code.wireshark.org/review/14431 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-14Parallelize fuzz-test.shGerald Combs2-2/+17
Run each "argument" test (e.g. "-nVxr" and "-nr") simultaneously in the background. This should speed up our tests without reducing the amount of fuzzing that we do. Change-Id: I737d1dc09b31e07910d56632bec62da0f35fe222 Reviewed-on: https://code.wireshark.org/review/14432 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-14Add EditorConfig settings for epan/*.[ch]João Valverde2-0/+169
Change-Id: Idf53845158e1c112984bee895b91a39475f8c110 Reviewed-on: https://code.wireshark.org/review/14454 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-14Set EditorConfig hard tab width to 8 for CJoão Valverde1-0/+1
Our check scripts require 8 columns when using tab indentation with modelines so use the same setting for EditorConfig. Change-Id: I5a5a7c22a03866ee77c8fdc98d6582366950ce77 Reviewed-on: https://code.wireshark.org/review/14453 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-14More sorting.Guy Harris1-1/+1
Change-Id: Id74c065ef2151d4b9fe2d8275838ebe12c83b6ad Reviewed-on: https://code.wireshark.org/review/14465 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14More sorting.Guy Harris1-4/+4
Change-Id: Iad364a735d348913d7bc8936dbb2c8543801fe7e Reviewed-on: https://code.wireshark.org/review/14464 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14More sorting.Guy Harris1-9/+9
Change-Id: I562c95b6b081d50e9b7c0c743a9ad01bcaf5b1f0 Reviewed-on: https://code.wireshark.org/review/14463 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14More sorting.Guy Harris1-3/+3
Change-Id: Ia1b2cef56ae1ca16598ab757a730c80bb20beca5 Reviewed-on: https://code.wireshark.org/review/14462 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14Move some non-ASN.1 dissectors out of the ASN.1 dissectors list.Guy Harris1-5/+5
Sort the list of PIDL dissectors while we're at it. Change-Id: Ice90bf9b14b440fdfe59d1639fc0674e326a9923 Reviewed-on: https://code.wireshark.org/review/14461 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14Move some non-ASN.1 dissectors out of the ASN.1 dissectors list.Guy Harris1-7/+7
Sort the list of PIDL dissectors while we're at it. Change-Id: I1425046d6feaded7af94f4a852d8f0984bd0b736 Reviewed-on: https://code.wireshark.org/review/14460 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14packet-u3v.c lost after cmake build cleanupMoeller, Thies1-0/+1
fixes 6b54fbf3bfb7a3b0519637d01fa36bba8cec9c98 Change-Id: If3b911dd8124a53b91d1ac2b35ea1dad0eec4802 Reviewed-on: https://code.wireshark.org/review/14459 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14Qt: Add FunnelTextDialog geometry stateStig Bjørlykke2-5/+9
Use "Funnel <title>" as dialog name to avoid a user defined dialog title to be equal to a existing dialog title. Change-Id: I3d21c87de8fe5852f37a18b4751fb4d4428ce6ea Reviewed-on: https://code.wireshark.org/review/14450 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>
2016-03-14Another fix for the Info column.Guy Harris1-1/+1
Bug: 12257 Change-Id: I1859aa11c79f82060ab6051f702e69794f82c0ea Reviewed-on: https://code.wireshark.org/review/14457 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14Don't let the existence of a protocol tree affect what's in the Info column.Guy Harris3-16/+18
A dissector must never assume that it will, or won't, be called with a protocol tree; it's up to the Wireshark/TShark/etc. core to decide whether to do it, and it can change its behavior over time or even change it from release to release. Have dissect_epath() take an argument that explicitly indicates whether to add the CIP class to the Info column, rather than assuming that you do so only if the tree pointer passed to it is null. Bug: 12257 Change-Id: Ide8a6fc21252880f849a8d0aa4659a675bb3ae04 Reviewed-on: https://code.wireshark.org/review/14456 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14Handle RADIUS ident reuse better.Jeff Morriss2-153/+160
Rather than storing RADIUS calls in a map keyed by the ident and conversation store a tree of calls (using the the same key). Store each (non-duplicate) call (request) in the tree, keyed by frame number. When looking for a match (or a duplicate) look for the most-recently-seen frame in the tree (i.e., the most recent frame with the same ident + conversation). Only declare a request a duplicate if the authenticator is identical (as per RFC 5080 section 2.2.2). Only store things in the map/tree on the first pass. Remove the 'request_ttl' preference: it's better to show the user when the response came back even if it was "late." (This also allows duplicate request detection inside of the TTL.) When telling the user about a duplicate don't tell them the ident again: they already know that. Tell them the frame number of the original. Use the FT_FRAMENUM_REQUEST/FT_FRAMENUM_RESPONSE hints. Move a couple structures from the header file to the C file: they're only used in the RADIUS dissector anyway. Bug: 4096 Change-Id: I0e8bc0d23cd6b219cecd82f5c4cd765d28a14d98 Reviewed-on: https://code.wireshark.org/review/14451 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-14wmem-ify the Radius call table.Jeff Morriss1-17/+52
This includes not making assumptions about the order in which a GHashTable or wmem_map implementation provides the keys to the GEqualFunc function (apparently the former's order is different than the latter). Change-Id: Ifbcb0f4f2c38b2ce6e44bf66c7246575af6299fa Reviewed-on: https://code.wireshark.org/review/14448 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-13Clean asn1 make/cmake whitespaceJoão Valverde403-404/+9
Add missing newline or remove extra newlines at the end of the file. Trim trailing whitespace. Change-Id: I73b7a4e20969bc13f72bf97e981fd5de89d8bb17 Reviewed-on: https://code.wireshark.org/review/14400 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-13Move /asn1 to /epan/dissectorsJoão Valverde1358-5801/+5799
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9 Reviewed-on: https://code.wireshark.org/review/14388 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-13[Automatic update for 2016-03-13]Gerald Combs1-129/+130
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a80e0c443496a65e6ef34c6a329c92dd48a803d Reviewed-on: https://code.wireshark.org/review/14452 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-13Fix a FIXME: remove an if(tree).Jeff Morriss1-28/+25
The reason the notice in the INFO column disappeared when a display filter was added is because the column operation was wrapped in an if(tree). Change-Id: Ic8ff929d7ef601458b8650f8095f87282f9fde40 Reviewed-on: https://code.wireshark.org/review/14449 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-13ISO 8583-1 dissector initial importPaulo Roberto Brandão4-0/+1408
Initial import of source code for the dissector of the ISO 8583-1 'financial transaction card originated messages - Interchange message specification' standard. Bug: 12244 Change-Id: I24804cab4a93131ec9afa307844ad62eb2e01089 Reviewed-on: https://code.wireshark.org/review/14311 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-13[Automatic update for 2016-03-13]Gerald Combs17-726/+859
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id764cddac44715977f4abbd1f55bfc961a1973a4 Reviewed-on: https://code.wireshark.org/review/14443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-13Lua: Remove heur dissectors when reload Lua pluginsStig Bjørlykke4-2/+21
When reloading Lua plugins all registered heuristic dissectors must be removed. Bug: 12251 Change-Id: Ib7da6df347fb9294f5394ae531b582bf6d2730bb Reviewed-on: https://code.wireshark.org/review/14429 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:23:45 +0000