aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-04-22Fix ASAN error due to invalid typePeter Wu1-7/+5
ei_array is supposed to be an array of expert_entry items. However, it was initialized of an array of expert_info_t items which is much larger. This caused an ASAN error when running `tshark -z expert` because expert_stat_packet wants to read past the stack. Fix this by correcting the type. While at it, reduce the size of expert_entry for 64-bit systems (reduces initial memory usage by 8 kilobytes) and avoid a redundant g_array_index call. Change-Id: I2e08676a5e242743ed502dd2836806604ea75cc0 Reviewed-on: https://code.wireshark.org/review/1275 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-22Minor cleanupBill Meier12-293/+220
- Remove unneeded #includes; - Move proto_reg_handoff...(() to the end of the file as per convention; - Use dissector_add_handle() instead of using dissector_add_uint(..., 0, ...); - #if 0 an unused global function (which caused a [-Wmissing-prototypes] warning); - Remove an empty proto_reg-handoff...(); - 'if (already_registered)' not required in one case. Change-Id: I74f267c2721df13eb4d52d7f19a6ded423218a39 Reviewed-on: https://code.wireshark.org/review/1277 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-22Fix gcc "warning: no previous prototype ... [-Wmissing-prototypes]Bill Meier1-0/+1
Change-Id: Icdbc626dca876244b603c58cba05d0847d5d6a6f Reviewed-on: https://code.wireshark.org/review/1276 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-22Cache the "tcp_tree" with p_add_proto_data. Bug 9518.Michael Mann1-2/+4
This is more reliable than doing "tree math" and corrects the intention of 5470356154bec50b607e071606f49696429a0c7c which made the incorrect assumption that tcp_dissect_pdus will be called with the tree that is passed into a protocol's main dissection function (directly from TCP). Change-Id: I6ffc2188420ab74784c7bc2c69aa79ff071c90b6 Reviewed-on: https://code.wireshark.org/review/1214 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-22Add Length for Mobility Header Link-Layer Address Option (Type 7)Alexis La Goutte1-0/+2
Change-Id: I8e5a254d25a63c18753a2d6a4da4bfc470191304 Reviewed-on: https://code.wireshark.org/review/1204 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-22Fix display of AVP: 3GPP-MS-TimeZone(23), oct is owerwritten.AndersBroman1-4/+6
Change-Id: I12caa4b612bb98459899054841317361bf4af215 Reviewed-on: https://code.wireshark.org/review/1273 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-22Manual fix of Dead Store (Dead assignement/Dead increment) warning found by ↵Alexis La Goutte1-2/+2
Clang No found how to fix the generator... Change-Id: Ic49e8904b44ff733cca0df916b6677e6fb86d9ba Reviewed-on: https://code.wireshark.org/review/1209 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-22Much faster implementation of 'strict' allocator.Evan Huus1-100/+72
Rather than using a hash table, which is overkill and slow, embed a doubly-linked-list in the prefix structure. On my tests with some random capture file and tshark -nxVr: - normal block allocator: ~2.1 seconds - old (slow) strict allocator: ~4.2 seconds - new (fast) strict allocator: ~2.8 seconds The buildbot will thank me :) Change-Id: I2fb42229c4ee4c40bbe45ba04b7848792998eaa9 Reviewed-on: https://code.wireshark.org/review/1251 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-21Note the new transport name resolution behavior.Gerald Combs1-0/+5
Change-Id: I345ca0770fe8c116c6103e09c70c46d7140b90e9 Reviewed-on: https://code.wireshark.org/review/1248 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-21Disable transport name resolution by default.Gerald Combs1-1/+1
Modern hosts typically open many more TCP and UDP connections than in years past. For an example opening a popular news site in a web browser can easily trigger dozens of separate connections. At the same time our services file has accumulated a lot of cruft over time. As a result transport name resolution is a bunch of lies. Change-Id: Ibbca5b1c7ea1e800fc46dad63b9270128dacd721 Reviewed-on: https://code.wireshark.org/review/1240 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-21regenerate manufMartin Kaiser1-1/+1
Change-Id: Ib4cfdd8261e53caef695d54a2991223b1f296448 Reviewed-on: https://code.wireshark.org/review/1247 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-21Add short name for CableLabs.Philip Rosenberg-Watt1-0/+1
Change-Id: I474c03a1a40586a14cdec2196ee3ebc89eedd8ab Reviewed-on: https://code.wireshark.org/review/1236 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-21Define a function as 'static' (Fixes [-Wmissing-prototypes] warning).Bill Meier1-1/+2
Change-Id: Ia0a5c05c953053691837c5795c8204e2144d8067 Reviewed-on: https://code.wireshark.org/review/1241 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-21dissect some more E-LMI fieldsMartin Kaiser1-2/+118
Change-Id: I9b0cb7c8602f813fd06f1b3ea6107ed6fe8d72ed Reviewed-on: https://code.wireshark.org/review/1244 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-21mention the E-LMI lua dissector in the headerMartin Kaiser1-0/+3
Change-Id: I5e0e44019ddee4d39fbf2d6204c40c02d3e97c6f Reviewed-on: https://code.wireshark.org/review/1243 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-21add E-LMI to the release notesMartin Kaiser1-0/+1
Change-Id: I5e0e44018eaee4da9fbf2d6204c40c0ad3ea7a6f Reviewed-on: https://code.wireshark.org/review/1242 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-21Fix gcc "warning: no previous prototype ... [-Wmissing-prototypes]"; Do some ↵Bill Meier57-422/+564
whitespace changes Change-Id: I8c2e8694223270f1810aa6b13d955f0d08001d30 Reviewed-on: https://code.wireshark.org/review/1239 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-21Fix some bugs; Do more cleanup;Bill Meier1-389/+585
Bugs fixed: - DISSECTOR_BUG (reported by proto.c) when displaying "Parameters" (Apparently introduced in I8de7a19 (gc538b44)) - Incorrect byte pane highlighting for ARG_ARRAY container type (In dissector code as originally committed) - "uint32uint32" should be "uint32" in packet details. (In dissector code as originally committed) Cleanup: - Remove unneeded #includes; - Simplify some code; - Remove unneeded initializers; - Fix: "warning: no previous prototype...[-Wmissing-prototypes]" - Reformat hf[] array entries; - Fix some spelling; - Do indentation, whitespace & formatting style changes. Change-Id: If1f488f10ba83b27f75a1f71cf4bce7d5279e87c Reviewed-on: https://code.wireshark.org/review/1238 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-21(Trivial) Clean up a comment; Fix spelling errors; Do some whitespace changes.Bill Meier1-70/+70
Change-Id: I57fb3c0d1ba97674c01c4c4799bf36696659c82b Reviewed-on: https://code.wireshark.org/review/1237 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-21Update to latsest spec. number while we are at it(no change).AndersBroman6-7/+7
Change-Id: I5064bbbd1d4961cbff6202967cbd2ee66f7a2c0b Reviewed-on: https://code.wireshark.org/review/1235 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-21Fix declaration of index shadows globalEvan Huus1-5/+5
Change-Id: I14030ab86c5f3a3fe28b6102f7c0d84494b138e2 Reviewed-on: https://code.wireshark.org/review/1234 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-21Replace linked list of proto fields with arrayEvan Huus6-41/+35
This is substantially more memory-efficient, shaving another ~1.5MB off our base usage. It also lets us remove the annoying extra "last_field" pointer and simplify proto_register_field_common(). It also accidentally fixed what may have been a memory leak in proto_unregister_field(). It unfortunately complicates proto_get_next_protocol_field() to require refetching the protocol each time, but that is itself just an array-lookup under the covers (and isn't much used), so I don't expect the performance hit to be noticable. Change-Id: I8e1006b2326d6563fc3b710b827cc99b54440df1 Reviewed-on: https://code.wireshark.org/review/1225 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-21Replace a GTree with a GHashTableEvan Huus1-10/+10
Shaves ~1.5MB off our base memory usage, and provides O(1) operations instead of O(log n). We don't need the additional operations a tree provides. Change-Id: I6159d09ee380a2bca0de3bb2d031a874d8eb79d2 Reviewed-on: https://code.wireshark.org/review/1224 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-21Apply the fix for bug 3290 to proto_tree_add_bytes*(): check the item length ↵Jeff Morriss1-0/+15
before trying to fake the item. This fixes the case described in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9983 proto_tree_add_bytes_item() and FT_UINT_BYTES both still need work. Change-Id: Ie421fed9e6dcecbc8b3eed1a57b3032d6ee043e8 Reviewed-on: https://code.wireshark.org/review/1219 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-21Minor value table updates. See bug 9718.David Ameiss1-10/+56
Change-Id: Ia0779c6055f6e2864d2099fd607d9763e4040380 Reviewed-on: https://code.wireshark.org/review/1233 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-21Fix various white space issues and typoes and regenerate SABP dissector.Guy Harris3-184/+174
Change-Id: Ic036dcbb36b2f0e1eda46062867b762d150b78e0 Reviewed-on: https://code.wireshark.org/review/1232 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Rename ENABLE_EXTRA_COMPILER_CHECKS to ENABLE_EXTRA_COMPILER_WARNINGS.Guy Harris2-4/+4
This matches the current name of the --enable-extra-compiler-warnings option in autotools. Fix the documentation of the option to match. (Note that "compiler" won't necessarily always be GCC or Clang, and won't necessarily always use -W for warning options, so speaking of them as "-W checks" isn't future-proof.) Change-Id: I2e142532e78be3c8051f1e738b3109a83e7d10dc Reviewed-on: https://code.wireshark.org/review/1231 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20"extra *compiler* warnings", not just "extra warnings".Guy Harris1-3/+3
Rename --enable-extra-warnings to --enable-extra-compiler-warnings, and have the message talking about "extra warnings" talk about "extra compiler warnings", to make it more uniform (the documentation for the --enable flag speaks of "additional compiler warnings") and to clarify that these are warnings from the compiler, not from *shark. Change-Id: Ic1a045670144f8d9eda2e3427142027e2a339156 Reviewed-on: https://code.wireshark.org/review/1230 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Rename ENABLE_EXTRA_GCC_CHECKS to ENABLE_EXTRA_COMPILER_CHECKS.Guy Harris1-1/+1
This matches with the change made to CMakeLists.txt. Change the description as well - the name was changed because those extra checks don't just apply to GCC. Change-Id: Id81c081574c42e11144d119c8af45875248578b5 Reviewed-on: https://code.wireshark.org/review/1229 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Get rid of ENABLE_EXTRA_CLANG_CHECKS.Guy Harris2-7/+0
It no longer does anything, and it refers to variables that no longer exist, as we're not distinguishing between extra GCC warning flags and extra CLang warning flags any more. Change-Id: If0b346f669f2573e46261e6da4dc78e96ef79a8f Reviewed-on: https://code.wireshark.org/review/1228 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Rename --enable-extra-compiler-checks to --enable-extra-warnings.Guy Harris1-3/+3
That makes it clearer that what we're enabling are extra warnings, and fits better with the description for --enable-warnings-as-errors, which says the default is "yes, unless extra warnings are enabled". Change-Id: If21f778df0dfdb98acbe02cb6a763ed27f2a7f91 Reviewed-on: https://code.wireshark.org/review/1227 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20Don't distinguish between "GCC" and "Clang" extra -W flags.Guy Harris3-45/+67
We test whether a given compiler supports a given -W flag, so we don't need to separate them and check them only for particular compilers. To make that even clearer, rename the --enable option from --enable-extra-gcc-checks to --enable-extra-compiler-checks, and document it as just "do additional -W checks", and rename the WIRESHARK_EXTRA_GCC_ CMake variables to WIRESHARK_EXTRA_COMPILER_. Sync up the lists of warning flags in CMake with the lists in autoconf. Uncomment -Wdocumentation while we're at it. If it doesn't work *at all*, comment it out until it's fixed, or, better yet, fix it; if it still produces warnings, we just leave it among the "extra" flags. Change-Id: I4042affdade612e4025e2881d08f1ca69d759626 Reviewed-on: https://code.wireshark.org/review/1226 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20[Automatic manuf, services and enterprise-numbers update for 2014-04-20]Gerald Combs3-23/+237
Change-Id: I2629e1cf04bdb003d659d2d25d1fe7bf0b4fe3e0 Reviewed-on: https://code.wireshark.org/review/1221 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-20Create the HTTP tree after we're assured it's HTTP. Otherwise a bogus tree ↵Michael Mann1-5/+6
is created when HTTP2 traffic is found. Change-Id: Ic315ed9b7d65fe70401945cb0cceda4af863d140 Reviewed-on: https://code.wireshark.org/review/1215 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-19Clean up white space (replace tabs with 4 spaces).Guy Harris1-9/+7
Change-Id: Id253ddca497ca92272e7317177aae5e5570f4271 Reviewed-on: https://code.wireshark.org/review/1218 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19More name changes.Guy Harris26-144/+144
Add ep_ to routines that may return ephemeral strings. Change "get_XXX" to "XXX_to_display" if the routine returns a formatted string if it can't get a name. Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88 Reviewed-on: https://code.wireshark.org/review/1217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19Some routine name changes.Guy Harris21-77/+70
"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it returns a string with ephemeral scope and 2) indicate that it maps an address to a "displayable" form - a name if possible, an address string if not. "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings have the same scope as "get_ether_name()", "get_hostname()", and "get_hostname6()". Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 Reviewed-on: https://code.wireshark.org/review/1216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19IPV6 Mobility Header Binding Revocation Acknowledge Global field is the ↵Michael Mann1-16/+24
wrong bit According to RFC 5846 (https://tools.ietf.org/html/rfc5846#section-5.2), there are 3 bits in the Binding Revocation Acknowledgement Message, which come in the following order: 1. Proxy Binding (P) 2. IPv4 HoA Binding Only (V) 3. Global (G) Found by Boaz Brickner From Alexis: MIP6 dissector is based on old draft... Closed-bug: 10007 Change-Id: I570381171e1455cc03fa7b40bf682d6ed7bd0a92 Reviewed-on: https://code.wireshark.org/review/1203 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-19IPv6 Authentication Header not parsed after Mobility HeaderAlexis La Goutte1-0/+11
When IPv6 has a Mobility Header that is followed by an Authentication Header, the Authentication Header is not parsed. Found by Boaz Brickner Change-Id: Ib6ad759c9f08c94650d72d8dfcc95856e628d2e6 Close-Bug: 10005 Reviewed-on: https://code.wireshark.org/review/1205 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-19Don't se_ allocate strings when mapping addresses to column strings.Guy Harris5-56/+36
This should significantly reduce memory usage, without increasing the CPU time required to process a capture file in TShark or Wireshark. As a result, se_address_to_str() is no longer used; eliminate it. Fixes bug #9949. Change-Id: I65a112a426c82cc73a957b81384c765c3d14f2c3 Reviewed-on: https://code.wireshark.org/review/1213 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-18Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+1
Change-Id: I3f0365e6e693e26e2490150d78cc6a7bc82281fe Reviewed-on: https://code.wireshark.org/review/1211 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-18Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I27b43b9326caaff7df5fbc65afdc77b06850c2a8 Reviewed-on: https://code.wireshark.org/review/1210 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-18Fix infinite loop. Bug #10003.Evan Huus1-8/+16
Also do a quick scan for other similar issues and fix them too; this type of underflow has popped up three times now in the openflow dissector in separate bugs. Hopefully this squashes the last of them. Change-Id: Id404433333016f64cdd83d7e0f9e60a3028d2d0b Reviewed-on: https://code.wireshark.org/review/1207 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-18Move packet-kerberos to ASN1 dissectorAlexis La Goutte2-2/+2
Change-Id: Ib4c97cb654b744bdc65155a0f97b3e944486fc30 Reviewed-on: https://code.wireshark.org/review/1200 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-18Remove all old BER functions.Stig Bjørlykke2-1150/+1
This should complete the transition to the "New" type. Change-Id: I882b088206c6e6d0592159451c943caeaf5b90ec Reviewed-on: https://code.wireshark.org/review/1202 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18Use new BER functions in kpasswd.Stig Bjørlykke7-23/+55
Added RFC 3244 ChangePasswdData to the kerberos dissector. This is the last dissector using the "old BER" functions. Change-Id: I1d79047103c07c268d08e652745391f1ac37c82c Reviewed-on: https://code.wireshark.org/review/1198 Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18Add kerberos-exp.cnf to asn1 gitignoreAlexis La Goutte1-0/+1
Change-Id: I48e225a6a68675afe6cacf57e5f3aa6b2eaaa407 Reviewed-on: https://code.wireshark.org/review/1201 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18Exported PDU: add support for more than 32 tagsPascal Quantin12-221/+242
Change-Id: Idc9f105164919827a8a81c88b5a56de4fa25df0b Reviewed-on: https://code.wireshark.org/review/1197 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18Fix warning found by -Wunused-const-variable (Clang 3.5)Alexis La Goutte3-55/+46
../../asn1/kerberos/packet-kerberos-template.c:1076:27: error: unused variable 'w2k_pac_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/packet-kerberos-template.c:1089:27: error: unused variable 'krb5_princ_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/packet-kerberos-template.c:1146:27: error: unused variable 'krb5_encryption_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/packet-kerberos-template.c:1184:27: error: unused variable 'krb5_checksum_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/packet-kerberos-template.c:1222:27: error: unused variable 'krb5_ad_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/packet-kerberos-template.c:1239:27: error: unused variable 'krb5_transited_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/packet-kerberos-template.c:1244:27: error: unused variable 'krb5_address_types' [-Werror,-Wunused-const-variable] ../../asn1/kerberos/kerberos.cnf:153:27: error: unused variable 'kerberos_Applications_vals' [-Werror,-Wunused-const-variable] Change-Id: Ie842d236628efb46450f3e6c23b5590b2e622c25 Reviewed-on: https://code.wireshark.org/review/1199 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-18Fix mix tab and spaceAlexis La Goutte2-12/+12
Change-Id: Ife12c5118dcd70ba6b2540d53697f7c9cc9207c9 Reviewed-on: https://code.wireshark.org/review/1196 Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 14:16:02 +0000