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

Merge branch 'master' into pu/mp

Browse Source 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
This commit is contained in:
svenhoefer
2017-03-20 01:31:51 +01:00
parent 66ea57d710 b8a97a97ca
commit b12624d1fa
12 changed files with 174 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -812,7 +812,15 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
std::string eth_id = netadapter.getMacAddr();
std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower);
hh->printf("%s %s (%s)\nMAC:%s\n", g_info.hw_caps->boxvendor, g_info.hw_caps->boxname, g_info.hw_caps->boxarch, eth_id.c_str());
std::string boxvendor(g_info.hw_caps->boxvendor);
/*
I don't know the current legal situation.
So better let's change the vendor's name to CST.
*/
if (boxvendor.compare("Coolstream") == 0)
boxvendor = "CST";
hh->printf("%s %s (%s)\nMAC:%s\n", boxvendor.c_str(), g_info.hw_caps->boxname, g_info.hw_caps->boxarch, eth_id.c_str());
}
//-----------------------------------------------------------------------------
void CControlAPI::ShutdownCGI(CyhookHandler *hh)