PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib,nas_5g: Fix unpacking/packing for timezone IEs

This commit is contained in:
Bedran Karakoc 2022-01-27 19:17:18 +01:00 committed by Bedran Karakoc
parent 84c842f8c3
commit 37280307b5
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/include/srsran/asn1/nas_5g_ies.h
View File

@ -1577,11 +1577,6 @@ public:
class time_zone_t
{
public:
uint8_t year;
uint8_t month;
uint8_t day;
uint8_t hour;
uint8_t second;
uint8_t time_zone;
SRSASN_CODE pack(asn1::bit_ref& bref);
@ -1594,6 +1589,12 @@ public:
class time_zone_and_time_t
{
public:
uint8_t year;
uint8_t month;
uint8_t day;
uint8_t hour;
uint8_t minute;
uint8_t second;
uint8_t time_zone;
SRSASN_CODE pack(asn1::bit_ref& bref);

22
lib/src/asn1/nas_5g_ies.cc
View File

@ -2721,11 +2721,6 @@ SRSASN_CODE network_name_t::unpack(asn1::cbit_ref& bref)
// Reference: 9.11.3.52
SRSASN_CODE time_zone_t::pack(asn1::bit_ref& bref)
{
HANDLE_CODE(bref.pack(year, 8));
HANDLE_CODE(bref.pack(month, 8));
HANDLE_CODE(bref.pack(day, 8));
HANDLE_CODE(bref.pack(hour, 8));
HANDLE_CODE(bref.pack(second, 8));
HANDLE_CODE(bref.pack(time_zone, 8));
return SRSASN_SUCCESS;
}
@ -2734,11 +2729,6 @@ SRSASN_CODE time_zone_t::pack(asn1::bit_ref& bref)
// Reference: 9.11.3.52
SRSASN_CODE time_zone_t::unpack(asn1::cbit_ref& bref)
{
HANDLE_CODE(bref.unpack(year, 8));
HANDLE_CODE(bref.unpack(month, 8));
HANDLE_CODE(bref.unpack(day, 8));
HANDLE_CODE(bref.unpack(hour, 8));
HANDLE_CODE(bref.unpack(second, 8));
HANDLE_CODE(bref.unpack(time_zone, 8));
return SRSASN_SUCCESS;
}
@ -2747,6 +2737,12 @@ SRSASN_CODE time_zone_t::unpack(asn1::cbit_ref& bref)
// Reference: 9.11.3.53
SRSASN_CODE time_zone_and_time_t::pack(asn1::bit_ref& bref)
{
HANDLE_CODE(bref.pack(year, 8));
HANDLE_CODE(bref.pack(month, 8));
HANDLE_CODE(bref.pack(day, 8));
HANDLE_CODE(bref.pack(hour, 8));
HANDLE_CODE(bref.pack(minute, 8));
HANDLE_CODE(bref.pack(second, 8));
HANDLE_CODE(bref.pack(time_zone, 8));
return SRSASN_SUCCESS;
}
@ -2755,6 +2751,12 @@ SRSASN_CODE time_zone_and_time_t::pack(asn1::bit_ref& bref)
// Reference: 9.11.3.53
SRSASN_CODE time_zone_and_time_t::unpack(asn1::cbit_ref& bref)
{
HANDLE_CODE(bref.unpack(year, 8));
HANDLE_CODE(bref.unpack(month, 8));
HANDLE_CODE(bref.unpack(day, 8));
HANDLE_CODE(bref.unpack(hour, 8));
HANDLE_CODE(bref.unpack(minute, 8));
HANDLE_CODE(bref.unpack(second, 8));
HANDLE_CODE(bref.unpack(time_zone, 8));
return SRSASN_SUCCESS;
}