improv/add-3g-4g-rrc-channel-types-from-scat: Fix decoding 4G signall…

…ing payload logs with the extended version 20 for LTE RRC packets (still according to SCAT)
tjbdlq · May 18, 2021 · c11340f · c11340f
1 parent ce50768
commit c11340f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/modules/pcap_dump.py b/modules/pcap_dump.py
@@ -257,12 +257,12 @@ def on_log(self, log_type, log_payload, log_header, timestamp = 0):
             if ext_header_ver in (14, 15, 16, 20, 24):
 
                 channel_lookup_table.update({
-                    LTE_BCCH_BCH_v0: GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message,
-                    LTE_BCCH_DL_SCH_v0: GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message,
-                    LTE_MCCH_v0: GSMTAP_LTE_RRC_SUB_MCCH_Message,
-                    LTE_PCCH_v0: GSMTAP_LTE_RRC_SUB_PCCH_Message,
-                    LTE_DL_CCCH_v0: GSMTAP_LTE_RRC_SUB_DL_CCCH_Message,
-                    LTE_DL_DCCH_v0: GSMTAP_LTE_RRC_SUB_DL_DCCH_Message,
+                    LTE_BCCH_BCH_v14: GSMTAP_LTE_RRC_SUB_BCCH_BCH_Message,
+                    LTE_BCCH_DL_SCH_v14: GSMTAP_LTE_RRC_SUB_BCCH_DL_SCH_Message,
+                    LTE_MCCH_v14: GSMTAP_LTE_RRC_SUB_MCCH_Message,
+                    LTE_PCCH_v14: GSMTAP_LTE_RRC_SUB_PCCH_Message,
+                    LTE_DL_CCCH_v14: GSMTAP_LTE_RRC_SUB_DL_CCCH_Message,
+                    LTE_DL_DCCH_v14: GSMTAP_LTE_RRC_SUB_DL_DCCH_Message,
                     LTE_UL_CCCH_v14: GSMTAP_LTE_RRC_SUB_UL_CCCH_Message,
                     LTE_UL_DCCH_v14: GSMTAP_LTE_RRC_SUB_UL_DCCH_Message,
                 })
@@ -304,7 +304,8 @@ def on_log(self, log_type, log_payload, log_header, timestamp = 0):
 
             if gsmtap_channel_type is None:
 
-                warning('Unknown log type received for LOG_LTE_RRC_OTA_MSG_LOG_C: %d' % channel_type)
+                warning('Unknown log type received for LOG_LTE_RRC_OTA_MSG_LOG_C version %d: %d' % (
+                    ext_header_ver, channel_type))
                 return
 
             packet = build_gsmtap_ip(GSMTAP_TYPE_LTE_RRC, gsmtap_channel_type, packet, is_uplink)

diff --git a/protocol/log_types.py b/protocol/log_types.py
@@ -52,6 +52,12 @@
 LTE_UL_CCCH_v0 = 7
 LTE_UL_DCCH_v0 = 8
 
+LTE_BCCH_BCH_v14 = 1
+LTE_BCCH_DL_SCH_v14 = 2
+LTE_MCCH_v14 = 4
+LTE_PCCH_v14 = 5
+LTE_DL_CCCH_v14 = 6
+LTE_DL_DCCH_v14 = 7
 LTE_UL_CCCH_v14 = 8
 LTE_UL_DCCH_v14 = 9