rel: 4.0.14 (#50)

Author: ewasjon

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## [4.0.12] 2025-04-14
+## [4.0.14] 2025-04-14
 
 - Added `--ls-hack-bad-transaction-initiator` to bypass incorrect location server behaviour
+- Added logging when sending or receive LPP message
 
 ## [4.0.11] 2025-04-07
 

CMakeLists.txt

@@ -12,8 +12,8 @@ include(cmake/compiler.cmake)
 include(cmake/target.cmake)
 
 add_definitions(-D_POSIX_C_SOURCE=200809L)
-add_definitions(-DCLIENT_VERSION="4.0.13")
-add_definitions(-DCLIENT_VERSION_INT=0x04000D)
+add_definitions(-DCLIENT_VERSION="4.0.14")
+add_definitions(-DCLIENT_VERSION_INT=0x04000E)
 
 find_package(Threads REQUIRED)
 

README.md

@@ -1,6 +1,6 @@
 # SUPL 3GPP LPP client
 
-![version](https://img.shields.io/badge/version-4.0.13-green)
+![version](https://img.shields.io/badge/version-4.0.14-green)
 ![license](https://img.shields.io/badge/license-MXM-blue)
 
 A comprehensive toolkit for developing 3GPP LPP (LTE Positioning Protocol) clients. This project provides libraries and tools for handling SUPL (Secure User Plane Location) communication and various positioning-related message conversions.

dependency/lpp/periodic_session/handler.cpp

@@ -72,20 +72,21 @@ void PeriodicSession::message(TransactionHandle const& transaction, Message mess
     // doesn't match one in the mRequestTransactions.
     if (mHackBadTransactionInitiator) {
         if (transaction.initiator() == Initiator::LocationServer) {
-            WARNF("HACK: bad transaction initiator: %s", transaction.to_string().c_str());
-            auto corrected_transaction = TransactionHandle{
-                mSession, transaction.id(), transaction.generation_id(), Initiator::TargetDevice};
-
-            auto rit = mRequestTransactions.find(corrected_transaction);
-            if (rit != mRequestTransactions.end()) {
-                handle_request_response(corrected_transaction, std::move(message));
-
-                // To actuall stop the request timeout, we to simulate PeriodicSession::end for the
-                // correction transaction. If the location server doesn't indicate that the
-                // transaction has ended - which would be weird - then this is technically
-                // incorrect. However, this is already a hack...
-                end(corrected_transaction);
-                return;
+            for (auto& [t, m] : mRequestTransactions) {
+                auto corrected_transaction = TransactionHandle{t};
+                if (corrected_transaction.initiator() == Initiator::TargetDevice &&
+                    corrected_transaction.id() == transaction.id()) {
+                    WARNF("HACK: bad transaction initiator: %s", transaction.to_string().c_str());
+                    handle_request_response(corrected_transaction, std::move(message));
+
+                    // To actuall stop the request timeout, we to simulate PeriodicSession::end for
+                    // the correction transaction. If the location server doesn't indicate that the
+                    // transaction has ended - which would be weird - then this is technically
+                    // incorrect. However, this is already a hack...
+                    end(corrected_transaction);
+                    return;  // NOTE: 'end' will modify mRequestTransactions, not return and
+                             // continuing to use the loop is bad
+                }
             }
         }
     }

dependency/lpp/session.cpp

@@ -559,6 +559,7 @@ void Session::send(TransactionHandle const& handle, Message& message) {
         return;
     }
 
+    DEBUGF("send message %s", handle.to_string().c_str());
     XVERBOSEF(&LOGLET_MODULE_REF2(lpp, print), "send:\n%s",
               encode_lpp_message_xer(message).c_str());
 
@@ -704,6 +705,7 @@ void Session::process_lpp_payload(supl::Payload const& payload) {
 
     auto& transaction = *transaction_ptr;
     auto  handle      = transaction.handle;
+    DEBUGF("recv message %s", handle.to_string().c_str());
     if (on_message) {
         on_message(*this, handle, std::move(message));
     }

dependency/time/include/time/timestamp.hpp

@@ -99,7 +99,7 @@ struct TimePoint {
 class LeapSeconds {
 public:
     NODISCARD static int64_t count() {
-#define LAST_UPDATE_CHECKED 0x04000D
+#define LAST_UPDATE_CHECKED 0x04000E
 #ifndef CLIENT_VERSION_INT
 #error "Please define CLIENT_VERSION_INT"
 #endif