Proper ETCS id assignment

cesarBLG · Aug 30, 2023 · 5094fbf · 5094fbf
1 parent 7e85fdd
commit 5094fbf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/EVC/Euroradio/radio_connection.cpp b/EVC/Euroradio/radio_connection.cpp
@@ -14,7 +14,12 @@ void radio_connection::Sa_connect_confirm(const etcs_id &id)
     t_estab_timer = {};
     status = safe_radio_status::Connected;
     peer_address.id = id;
-    if (session != nullptr) session->contact.id = id.id;
+    if (session != nullptr) {
+        session->contact.country = id.id>>14;
+        session->contact.id = id.id & 0x3FFF;
+        if (session == supervising_rbc)
+            set_rbc_contact(session->contact);
+    }
 }
 void radio_connection::Sa_data_indication(std::vector<unsigned char>&& data)
 {

diff --git a/EVC/Euroradio/safe_radio_connection.cpp b/EVC/Euroradio/safe_radio_connection.cpp
@@ -149,13 +149,6 @@ void safe_radio_connection::T_connect_indication(etcs_id id, std::vector<unsigne
 {
     if (!validate_sapdu(data))
         return;
-    peer_address.id = id;
-    if (session != nullptr) {
-        session->contact.country = id.id>>14;
-        session->contact.id = id.id & 0x3FFF;
-        if (session == supervising_rbc)
-            set_rbc_contact(session->contact);
-    }
     PDU_header header(data[0]);
     if (header.MTI == 2) {
         PDU_header auth;