Narrowing conversion fixes

src/gnb/gtp/proto.cpp

@@ -243,7 +243,7 @@ GtpMessage *DecodeGtpMessage(const OctetView &stream)
 
 std::unique_ptr<PduSessionInformation> PduSessionInformation::Decode(const OctetView &stream)
 {
-    int startIndex = stream.currentIndex();
+    size_t startIndex = stream.currentIndex();
 
     uint8_t octet = stream.read();
 

src/gnb/gtp/task.cpp

@@ -139,10 +139,10 @@ void GtpTask::handleSessionRelease(int ueId, int psi)
 
     // Remove all session information from rate limiter
     m_rateLimiter->updateSessionUplinkLimit(sessionInd, 0);
-    m_rateLimiter->updateUeDownlinkLimit(sessionInd, 0);
+    m_rateLimiter->updateUeDownlinkLimit(ueId, 0);
 
     // And remove from PDU session table
-    int teid = m_pduSessions[sessionInd]->downTunnel.teid;
+    uint32_t teid = m_pduSessions[sessionInd]->downTunnel.teid;
     m_pduSessions.erase(sessionInd);
 
     // And remove from the tree
@@ -159,10 +159,10 @@ void GtpTask::handleUeContextDelete(int ueId)
     {
         // Remove all session information from rate limiter
         m_rateLimiter->updateSessionUplinkLimit(session, 0);
-        m_rateLimiter->updateUeDownlinkLimit(session, 0);
+        m_rateLimiter->updateUeDownlinkLimit(ueId, 0);
 
         // And remove from PDU session table
-        int teid = m_pduSessions[session]->downTunnel.teid;
+        uint32_t teid = m_pduSessions[session]->downTunnel.teid;
         m_pduSessions.erase(session);
 
         // And remove from the tree

src/gnb/gtp/utils.hpp

@@ -22,14 +22,14 @@ inline uint64_t MakeSessionResInd(int ueId, int psi)
     return (static_cast<int64_t>(ueId) << 32LL) | static_cast<int64_t>(psi);
 }
 
-inline int GetUeId(int64_t sessionResInd)
+inline int GetUeId(uint64_t sessionResInd)
 {
-    return static_cast<int>((sessionResInd >> 32LL) & 0xFFFFFFFFLL);
+    return static_cast<int>((sessionResInd >> 32uLL) & 0xFFFFFFFFuLL);
 }
 
-inline int GetPsi(int64_t sessionResInd)
+inline int GetPsi(uint64_t sessionResInd)
 {
-    return static_cast<int>(sessionResInd & 0xFFFFFFFFLL);
+    return static_cast<int>(sessionResInd & 0xFFFFFFFFuLL);
 }
 
 class IRateLimiter

src/lib/app/cli_base.cpp

@@ -57,10 +57,10 @@ void CliServer::sendMessage(const CliMessage &msg)
     stream.appendOctet(cons::Minor);
     stream.appendOctet(cons::Patch);
     stream.appendOctet(static_cast<int>(msg.type));
-    stream.appendOctet4(static_cast<size_t>(msg.nodeName.size()));
+    stream.appendOctet4(static_cast<int>(msg.nodeName.size()));
     for (char c : msg.nodeName)
         stream.appendOctet(static_cast<uint8_t>(c));
-    stream.appendOctet4(static_cast<size_t>(msg.value.size()));
+    stream.appendOctet4(static_cast<int>(msg.value.size()));
     for (char c : msg.value)
         stream.appendOctet(static_cast<uint8_t>(c));
 

src/utils/octet_string.cpp

@@ -95,6 +95,11 @@ void OctetString::appendOctet4(int v)
     appendOctet4(octet4{v});
 }
 
+void OctetString::appendOctet4(uint32_t v)
+{
+    appendOctet4(octet4{v});
+}
+
 int OctetString::length() const
 {
     return static_cast<int>(m_data.size());

src/utils/octet_string.hpp

@@ -47,6 +47,7 @@ class OctetString
     void appendOctet3(int v);
     void appendOctet4(octet4 v);
     void appendOctet4(int v);
+    void appendOctet4(uint32_t v);
     void appendOctet8(octet8 v);
     void appendOctet8(int64_t v);
     void appendOctet8(uint64_t v);

src/utils/octet_view.cpp

@@ -24,6 +24,11 @@ OctetString OctetView::readOctetString(int length) const
     return OctetString(std::move(v));
 }
 
+OctetString OctetView::readOctetString(size_t length) const
+{
+    return readOctetString(static_cast<int>(length));
+}
+
 OctetString OctetView::readOctetString() const
 {
     return readOctetString(static_cast<int>(size - index));
@@ -35,3 +40,8 @@ std::string OctetView::readUtf8String(int length) const
     index += length;
     return res;
 }
+
+std::string OctetView::readUtf8String(size_t length) const
+{
+    return readUtf8String(static_cast<int>(length));
+}

src/utils/octet_view.hpp

@@ -124,6 +124,8 @@ class OctetView
     }
 
     OctetString readOctetString(int length) const;
+    OctetString readOctetString(size_t length) const;
     OctetString readOctetString() const;
     std::string readUtf8String(int length) const;
+    std::string readUtf8String(size_t length) const;
 };