Skip to content

Commit

Permalink
Camel: Fix TimeAndTimezone presentation
Browse files Browse the repository at this point in the history 
ping #18485
  • Loading branch information
@AndersBroman
AndersBroman committed Aug 23, 2023
1 parent 09ebdda commit 61c3363
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 54 deletions.
10 changes: 4 additions & 6 deletions epan/dissectors/asn1/camel/camel.cnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,6 @@ proto_tree *subtree;
gchar hour[3];
gchar minute[3];
gchar second[3];
gchar timezone_digits[3];

guint8 oct;
char sign;
Expand All @@ -793,19 +792,18 @@ proto_tree *subtree;
(void) g_strlcpy(hour, digit_str+8, 3);
(void) g_strlcpy(minute, digit_str+10, 3);
(void) g_strlcpy(second, digit_str+12, 3);
(void) g_strlcpy(timezone_digits, digit_str+14, 3);

/*
The Time Zone indicates the difference, expressed in quarters of an hour, between the local time and GMT. In the first of the two semi octets,
the first bit (bit 3 of the seventh octet of the TP Service Centre Time Stamp field) represents the algebraic sign of this difference (0: positive, 1: negative).
*/
if (!ws_hexstrtou8(timezone_digits, NULL, &oct)){
return offset;
}
oct = tvb_get_guint8(parameter_tvb,7);

/* packet-gsm_sms.c time dis_field_scts_aux() */
sign = (oct & 0x08)?'-':'+';
oct = (oct >> 4) + (oct & 0x07) * 10;

proto_item_append_text(item, "(%%s-%%s-%%s %%s:%%s:%%s GMT %%c %%d hours %%d minutes)", year,month,day,hour,minute,second,sign, oct / 4, oct %% 4 * 15);
proto_item_append_text(item, "(%%s-%%s-%%s %%s:%%s:%%s GMT %%c%%d hours %%d minutes)", year,month,day,hour,minute,second,sign, oct / 4, oct %% 4 * 15);


#.TYPE_ATTR
Expand Down
42 changes: 21 additions & 21 deletions epan/dissectors/asn1/camel/packet-camel-template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ static int hf_camel_CAMEL_CallResult = -1;

/* Used by persistent data */
static int hf_camelsrt_SessionId=-1;
static int hf_camelsrt_RequestNumber=-1;
//static int hf_camelsrt_RequestNumber=-1;
static int hf_camelsrt_Duplicate=-1;
static int hf_camelsrt_RequestFrame=-1;
static int hf_camelsrt_ResponseFrame=-1;
static int hf_camelsrt_DeltaTime=-1;
static int hf_camelsrt_SessionTime=-1;
//static int hf_camelsrt_DeltaTime=-1;
//static int hf_camelsrt_SessionTime=-1;
static int hf_camelsrt_DeltaTime31=-1;
static int hf_camelsrt_DeltaTime75=-1;
static int hf_camelsrt_DeltaTime65=-1;
Expand Down Expand Up @@ -1378,12 +1378,12 @@ void proto_register_camel(void) {
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_camelsrt_RequestNumber,
{ "Request Number",
"camel.srt.request_number",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
//{ &hf_camelsrt_RequestNumber,
// { "Request Number",
// "camel.srt.request_number",
// FT_UINT64, BASE_DEC, NULL, 0x0,
// NULL, HFILL }
//},
{ &hf_camelsrt_Duplicate,
{ "Request Duplicate",
"camel.srt.duplicate",
Expand All @@ -1402,18 +1402,18 @@ void proto_register_camel(void) {
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"SRT Response Frame", HFILL }
},
{ &hf_camelsrt_DeltaTime,
{ "Service Response Time",
"camel.srt.deltatime",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"DeltaTime between Request and Response", HFILL }
},
{ &hf_camelsrt_SessionTime,
{ "Session duration",
"camel.srt.sessiontime",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"Duration of the TCAP session", HFILL }
},
//{ &hf_camelsrt_DeltaTime,
// { "Service Response Time",
// "camel.srt.deltatime",
// FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
// "DeltaTime between Request and Response", HFILL }
//},
//{ &hf_camelsrt_SessionTime,
// { "Session duration",
// "camel.srt.sessiontime",
// FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
// "Duration of the TCAP session", HFILL }
//},
{ &hf_camelsrt_DeltaTime31,
{ "Service Response Time",
"camel.srt.deltatime31",
Expand Down
52 changes: 25 additions & 27 deletions epan/dissectors/packet-camel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ static int hf_camel_CAMEL_CallResult = -1;

/* Used by persistent data */
static int hf_camelsrt_SessionId=-1;
static int hf_camelsrt_RequestNumber=-1;
//static int hf_camelsrt_RequestNumber=-1;
static int hf_camelsrt_Duplicate=-1;
static int hf_camelsrt_RequestFrame=-1;
static int hf_camelsrt_ResponseFrame=-1;
static int hf_camelsrt_DeltaTime=-1;
static int hf_camelsrt_SessionTime=-1;
//static int hf_camelsrt_DeltaTime=-1;
//static int hf_camelsrt_SessionTime=-1;
static int hf_camelsrt_DeltaTime31=-1;
static int hf_camelsrt_DeltaTime75=-1;
static int hf_camelsrt_DeltaTime65=-1;
Expand Down Expand Up @@ -4625,7 +4625,6 @@ dissect_camel_TimeAndTimezone(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offs
gchar hour[3];
gchar minute[3];
gchar second[3];
gchar timezone_digits[3];

guint8 oct;
char sign;
Expand All @@ -4649,19 +4648,18 @@ dissect_camel_TimeAndTimezone(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offs
(void) g_strlcpy(hour, digit_str+8, 3);
(void) g_strlcpy(minute, digit_str+10, 3);
(void) g_strlcpy(second, digit_str+12, 3);
(void) g_strlcpy(timezone_digits, digit_str+14, 3);

/*
The Time Zone indicates the difference, expressed in quarters of an hour, between the local time and GMT. In the first of the two semi octets,
the first bit (bit 3 of the seventh octet of the TP Service Centre Time Stamp field) represents the algebraic sign of this difference (0: positive, 1: negative).
*/
if (!ws_hexstrtou8(timezone_digits, NULL, &oct)){
return offset;
}
oct = tvb_get_guint8(parameter_tvb,7);

/* packet-gsm_sms.c time dis_field_scts_aux() */
sign = (oct & 0x08)?'-':'+';
oct = (oct >> 4) + (oct & 0x07) * 10;

proto_item_append_text(item, "(%s-%s-%s %s:%s:%s GMT %c %d hours %d minutes)", year,month,day,hour,minute,second,sign, oct / 4, oct % 4 * 15);
proto_item_append_text(item, "(%s-%s-%s %s:%s:%s GMT %c%d hours %d minutes)", year,month,day,hour,minute,second,sign, oct / 4, oct % 4 * 15);



Expand Down Expand Up @@ -8419,12 +8417,12 @@ void proto_register_camel(void) {
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_camelsrt_RequestNumber,
{ "Request Number",
"camel.srt.request_number",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
//{ &hf_camelsrt_RequestNumber,
// { "Request Number",
// "camel.srt.request_number",
// FT_UINT64, BASE_DEC, NULL, 0x0,
// NULL, HFILL }
//},
{ &hf_camelsrt_Duplicate,
{ "Request Duplicate",
"camel.srt.duplicate",
Expand All @@ -8443,18 +8441,18 @@ void proto_register_camel(void) {
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"SRT Response Frame", HFILL }
},
{ &hf_camelsrt_DeltaTime,
{ "Service Response Time",
"camel.srt.deltatime",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"DeltaTime between Request and Response", HFILL }
},
{ &hf_camelsrt_SessionTime,
{ "Session duration",
"camel.srt.sessiontime",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"Duration of the TCAP session", HFILL }
},
//{ &hf_camelsrt_DeltaTime,
// { "Service Response Time",
// "camel.srt.deltatime",
// FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
// "DeltaTime between Request and Response", HFILL }
//},
//{ &hf_camelsrt_SessionTime,
// { "Session duration",
// "camel.srt.sessiontime",
// FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
// "Duration of the TCAP session", HFILL }
//},
{ &hf_camelsrt_DeltaTime31,
{ "Service Response Time",
"camel.srt.deltatime31",
Expand Down

0 comments on commit 61c3363

Please sign in to comment.