Merge pull request #1021 from slaclab/udp_segment_size

Fix RSSI sgement size calculation
slaclab · Aug 17, 2024 · d19e4b2 · d19e4b2
2 parents 1b6aebd + f1675cb
commit d19e4b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/pyrogue/protocols/_Network.py b/python/pyrogue/protocols/_Network.py
@@ -28,10 +28,10 @@ def __init__(self,*, port, host='127.0.0.1', jumbo=False, wait=True, packVer=1,
 
         if server:
             self._udp  = rogue.protocols.udp.Server(port,jumbo)
-            self._rssi = rogue.protocols.rssi.Server(self._udp.maxPayload())
+            self._rssi = rogue.protocols.rssi.Server(self._udp.maxPayload()-8)
         else:
             self._udp  = rogue.protocols.udp.Client(host,port,jumbo)
-            self._rssi = rogue.protocols.rssi.Client(self._udp.maxPayload())
+            self._rssi = rogue.protocols.rssi.Client(self._udp.maxPayload()-8)
 
         if packVer == 2:
             self._pack = rogue.protocols.packetizer.CoreV2(False,True,enSsi) # ibCRC = False, obCRC = True

diff --git a/src/rogue/protocols/udp/Client.cpp b/src/rogue/protocols/udp/Client.cpp
@@ -202,7 +202,7 @@ void rpu::Client::runThread(std::weak_ptr<int> lockPtr) {
         if (res > 0) {
             // Message was too big
             if (res > avail) {
-                udpLog_->warning("Receive data was too large. Dropping.");
+                udpLog_->warning("Receive data was too large. Rx=%i, avail=%i Dropping.", res, avail);
             } else {
                 buff->setPayload(res);
                 sendFrame(frame);