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

Rewrote wifi_sta_gethostname in wifi module.

This commit is contained in:
dnc40085 2016-01-02 19:14:17 -08:00
parent b2190e4d7b
commit fcbf58cf0d
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/modules/wifi.c
View File

@ -920,7 +920,6 @@ static int wifi_station_listap( lua_State* L )
} }
} }
// Lua: wifi.sta.gethostname() // Lua: wifi.sta.gethostname()
static int wifi_sta_gethostname( lua_State* L ) static int wifi_sta_gethostname( lua_State* L )
{ {
@ -931,28 +930,25 @@ static int wifi_sta_gethostname( lua_State* L )
static uint8 wifi_sta_sethostname(const char *hostname, size_t len) static uint8 wifi_sta_sethostname(const char *hostname, size_t len)
{ {
const char* charset="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-"; uint8 status;
size_t span = strspn(hostname, charset); if(hostname[0]!='-' && hostname[len-1]!='-' && (len >= 1 && len <= 32))
if(hostname[span] == '\0' && hostname[span - 1] != '-' && hostname[0] != '-' && (len >= 1 && len <= 32))
{ {
NODE_DBG("\n\tstring is: \"%s\"\n\tlength is: %d\n", hostname, len ); uint8 i=0;
if(wifi_station_set_hostname((char*)hostname)) while(hostname[i])
{ {
NODE_DBG("\n\twifi_sta_sethostname returned: true\n"); if(!(isalnum(hostname[i])||hostname[i]=='-'))
return 1; //pass {
} return 2;
else }
{ i++;
NODE_DBG("\n\twifi_sta_sethostname returned: false\n"); }
return 0; //fail status=wifi_station_set_hostname((char*)hostname);
}
} }
else else
{ {
NODE_DBG("\n\tInvalid hostname!\n"); return 2;
return 2; //Invalid hostname }
} return status;
} }
// Lua: wifi.sta.sethostname() // Lua: wifi.sta.sethostname()
@ -961,7 +957,7 @@ 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);
uint8 retval = wifi_sta_sethostname(hostname, len); uint8 retval = wifi_sta_sethostname(hostname, len);
NODE_DBG("\n\twifi_sta_sethostname returned: %d\n", retval); NODE_DBG("\n\tstring is: \"%s\"\n\tlength is: %u\t wifi_sta_sethostname returned: %u\n", hostname, len, retval);
if(retval==0) if(retval==0)
{ {
lua_pushboolean(L, 0); lua_pushboolean(L, 0);