Choose a better subnet mask value for the IPv4 address.

[mirror_edk2.git] / StdLib / EfiSocketLib / Tcp4.c

diff --git a/StdLib/EfiSocketLib/Tcp4.c b/StdLib/EfiSocketLib/Tcp4.c
index 5027ca343da9ae674db5b9d088aaa2399480d623..34e60e2a7f7a951a3b4ee02a084e2f7af9f74938 100644 (file)
--- a/StdLib/EfiSocketLib/Tcp4.c
+++ b/StdLib/EfiSocketLib/Tcp4.c
@@ -241,15 +241,17 @@ EslTcp4ConnectComplete (
     //\r
     //  The connection failed\r
     //\r
-    DEBUG (( DEBUG_CONNECT,\r
-              "0x%08x: Port connection to %d.%d.%d.%d:%d failed, Status: %r\r\n",\r
-              pPort,\r
-              pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[0],\r
-              pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[1],\r
-              pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[2],\r
-              pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[3],\r
-              pTcp4->ConfigData.AccessPoint.RemotePort,\r
-              Status ));\r
+    if ( pPort->bConfigured ) {\r
+      DEBUG (( DEBUG_CONNECT,\r
+                "0x%08x: Port connection to %d.%d.%d.%d:%d failed, Status: %r\r\n",\r
+                pPort,\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[0],\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[1],\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[2],\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[3],\r
+                pTcp4->ConfigData.AccessPoint.RemotePort,\r
+                Status ));\r
+    }\r
 \r
     //\r
     //  Close the current port\r
@@ -272,7 +274,6 @@ EslTcp4ConnectComplete (
     //\r
     Status = EslTcp4ConnectStart ( pSocket );\r
     if ( EFI_NOT_READY != Status ) {\r
-      pSocket->ConnectStatus = Status;\r
       bRemoveFirstPort = TRUE;\r
     }\r
   }\r
@@ -374,24 +375,43 @@ EslTcp4ConnectPoll (
       break;\r
 \r
     case EFI_ABORTED:\r
-      pSocket->errno = ECONNREFUSED;\r
+      pSocket->errno = ECONNABORTED;\r
+      break;\r
+\r
+    case EFI_ACCESS_DENIED:\r
+      pSocket->errno = EACCES;\r
+      break;\r
+\r
+    case EFI_CONNECTION_RESET:\r
+      pSocket->errno = ECONNRESET;\r
       break;\r
 \r
     case EFI_INVALID_PARAMETER:\r
-      pSocket->errno = EINVAL;\r
+      pSocket->errno = EADDRNOTAVAIL;\r
       break;\r
 \r
-    case EFI_NO_MAPPING:\r
+    case EFI_HOST_UNREACHABLE:\r
     case EFI_NO_RESPONSE:\r
       pSocket->errno = EHOSTUNREACH;\r
       break;\r
 \r
+    case EFI_NO_MAPPING:\r
+      pSocket->errno = EAFNOSUPPORT;\r
+      break;\r
+\r
     case EFI_NO_MEDIA:\r
+    case EFI_NETWORK_UNREACHABLE:\r
       pSocket->errno = ENETDOWN;\r
       break;\r
 \r
     case EFI_OUT_OF_RESOURCES:\r
-      pSocket->errno = ENOMEM;\r
+      pSocket->errno = ENOBUFS;\r
+      break;\r
+\r
+    case EFI_PORT_UNREACHABLE:\r
+    case EFI_PROTOCOL_UNREACHABLE:\r
+    case EFI_CONNECTION_REFUSED:\r
+      pSocket->errno = ECONNREFUSED;\r
       break;\r
 \r
     case EFI_SUCCESS:\r
@@ -404,13 +424,17 @@ EslTcp4ConnectPoll (
       break;\r
 \r
     case EFI_UNSUPPORTED:\r
-      pSocket->errno = ENOTSUP;\r
-      break;\r
-\r
-    case 0x80000069:\r
-      pSocket->errno = ECONNRESET;\r
+      pSocket->errno = EOPNOTSUPP;\r
       break;\r
     }\r
+\r
+    //\r
+    //  Display the translation\r
+    //\r
+    DEBUG (( DEBUG_CONNECT,\r
+              "ERROR - errno: %d, Status: %r\r\n",\r
+              pSocket->errno,\r
+              Status ));\r
   }\r
 \r
   //\r
@@ -476,32 +500,6 @@ EslTcp4ConnectStart (
       DEBUG (( DEBUG_CONNECT,\r
                 "ERROR - Failed to configure the Tcp4 port, Status: %r\r\n",\r
                 Status ));\r
-      switch ( Status ) {\r
-      case EFI_ACCESS_DENIED:\r
-        pSocket->errno = EACCES;\r
-        break;\r
-    \r
-      default:\r
-      case EFI_DEVICE_ERROR:\r
-        pSocket->errno = EIO;\r
-        break;\r
-    \r
-      case EFI_INVALID_PARAMETER:\r
-        pSocket->errno = EADDRNOTAVAIL;\r
-        break;\r
-    \r
-      case EFI_NO_MAPPING:\r
-        pSocket->errno = EAFNOSUPPORT;\r
-        break;\r
-    \r
-      case EFI_OUT_OF_RESOURCES:\r
-        pSocket->errno = ENOBUFS;\r
-        break;\r
-    \r
-      case EFI_UNSUPPORTED:\r
-        pSocket->errno = EOPNOTSUPP;\r
-        break;\r
-      }\r
     }\r
     else {\r
       DEBUG (( DEBUG_CONNECT,\r
@@ -512,7 +510,6 @@ EslTcp4ConnectStart (
       //\r
       //  Verify the port connection\r
       //\r
-      pTcp4Protocol = pPort->pProtocol.TCPv4;\r
       Status = pTcp4Protocol->GetModeData ( pTcp4Protocol,\r
                                             NULL,\r
                                             NULL,\r
@@ -535,22 +532,7 @@ EslTcp4ConnectStart (
                                             &pTcp4->ConnectToken );\r
         }\r
       }\r
-      if ( !EFI_ERROR ( Status )) {\r
-        //\r
-        //  Connection in progress\r
-        //\r
-        pSocket->errno = EINPROGRESS;\r
-        Status = EFI_NOT_READY;\r
-        DEBUG (( DEBUG_CONNECT,\r
-                  "0x%08x: Port attempting connection to %d.%d.%d.%d:%d\r\n",\r
-                  pPort,\r
-                  pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[0],\r
-                  pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[1],\r
-                  pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[2],\r
-                  pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[3],\r
-                  pTcp4->ConfigData.AccessPoint.RemotePort ));\r
-      }\r
-      else {\r
+      if ( EFI_ERROR ( Status )) {\r
         //\r
         //  Connection error\r
         //\r
@@ -558,43 +540,38 @@ EslTcp4ConnectStart (
                   "ERROR - Port 0x%08x not connected, Status: %r\r\n",\r
                   pPort,\r
                   Status ));\r
-        //\r
-        //  Determine the errno value\r
-        //\r
-        switch ( Status ) {\r
-        default:\r
-          pSocket->errno = EIO;\r
-          break;\r
-\r
-        case EFI_OUT_OF_RESOURCES:\r
-          pSocket->errno = ENOBUFS;\r
-          break;\r
-\r
-        case EFI_TIMEOUT:\r
-          pSocket->errno = ETIMEDOUT;\r
-          break;\r
-\r
-        case EFI_NO_MEDIA:\r
-        case EFI_NETWORK_UNREACHABLE:\r
-          pSocket->errno = ENETDOWN;\r
-          break;\r
-\r
-        case EFI_HOST_UNREACHABLE:\r
-          pSocket->errno = EHOSTUNREACH;\r
-          break;\r
-\r
-        case EFI_PORT_UNREACHABLE:\r
-        case EFI_PROTOCOL_UNREACHABLE:\r
-        case EFI_CONNECTION_REFUSED:\r
-          pSocket->errno = ECONNREFUSED;\r
-          break;\r
-\r
-        case EFI_CONNECTION_RESET:\r
-          pSocket->errno = ECONNRESET;\r
-          break;\r
-        }\r
       }\r
     }\r
+    if ( !EFI_ERROR ( Status )) {\r
+      //\r
+      //  Connection in progress\r
+      //\r
+      pSocket->errno = EINPROGRESS;\r
+      DEBUG (( DEBUG_CONNECT,\r
+                "0x%08x: Port attempting connection to %d.%d.%d.%d:%d\r\n",\r
+                pPort,\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[0],\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[1],\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[2],\r
+                pTcp4->ConfigData.AccessPoint.RemoteAddress.Addr[3],\r
+                pTcp4->ConfigData.AccessPoint.RemotePort ));\r
+    }\r
+    else {\r
+      //\r
+      //  Error return path is through EslTcp4ConnectComplete to\r
+      //  enable retry on other ports\r
+      //\r
+      //  Status to errno translation gets done in EslTcp4ConnectPoll\r
+      //\r
+      pTcp4->ConnectToken.CompletionToken.Status = Status;\r
+\r
+      //\r
+      //  Continue with the next port\r
+      //\r
+      gBS->CheckEvent ( pTcp4->ConnectToken.CompletionToken.Event );\r
+      gBS->SignalEvent ( pTcp4->ConnectToken.CompletionToken.Event );\r
+    }\r
+    Status = EFI_NOT_READY;\r
   }\r
   else {\r
     //\r
@@ -813,6 +790,8 @@ EslTcp4Listen (
     //  Mark the socket as configured\r
     //\r
     pSocket->bConfigured = TRUE;\r
+    Status = EFI_SUCCESS;\r
+    pSocket->errno = 0;\r
 \r
     //\r
     //  All done\r
@@ -1178,9 +1157,9 @@ EslTcp4LocalAddressSet (
     }\r
     else {\r
       pAccessPoint->SubnetMask.Addr[0] = 0xff;\r
-      pAccessPoint->SubnetMask.Addr[1] = 0xff;\r
-      pAccessPoint->SubnetMask.Addr[2] = 0xff;\r
-      pAccessPoint->SubnetMask.Addr[3] = 0xff;\r
+      pAccessPoint->SubnetMask.Addr[1] = ( 128 <= pAccessPoint->StationAddress.Addr[0]) ? 0xff : 0;\r
+      pAccessPoint->SubnetMask.Addr[2] = ( 192 <= pAccessPoint->StationAddress.Addr[0]) ? 0xff : 0;\r
+      pAccessPoint->SubnetMask.Addr[3] = ( 224 <= pAccessPoint->StationAddress.Addr[0]) ? 0xff : 0;\r
     }\r
 \r
     //\r