Fix lwIP init and adapter config (#2886)

josesimoes · web-flow · commit 9b917fa57819 · 2024-02-15T16:11:42.000Z
diff --git a/src/PAL/Lwip/lwIP_Sockets.cpp b/src/PAL/Lwip/lwIP_Sockets.cpp
@@ -283,7 +283,10 @@ bool LWIP_SOCKETS_Driver::Initialize()
 
         g_LWIP_SOCKETS_Driver.m_interfaces[i].m_interfaceNumber = interfaceNumber;
 
-        UpdateAdapterConfiguration(i, (NetworkInterface_UpdateOperation_Dns), &networkConfiguration);
+        UpdateAdapterConfiguration(
+            i,
+            (NetworkInterface_UpdateOperation_Dhcp | NetworkInterface_UpdateOperation_Dns),
+            &networkConfiguration);
 
         networkInterface = netif_find_interface(interfaceNumber);
 
@@ -1344,12 +1347,6 @@ HRESULT LWIP_SOCKETS_Driver::UpdateAdapterConfiguration(
         {
             dhcp_renew(networkInterface);
         }
-        else if (
-            0 !=
-            (updateFlags & (NetworkInterface_UpdateOperation_DhcpRelease | NetworkInterface_UpdateOperation_DhcpRenew)))
-        {
-            return CLR_E_INVALID_PARAMETER;
-        }
     }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,10 @@ bool LWIP_SOCKETS_Driver::Initialize()`
`283`	`283`
`284`	`284`	`g_LWIP_SOCKETS_Driver.m_interfaces[i].m_interfaceNumber = interfaceNumber;`
`285`	`285`
`286`		`- UpdateAdapterConfiguration(i, (NetworkInterface_UpdateOperation_Dns), &networkConfiguration);`
	`286`	`+ UpdateAdapterConfiguration(`
	`287`	`+ i,`
	`288`	`+ (NetworkInterface_UpdateOperation_Dhcp \| NetworkInterface_UpdateOperation_Dns),`
	`289`	`+ &networkConfiguration);`
`287`	`290`
`288`	`291`	`networkInterface = netif_find_interface(interfaceNumber);`
`289`	`292`
`@@ -1344,12 +1347,6 @@ HRESULT LWIP_SOCKETS_Driver::UpdateAdapterConfiguration(`
`1344`	`1347`	`{`
`1345`	`1348`	`dhcp_renew(networkInterface);`
`1346`	`1349`	`}`
`1347`		`- else if (`
`1348`		`- 0 !=`
`1349`		`- (updateFlags & (NetworkInterface_UpdateOperation_DhcpRelease \| NetworkInterface_UpdateOperation_DhcpRenew)))`
`1350`		`- {`
`1351`		`- return CLR_E_INVALID_PARAMETER;`
`1352`		`- }`
`1353`	`1350`	`}`
`1354`	`1351`	`#endif`
`1355`	`1352`