diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-08-09 18:18:08 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-08-09 16:26:44 +0000 |
| commit | ddeac70a5a21e890a815d70930ea2decf95a1b8c (patch) | |
| tree | ae9cf9cb2c2910d8096731fd3a3354750f5490a4 /asn1 | |
| parent | 020d0f89637faab8ec0e25e07d64eb66d96c2a72 (diff) | |
LTE RRC: fix dissection of CDMA System Time broken in gcd02af5
Also put back initial text indentation
Change-Id: I6fe207086018a806a258b1de2888ac0b9310aac6
Reviewed-on: https://code.wireshark.org/review/3524
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 8 | ||||
| -rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index bf3d57f5d6..283b81f5f8 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -359,8 +359,8 @@ if(ue_cap_tvb){ bits = tvb_get_bits64(async_system_time_tvb, 0, 49, ENC_BIG_ENDIAN); ts.secs = (time_t)((bits*8)/1228800) + 315964800; /* CDMA2000 epoch is 00:00:00 (midnight) UTC on 1980-01-06 */ ts.nsecs = (int)(((bits%153600)*8*1000000000)/1228800); - proto_tree_add_time(subtree, hf_lte_rrc_cdma_time, async_system_time_tvb, 0, -1, &ts); - proto_tree_add_time(subtree, hf_lte_rrc_local_time, async_system_time_tvb, 0, -1,&ts); + proto_tree_add_time(subtree, hf_lte_rrc_cdma_time, async_system_time_tvb, 0, 7, &ts); + proto_tree_add_time(subtree, hf_lte_rrc_local_time, async_system_time_tvb, 0, 7,&ts); } #.FN_BODY SystemTimeInfoCDMA2000/cdma-SystemTime/synchronousSystemTime VAL_PTR=&sync_system_time_tvb @@ -376,8 +376,8 @@ if(ue_cap_tvb){ bits = tvb_get_bits64(sync_system_time_tvb, 0, 39, ENC_BIG_ENDIAN); ts.secs = (time_t)(bits/100) + 315964800; /* CDMA2000 epoch is 00:00:00 (midnight) UTC on 1980-01-06 */ ts.nsecs = (int)(bits%100)*10000000; - proto_tree_add_time(subtree, hf_lte_rrc_cdma_time, sync_system_time_tvb, 0, -1, &ts); - proto_tree_add_time(subtree, hf_lte_rrc_local_time, sync_system_time_tvb, 0, -1, &ts); + proto_tree_add_time(subtree, hf_lte_rrc_cdma_time, sync_system_time_tvb, 0, 5, &ts); + proto_tree_add_time(subtree, hf_lte_rrc_local_time, sync_system_time_tvb, 0, 5, &ts); } #.FN_BODY CellInfoUTRA-FDD-r9/utra-BCCH-Container-r9 VAL_PTR = &utra_bcch_cont_tvb diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index 7f2916939b..0d4ce1c1b3 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -2837,11 +2837,11 @@ void proto_register_lte_rrc(void) { FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_lte_rrc_cdma_time, - { "CDMA time", "lte-rrc.cdma_time", + { "CDMA time", "lte-rrc.cdma_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0, NULL, HFILL }}, { &hf_lte_rrc_utc_time, - { "UTC time", "lte-rrc.utc_time", + { "UTC time", "lte-rrc.utc_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0, NULL, HFILL }}, { &hf_lte_rrc_local_time, |