Let me revive tis issue (in regards to #4586).

I was looking at the code for mDNS and hostname and did find it a bit odd.

Line 466 in a87b562

    
           if (strcmp(cmDNS, DEFAULT_MDNS_NAME) == 0) sprintf_P(cmDNS, PSTR("wled-%*s"), 6, escapedMac.c_str() + 6);

WLED/wled00/wled.cpp

Lines 658 to 670 in a87b562

    
               // convert the "serverDescription" into a valid DNS hostname (alphanumeric) 
        
               char hostname[25]; 
        
               prepareHostname(hostname); 
        
               WiFi.begin(multiWiFi[selectedWiFi].clientSSID, multiWiFi[selectedWiFi].clientPass); // no harm if called multiple times 
        
           #ifdef ARDUINO_ARCH_ESP32 
        
               WiFi.setTxPower(wifi_power_t(txPower)); 
        
               WiFi.setSleep(!noWifiSleep); 
        
               WiFi.setHostname(hostname); 
        
           #else 
        
               wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T); 
        
               WiFi.hostname(hostname); 
        
           #endif

WLED/wled00/cfg.cpp

Lines 59 to 61 in a87b562

    
           JsonObject id = doc["id"]; 
        
           getStringFromJson(cmDNS, id[F("mdns")], 33); 
        
           getStringFromJson(serverDescription, id[F("name")], 33);

I would assume most people would want 2 names: mDNS/DHCP/hostname and device name/UI name.

Currently WLED also stores 2 names cmDNS and serverDescription but their use is a bit odd. cmDNS is used for mDNS but not hostname (which is associated with DHCP registration). Instead serverDescription is used as hostname/DHCP registration and UI device name. It is also used in Improv and E1.31.

I think cmDNs (a field in WiFi settings) should be used for hostname and have serverDescription(field in UI settings) used only for UI/Improv/E1.31.

Another oddity is how current hostname is constructed from serverDescription.

WLED/wled00/util.cpp

Lines 118 to 139 in a87b562

    
           void prepareHostname(char* hostname) 
        
           { 
        
             sprintf_P(hostname, PSTR("wled-%*s"), 6, escapedMac.c_str() + 6); 
        
             const char *pC = serverDescription; 
        
             unsigned pos = 5;          // keep "wled-" 
        
             while (*pC && pos < 24) { // while !null and not over length 
        
               if (isalnum(*pC)) {     // if the current char is alpha-numeric append it to the hostname 
        
                 hostname[pos] = *pC; 
        
                 pos++; 
        
               } else if (*pC == ' ' || *pC == '_' || *pC == '-' || *pC == '+' || *pC == '!' || *pC == '?' || *pC == '*') { 
        
                 hostname[pos] = '-'; 
        
                 pos++; 
        
               } 
        
               // else do nothing - no leading hyphens and do not include hyphens for all other characters. 
        
               pC++; 
        
             } 
        
             //last character must not be hyphen 
        
             if (pos > 5) { 
        
               while (pos > 4 && hostname[pos -1] == '-') pos--; 
        
               hostname[pos] = '\0'; // terminate string (leave at least "wled") 
        
             } 
        
           }

As for AP name, IMO that should be independent from anything else.

Should we change how hostname/mDNS/DHCP name is constructed?

	// convert the "serverDescription" into a valid DNS hostname (alphanumeric)
	char hostname[25];
	prepareHostname(hostname);
	WiFi.begin(multiWiFi[selectedWiFi].clientSSID, multiWiFi[selectedWiFi].clientPass); // no harm if called multiple times

	#ifdef ARDUINO_ARCH_ESP32
	WiFi.setTxPower(wifi_power_t(txPower));
	WiFi.setSleep(!noWifiSleep);
	WiFi.setHostname(hostname);
	#else
	wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T);
	WiFi.hostname(hostname);
	#endif

	JsonObject id = doc["id"];
	getStringFromJson(cmDNS, id[F("mdns")], 33);
	getStringFromJson(serverDescription, id[F("name")], 33);

	void prepareHostname(char* hostname)
	{
	sprintf_P(hostname, PSTR("wled-%*s"), 6, escapedMac.c_str() + 6);
	const char *pC = serverDescription;
	unsigned pos = 5; // keep "wled-"
	while (*pC && pos < 24) { // while !null and not over length
	if (isalnum(*pC)) { // if the current char is alpha-numeric append it to the hostname
	hostname[pos] = *pC;
	pos++;
	} else if (pC == ' ' \|\| pC == '_' \|\| pC == '-' \|\| pC == '+' \|\| pC == '!' \|\| pC == '?' \|\| pC == '') {
	hostname[pos] = '-';
	pos++;
	}
	// else do nothing - no leading hyphens and do not include hyphens for all other characters.
	pC++;
	}
	//last character must not be hyphen
	if (pos > 5) {
	while (pos > 4 && hostname[pos -1] == '-') pos--;
	hostname[pos] = '\0'; // terminate string (leave at least "wled")
	}
	}

Uh oh!

Simplify "device name" across app #1242

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions