New method: NetSocket::get()

ThBreuer · Jun 25, 2024 · 904349f · 904349f
1 parent 5cc3ea8
commit 904349f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 0 deletions.
diff --git a/Src/Hardware/Common/Net/Eth/NetEthTCP.h b/Src/Hardware/Common/Net/Eth/NetEthTCP.h
@@ -165,6 +165,9 @@ class NetEthTCP : public NetEthTransport
         //-----------------------------------------------------------
         virtual bool get( BYTE &x );
 
+        //-----------------------------------------------------------
+        virtual DataPointer get( WORD maxLen );
+
         //-----------------------------------------------------------
         virtual DataPointer getDataPointer( void );
 

diff --git a/Src/Hardware/Common/Net/Eth/NetEthUDP.cpp b/Src/Hardware/Common/Net/Eth/NetEthUDP.cpp
@@ -187,6 +187,22 @@ bool NetEthUDP::Socket::get( BYTE &x )
   return( false );
 }
 
+//-------------------------------------------------------------------
+DataPointer NetEthUDP::Socket::get( WORD maxLen )
+{
+  DataPointer dp;
+  if( stateLocal == OPEN || stateLocal == LISTEN )
+  {
+    if( udp.inPos < udp.inBufLen )
+    {
+      WORD minLen = MIN( (WORD)(udp.inBufLen-udp.inPos), dp.getSize() );
+	  dp = DataPointer( (BYTE*)&udp.buf[udp.inPos], minLen);
+	  udp.inPos += minLen;
+    }
+  }
+  return( dp );
+}
+
 //-------------------------------------------------------------------
 DataPointer NetEthUDP::Socket::getDataPointer( void )
 {

diff --git a/Src/Hardware/Common/Net/Eth/NetEthUDP.h b/Src/Hardware/Common/Net/Eth/NetEthUDP.h
@@ -109,6 +109,9 @@ class NetEthUDP : public NetEthTransport
         //-----------------------------------------------------------
         virtual bool get( BYTE &x );
 
+        //-----------------------------------------------------------
+        virtual DataPointer get( WORD maxLen );
+
         //-----------------------------------------------------------
         virtual DataPointer getDataPointer( void );
 

diff --git a/Src/Hardware/Common/Net/NetSocket.h b/Src/Hardware/Common/Net/NetSocket.h
@@ -188,6 +188,12 @@ class NetSocket : protected Net::Task
     */
     virtual bool get( BYTE &x ) = 0;
 
+    //---------------------------------------------------------------
+    /*! todo comment
+        \return ...
+    */
+    virtual DataPointer get( WORD maxLen ) = 0;
+
     //---------------------------------------------------------------
     /*! Get the DataPointer of the outgoing data buffer
         \return DataPointer

diff --git a/Src/Hardware/MCU/Virtual/Src/NetWin.h b/Src/Hardware/MCU/Virtual/Src/NetWin.h
@@ -75,6 +75,19 @@ class NetWin : public Net
           return( false );
         }
 
+        //-------------------------------------------------------------------
+        virtual DataPointer get( WORD maxLen )
+        {
+          DataPointer dp;
+          if( net.bufIdx < net.bufLen )
+          {
+            WORD minLen = MIN( (WORD)(net.bufLen-net.bufIdx), maxLen );
+            dp = DataPointer( (BYTE*)&net.buf[net.bufIdx], minLen);
+            net.bufIdx += minLen;
+          }
+          return( dp );
+        }
+
         //-----------------------------------------------------------
         virtual DataPointer getDataPointer( void )
         {