diff options
| author | Joakim Karlsson <oakimk@gmail.com> | 2021-07-21 12:05:08 +0200 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-21 13:09:42 +0000 |
| commit | 9ed273e5da0b8b3f62e021a255d7b98203d1c165 (patch) | |
| tree | 8c4608fdeda484113cb6bf4dc37dcaadab8ade6e /epan | |
| parent | c9a7b4f8bacb2d377cde4a66183804bc6333bb13 (diff) | |
JSON: correction of 3gpp ueEpsPdnConnection
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-gtpv2.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-json.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index c3208099c7..6aa0afed7a 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -3321,7 +3321,7 @@ static const true_false_string gtpv2_f_teid_v6_vals = { }; static void -dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_, session_args_t *args) +dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_, session_args_t *args) { int offset = 0; guint8 flags; @@ -3360,7 +3360,7 @@ dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr set_address_tvb(ipv6, AT_IPv6, 16, tvb, offset); } - if (g_gtp_session) { + if (g_gtp_session && args) { session = (guint32 *)g_hash_table_lookup(session_table, &pinfo->num); if (!session) { /* We save the teid so that we could assignate its corresponding session ID later */ diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 164f39c697..d7b40c0c0f 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -773,7 +773,7 @@ before_member(void *tvbparse_data, const void *wanted_data _U_, tvbparse_elem_t tvbparse_elem_t *key_tok = tok->sub; if (key_tok && key_tok->id == JSON_TOKEN_STRING) { - ti_compact = json_key_lookup(tree_compact, tok, key_string_with_quotation_marks, data->pinfo); + ti_compact = json_key_lookup(tree_compact, tok, key_string_without_quotation_marks, data->pinfo); if (!ti_compact) { ti_compact = proto_tree_add_none_format(tree_compact, &hfi_json_member_compact, tok->tvb, tok->offset, tok->len, "%s:", key_string_with_quotation_marks); } @@ -1157,7 +1157,7 @@ dissect_ueepspdnconnection(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo, add_new_data_source(pinfo, bin_tvb, "Base64 decoded"); ti = proto_tree_add_item(tree, &hfi_json_binary_data_compact, bin_tvb, 0, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_json_ueepspdnconnection); - dissect_gtpv2_ie_common(bin_tvb, NULL, sub_tree, 0, 0/* Message type 0, Reserved */, NULL); + dissect_gtpv2_ie_common(bin_tvb, pinfo, sub_tree, 0, 0/* Message type 0, Reserved */, NULL); } static void |