aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-02-23jmirror packet dissector expects ipv6 flow label = 0Alexis La Goutte1-3/+3
When the ipv6 flow label is non-zero the dissector does not detect the payload as being ipv6. Issue reported by Shehan Perera Bug:10976 Change-Id: I1de4966dfefd1afa9bb51b9a7570091aad59fbdd Reviewed-on: https://code.wireshark.org/review/7260 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-23L2CAP information message contained two bits that were wrongly dissected.Jeroen Sack1-2/+2
Change-Id: I308b6ed1a3953676212b9c0bb6cd7fc180210534 Reviewed-on: https://code.wireshark.org/review/7323 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-23Fix generation of address-with-resolution strings.Guy Harris1-26/+26
XXX_to_str routines should return the length, in bytes, of the generated string, including the terminating '\0'. As their reutrn values include the terminating '\0', we need to subtract 1 from the return value if, when appending the ")" after the address string, we want to skip past the address string rather than skipping past the terminating '\0'. Change-Id: Ibfd41e6d7152d05070706e6d76fc3e56a097a75b Reviewed-on: https://code.wireshark.org/review/7324 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22BMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I322be0953ce8c872f8464c3e095dfe9006d3b67b Reviewed-on: https://code.wireshark.org/review/7261 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-22Fix handling of longitude and latitude values.Guy Harris1-3/+3
The formatting routine is getting passed the 5-byte value, not some 8-byte value that includes the 3 bytes after it, so shifting it produces the wrong value. Make the longitude and latitude FT_UINT40, as they're only 5 bytes long. Change-Id: I35aa05887bcfdfc1107fef2ac5069f1fe96fda3a Reviewed-on: https://code.wireshark.org/review/7321 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Clean up display of raw hex latitude/longitude values.Guy Harris1-1/+1
1) It's only 40 bits long, so show only 10 hex digits. 2) If you're putting "0x" before the number, blank-padding on the left looks weird; use zero-padding. 3) Fix unbalanced parentheses. Change-Id: I76aedb1fb82f699ee08102b97b0d72e09d8c5917 Reviewed-on: https://code.wireshark.org/review/7320 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Put back address family field.Guy Harris1-0/+1
Change-Id: I89d60f78a0c834663c426f5ec50c6033ba9f99e1 Reviewed-on: https://code.wireshark.org/review/7318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22[Automatic manuf, services and enterprise-numbers update for 2015-02-22]Gerald Combs3-24/+212
Change-Id: Ida0ae626be0753c05435f3828d5137863309ebf1 Reviewed-on: https://code.wireshark.org/review/7309 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-22Make FT_{U}INT{40,48,56,64} handle BASE_CUSTOM.Guy Harris1-85/+23
Finish the job of handling integral values > 32 bits similarly to who we handle values 32 bits or less. In cases that "should not happen", and where we might *not* be executing in the context of a dissector (filling in the field label can be done lazily, being deferred to "print" time, and that doesn't happen in the context of a dissector), use g_assert_not_reached() rather than DISSECTOR_ASSERT_NOT_REACHED() - the latter throws an assertion that's not caught if we're not doing dissection, so we crash anyway. Bug: 10983 Change-Id: Ia81a0a4925394f99aa35193a333f3e9659a9b93d Reviewed-on: https://code.wireshark.org/review/7307 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Set 64-bit signed values with proto_tree_set_int64().Guy Harris1-1/+1
As in "don't set it with proto_tree_set_uint64(), signed vs. unsigned matters". Change-Id: I23ef3d172fa40c0867dfb6a078ce292bd5282170 Reviewed-on: https://code.wireshark.org/review/7306 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Fetch values appropriately according to the value's type.Guy Harris1-4/+5
This fixes some crashes. Change-Id: I47583777486486114675ba98cb58971adb8b1b10 Reviewed-on: https://code.wireshark.org/review/7305 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Add tvb_address_with_resolution_to_str.Michael Mann9-74/+66
Convert dissectors to using the API where appropriate. Change-Id: I059582f73a75635d4a0338d02d4c4b212162480b Reviewed-on: https://code.wireshark.org/review/7296 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-21Remove tvb_ from the names of wsutil mempbrk routines.Guy Harris9-77/+77
Routines that don't take a tvbuff as an argument shouldn't have tvb_ in the name. Change-Id: I3550256551e30b3f329cbbfca71ef27c727d29c0 Reviewed-on: https://code.wireshark.org/review/7302 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21More wrapping of constants with G_GUINT64_CONSTANT().Guy Harris1-18/+18
Change-Id: I11771b08cc4e57692c42dd3fc8976fe390b3025d Reviewed-on: https://code.wireshark.org/review/7299 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-2164-bit constants need to be wrapped in G_G{U}INT64_CONSTANT().Guy Harris1-6/+6
Otherwise, they don't get the right suffix to tell the compiler that they're 64-bit even on ILP32 platforms. Change-Id: I5c52a999d21707602e0a4174a142d1d1036242be Reviewed-on: https://code.wireshark.org/review/7297 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21The shortening to 32 bits is intentional, so add a cast.Guy Harris1-4/+4
The cast reassures the compiler that we do, in fact, know what we're doing, so it doesn't issue a warning. Change-Id: Ie3bc4e1c955f9c5cad5506e26fc72e12f7a8f854 Reviewed-on: https://code.wireshark.org/review/7295 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21Ftypes: Double: Minor fixesMichal Labedzki1-6/+8
Fix comments typos and use safe equivalent of sprintf. Change-Id: Icc9d69532dc35e8a58a78c0eacdb42214b679069 Reviewed-on: https://code.wireshark.org/review/7290 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Use correct mem scope for source address in Text LogcatMichal Labedzki1-1/+1
Change-Id: I94594e5c7ad8a398dd86ee3fe496077196f81fb9 Reviewed-on: https://code.wireshark.org/review/7287 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Fix GTK-sharkMichal Labedzki1-1/+1
Looks like a copy/paste issue. ERROR: wireshark/color_filters.c:100:color_filters_add_tmp: assertion failed: (strlen(prefs.gui_colorized_fg)==69) Change-Id: I7b8309cfc178fd834951078a098bbce986639ed2 Reviewed-on: https://code.wireshark.org/review/7286 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Make FT_{U}INT64 behave more like FT_{U}INT32, add support for ↵JC Wren22-443/+1618
FT_{U}INT{40,48,56} Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19 Reviewed-on: https://code.wireshark.org/review/5813 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-21Convert dissectors to use address_with_resolution_to_str instead of two ↵Michael Mann8-86/+82
separate calls for address string and name resolution. Change-Id: I7c8cfbcf201b3b73afe731302572646ce7833d64 Reviewed-on: https://code.wireshark.org/review/7284 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-21Call pre_init_prefs each time our profile changes.Gerald Combs2-54/+67
Manually back out gafa96c3 so that we can set our preferences to their default values each time we switch profiles. Zero the prefs struct at startup. Change-Id: Ic28db44cd0c4cdf640e977d7277f7357db10ebe8 Reviewed-on: https://code.wireshark.org/review/7282 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-02-20Clear the filter expression list in prefs.c.Gerald Combs3-0/+36
Move filter_expression_nuke from ui/gtk to epan and rename it to filter_expression_free. Call it in prefs_reset along with the other preference reset routines. This keeps the Qt filter toolbar from filling up with duplicate expressions when the profile changes. Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b Reviewed-on: https://code.wireshark.org/review/7281 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-02-20[Diameter] It's MCC first in 3GPP AVP 909 RAIAndersBroman1-9/+8
Change-Id: If4dd0d64d5a8d313ae9e62d2fcce3606ef8eb4f4 Reviewed-on: https://code.wireshark.org/review/7274 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-20addr_resolv.c: fix a stack buffer overflow detected by ASANPascal Quantin1-1/+1
Issue reported by Alexis Change-Id: I0ef19625b6844fbc2996b75d51e86f949e358c8d Reviewed-on: https://code.wireshark.org/review/7273 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-20address_types.c: fix a "conditional jump or move depends on uninitialised ↵Pascal Quantin1-1/+1
value" error found by Valgrind Change-Id: Ic752bb6aa1ba56e113895fcbed52f417ac0128f7 Reviewed-on: https://code.wireshark.org/review/7272 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-20MQTT: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-15/+15
Change-Id: I730b752680c85777a074a6b2bb4aef0c9f4d3ff5 Reviewed-on: https://code.wireshark.org/review/7265 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-20MCPE: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I7053c3c9e42cb4246ae504d31213bf95917a34f2 Reviewed-on: https://code.wireshark.org/review/7264 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-20addr_resolv: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-11/+0
by Clang Change-Id: I559151afab48892c51b702d008c1583570bd8754 Reviewed-on: https://code.wireshark.org/review/7262 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Rename packet-nbns.c to packet-nbt.c to reflect that it's not just NBNS.Guy Harris3-5/+4
packet-nbt.c handles all of NetBIOS-over-TCP, not just the name service; the file name is historical. Change-Id: I333d331fd9453cea8d1d7595b4fd2650f0a92e98 Reviewed-on: https://code.wireshark.org/review/7259 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19[bmp] Adding dissector for BGP Monitoring ProtocolEbben Aries4-0/+834
* Support per draft-ietf-grow-bmp-07 Change-Id: Iadb833157e7832077429c048e28e9814da29e2c6 Reviewed-on: https://code.wireshark.org/review/7192 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-19openSAFETY: Merge both CT valuesRoland Knall1-9/+5
Both values mean the same thing and should be found using the same hf_field, as this eases debugging scenarios. Change-Id: I23f675e22623b5e66354708319a41dcf34143e30 Reviewed-on: https://code.wireshark.org/review/7257 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-19patch for PMIPv6 MAG GPS coordinatesOsman Sakalla1-9/+28
Change-Id: I25bbd67775e19c2a0199507538b7dcfe5ce28bf6 Reviewed-on: https://code.wireshark.org/review/7256 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Bugfix in nbns dissector.Dario Lombardo1-3/+3
Change-Id: I5375a1ae2e48fe0c7ff6e3dde24b8d7b02b1f27f Reviewed-on: https://code.wireshark.org/review/7251 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add some casts to satisfy the various compilers.AndersBroman4-4/+4
Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d Reviewed-on: https://code.wireshark.org/review/7254 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19Add some casts to satisfy the various compilers.Jeff Morriss2-4/+5
Change-Id: Ic6a1124da986555d07cfeb71167b74f192c1c062 Reviewed-on: https://code.wireshark.org/review/7253 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-19Add name resolution support to address type.Michael Mann17-147/+291
Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-19Don't put CORBA IDL dissectors in ASN1_ variables.Guy Harris3-11/+28
Put them into separate CORBA_IDL_ variables, to keep the two types of generated dissectors separate. Change-Id: I4eb091a76ba5bc7d73533ef38fb29adc12a8ec42 Reviewed-on: https://code.wireshark.org/review/7250 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19Add a dissector for Microsoft's SSTP protocol.Hofer Manuel4-4/+549
... with some changes from Jeff Morriss: - Change how SSTP is "registered": rather than trying something complicated, just put the intelligence for recognizing SSTP into the HTTP dissector. (This does mean the SSTP dissector needs to do its own desegmentation now but it makes things much cleaner.) - Use proto_tree_add_subtree_format() instead of proto_tree_add_text() + proto_item_add_subtree(). - The messagetype is 16 bits, use tvb_get_guint16() instead of tvb_get_guint8() (fixes COL_INFO display) - A few other few misc. cleanups (I didn't update NEWS because I can no longer build NEWS without adding UTF8 fancy quotes and so forth.) Bug: 8239 Change-Id: I3631ae65f67bea69815ccf43472fdbcac3ca3499 Reviewed-on: https://code.wireshark.org/review/7227 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-19ssl: check for minimal SSLv3/TLS record sizePeter Wu1-0/+15
When a TLS record is fragmented over multiple TCP segments, with its first byte in one segment, and the remainder over the others, ssl_looks_like_sslv3() throws an exception because it tries to access the third byte. This breaks the encryption state, resulting in very weird (scrambled) decrypted data. To fix this, check the record size before using it. Also add TLSv1.1 and TLSv1.2 as known version. Change-Id: Ie0ca78302a5d6c4241ea699d2ef6f7b873dd51ee Reviewed-on: https://code.wireshark.org/review/7234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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>
2015-02-19That's not an ASN.1 dissector (and gets warnings).Guy Harris2-2/+2
Change-Id: I55b49080c64a44c1e5752ab986cb6b27772d14db Reviewed-on: https://code.wireshark.org/review/7248 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19Move some ASN.1 dissectors to the clean list.Guy Harris2-14/+14
Change-Id: If642132eb4a2b77db5e56b150b85f064b4b10b30 Reviewed-on: https://code.wireshark.org/review/7244 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18H.248: fix dissection of ServiceChangeReason for version 1Pascal Quantin1-51/+4
My understanding of RFC 3015 is that the encoding of this field was not different in version 1 compared to newer releases Bug: 10879 Change-Id: Iaa81679388860c0df4adc673ca6e56aff6f4591c Reviewed-on: https://code.wireshark.org/review/7195 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18Some additional UAT update callback changes.Guy Harris2-14/+16
I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Fix comments to reflect reality.Guy Harris1-5/+0
Change-Id: I63aeb49e442eb6eba5cdf35ded221894c1d0ea6c Reviewed-on: https://code.wireshark.org/review/7223 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Make UAT record update callbacks return a success/failure indication.Guy Harris25-101/+166
Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs49-678/+684
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17Make it a bit more like the way it was before all these changes.Guy Harris1-2/+2
Change-Id: I9fc0ef50574a7e068c32e3f6ffeb3634df9474d4 Reviewed-on: https://code.wireshark.org/review/7212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-17A UAT's update is expected to set *error; do so.Guy Harris1-1/+3
Its callers treat a non-null error pointer as a failure and a null error pointer as a success, so it has to set *error, even if it's only setting it to NULL. Change-Id: I48b2faa4bc013e4a754180dfae487829c8fe35a6 Reviewed-on: https://code.wireshark.org/review/7211 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-17[zvt] dissect some more fieldsMartin Kaiser1-1/+28
Change-Id: I93ffcfddd59a196a7e4f9f354b99884a7f5a814c Reviewed-on: https://code.wireshark.org/review/7208 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 15:04:25 +0000