aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2019-05-08 09:04:43 +0200
committerAnders Broman <a.broman58@gmail.com>2019-05-13 07:22:38 +0000
commitebcc9157c3ebf4647d565c175deab798a9437297 (patch)
tree0341a94bc729afb68a52583591be021ecd4b08c4 /epan/proto.c
parent4f599be06dfd03c3a30d24f9c1e94adb1bd420a0 (diff)
elastic: use correct elastic field types in mapping.
Elastic integer fields are: integer: signed 32 bit long: signed 64 bit Fix values in mapping. uint64 is not handled by elastic, but still mapped on 'long'. Fix point (2) of the linked bug. Bug: 15763 Change-Id: I14afa1cb7fcb6ad98d44707a8b506420e29ceb83 Reviewed-on: https://code.wireshark.org/review/33109 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/proto.c b/epan/proto.c
index 6d8d41ce26..177afa47b0 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -10286,19 +10286,19 @@ ws_type_to_elastic(guint type _U_)
case FT_UINT16:
case FT_INT16:
case FT_INT32:
- case FT_UINT32:
case FT_UINT24:
- case FT_FRAMENUM:
- case FT_UINT48:
- case FT_INT48:
case FT_INT24:
return "integer";
case FT_INT8:
case FT_UINT8:
return "short";
+ case FT_FRAMENUM:
+ case FT_UINT32:
case FT_UINT40:
+ case FT_UINT48:
case FT_UINT56:
- case FT_UINT64:
+ case FT_UINT64: // Actually it's not handled by 'long' elastic type.
+ case FT_INT48:
case FT_INT64:
return "long";
case FT_FLOAT: