Skip to content

Fix hostname management #8626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 6, 2022
Merged

Fix hostname management #8626

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
154a41b
manage hostname with sdk string
d-a-v Jul 4, 2022
9b46278
comments
d-a-v Jul 4, 2022
352382d
fix emulation on host
d-a-v Jul 5, 2022
e28c404
remove duplicate hostname per review
d-a-v Jul 5, 2022
a5471e8
restyle
d-a-v Jul 5, 2022
f9b2ab1
wifi_station_hostname is a pointer, not an array
d-a-v Jul 5, 2022
f417a23
simplify
d-a-v Jul 5, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
manage hostname with sdk string
  • Loading branch information
@d-a-v
d-a-v committed Jul 4, 2022
commit 154a41bef15e48ea9f2fcedd9a81596af53bc605
15 changes: 12 additions & 3 deletions cores/esp8266/LwipIntf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ extern "C"
#include "debug.h"
#include "LwipIntf.h"

extern "C" char* wifi_station_hostname; // sdk's hostname location
extern "C" char* wifi_station_default_hostname; // sdk's hostname location

// args | esp order arduino order
// ---- + --------- -------------
// local_ip | local_ip local_ip
Expand Down Expand Up @@ -66,7 +69,7 @@ bool LwipIntf::ipAddressReorder(const IPAddress& local_ip, const IPAddress& arg1
*/
String LwipIntf::hostname(void)
{
return wifi_station_get_hostname();
return wifi_station_hostname; //wifi_station_get_hostname();
}

/**
Expand All @@ -75,7 +78,7 @@ String LwipIntf::hostname(void)
*/
const char* LwipIntf::getHostname(void)
{
return wifi_station_get_hostname();
return wifi_station_hostname; //wifi_station_get_hostname();
}

/**
Expand Down Expand Up @@ -136,20 +139,26 @@ bool LwipIntf::hostname(const char* aHostname)
DEBUGV("hostname '%s' is not compliant with RFC952\n", aHostname);
}

#if 0
bool ret = wifi_station_set_hostname(aHostname);
if (!ret)
{
DEBUGV("WiFi.hostname(%s): wifi_station_set_hostname() failed\n", aHostname);
return false;
}
#else
bool ret = true;

strcpy(wifi_station_hostname, aHostname);
strcpy(wifi_station_default_hostname, aHostname);
#endif
// now we should inform dhcp server for this change, using lwip_renew()
// looping through all existing interface
// harmless for AP, also compatible with ethernet adapters (to come)
for (netif* intf = netif_list; intf; intf = intf->next)
{
// unconditionally update all known interfaces
intf->hostname = wifi_station_get_hostname();
intf->hostname = wifi_station_hostname; //wifi_station_get_hostname();

if (netif_dhcp_data(intf) != nullptr)
{
Expand Down