Modify UDP and IP to transmit on all network adapters instead of just the first netwo...

Fix comment in Socket.c.

Signed-off-by: lpleahy
Reviewed and tested by: Sreenivasula Reddy of Dell

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13713 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/StdLib/EfiSocketLib/Ip4.c b/StdLib/EfiSocketLib/Ip4.c
index a245e6847e25a0fba58445f7b99f2b278bde2c19..2e832c7ac96343410f25c40f248210b16793e9c3 100644 (file)
--- a/StdLib/EfiSocketLib/Ip4.c
+++ b/StdLib/EfiSocketLib/Ip4.c
@@ -985,21 +985,21 @@ EslIp4TxBuffer (
   //\r
   if ( SOCKET_STATE_CONNECTED == pSocket->State ) {\r
     //\r
   //\r
   if ( SOCKET_STATE_CONNECTED == pSocket->State ) {\r
     //\r

-    //  Locate the port\r
+    //  Verify that there is enough room to buffer another\r
+    //  transmit operation\r

     //\r
     //\r

-    pPort = pSocket->pPortList;\r
-    if ( NULL != pPort ) {\r
+    pTxBytes = &pSocket->TxBytes;\r
+    if ( pSocket->MaxTxBuf > *pTxBytes ) {\r

       //\r
       //\r

-      //  Determine the queue head\r
+      //  Locate the port\r

       //\r
       //\r

-      pIp4 = &pPort->Context.Ip4;\r
-      pTxBytes = &pSocket->TxBytes;\r
+      pPort = pSocket->pPortList;\r
+      while ( NULL != pPort ) {\r
+        //\r
+        //  Determine the queue head\r
+        //\r
+        pIp4 = &pPort->Context.Ip4;\r

 \r
 \r

-      //\r
-      //  Verify that there is enough room to buffer another\r
-      //  transmit operation\r
-      //\r
-      if ( pSocket->MaxTxBuf > *pTxBytes ) {\r

         //\r
         //  Attempt to allocate the packet\r
         //\r
         //\r
         //  Attempt to allocate the packet\r
         //\r


@@ -1131,6 +1131,7 @@ EslIp4TxBuffer (
             //  Free the packet\r
             //\r
             EslSocketPacketFree ( pPacket, DEBUG_TX );\r
             //  Free the packet\r
             //\r
             EslSocketPacketFree ( pPacket, DEBUG_TX );\r

+            break;\r

           }\r
 \r
           //\r
           }\r
 \r
           //\r


@@ -1143,16 +1144,22 @@ EslIp4TxBuffer (
           //  Packet allocation failed\r
           //\r
           pSocket->errno = ENOMEM;\r
           //  Packet allocation failed\r
           //\r
           pSocket->errno = ENOMEM;\r

+          break;\r

         }\r
         }\r

-      }\r
-      else {\r
+\r

         //\r
         //\r

-        //  Not enough buffer space available\r
+        //  Set the next port\r

         //\r
         //\r

-        pSocket->errno = EAGAIN;\r
-        Status = EFI_NOT_READY;\r
+        pPort = pPort->pLinkSocket;\r

       }\r
     }\r
       }\r
     }\r

+    else {\r
+      //\r
+      //  Not enough buffer space available\r
+      //\r
+      pSocket->errno = EAGAIN;\r
+      Status = EFI_NOT_READY;\r
+    }\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r

diff --git a/StdLib/EfiSocketLib/Socket.c b/StdLib/EfiSocketLib/Socket.c
index acb23677aa6a8650c8c88910f57764ee2282555e..e718e9bdf857d24a7dc4c0b86ec9378b7ee973de 100644 (file)
--- a/StdLib/EfiSocketLib/Socket.c
+++ b/StdLib/EfiSocketLib/Socket.c
@@ -3191,7 +3191,7 @@ EslSocketPacketFree (
   DBG_ENTER ( );\r
 \r
   //\r
   DBG_ENTER ( );\r
 \r
   //\r

-  //  Allocate a packet structure\r
+  //  Free a packet structure\r

   //\r
   LengthInBytes = pPacket->PacketSize;\r
   Status = gBS->FreePool ( pPacket );\r
   //\r
   LengthInBytes = pPacket->PacketSize;\r
   Status = gBS->FreePool ( pPacket );\r

diff --git a/StdLib/EfiSocketLib/Udp4.c b/StdLib/EfiSocketLib/Udp4.c
index 45c0adad3a801673bac7eb01a547a5c791271fd6..414e3fe321a4c076c9f0d64d4f252b9a65f093ff 100644 (file)
--- a/StdLib/EfiSocketLib/Udp4.c
+++ b/StdLib/EfiSocketLib/Udp4.c
@@ -794,21 +794,21 @@ EslUdp4TxBuffer (
   //\r
   if ( SOCKET_STATE_CONNECTED == pSocket->State ) {\r
     //\r
   //\r
   if ( SOCKET_STATE_CONNECTED == pSocket->State ) {\r
     //\r

-    //  Locate the port\r
+    //  Verify that there is enough room to buffer another\r
+    //  transmit operation\r

     //\r
     //\r

-    pPort = pSocket->pPortList;\r
-    if ( NULL != pPort ) {\r
+    pTxBytes = &pSocket->TxBytes;\r
+    if ( pSocket->MaxTxBuf > *pTxBytes ) {\r

       //\r
       //\r

-      //  Determine the queue head\r
+      //  Locate the port\r

       //\r
       //\r

-      pUdp4 = &pPort->Context.Udp4;\r
-      pTxBytes = &pSocket->TxBytes;\r
+      pPort = pSocket->pPortList;\r
+      while ( NULL != pPort ) {\r
+        //\r
+        //  Determine the queue head\r
+        //\r
+        pUdp4 = &pPort->Context.Udp4;\r

 \r
 \r

-      //\r
-      //  Verify that there is enough room to buffer another\r
-      //  transmit operation\r
-      //\r
-      if ( pSocket->MaxTxBuf > *pTxBytes ) {\r

         //\r
         //  Attempt to allocate the packet\r
         //\r
         //\r
         //  Attempt to allocate the packet\r
         //\r


@@ -923,6 +923,7 @@ EslUdp4TxBuffer (
             //  Free the packet\r
             //\r
             EslSocketPacketFree ( pPacket, DEBUG_TX );\r
             //  Free the packet\r
             //\r
             EslSocketPacketFree ( pPacket, DEBUG_TX );\r

+            break;\r

           }\r
 \r
           //\r
           }\r
 \r
           //\r


@@ -935,16 +936,22 @@ EslUdp4TxBuffer (
           //  Packet allocation failed\r
           //\r
           pSocket->errno = ENOMEM;\r
           //  Packet allocation failed\r
           //\r
           pSocket->errno = ENOMEM;\r

+          break;\r

         }\r
         }\r

-      }\r
-      else {\r
+\r

         //\r
         //\r

-        //  Not enough buffer space available\r
+        //  Set the next port\r

         //\r
         //\r

-        pSocket->errno = EAGAIN;\r
-        Status = EFI_NOT_READY;\r
+        pPort = pPort->pLinkSocket;\r

       }\r
     }\r
       }\r
     }\r

+    else {\r
+      //\r
+      //  Not enough buffer space available\r
+      //\r
+      pSocket->errno = EAGAIN;\r
+      Status = EFI_NOT_READY;\r
+    }\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r

diff --git a/StdLib/EfiSocketLib/Udp6.c b/StdLib/EfiSocketLib/Udp6.c
index 899e50681eeee8b5d94e54ae5cea66ebdfc0ca3d..7de5005096477ea71ed023d033218d87f3ff3365 100644 (file)
--- a/StdLib/EfiSocketLib/Udp6.c
+++ b/StdLib/EfiSocketLib/Udp6.c
@@ -835,21 +835,21 @@ EslUdp6TxBuffer (
   //\r
   if ( SOCKET_STATE_CONNECTED == pSocket->State ) {\r
     //\r
   //\r
   if ( SOCKET_STATE_CONNECTED == pSocket->State ) {\r
     //\r

-    //  Locate the port\r
+    //  Verify that there is enough room to buffer another\r
+    //  transmit operation\r

     //\r
     //\r

-    pPort = pSocket->pPortList;\r
-    if ( NULL != pPort ) {\r
+    pTxBytes = &pSocket->TxBytes;\r
+    if ( pSocket->MaxTxBuf > *pTxBytes ) {\r

       //\r
       //\r

-      //  Determine the queue head\r
+      //  Locate the port\r

       //\r
       //\r

-      pUdp6 = &pPort->Context.Udp6;\r
-      pTxBytes = &pSocket->TxBytes;\r
+      pPort = pSocket->pPortList;\r
+      while ( NULL != pPort ) {\r
+        //\r
+        //  Determine the queue head\r
+        //\r
+        pUdp6 = &pPort->Context.Udp6;\r

 \r
 \r

-      //\r
-      //  Verify that there is enough room to buffer another\r
-      //  transmit operation\r
-      //\r
-      if ( pSocket->MaxTxBuf > *pTxBytes ) {\r

         //\r
         //  Attempt to allocate the packet\r
         //\r
         //\r
         //  Attempt to allocate the packet\r
         //\r


@@ -960,6 +960,7 @@ EslUdp6TxBuffer (
             //  Free the packet\r
             //\r
             EslSocketPacketFree ( pPacket, DEBUG_TX );\r
             //  Free the packet\r
             //\r
             EslSocketPacketFree ( pPacket, DEBUG_TX );\r

+            break;\r

           }\r
 \r
           //\r
           }\r
 \r
           //\r


@@ -972,16 +973,22 @@ EslUdp6TxBuffer (
           //  Packet allocation failed\r
           //\r
           pSocket->errno = ENOMEM;\r
           //  Packet allocation failed\r
           //\r
           pSocket->errno = ENOMEM;\r

+          break;\r

         }\r
         }\r

-      }\r
-      else {\r
+\r

         //\r
         //\r

-        //  Not enough buffer space available\r
+        //  Set the next port\r

         //\r
         //\r

-        pSocket->errno = EAGAIN;\r
-        Status = EFI_NOT_READY;\r
+        pPort = pPort->pLinkSocket;\r

       }\r
     }\r
       }\r
     }\r

+    else {\r
+      //\r
+      //  Not enough buffer space available\r
+      //\r
+      pSocket->errno = EAGAIN;\r
+      Status = EFI_NOT_READY;\r
+    }\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r