MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added boolean return value for wifi.sta.sethostname (#2079) 

- simplified wifi_change_default_host_name
- refactored code that checks hostname for compliance
This commit is contained in:
dnc40085 2017-09-15 13:38:35 -07:00 committed by Marcel Stör
parent e4d010e1c0
commit 7946deadab
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
app/modules/wifi.c
View File

@ -1191,24 +1191,21 @@ static int wifi_sta_gethostname( lua_State* L )
} }
// Used by wifi_sta_sethostname_lua and wifi_change_default_hostname // Used by wifi_sta_sethostname_lua and wifi_change_default_hostname
static bool wifi_sta_sethostname(const char *hostname, size_t len) // This function checks host name to ensure that it follows RFC 952 & RFC 1123 host name standards.
static bool wifi_sta_checkhostname(const char *hostname, size_t len)
{ {
//this function follows RFC 952 & RFC 1123 host name standards.
//the hostname must be 32 chars or less and first and last char must be alphanumeric //the hostname must be 32 chars or less and first and last char must be alphanumeric
if (!isalnum(hostname[0]) || !isalnum(hostname[len-1]) || len > 32) if (len == 0 || len > 32 || !isalnum(hostname[0]) || !isalnum(hostname[len-1])){
{
return false; return false;
} }
//characters in the middle of the host name must be alphanumeric or a hyphen(-) only
for (int i=1; i<len; i++){
if (!(isalnum(hostname[i]) || hostname[i]=='-')){
return false;
}
}
for (int i=1; i<len; i++) return true;
{
//characters in the middle of the host name can be alphanumeric or a hyphen(-) only
if (!(isalnum(hostname[i]) || hostname[i]=='-'))
{
return false;
}
}
return wifi_station_set_hostname((char*)hostname);
} }
// Lua: wifi.sta.sethostname() // Lua: wifi.sta.sethostname()
@ -1216,8 +1213,9 @@ static int wifi_sta_sethostname_lua( lua_State* L )
{ {
size_t len; size_t len;
const char *hostname = luaL_checklstring(L, 1, &len); const char *hostname = luaL_checklstring(L, 1, &len);
luaL_argcheck(L, wifi_sta_sethostname(hostname, len), 1, "Invalid hostname"); luaL_argcheck(L, wifi_sta_checkhostname(hostname, len), 1, "Invalid hostname");
return 0; lua_pushboolean(L, wifi_station_set_hostname((char*)hostname));
return 1;
} }
// Lua: wifi.sta.sleeptype(type) // Lua: wifi.sta.sleeptype(type)
@ -1847,36 +1845,31 @@ void wifi_change_default_host_name(void)
{ {
uint8 opmode_temp=wifi_get_opmode(); uint8 opmode_temp=wifi_get_opmode();
wifi_set_opmode_current(STATION_MODE); wifi_set_opmode_current(STATION_MODE);
char temp[33] = {0};//32 chars + NULL
uint8_t mac[6];
wifi_get_macaddr(STATION_IF, mac);
#ifndef WIFI_STA_HOSTNAME #ifndef WIFI_STA_HOSTNAME
char temp[32];
uint8_t mac[6];
wifi_get_macaddr(STATION_IF, mac);
c_sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]); c_sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
wifi_sta_sethostname((const char*)temp, strlen(temp));
#elif defined(WIFI_STA_HOSTNAME) && !defined(WIFI_STA_HOSTNAME_APPEND_MAC) #elif defined(WIFI_STA_HOSTNAME) && !defined(WIFI_STA_HOSTNAME_APPEND_MAC)
if(!wifi_sta_sethostname(WIFI_STA_HOSTNAME, strlen(WIFI_STA_HOSTNAME))) if(wifi_sta_checkhostname(WIFI_STA_HOSTNAME, strlen(WIFI_STA_HOSTNAME))){
{ c_sprintf(temp, "%s", WIFI_STA_HOSTNAME);
char temp[32];
uint8_t mac[6];
wifi_get_macaddr(STATION_IF, mac);
c_sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
wifi_sta_sethostname((const char*)temp, strlen(temp));
} }
else{
#elif defined(WIFI_STA_HOSTNAME) && defined(WIFI_STA_HOSTNAME_APPEND_MAC) c_sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
char temp[32]; }
uint8_t mac[6]; #elif defined(WIFI_STA_HOSTNAME) && defined(WIFI_STA_HOSTNAME_APPEND_MAC)
wifi_get_macaddr(STATION_IF, mac); if(strlen(WIFI_STA_HOSTNAME) <= 26 && wifi_sta_checkhostname(WIFI_STA_HOSTNAME, strlen(WIFI_STA_HOSTNAME))){
c_sprintf(temp, "%s%X%X%X", WIFI_STA_HOSTNAME, (mac)[3], (mac)[4], (mac)[5]); c_sprintf(temp, "%s%X%X%X", WIFI_STA_HOSTNAME, (mac)[3], (mac)[4], (mac)[5]);
if(!wifi_sta_sethostname(temp, strlen(temp))) }
{ else{
c_sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]); c_sprintf(temp, "NODE-%X%X%X", (mac)[3], (mac)[4], (mac)[5]);
wifi_sta_sethostname((const char*)temp, strlen(temp));
} }
#endif #endif
if(opmode_temp!=wifi_get_opmode())
{ wifi_station_set_hostname((char*)temp);
if(opmode_temp != wifi_get_opmode()){
wifi_set_opmode_current(opmode_temp); wifi_set_opmode_current(opmode_temp);
} }
} }

4
docs/en/modules/wifi.md
View File

@ -937,7 +937,9 @@ Sets station hostname.
`hostname` must only contain letters, numbers and hyphens('-') and be 32 characters or less with first and last character being alphanumeric `hostname` must only contain letters, numbers and hyphens('-') and be 32 characters or less with first and last character being alphanumeric
#### Returns #### Returns
`nil` - `true` Success
- `false` Failure
#### Example #### Example
```lua ```lua