diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2019-05-05 22:51:58 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2019-05-05 21:36:00 +0000 |
| commit | a8317adbcaaac947b2725525f3ad13dc88932954 (patch) | |
| tree | bd2709d86dbc2a2651cca81e600c6af97eda5a7d /epan | |
| parent | d6ab4f792b93c50a1204cc1b4a9fb1a00d34c48c (diff) | |
S1AP: add ErrorIndication message type to info column
Change-Id: I82206169d7a77f9798fc672a87de9789d56fda3d
Reviewed-on: https://code.wireshark.org/review/33088
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/asn1/s1ap/s1ap.cnf | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-s1ap.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf index 7eb6c63b43..bc4fac87fa 100644 --- a/epan/dissectors/asn1/s1ap/s1ap.cnf +++ b/epan/dissectors/asn1/s1ap/s1ap.cnf @@ -2109,8 +2109,8 @@ SecondaryRATDataUsageReport N s1ap.proc.imsg id-SecondaryRATDataUsag col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset"); #.FN_HDR ResetAcknowledge col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ResetAcknowledge"); -# FN_HDR ErrorIndication -#col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); +#.FN_HDR ErrorIndication + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); #.FN_HDR S1SetupRequest col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "S1SetupRequest"); #.FN_HDR S1SetupResponse @@ -2236,7 +2236,7 @@ SecondaryRATDataUsageReport N s1ap.proc.imsg id-SecondaryRATDataUsag #.FN_BODY CauseNas VAL_PTR=&value guint32 value; %(DEFAULT_BODY)s - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [NAS-cause=%%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown")); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [NAS-cause=%%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown")); #.FN_BODY CauseProtocol VAL_PTR=&value guint32 value; diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 5875dedd27..a694745380 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -4058,7 +4058,7 @@ dissect_s1ap_CauseNas(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, &value, TRUE, 1, NULL); - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [NAS-cause=%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown")); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [NAS-cause=%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown")); @@ -11358,6 +11358,9 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_s1ap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 2113 "./asn1/s1ap/s1ap.cnf" + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ErrorIndication, ErrorIndication_sequence); |