mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix:

Browse Source 
check if last used interface exist, revert to eth0 if not
use current network config instance to show current network settings



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1309 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-03-17 16:49:51 +00:00
parent 7a93361f5a
commit 88e291c856
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/network_setup.cpp
View File

@@ -179,6 +179,30 @@ void CNetworkSetup::showNetworkSetup()
{ {
struct dirent **namelist; struct dirent **namelist;
//if select
int ifcount = scandir("/sys/class/net", &namelist, my_filter, alphasort);
CMenuOptionStringChooser * ifSelect = new CMenuOptionStringChooser(LOCALE_NETWORKMENU_SELECT_IF, g_settings.ifname, ifcount > 1, this, CRCInput::RC_nokey, "", true);
bool found = false;
for(int i = 0; i < ifcount; i++) {
ifSelect->addOption(namelist[i]->d_name);
if(strcmp(g_settings.ifname, namelist[i]->d_name) == 0)
found = true;
free(namelist[i]);
}
if (ifcount >= 0)
free(namelist);
if(!found)
strcpy(g_settings.ifname, "eth0");
networkConfig->readConfig(g_settings.ifname);
readNetworkSettings();
backupNetworkSettings();
//menue init //menue init
CMenuWidget* networkSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width); CMenuWidget* networkSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
networkSettings->setWizardMode(is_wizard); networkSettings->setWizardMode(is_wizard);
@@ -187,10 +211,6 @@ void CNetworkSetup::showNetworkSetup()
//apply button //apply button
CMenuForwarder *m0 = new CMenuForwarder(LOCALE_NETWORKMENU_SETUPNOW, true, NULL, this, "networkapply", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); CMenuForwarder *m0 = new CMenuForwarder(LOCALE_NETWORKMENU_SETUPNOW, true, NULL, this, "networkapply", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
networkConfig->readConfig(g_settings.ifname);
readNetworkSettings();
backupNetworkSettings();
//eth id //eth id
CMenuForwarder *mac = new CMenuForwarderNonLocalized("MAC", false, mac_addr); CMenuForwarder *mac = new CMenuForwarderNonLocalized("MAC", false, mac_addr);
@@ -204,16 +224,6 @@ void CNetworkSetup::showNetworkSetup()
//hostname //hostname
CStringInputSMS * networkSettings_Hostname = new CStringInputSMS(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 30, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-. "); CStringInputSMS * networkSettings_Hostname = new CStringInputSMS(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 30, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-. ");
//if select
int ifcount = scandir("/sys/class/net", &namelist, my_filter, alphasort);
CMenuOptionStringChooser * ifSelect = new CMenuOptionStringChooser(LOCALE_NETWORKMENU_SELECT_IF, g_settings.ifname, ifcount > 1, this, CRCInput::RC_nokey, "", true);
for(int i = 0; i < ifcount; i++) {
ifSelect->addOption(namelist[i]->d_name);
free(namelist[i]);
}
if (ifcount >= 0)
free(namelist);
//auto start //auto start
CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -604,8 +614,11 @@ void CNetworkSetup::showCurrentNetworkSettings()
else { else {
netGetNameserver(nameserver); netGetNameserver(nameserver);
netGetDefaultRoute(router); netGetDefaultRoute(router);
#if 0 // i think we can use current networkConfig instance for that
CNetworkConfig _networkConfig; CNetworkConfig _networkConfig;
std::string dhcp = _networkConfig.inet_static ? g_Locale->getText(LOCALE_OPTIONS_OFF) : g_Locale->getText(LOCALE_OPTIONS_ON); std::string dhcp = _networkConfig.inet_static ? g_Locale->getText(LOCALE_OPTIONS_OFF) : g_Locale->getText(LOCALE_OPTIONS_ON);
#endif
std::string dhcp = networkConfig->inet_static ? g_Locale->getText(LOCALE_OPTIONS_OFF) : g_Locale->getText(LOCALE_OPTIONS_ON);
text = (std::string)g_Locale->getText(LOCALE_NETWORKMENU_DHCP) + ": " + dhcp + '\n' text = (std::string)g_Locale->getText(LOCALE_NETWORKMENU_DHCP) + ": " + dhcp + '\n'
+ g_Locale->getText(LOCALE_NETWORKMENU_IPADDRESS ) + ": " + ip + '\n' + g_Locale->getText(LOCALE_NETWORKMENU_IPADDRESS ) + ": " + ip + '\n'