mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/nfs: implement mac address lookup

Browse Source 
Conflicts:
	src/gui/moviebrowser.cpp
	src/gui/nfs.cpp
This commit is contained in:
martii
2013-06-29 15:22:39 +02:00
committed by [CST] Focus
parent 6f1f961b13
commit 706ea95092
10 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/network_setup.cpp
View File

@@ -58,7 +58,7 @@
#include <libnet.h>
#include <libiw/iwscan.h>
extern "C" int pinghost( const char *hostname );
extern int pinghost (const std::string &hostname, std::string *ip = NULL);
CNetworkSetup::CNetworkSetup(bool wizard_mode)
{
@@ -702,7 +702,7 @@ void CNetworkSetup::showCurrentNetworkSettings()
const char * CNetworkSetup::mypinghost(std::string &host)
{
int retvalue = pinghost(host.c_str());
int retvalue = pinghost(host);
switch (retvalue)
{
case 1: return (g_Locale->getText(LOCALE_PING_OK));
@@ -776,7 +776,7 @@ void CNetworkSetup::testNetworkSettings()
text += (std::string)g_Locale->getText(LOCALE_NETWORKMENU_NAMESERVER) + ":\n";
text += offset + our_nameserver + " " + mypinghost(our_nameserver) + "\n";
//NTPserver
if ( (pinghost(our_nameserver.c_str()) == 1) && g_settings.network_ntpenable && (g_settings.network_ntpserver != "") )
if ( (pinghost(our_nameserver) == 1) && g_settings.network_ntpenable && (g_settings.network_ntpserver != "") )
{
text += std::string(g_Locale->getText(LOCALE_NETWORKMENU_NTPSERVER)) + ":\n";
text += offset + g_settings.network_ntpserver + " " + mypinghost(g_settings.network_ntpserver) + "\n";
@@ -784,7 +784,7 @@ void CNetworkSetup::testNetworkSettings()
//Wiki
text += wiki_URL + ":\n";
text += offset + "via IP (" + wiki_IP + "): " + mypinghost(wiki_IP) + "\n";
if (pinghost(our_nameserver.c_str()) == 1)
if (pinghost(our_nameserver) == 1)
{
text += offset + "via DNS: " + mypinghost(wiki_URL) + "\n";
//testsite (or defaultsite)