mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

network-setup: rework testNetworkSettings()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf1cb6cb3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-01-06 (Fri, 06 Jan 2023)

Origin message was:
------------------
- network-setup: rework testNetworkSettings()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2023-01-06 22:26:46 +01:00
parent 3b207f6b8b
commit 8747daa055
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/gui/network_setup.cpp
View File

@@ -720,24 +720,24 @@ void CNetworkSetup::testNetworkSettings()
std::string our_ip, our_mask, our_broadcast, our_gateway, our_nameserver; std::string our_ip, our_mask, our_broadcast, our_gateway, our_nameserver;
std::string text, testsite, offset = " "; std::string text, offset = " ";
//set default testdomain //set test-url and test-ip
std::string defaultsite = "www.google.de"; std::string test_url = "www.neutrino-images.de";
std::string test_ip = "178.32.218.87";
//set test-URL and test-IP //set homepage-default
std::string test_URL = "tuxbox-neutrino.org"; std::string homepage_default = "www.google.de";
std::string test_IP = "89.31.143.1";
//get www-domain testsite from /.version //get homepage from /.version
std::string homepage = "";
CConfigFile config('\t'); CConfigFile config('\t');
config.loadConfig(IMAGE_VERSION_FILE); config.loadConfig(IMAGE_VERSION_FILE);
testsite = config.getString("homepage",defaultsite); homepage = config.getString("homepage", homepage_default);
testsite.replace( 0, testsite.find("www",0), "" );
//use default testdomain if testsite missing //use homepage-default if homepage is missing
if (testsite.length()==0) if (homepage.length() == 0)
testsite = defaultsite; homepage = homepage_default;
if (networkConfig->inet_static) if (networkConfig->inet_static)
{ {
@@ -761,7 +761,7 @@ void CNetworkSetup::testNetworkSettings()
printf("testNw Broadcast: %s\n", our_broadcast.c_str()); printf("testNw Broadcast: %s\n", our_broadcast.c_str());
printf("testNw Gateway: %s\n", our_gateway.c_str()); printf("testNw Gateway: %s\n", our_gateway.c_str());
printf("testNw Nameserver: %s\n", our_nameserver.c_str()); printf("testNw Nameserver: %s\n", our_nameserver.c_str());
printf("testNw Testsite: %s\n", testsite.c_str()); printf("testNw Homepage: %s\n", homepage.c_str());
if (our_ip.empty()) if (our_ip.empty())
{ {
@@ -772,36 +772,38 @@ void CNetworkSetup::testNetworkSettings()
//Box //Box
text = "Box (" + old_mac_addr + "):\n"; text = "Box (" + old_mac_addr + "):\n";
text += offset + our_ip + " " + mypinghost(our_ip) + "\n"; text += offset + our_ip + " " + mypinghost(our_ip) + "\n";
//Gateway //Gateway
text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_GATEWAY) + " (Router):\n"; text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_GATEWAY) + " (Router):\n";
text += offset + our_gateway + " " + mypinghost(our_gateway) + "\n"; text += offset + our_gateway + " " + mypinghost(our_gateway) + "\n";
//Nameserver //Nameserver
text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_NAMESERVER) + ":\n"; text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_NAMESERVER) + ":\n";
text += offset + our_nameserver + " " + mypinghost(our_nameserver) + "\n"; text += offset + our_nameserver + " " + mypinghost(our_nameserver) + "\n";
//NTPserver //NTPserver
if ( (pinghost(our_nameserver) == 1) && g_settings.network_ntpenable && (!g_settings.network_ntpserver.empty()) ) if ((pinghost(our_nameserver) == 1) && g_settings.network_ntpenable && (!g_settings.network_ntpserver.empty()))
{ {
text += std::string(g_Locale->getText(LOCALE_NETWORKMENU_NTPSERVER)) + ":\n"; text += std::string(g_Locale->getText(LOCALE_NETWORKMENU_NTPSERVER)) + ":\n";
text += offset + g_settings.network_ntpserver + " " + mypinghost(g_settings.network_ntpserver) + "\n"; text += offset + g_settings.network_ntpserver + " " + mypinghost(g_settings.network_ntpserver) + "\n";
} }
//NI
if (pinghost(our_nameserver.c_str()) == 1) //test-url
{ text += test_url + ":\n";
//testsite (or defaultsite) text += offset + "via IP (" + test_ip + "): " + mypinghost(test_ip) + "\n";
text += testsite + ":\n";
text += offset + "via DNS: " + mypinghost(testsite) + "\n";
}
//Test-URL
text += test_URL + ":\n";
text += offset + "via IP (" + test_IP + "): " + mypinghost(test_IP) + "\n";
if (pinghost(our_nameserver) == 1) if (pinghost(our_nameserver) == 1)
{ {
text += offset + "via DNS: " + mypinghost(test_URL) + "\n"; text += offset + "via DNS: " + mypinghost(test_url) + "\n";
//testsite (or defaultsite) }
#if 0
text += testsite + ":\n"; //homepage from /.version (or homepage-default)
text += offset + "via DNS: " + mypinghost(testsite) + "\n"; if (homepage.compare(test_url) != 0)
#endif {
if (pinghost(our_nameserver) == 1)
{
text += homepage + ":\n";
text += offset + "via DNS: " + mypinghost(homepage) + "\n";
}
} }
} }