diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-02 20:26:49 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-02 20:26:49 +0000 |
| commit | 437baee30143cfc76fc4c03a8318a0151b94e5ed (patch) | |
| tree | 4b7effb4b94dbe47b69ee68579037c0dbb6c6e4e | |
| parent | e5001116f17c762907991655f825cf820385b2c8 (diff) | |
Fix Bug 913 DateAndTime dissection error in CAMEL CallInfoReportArg
svn path=/trunk/; revision=18079
| -rw-r--r-- | asn1/camel/camel.cnf | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-camel.c | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 741bd1db8d..ffbbe8680a 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -167,12 +167,12 @@ tvbuff_t *parameter_tvb; tvb, curr_offset, 1, - digit_pair & 0xF0); + digit_pair >>4); c[i] = camel_number_to_char( digit_pair & 0x0F); i++; - c[i] = camel_number_to_char( digit_pair & 0xF0); + c[i] = camel_number_to_char( digit_pair >>4); i++; } @@ -180,8 +180,8 @@ tvbuff_t *parameter_tvb; /* XXX - Should we use sprintf here instead of assembling the string by * hand? */ - time[0] = c[9]; - time[1] = c[8]; + time[0] = c[8]; + time[1] = c[9]; time[2] = ':'; time[3] = c[10]; time[4] = c[11]; @@ -429,4 +429,5 @@ tvbuff_t *parameter_tvb; #.TYPE_ATTR CallingPartysCategory TYPE = FT_UINT16 DISPLAY = BASE_DEC STRINGS = VALS(isup_calling_partys_category_value) PDPTypeOrganization TYPE = FT_UINT8 DISPLAY = BASE_DEC BITMASK = 0x0f STRINGS = VALS(gsm_map_PDP_Type_Organisation_vals) +DateAndTime TYPE = FT_STRING DISPLAY = NONE #.END diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index f62d9a4e77..6194aced0c 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -4089,12 +4089,12 @@ dissect_camel_DateAndTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, tvb, curr_offset, 1, - digit_pair & 0xF0); + digit_pair >>4); c[i] = camel_number_to_char( digit_pair & 0x0F); i++; - c[i] = camel_number_to_char( digit_pair & 0xF0); + c[i] = camel_number_to_char( digit_pair >>4); i++; } @@ -4102,8 +4102,8 @@ dissect_camel_DateAndTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, /* XXX - Should we use sprintf here instead of assembling the string by * hand? */ - time[0] = c[9]; - time[1] = c[8]; + time[0] = c[8]; + time[1] = c[9]; time[2] = ':'; time[3] = c[10]; time[4] = c[11]; @@ -9641,7 +9641,7 @@ void proto_register_camel(void) { "RequestedInformationValue/callAttemptElapsedTimeValue", HFILL }}, { &hf_camel_callStopTimeValue, { "callStopTimeValue", "camel.callStopTimeValue", - FT_BYTES, BASE_HEX, NULL, 0, + FT_STRING, NONE, NULL, 0, "RequestedInformationValue/callStopTimeValue", HFILL }}, { &hf_camel_callConnectedElapsedTimeValue, { "callConnectedElapsedTimeValue", "camel.callConnectedElapsedTimeValue", |