aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/camel
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2006-05-02 20:26:49 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2006-05-02 20:26:49 +0000
commit155c27d813c25ad65bddd3d7155cea374cca5563 (patch)
tree4b7effb4b94dbe47b69ee68579037c0dbb6c6e4e /asn1/camel
parentfac9e4aca30f905401b9c212eff42a820f37ba7e (diff)
Fix Bug 913 DateAndTime dissection error in CAMEL CallInfoReportArg
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18079 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/camel')
-rw-r--r--asn1/camel/camel.cnf9
1 files changed, 5 insertions, 4 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