osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

proto: don't generate elastic-mapping entries for string fields. 

The string type is the default in elasticsearch, then there is no
need to put those entries in the mapping report. This shortens a lot
the list.

Small indentation fix, while here.

Change-Id: If304d409a3ee2c30f24b5de4d90be522bbfae41e
Ping-Bug: 15719
Reviewed-on: https://code.wireshark.org/review/33053
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Dario Lombardo 2019-05-02 11:20:16 +02:00 committed by Peter Wu
parent d52b74ee4f
commit e5b4e673f0
2 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
epan/proto.c
View File

@ -1395,8 +1395,8 @@ void proto_report_dissector_bug(const char *format, ...)
/* We could probably get away with changing is_error to a minimum length value. */
static void
report_type_length_mismatch(proto_tree *tree, const gchar *descr, int length, gboolean is_error) {
report_type_length_mismatch(proto_tree *tree, const gchar *descr, int length, gboolean is_error)
{
if (is_error) {
expert_add_info_format(NULL, tree, &ei_type_length_mismatch_error, "Trying to fetch %s with length %d", descr, length);
} else {
@ -10315,28 +10315,8 @@ ws_type_to_elastic(guint type _U_)
return "byte";
case FT_BOOLEAN:
return "boolean";
case FT_NONE:
case FT_STRING:
case FT_ETHER:
case FT_GUID:
case FT_OID:
case FT_STRINGZ:
case FT_UINT_STRING:
case FT_CHAR:
case FT_AX25:
case FT_REL_OID:
case FT_IEEE_11073_SFLOAT:
case FT_IEEE_11073_FLOAT:
case FT_STRINGZPAD:
case FT_PROTOCOL:
case FT_EUI64:
case FT_IPXNET:
case FT_SYSTEM_ID:
case FT_FCWWN:
case FT_VINES:
return "string";
default:
DISSECTOR_ASSERT_NOT_REACHED();
return NULL;
}
}
@ -10366,6 +10346,7 @@ proto_registrar_dump_elastic(const gchar* filter)
gchar* proto;
gboolean found;
guint j;
gchar* type;
/* We have filtering protocols. Extract them. */
if (filter) {
@ -10456,13 +10437,17 @@ proto_registrar_dump_elastic(const gchar* filter)
json_dumper_begin_object(&dumper); // 8.properties
open_object = FALSE;
}
str = g_strdup(hfinfo->abbrev);
json_dumper_set_member_name(&dumper, dot_to_underscore(str));
g_free(str);
json_dumper_begin_object(&dumper); // 9.hfinfo->abbrev
json_dumper_set_member_name(&dumper, "type");
json_dumper_value_string(&dumper, ws_type_to_elastic(hfinfo->type));
json_dumper_end_object(&dumper); // 9.hfinfo->abbrev
/* Skip the fields that would map into string. This is the default in elasticsearch. */
type = ws_type_to_elastic(hfinfo->type);
if (type) {
str = g_strdup(hfinfo->abbrev);
json_dumper_set_member_name(&dumper, dot_to_underscore(str));
g_free(str);
json_dumper_begin_object(&dumper); // 9.hfinfo->abbrev
json_dumper_set_member_name(&dumper, "type");
json_dumper_value_string(&dumper, type);
json_dumper_end_object(&dumper); // 9.hfinfo->abbrev
}
}
}

3
test/baseline/elastic-mapping-ip-subset.json
View File

@ -26,9 +26,6 @@
"ip_dst" : {
"type" : "ip"
},
"ip_dst_host" : {
"type" : "string"
},
"ip_geoip_lat" : {
"type" : "float"
},