Revert "Hack to ignore do_dhcp failures"
This reverts commit 9d5a7b31a78a7c75c3f9380a47afb8bd3dc7c066.
It turns out that this breaks networking. The interface goes down
on O seconds after it is configured.
BUG: 70724395
Change-Id: I1a950800b235a8d3d44b132a706df33dc0b0b5bb
diff --git a/guest/hals/ril/vsoc_ril.cpp b/guest/hals/ril/vsoc_ril.cpp
index 3adbf7f..70c6633 100644
--- a/guest/hals/ril/vsoc_ril.cpp
+++ b/guest/hals/ril/vsoc_ril.cpp
@@ -139,9 +139,12 @@
return false;
}
// do_dhcp doesn't really write to this
- // Failures are ignored here because interface setup won't work on master
- struct in_addr ipaddr{}, gateway{}, dns1{};
- uint32_t prefix_length{}, unused;
+ if (do_dhcp(const_cast<char*>(interface_name))) {
+ ALOGE("%s disabled because DHCP failed", interface_name);
+ return false;
+ }
+ struct in_addr ipaddr, gateway, dns1;
+ uint32_t prefix_length, unused;
get_dhcp_info(&ipaddr.s_addr, &gateway.s_addr, &prefix_length, &dns1.s_addr,
&unused, &unused, &unused);
snprintf(g_address_prefix, sizeof(g_address_prefix), "%s/%d",
