aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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>
2015-01-01Added DNP3 support for g13 and g43, output command eventsGraham Bloice1-9/+117
Bug: 10347 Change-Id: Ic173f31d8cf3fd002454f4c22b85c19bae42d544 Reviewed-on: https://code.wireshark.org/review/6175 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: Anders Broman <a.broman58@gmail.com>
2014-12-31We no longer do anything signal-related, so don't include <signal.h>.Guy Harris1-8/+13
Update a comment pertaining to that, while we're at it. Change-Id: Ic0a3f8575f8e98ca6032ed3e06e3dd76055d65a1 Reviewed-on: https://code.wireshark.org/review/6192 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31rtse.cnf: fix Nesting level does not match indendation (CID 1159214)Alexis La Goutte1-9/+10
Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4 Reviewed-on: https://code.wireshark.org/review/6173 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31Zbee ZDP: fix Copy-paste error (CID 1158598)Alexis La Goutte1-1/+1
Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc Reviewed-on: https://code.wireshark.org/review/6163 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31GTPv2: fix Copy-paste error (CID 1158587)Alexis La Goutte1-3/+2
Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5 Reviewed-on: https://code.wireshark.org/review/6169 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31wslua field: fix Copy-paste error (CID 1158590 & 1158589)Alexis La Goutte1-2/+2
Change-Id: I566ddd2930b5c86bc32ca9ba12cd4be7d994bd22 Reviewed-on: https://code.wireshark.org/review/6168 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31umts_fp: Replace se_new0(...) by wmem_new0(wmem_file_scope(), ...)Bill Meier1-1/+1
Change-Id: I9d40ffd199147fb8b975c493253d5cf796be5983 Reviewed-on: https://code.wireshark.org/review/6179 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31Lua: allow a Dissector object to be passed in for register_heuristicHadriel Kaplan2-0/+32
Bug: 10695 Change-Id: I81181b2d00fcb5f0c25ab89bbe4968897f47a3a6 Reviewed-on: https://code.wireshark.org/review/6131 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31GTP: fix Copy-paste error (CID 1158594 & 1158595)Alexis La Goutte1-2/+2
Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff Reviewed-on: https://code.wireshark.org/review/6166 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31SCTP: fix Nesting level does not match indendation (CID 1159213 & 1159215 )Alexis La Goutte1-2/+0
Change-Id: Icd04c5f1f09b9cf704828e4b6a598cd2c1f6dd15 Reviewed-on: https://code.wireshark.org/review/6172 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31DHCPv6: fix Nesting level does not match indendation (CID 1159219)Alexis La Goutte1-1/+2
Change-Id: Id57a9f2df6a4011078b0bef359b2cd5503f6f7ce Reviewed-on: https://code.wireshark.org/review/6171 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31GTPv2: fix typo in Anders e-mail AddressAlexis La Goutte1-1/+1
Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc Reviewed-on: https://code.wireshark.org/review/6170 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31jxta: fix Copy-paste error (CID 1158599 & 1158600)Alexis La Goutte1-2/+2
Change-Id: Ica4ade2e7de70cefc4e77d421e35ddd72e688c16 Reviewed-on: https://code.wireshark.org/review/6165 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31mount: fix Copy-paste error (CID 1224605)Alexis La Goutte1-5/+3
Don't longer need to check if(tree) Change-Id: I4ec572df28bad3c487c3c744840d97b79781feb3 Reviewed-on: https://code.wireshark.org/review/6164 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31Column utils: Missing varargs init or cleanup (CID 1212122)Alexis La Goutte1-0/+1
Change-Id: I013c737c2cd62e3f1f49b113a7ce0c0616e1ecc4 Reviewed-on: https://code.wireshark.org/review/6119 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31prefs: fix typoAlexis La Goutte1-1/+1
Change-Id: Ic4dbbab5e53b5745cb703e6e30b2dc6251c3918e Reviewed-on: https://code.wireshark.org/review/6161 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31Fix conversations filteringPascal Quantin1-4/+6
Change-Id: Ic615830a373deab349a0a5a62f25b131e0bcbf18 Reviewed-on: https://code.wireshark.org/review/6162 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>
2014-12-31DNS: ensure that suffix_addr structure is always initializedPascal Quantin1-1/+1
Bug: 10816 Change-Id: Ifd036148f9f2e76516913bda11cf07fdb63def94 Reviewed-on: https://code.wireshark.org/review/6174 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31E.164: display country_code as decimal not hexLuke Mewburn1-366/+428
Display and filter e164.country_code and e164.identification_code as decimal instead of hexadecimal, as that is more natural. E.g. Use 'e164.country_code == 61' instead of 'e164.country_code == 0x61' to match Australia (+61...) If the country_code or identification_code contain BCD digits > 9 add an expert info warning. Required modifying the various prefix to description value_string arrays from hex to decimal constants, and converting the decoded BCD from hex to decimal before adding to the proto tree. Change-Id: Ibedfc75246fe409b7d63776083379bb028fb784b Reviewed-on: https://code.wireshark.org/review/6054 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>
2014-12-31BGP : Simple typo fix for BGP AttributeEbben Aries1-1/+1
Change-Id: I793eed5c7d63c82e13847c8a6c8fd6def3025b8c Reviewed-on: https://code.wireshark.org/review/6158 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-31Lua: getting fieldinfo.value for FT_NONE causes assertHadriel Kaplan1-4/+6
Retrieving an FT_NONE field's value through `fieldinfo.value` or `fieldinfo()` causes an assert. It should retrieve the label instead. Bug: 10815 Change-Id: Ia80443f3dd046b2cc31d1dff70d599e96d6f6fe3 Reviewed-on: https://code.wireshark.org/review/6150 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-31tshark: endpoints statistics are not supported for now, do not list them in -zPascal Quantin1-23/+26
Move statistics registration to "GUI" callback registration Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc Reviewed-on: https://code.wireshark.org/review/6151 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-2/+1
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-30Test suite: Start testing our output for valid UTF-8.Gerald Combs3-99/+109
Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a couple of the Bluetooth dissectors and X11 keysyms accordingly. Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd Reviewed-on: https://code.wireshark.org/review/6146 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw()Martin Kaiser1-1/+5
Bug: 10740 Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0 Reviewed-on: https://code.wireshark.org/review/6145 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30Fix IPv6/IPX statistics generationPascal Quantin1-6/+6
Use a doubly-linked list and iterate on the reversed statistics list to always test the bigger strings first Bug: 10813 Change-Id: Ibfedac9648db58e6dadc2334eec678e26daca906 Reviewed-on: https://code.wireshark.org/review/6140 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30Websocket: use pinfo pool and not packet one for the unmasked data tvbPascal Quantin1-3/+3
As indicated in README.wmem, pinfo pool must be used for anything that might end up being passed to add_new_data_source Change-Id: I4a6396fc52e6c70c771390f502d58199c38c172a Reviewed-on: https://code.wireshark.org/review/6144 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-30clean up the part where dissect_websocket() is called recursivelyMartin Kaiser1-2/+5
Change-Id: Ia94ddb2c4cb03fe5d1af9f8d316e1cdb18fe8283 Reviewed-on: https://code.wireshark.org/review/6143 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30use packet-scoped memory for the unmasked data tvbMartin Kaiser1-5/+2
Change-Id: I5f9b769e26c16072a1656dfe9094487d6dfe76f4 Reviewed-on: https://code.wireshark.org/review/6142 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30skip the payload if it's emptyMartin Kaiser1-2/+4
Change-Id: Ib38e747bc762422c690abc1cb127bb0944c80ce2 Reviewed-on: https://code.wireshark.org/review/6141 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30no need for if(tree)Martin Kaiser1-5/+3
Change-Id: I0b20b66e1b44da0362c13009946a69738a2aa267 Reviewed-on: https://code.wireshark.org/review/6138 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30stats_tree: Make sure some structs are fully initialized.Gerald Combs1-36/+4
Get rid of a strcpy. Change-Id: I49460969fdf627fdb89030115ad5a658e300a5d4 Reviewed-on: https://code.wireshark.org/review/6130 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30Qt: Convert more dialogs to WiresharkDialog.Gerald Combs1-1/+1
Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs subclasses of WiresharkDialog. Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain if the user opens more than one instance of the dialog. Use the applicationName property in WiresharkApplication instead of a separate variable. Add a preexisting item to the IO Graph bug list (hovering when the file is closed clears the graph). Change-Id: I8411a25305d00b16e0d4a82fa50a9bad5c85b239 Reviewed-on: https://code.wireshark.org/review/6125 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30Tabs are not necessarily set every 4 spaces.Guy Harris1-121/+121
Use spaces, not tabs, for indentation; that makes the code's layout indepencent of tab settings, which might be every *8* spaces. Change-Id: I69891b6424a668f1ee0ca80cc622b8cb0ed8967e Reviewed-on: https://code.wireshark.org/review/6132 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-29Remove some proto_tree_add_text outside the dissector directory.Michael Mann2-7/+5
Change-Id: I890846a0cede755a603243b4048fb5c917b2826b Reviewed-on: https://code.wireshark.org/review/6112 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Add ability to follow UDP stream by indexPascal Quantin5-65/+125
-z "follow,udp" tshark cli command now supports a stream index It is now possible to select the UDP stream displayed in Qt GUI (like for TCP) Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d Reviewed-on: https://code.wireshark.org/review/6083 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-29TN5250: Missing break in switch (CID 280477)Alexis La Goutte1-1/+3
fix also indent typo Change-Id: I47ff84a6062a203e14b9dde420a1a2efd5b05fab Reviewed-on: https://code.wireshark.org/review/6118 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29rtsp: Fix (what I think may be) a minor bug.Bill Meier1-14/+15
(Also fixes a compiler 'Shadow' warning in a different way than the now reverted previous fix). Change-Id: Iedcac3d402b89d1b0261a49647bf39cc854d1a0c Reviewed-on: https://code.wireshark.org/review/6123 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29rtsp: Fix compiler 'Shadow' warning ...Bill Meier1-8/+8
Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90 Reviewed-on: https://code.wireshark.org/review/6122 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29rtsp: Replace g_warning() by expert...() (dissectors shouldn't do termio).Bill Meier1-12/+36
Also: Add an expert...() in rtsp_create_conversation() for "Unknown transport type". Change-Id: I1d8ca20b9c0bc1e3d11b947b6653a2e2669a0f96 Reviewed-on: https://code.wireshark.org/review/6121 Reviewed-by: Bill Meier <wmeier@newsguy.com>