ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-22 06:57:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VFS lwIP: restart DHCP with link-state changes

Browse Source 
Start and stop the DHCP state machine as the Nic link-state changes.
Invoke the link state handler during configuration rather than assume
that in the case of a downed link lwIP will defer DHCP until the link
comes up.

Additionally, support static DNS configuration via the "nameserver"
configuration attribute.

Fix #3388
This commit is contained in:
Emery Hemingway 2019-05-29 11:03:52 +02:00 committed by Christian Helmuth
parent 24a3eea89e
commit bbf7a6230e
1 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
repos/libports/include/lwip/nic_netif.h
View File

@ -41,6 +41,7 @@ extern "C" {
#endif #endif
#include <lwip/init.h> #include <lwip/init.h>
#include <lwip/dhcp.h> #include <lwip/dhcp.h>
#include <lwip/dns.h>
} }
class Nic_netif; class Nic_netif;
@ -94,6 +95,8 @@ class Lwip::Nic_netif
Genode::Io_signal_handler<Nic_netif> _link_state_handler; Genode::Io_signal_handler<Nic_netif> _link_state_handler;
Genode::Io_signal_handler<Nic_netif> _rx_packet_handler; Genode::Io_signal_handler<Nic_netif> _rx_packet_handler;
bool _dhcp { false };
public: public:
void free_pbuf(Nic_netif_pbuf &pbuf) void free_pbuf(Nic_netif_pbuf &pbuf)
@ -114,15 +117,24 @@ class Lwip::Nic_netif
void handle_link_state() void handle_link_state()
{ {
/* /*
* if the application wants to know what is going * if the application wants to be informed of the
* on then it should use 'set_link_callback' * link state then it should use 'set_link_callback'
*/ */
if (_nic.link_state()) { if (_nic.link_state()) {
netif_set_link_up(&_netif); netif_set_link_up(&_netif);
/* XXX: DHCP? */ if (_dhcp) {
err_t err = dhcp_start(&_netif);
if (err != ERR_OK) {
Genode::error("failed to configure lwIP interface with DHCP, error ", -err);
}
} else {
dhcp_inform(&_netif);
}
} else { } else {
netif_set_link_down(&_netif); netif_set_link_down(&_netif);
if (_dhcp) {
dhcp_release_and_stop(&_netif);
}
} }
} }
@ -155,51 +167,58 @@ class Lwip::Nic_netif
void configure(Genode::Xml_node const &config) void configure(Genode::Xml_node const &config)
{ {
if (config.attribute_value("dhcp", false)) { _dhcp = config.attribute_value("dhcp", false);
err_t err = dhcp_start(&_netif); typedef Genode::String<IPADDR_STRLEN_MAX> Str;
if (err == ERR_OK) Str ip_str = config.attribute_value("ip_addr", Str());
Genode::log("configuring lwIP interface with DHCP");
else
Genode::error("failed to configure lwIP interface with DHCP, error ", -err);
} else /* get addressing from config */ { if (_dhcp && ip_str != "") {
typedef Genode::String<IPADDR_STRLEN_MAX> Str; _dhcp = false;
Str ip_str = config.attribute_value("ip_addr", Str()); netif_set_down(&_netif);
Genode::error("refusing to configure lwIP interface with both DHCP and a static IPv4 address");
return;
}
netif_set_up(&_netif);
if (ip_str != "") {
ip_addr_t ipaddr; ip_addr_t ipaddr;
if (!ipaddr_aton(ip_str.string(), &ipaddr)) { if (!ipaddr_aton(ip_str.string(), &ipaddr)) {
Genode::error("lwIP configured with invalid IP address '",ip_str,"'"); Genode::error("lwIP configured with invalid IP address '",ip_str,"'");
throw ip_str; throw ip_str;
} }
if (IP_IS_V6_VAL(ipaddr)) { netif_set_ipaddr(&_netif, ip_2_ip4(&ipaddr));
netif_create_ip6_linklocal_address(&_netif, 1);
err_t err = netif_add_ip6_address(&_netif, ip_2_ip6(&ipaddr), NULL);
if (err != ERR_OK) {
Genode::error("failed to set lwIP IPv6 address to '",ip_str,"'");
throw err;
}
} else {
netif_set_ipaddr(&_netif, ip_2_ip4(&ipaddr));
if (config.has_attribute("netmask")) { if (config.has_attribute("netmask")) {
Str str = config.attribute_value("netmask", Str()); Str str = config.attribute_value("netmask", Str());
ip_addr_t ip; ip_addr_t ip;
ipaddr_aton(str.string(), &ip); ipaddr_aton(str.string(), &ip);
netif_set_netmask(&_netif, ip_2_ip4(&ip)); netif_set_netmask(&_netif, ip_2_ip4(&ip));
}
if (config.has_attribute("gateway")) {
Str str = config.attribute_value("gateway", Str());
ip_addr_t ip;
ipaddr_aton(str.string(), &ip);
netif_set_gw(&_netif, ip_2_ip4(&ip));
}
/* inform DHCP servers of our fixed IP address */
dhcp_inform(&_netif);
} }
if (config.has_attribute("gateway")) {
Str str = config.attribute_value("gateway", Str());
ip_addr_t ip;
ipaddr_aton(str.string(), &ip);
netif_set_gw(&_netif, ip_2_ip4(&ip));
}
} }
if (config.has_attribute("nameserver")) {
/*
* LwIP does not use DNS internally, but the application
* should expect "dns_getserver" to work regardless of
* how the netif configures itself.
*/
Str str = config.attribute_value("nameserver", Str());
ip_addr_t ip;
ipaddr_aton(str.string(), &ip);
dns_setserver(0, &ip);
}
handle_link_state();
} }
Nic_netif(Genode::Env &env, Nic_netif(Genode::Env &env,
@ -228,11 +247,11 @@ class Lwip::Nic_netif
} }
netif_set_default(&_netif); netif_set_default(&_netif);
netif_set_up(&_netif);
configure(config);
netif_set_status_callback( netif_set_status_callback(
&_netif, nic_netif_status_callback); &_netif, nic_netif_status_callback);
nic_netif_status_callback(&_netif); nic_netif_status_callback(&_netif);
configure(config);
} }
virtual ~Nic_netif() { } virtual ~Nic_netif() { }