aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-08-13Eliminate proto_tree_add_text from some dissectors.Michael Mann6-166/+228
Change-Id: I1e6bf52fad1b1fffefc174a557ff836f400e8fd7 Reviewed-on: https://code.wireshark.org/review/9996 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-08-12GTP: fix indent (use 4 spaces)Alexis La Goutte1-4/+4
Change-Id: I2f0645adee2aff32122a8ccb60843e1bfd0897e1 Reviewed-on: https://code.wireshark.org/review/10004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-12[lwres] Fix (32 bit ?) MSVC-2015 warning: "conversion from 'size_t' to ↵Bill Meier1-1/+1
'guint16', possible loss of data" Change-Id: Ifc71d1c2afc3ff16f950f2f1c3c9e7142d62fc16 Reviewed-on: https://code.wireshark.org/review/10007 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-12[pdc] Fix a few [msvc-2015?] warnings about 'constant compared to constant'Bill Meier1-34/+47
Essentially: Do the version checks at compile time using #if statements (even though the compiler probably optimized out the run time checks). Change-Id: I4879b39729ba5bd6b1c478ac43c107cb9fb445b3 Reviewed-on: https://code.wireshark.org/review/10006 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-12[pdc] [msvc-2015] Change a variable type to prevent 32-bit MSVC-2015 ↵Bill Meier1-1/+1
"internal error" [...]\packet-pdc.c(205) : fatal error C1001: An internal error has occurred in the compiler. (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 246) To work around this problem, try simplifying or changing the program near the locations listed above. Please choose the Technical Support command on the Visual C++ Help menu, or open the Technical Support help file for more information INTERNAL COMPILER ERROR in 'C:\Program Files\Microsoft Visual Studio 14.0\VC\BIN\cl.EXE' Please choose the Technical Support command on the Visual C++ Help menu, or open the Technical Support help file for more information Change-Id: I505898d0c76244a56d75af1a1c5bf30554dd9a2b Reviewed-on: https://code.wireshark.org/review/10005 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-12Add DCE-RPC and ONC-RPC service response time dialogs.Gerald Combs4-4/+17
Add RpcServiceResponseTimeDialog, which handles DCE-RPC and ONC-RPC service response time statistics. Try to make it as lightweight as possible, since we might want to pull this into the RPC dissectors similar to the other SRT statistics. Allow program names on the command line in place of numbers or UUIDs. Make matches case-insensitive. E.g. the following are equivalent: -z rpc,srt,100003,3 -z rpc,srt,nfs,3 -z rpc,srt,NFS,3 as are the following: -z dcerpc,srt,f5cc5a18-4264-101a-8c59-08002b2f8426,56 -z dcerpc,srt,nspi,56 -z dcerpc,srt,NSPI,56 Change-Id: Ie451c64bf6fbc776f27d81e3bc248435c5cbc9e4 Reviewed-on: https://code.wireshark.org/review/9981 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-12Lua: Moved deregister out of wslua_cleanupStig Bjørlykke1-8/+8
Change-Id: Ia43aa0e5f09400ef9923288b362256094a1241b8 Reviewed-on: https://code.wireshark.org/review/9998 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-12Added guards for deregistered fieldsStig Bjørlykke1-2/+15
This is functions used when redissecting after a Lua plugins reload. Change-Id: Ida14526faec1992006938a6732ee894ac83c2d12 Reviewed-on: https://code.wireshark.org/review/9995 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-12Align commentsAndersBroman1-5/+5
Change-Id: Iab59ba51700b018337552018c76e30dcbd41f3f6 Reviewed-on: https://code.wireshark.org/review/9993 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-12[GTP] Direct Tunnel Flags 7.7.81 is currently specified with one dataAndersBroman1-2/+4
octet. Change-Id: Iab7917b23e6be03f63a92ef0aaf0814c9cbea2c3 Reviewed-on: https://code.wireshark.org/review/9992 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-12Eliminate proto_tree_add_text from some dissectors.Michael Mann5-279/+452
Change-Id: I7a7778802c442b254626a7676cb74ca2855fa65e Reviewed-on: https://code.wireshark.org/review/9977 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-08-11Lua: Remove unneeded call in wslua_cleanupStig Bjørlykke1-1/+0
Change-Id: I0cda00001b40e5951d680d72dbc8043cbe8b9309 Reviewed-on: https://code.wireshark.org/review/9980 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-11wmem: Fix wmem_tree_remove_stringStig Bjørlykke1-3/+1
Always set is_removed when insert data in a node. Change-Id: I8fb50932a369e3f4fe8a1f743462683fff705cc2 Reviewed-on: https://code.wireshark.org/review/9978 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-11H225: fix indent (use 2 spaces) and add modelines infoAlexis La Goutte2-950/+974
Change-Id: Ibe4cf8d004c6c94f745e5c620100af9483fa6a31 Reviewed-on: https://code.wireshark.org/review/9934 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-11wmem: Mark removed strings with is_removedStig Bjørlykke1-2/+7
This will allow integer value 0 again. Change-Id: Ibfa4249ea8b887971d3b3214ad9e4d095d20d155 Reviewed-on: https://code.wireshark.org/review/9973 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-11Added Reload Lua plugins.Stig Bjørlykke28-120/+635
This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-11[SMCR] Minimum 4 bytes is required to perform the heuristic check.AndersBroman1-0/+4
Change-Id: I29426147cb1443af3c9cc9dc1b60beabe9a94277 Reviewed-on: https://code.wireshark.org/review/9972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-11[Diameter] Add expert info to subdissection of 3GPP AVP:sAndersBroman1-1/+19
Change-Id: Ic2ec0696f1f6b8bb918dd04aa898dccdb8b90ece Reviewed-on: https://code.wireshark.org/review/9971 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-11[ENEA LINX over TCP] Make the TCP port registration a preference defaltedAndersBroman1-3/+33
to 0. Change-Id: I837bf8ac9d5724dd485f0bc62f3fe32bedd3eb0e Reviewed-on: https://code.wireshark.org/review/9970 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-11[GIOP] A GIOP message can have size = 0 (CloseConnection)AndersBroman1-0/+4
Change-Id: I1feb6135c79191aa3ac7f36bbc969e6b36314107 Reviewed-on: https://code.wireshark.org/review/9969 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-11zbee-nwk-gp: fix a memory leak when keys are defined in the preferencesMartin Kaiser1-4/+19
==5932== 33 (32 direct, 1 indirect) bytes in 1 blocks are definitely lost in loss record 2,124 of 4,121 ==5932== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==5932== by 0xA024F30: g_malloc (gmem.c:159) ==5932== by 0xA03A9E5: g_memdup (gstrfuncs.c:384) ==5932== by 0x70754D2: gp_init_zbee_security (packet-zbee-nwk-gp.c:1459) ==5932== by 0xA03A78C: g_slist_foreach (gslist.c:840) ==5932== by 0x67E867C: init_dissection (packet.c:249) ==5932== by 0x67DC202: epan_new (epan.c:160) ==5932== by 0x414B16: cf_open (tshark.c:2464) ==5932== by 0x40CF8A: main (tshark.c:2169) Change-Id: I7c0ce0717957525ca18eb4888ed3389debc89a49 Reviewed-on: https://code.wireshark.org/review/9967 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10zigbee: remove some more if (tree) checksMartin Kaiser1-11/+10
Change-Id: I81b46ec7d9d919ff2779d1005063e9ef6c92e097 Reviewed-on: https://code.wireshark.org/review/9966 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-10remove some unnecessary if (tree) checksMartin Kaiser1-13/+5
Change-Id: Ib0f4cc47ede7b840cba38ecad04bd17bb6bccd55 Reviewed-on: https://code.wireshark.org/review/9965 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-10Try to fix the build bou by copying tha cast made in glib.AndersBroman1-1/+1
Change-Id: I6da06b8e6ae272b940ef4ee47ce6b253bf9f3699 Reviewed-on: https://code.wireshark.org/review/9961 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10GSM (a_common): fix indent (replace tab by 8 spaces)Alexis La Goutte1-142/+142
Change-Id: Id1d6bfcb04ac75d767fe6f09454dc8235de7bc75 Reviewed-on: https://code.wireshark.org/review/9928 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10g_slist_free_full () does not exist until GLIB 2.28AndersBroman1-0/+5
Change-Id: I81df5b4dbe1916eca51cdb72199de7a90471bd07 Reviewed-on: https://code.wireshark.org/review/9960 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10Get rid of trailing white space.Guy Harris1-1/+1
Change-Id: I3c0091612bdd518f749abbfbefbd0e2097b8c18b Reviewed-on: https://code.wireshark.org/review/9958 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-10Don't try to decrypt the payload if it was cut short by the snapshot length.Guy Harris1-14/+32
It's not clear that the decryption code can handle an incomplete payload. If it can, please fix this (bear in mind that you won't have all the MIC, and may not have *any* of the MIC, so...). Bug: 11389 Change-Id: Ie863ddc5c4aa7fbf6cde317823a413d226a41c0d Reviewed-on: https://code.wireshark.org/review/9954 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-10Use the reported length where appropriate.Guy Harris1-11/+15
Use the captured length to know how much data to decrypt. Use the reported length to determine whether we have a null payload and to se the reported length of the decrypted payload and of tvbuffs for the un-decrypted payload. Bug: 11389 Change-Id: I4395c5a48c16110fcf31b611b99749c61000d489 Reviewed-on: https://code.wireshark.org/review/9953 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-10zigbee: fix two memory leaksMartin Kaiser2-13/+9
==17992== 4 bytes in 1 blocks are definitely lost in loss record 68 of 4,102 ==17992== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==17992== by 0x9FB2F30: g_malloc (gmem.c:159) ==17992== by 0x9FC89E5: g_memdup (gstrfuncs.c:384) ==17992== by 0x703F977: dissect_zbee_aps (packet-zbee-aps.c:1300) ==17992== by 0x67B4F1E: call_dissector_through_handle (packet.c:618) ==17992== 8 bytes in 1 blocks are definitely lost in loss record 580 of 4,102 ==17992== at 0x4C272B8: calloc (vg_replace_malloc.c:566) ==17992== by 0x9FB2F88: g_malloc0 (gmem.c:189) ==17992== by 0x703F962: dissect_zbee_aps (packet-zbee-aps.c:1299) ==17992== by 0x67B4F1E: call_dissector_through_handle (packet.c:618) second version that uses glib memory routines and does not mix g_hash_table and wmem remove an obsolete comment and an unnecessary return; while at it Change-Id: I2e92db0613f01b6c3009e8ad82ceb65a87cba12e Reviewed-on: https://code.wireshark.org/review/9830 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10Eliminate proto_tree_add_text from packet-wbxml.cMichael Mann1-1236/+756
While I was at it, some (mostly) duplicate functionality allowed rearranging of functions to eliminate most forward declarations. Change-Id: I2d7027d336c391d81dfe81c7a1ebf0d56c0826b2 Reviewed-on: https://code.wireshark.org/review/9951 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-08-10Cleanup variable name in dissect_frag6()João Valverde1-8/+8
Change-Id: Ib6bdea5dbc95b5221e41ca30c11288ff8c1dbb7f Reviewed-on: https://code.wireshark.org/review/9952 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-10use the captured length as payload length for zigbee decryptionMartin Kaiser1-4/+2
this length is used for allocating a buffer and for crypto calculations we should use the bytes that were actually captured, not the reported length the capture in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11389 has one packet with a stupidly large reported length and a reasonable capture length (and one completely bogus packet) - this fix ensures that the decryption does not break for the former packet also, tvb_reported_length_remaining() does not return values < 0 any more, remove the check for this Bug: 11389 Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3 Reviewed-on: https://code.wireshark.org/review/9950 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-09H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94 Reviewed-on: https://code.wireshark.org/review/9933 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-09[skinny] Add missing change to source (.in); Also do minor cleanup.Bill Meier2-47/+37
packet-skinny.c is generated from packet-skinny.in and etc. So: Change committed in gceb8d95 to packet-skinny.c should really have been applied as well to packet-skinny.c.in. Minor cleanup: Remove a few unneeded initializers; Remove unneeded code in proto_reg_handoff_skinny(); Replace a tab by spaces; Change editor tab-width specification to be 8 (not 2). No actual indentation change since tabs not used in the file. packet-skinny.c regenerated using 'cog' Change-Id: Ib3510c257e0b98bb7da8fae9aa010e134ec381cb Reviewed-on: https://code.wireshark.org/review/9948 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-09t124: kill evil global variablesEvan Huus1-17/+13
Bug: 11430 Change-Id: Ia4196ff693806dc1e20eae4075dda7dfe272c5b6 Reviewed-on: https://code.wireshark.org/review/9941 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-08-09zigbee: remove a numer of unnecessary if (tree) checksMartin Kaiser1-63/+31
Change-Id: Ifd0dcc220cfdd0809f2e7cf2fc54fc8bdeb987be Reviewed-on: https://code.wireshark.org/review/9947 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-09Trivial: Convert 'tabs' indentation to '4 space' indentationBill Meier4-1538/+1515
Change-Id: If71dd8a04050ce11e37ad88ee862419313c06639 Reviewed-on: https://code.wireshark.org/review/9946 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-09Trivial: Change editor-modelines tab-width specification from 4 to 8.Bill Meier11-32/+32
[There were no actual indentation changes since since none of the files contained tabs]. Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92 Reviewed-on: https://code.wireshark.org/review/9945 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-09[Automatic update for 2015-08-09]Gerald Combs2-7/+207
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa Reviewed-on: https://code.wireshark.org/review/9942 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-08GSM (a_common): fix no previous prototype for 'gsm_a_*_init' ↵Alexis La Goutte1-11/+11
[-Wmissing-prototypes] Change-Id: I2990cb3432ad377cbed7039ad8fe15019eb7e7f5 Reviewed-on: https://code.wireshark.org/review/9927 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-08-08GSM (a_common): fix comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I0ea06451861412b642d033a70e0a639aae753beb Reviewed-on: https://code.wireshark.org/review/9926 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-08Fix another typo.Guy Harris1-1/+1
Change-Id: I1fee679b4b0f582806b0e9302c3e404c0222cd6d Reviewed-on: https://code.wireshark.org/review/9930 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-08IEEE802.11: Fix typoAlexis La Goutte1-1/+1
Pseduo -> Pseudo Change-Id: I34700b3392bfd7e47e79cb2cad0f65a1046a26a2 Reviewed-on: https://code.wireshark.org/review/9925 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-08If SOCKS server doesnt't require authentication, then client should be ready ↵Michael Mann1-0/+2
for commands. Bug: 11417 Change-Id: I62c6d94923dcda2ef8297086faac7d7c4b85a3fb Reviewed-on: https://code.wireshark.org/review/9923 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-08NCP2222(.inc): fix indent (use 4 spaces)Alexis La Goutte1-20/+19
Change-Id: I8161423ae270f685c28003eac36adf15be83c5fd Reviewed-on: https://code.wireshark.org/review/9922 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-08GTPv2: fix indent (use 4 spaces)Alexis La Goutte1-3/+3
Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d Reviewed-on: https://code.wireshark.org/review/9921 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-07Add SHA2 algos to certificate dissection in SSLTimothy Geiser2-4/+11
Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9 Reviewed-on: https://code.wireshark.org/review/9880 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>
2015-08-07More casting issues with older versions of GLib.Gerald Combs3-4/+4
Try to fix packet-btl2cap.c: In function 'btl2cap_cid_value': packet-btl2cap.c:425: warning: cast to pointer from integer of different size packet-btl2cap.c: In function 'btl2cap_psm_value': packet-btl2cap.c:448: warning: cast to pointer from integer of different size packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value': packet-btrfcomm.c:287: warning: cast to pointer from integer of different size packet-btobex.c: In function 'btobex_profile_value': packet-btobex.c:1134: warning: cast to pointer from integer of different size on the 32-bit OS X builder. Change-Id: Ieb2fe6c31fdad0cf776c24bada7a6a83e8aa91ec Reviewed-on: https://code.wireshark.org/review/9915 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-07Switch the floats in stat_tap table items to doubles.Gerald Combs2-4/+4
Use doubles instead of floats in stat_tap_table_item_type. This should make stat taps easier to use with a lot of our API (e.g. nstime) along with Qt and the C math library. This reverts commit 5bbb6ff5e43511ddc57b0b771f3d60da1eb82c02. Change-Id: I113b44fb944a883cde016b7a8961597658be4c0a Reviewed-on: https://code.wireshark.org/review/9912 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 06:24:27 +0000