aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-01-05Minor CMake updates to better group build artefactsGraham Bloice1-0/+1
Move capchild, caputils, codecs and wsutil into a Libs group Move gtkui into UI group Move update-sminmpec into tools group Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee Reviewed-on: https://code.wireshark.org/review/6332 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-05Squelch harmless compiler warnings.Guy Harris1-3/+3
(Yes, we know, we're casting 16-bit integers to pointers. That's because various generic maps need to be able to take arbitrary values as keys, and sometimes the arbitrary values aren't structures to which we point, but just integral values, and that's why GUINT_TO_POINTER() exists, but it doesn't do enough casting to suppress harmless warnings.) Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a Reviewed-on: https://code.wireshark.org/review/6329 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05Beginnings of dissection of the dji drones control protocol.Joerg Mayer2-0/+390
Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532 Reviewed-on: https://code.wireshark.org/review/6328 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05Get rid of some GNU make extensions so users can build withStephen Fisher1-1/+1
the make that comes with *BSD and other systems now. Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131 Reviewed-on: https://code.wireshark.org/review/6320 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05Replace ep_display_to_address with wmem equivalent display_to_address.Michael Mann6-55/+11
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 Reviewed-on: https://code.wireshark.org/review/6318 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-05OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-4/+0
Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493 Reviewed-on: https://code.wireshark.org/review/6322 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33 Reviewed-on: https://code.wireshark.org/review/6321 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05Added DNS statistics supportDario Lombardo2-14/+184
This affects both the dissector (that has been added with a tap interface and a stats generator) and the UI (to recall the stats menu). Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53 Reviewed-on: https://code.wireshark.org/review/6236 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-04Make all Lua code use wmem not ememHadriel Kaplan13-41/+114
Changed all remaining code in wslua that was using emem, to use wmem or simpler methods. Bug: 9927 Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55 Reviewed-on: https://code.wireshark.org/review/6109 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04ACSE: get rid of an evil global variablePascal Quantin1-32/+52
Bug: 10787 Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f Reviewed-on: https://code.wireshark.org/review/6263 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04PKIX1Explicit: get rid of an evil global variablePascal Quantin1-14/+22
Bug: 10744 Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b Reviewed-on: https://code.wireshark.org/review/6264 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04Convert "FC Member Identifier" fields from all strings to their "native" ↵Michael Mann3-170/+157
formats. Change-Id: I7ea32170b1cdcbc16c1d62b1069c4ed71ea6e9bb Reviewed-on: https://code.wireshark.org/review/6099 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04Make sure we don't underrun a buffer when decrypting SSL.Gerald Combs1-0/+4
Discovered by Noam Rathaus. Change-Id: Ia0275601b2a825ba616656064d9a6eca109e34fa Reviewed-on: https://code.wireshark.org/review/6256 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-04TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824)Alexis La Goutte1-36/+68
* Add Fast Close subtype * Sender MAC => Sender HMAC * Display some reserved field * Add new flag (Checksum, Extensibility, HMAC-SHA1...) from MP Capability subtype * Use also proto_tree_add_bitmask for flag Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377 Reviewed-on: https://code.wireshark.org/review/6034 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: Evan Huus <eapache@gmail.com>
2015-01-04Get rid of warning: comma at end of enumerator list [-Wpedantic]Pascal Quantin1-3/+3
Change-Id: I8faca065e1afff6d4d29b9b96c1b0f0b135163a7 Reviewed-on: https://code.wireshark.org/review/6306 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field ↵Michael Mann32-257/+287
type. These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter. Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type. Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values. Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9 Reviewed-on: https://code.wireshark.org/review/6098 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04gmr1_rach: Update dual-values fields to use true_false_stringSylvain Munaut1-17/+24
Change-Id: I87f2be4b28f6409e525afc36e8ed834fae3befbb Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Reviewed-on: https://code.wireshark.org/review/6300 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04gmr1_rach: Add support for GmPRS/GMR-1 3G Channel Request Type 1 & 2Sylvain Munaut1-16/+446
Those are related to the Packet Data service. Change-Id: Ia8e9732901609e1cdad38558aac4a2f3475a0a9d Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Reviewed-on: https://code.wireshark.org/review/6291 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04[Automatic manuf, services and enterprise-numbers update for 2015-01-04]Gerald Combs2-4/+64
Change-Id: Id1c008d9bbce7d9fdf8b1d2ec7d382e9d205db17 Reviewed-on: https://code.wireshark.org/review/6301 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-04GTPv2: fix Logically dead code (CID 1250813)Alexis La Goutte1-6/+7
Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152 Reviewed-on: https://code.wireshark.org/review/6279 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04BACAPP: fix empty paragraph passed to '@param' command [-Wdocumentation]Alexis La Goutte1-1/+1
Change-Id: Ibef3cee6930dea08fc7a87635c48de609d3d4015 Reviewed-on: https://code.wireshark.org/review/6299 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04GTPv2: fix Logically dead code (CID 1255924)Alexis La Goutte1-1/+1
Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc Reviewed-on: https://code.wireshark.org/review/6278 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04gmr1_rach: Fixup the MOC Dialled Number decodingSylvain Munaut1-34/+77
Turns out the special values 1023/1022/1021 can happen in any group and not just the last one. The last one is still special though with codes [1100->1209] being exclusive to it. Change-Id: If86d0260aaa2cc1215560b89d7fc57d7ef21f082 Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Reviewed-on: https://code.wireshark.org/review/6290 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04gmr1_rach: Update NULL GPS position decoding with realitySylvain Munaut1-3/+14
The spec doesn't always match 100% reality. In this case it seems some manufacturer implemented NULL GPS position with longitude. Change-Id: I0c09627d64814a9467ecbecdc18e43974e4bab4a Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Reviewed-on: https://code.wireshark.org/review/6289 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04gmr1_rach: Use FT_INT24 instead of FT_UINT24 for latitude/longitudeSylvain Munaut1-15/+5
No need to do sign extension manually, the core code now supports signed integers with bitmask and it will do the sign extension. Not sure if that was always the code, but it works now. This also have the advantage that the real value 'seen' by wireshark when applying filters is the real signed value. Change-Id: I47e2357e5556160a00110ad63e3342879769a0b9 Signed-off-by: Sylvain Munaut <tnt@246tNt.com> Reviewed-on: https://code.wireshark.org/review/6288 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04Lua: replace proto_tree_add_text callsHadriel Kaplan3-3/+31
Replace proto_tree_add_text() calls in Lua API code, to use Lua-specific hfinfo items. Bug: 10828 Change-Id: I9b5899106502a9bdbc748b5ec0f27b787d374562 Reviewed-on: https://code.wireshark.org/review/6296 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-04WiFi Display: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+1
It is the revert of adb81f335d17a151361f00001e125480eeaf7bc5 Change-Id: I7a19ff175ca1ab59d0d0d9e89b3b3e6e12de3b96 Reviewed-on: https://code.wireshark.org/review/6273 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-03IPv6: do not allocate tap data on stackPascal Quantin1-11/+11
Bug: 10780 Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a Reviewed-on: https://code.wireshark.org/review/6276 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-03Lua: replace deprecated functionsHadriel Kaplan4-15/+12
Remove deprecated functions from Lua API code: tvb_length and tvb_length_remaining. The calls to proto_tree_add_text() are left in, as I have no idea what to replace them with. The calls to ep_* are being left in, as they're removed by change-id I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55. Bug: 10822 Change-Id: Ib0686f90be1edc892d3ecf401b91eb7484540b3e Reviewed-on: https://code.wireshark.org/review/6247 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03Remove the probes from packet-kerberos.c.Guy Harris1-17/+3
None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or HAVE_LIBNETTLE defined when it's compiled. So how is HAVE_KERBEROS getting defined when wireshark-qt.cpp is compiled? Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d Reviewed-on: https://code.wireshark.org/review/6262 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Stick some #define probes in on Windows.Guy Harris1-3/+17
Let's try to figure out why, on the 64-bit Windows build, wireshark-qt.cpp is being compiled to call read_keytab_file() but packet-kerberos.c is not being compiled to define it. Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d Reviewed-on: https://code.wireshark.org/review/6261 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02Replace proto_tree_add_text in dissector header files where it was used in a ↵Michael Mann17-862/+885
macro that should be expert info. Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af Reviewed-on: https://code.wireshark.org/review/6244 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02Don't define a stub read_keytab_file() on Windows if we don't have Kerberos.Guy Harris1-25/+6
We don't declare it, so all the DLL export stuff won't work, and we shouldn't need it, as we shouldn't be calling it if we don't have Kerberos (we shouldn't support the -K option if we don't have Kerberos, for example). Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef Reviewed-on: https://code.wireshark.org/review/6255 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02USB HID: fix report descriptor main items dissectionPascal Quantin1-9/+9
true_false_string definitions were inverted While we are at it, use the exact same wording as in the spec Bug: 10825 Change-Id: Ia391b310e92eb88a9a144a2fb0974701a460afc8 Reviewed-on: https://code.wireshark.org/review/6251 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-02mux27010: Add a link to info about the mux27010 packet structure.Bill Meier1-0/+11
Change-Id: I46f8efc8c95bf4501a631ef3adc5291939ab1497 Reviewed-on: https://code.wireshark.org/review/6240 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02ositp: fix some BASE_ errors from g7935ba9f5beEvan Huus1-3/+3
Change-Id: I71639f95f8efff9619e00dae45763ff863f0ca21 Reviewed-on: https://code.wireshark.org/review/6237 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02Eliminate proto_tree_add_text from packet-ositp.cMichael Mann1-178/+178
Change-Id: If97f1b17bf8dbd6bac708b7dfbef6df73fad0f30 Reviewed-on: https://code.wireshark.org/review/6218 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: Evan Huus <eapache@gmail.com>
2015-01-02tvb: implement endianness-paramterized gettersEvan Huus2-4/+125
e.g. tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN) Change-Id: Iea02fd59b13678aca741d028fb1f66f334447498 Reviewed-on: https://code.wireshark.org/review/6191 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: Evan Huus <eapache@gmail.com>
2015-01-02Always set decrypt_len when setting decrypt.Guy Harris1-3/+8
This may not always be necessary, but.... Change-Id: Ib409839dbee0574c516568a1f43793f8b407f611 Reviewed-on: https://code.wireshark.org/review/6232 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02When deccoding base-64, the result is the length of the *decoded* result.Guy Harris1-28/+43
That way, for example, format_text() calls on the decoded result don't go past the end of the decoded result. Fix some more indentation while we're at it. Bug: 10823 Change-Id: Ia7b7b1d9fb06af5df945f19a375bf5bef3277018 Reviewed-on: https://code.wireshark.org/review/6221 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier9-9/+10
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02Add "Editor modelines"; Adjust whitespace as needed.Bill Meier2-34/+60
Change-Id: Ic5a5acb0f36d3aa144edbfb1ae71097b18426db4 Reviewed-on: https://code.wireshark.org/review/6216 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02tshark: Add endpoints statisticsMichael Mann18-50/+22
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector. Change-Id: If34bcb5165b493948e784ba038ab202803a59843 Reviewed-on: https://code.wireshark.org/review/6154 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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>
2015-01-02Remove pkt_comment member from packet_info structure.Michael Mann7-32/+57
Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d Reviewed-on: https://code.wireshark.org/review/5884 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-01Fix tpyo.Guy Harris1-10/+10
Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236 Reviewed-on: https://code.wireshark.org/review/6213 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01More indentation cleanups.Guy Harris1-34/+34
Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7 Reviewed-on: https://code.wireshark.org/review/6212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Clean up indentation.Guy Harris1-7/+7
Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685 Reviewed-on: https://code.wireshark.org/review/6211 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.Guy Harris2-7/+7
Don't throw its declaration in file.h, as it's not defined in file.c. Instead, include it in epan/dissectors/packet-kerberos.h and include that wherever read_keytab_file() is called. Yes, that means you also have to include <epan/asn1.h> and, therefore, you have to include <epan/packet.h>. Yes, that should be cleaned up, perhaps by splitting the Kerberos support code into "stuff that handles encryption keys without any reference to dissection" and "stuff that does dissection-related work". Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef Reviewed-on: https://code.wireshark.org/review/6210 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Lua: FieldInfo '==' check isn't really equalityHadriel Kaplan1-12/+10
The FieldInfo metamethod for equality (letting you use the '==' operator) doesn't check for equality, but rather if the left-hand side is within the right-hand side. It should be equality instead. Also, all of the FieldInfo operate overloads should push a boolean even if they're false result. Bug: 10820 Change-Id: Ibddaab29713f26d22ddb4d5804b9edb15e93fd79 Reviewed-on: https://code.wireshark.org/review/6186 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-01Let routines from the Kerberos dissector be called from C++.Guy Harris1-3/+9
Wrap its declarations in the usual "extern "C"" stuff. Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a Reviewed-on: https://code.wireshark.org/review/6201 Reviewed-by: Guy Harris <guy@alum.mit.edu>