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

yweb: fix remotecontrol; remove dependency from MAC

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8131a25af1
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-19 (Mon, 19 Nov 2012)

Origin message was:
------------------
- yweb: fix remotecontrol; remove dependency from MAC

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2012-11-19 22:33:50 +01:00
parent 629cc6837e
commit 49e7d1904d
3 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -595,44 +595,43 @@ void CControlAPI::InfoCGI(CyhookHandler *hh)
void CControlAPI::HWInfoCGI(CyhookHandler *hh) void CControlAPI::HWInfoCGI(CyhookHandler *hh)
{ {
unsigned int system_rev = cs_get_revision(); unsigned int system_rev = cs_get_revision();
std::string boxname; std::string boxname = "Coolstream ";
static CNetAdapter netadapter; static CNetAdapter netadapter;
std::string eth_id = netadapter.getMacAddr(); std::string eth_id = netadapter.getMacAddr();
std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower); std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower);
if("00:c5:5c" == eth_id.substr(0, 8) ) #if HAVE_TRIPLEDRAGON
boxname = "Coolstream "; boxname = "Armas ";
else if("ba:dd:ad" == eth_id.substr(0, 8) ) #endif
boxname = "Armas ";
switch(system_rev) switch(system_rev)
{ {
case 1: case 1:
if( boxname == "Armas ") if( boxname == "Armas ")
boxname += "TripleDragon"; boxname += "TripleDragon";
break; break;
case 6: case 6:
boxname += "HD1"; boxname += "HD1";
break; break;
case 7: case 7:
boxname += "BSE"; boxname += "BSE";
break; break;
case 8: case 8:
case 9: case 9:
boxname += "Neo"; boxname += "Neo";
break; break;
case 10: case 10:
boxname += "Zee"; boxname += "Zee";
break; break;
default: { default:
char buffer[10]; char buffer[10];
snprintf(buffer, sizeof(buffer), "%u\n", system_rev); snprintf(buffer, sizeof(buffer), "%u\n", system_rev);
boxname += "Unknown nr. "; boxname += "Unknown nr. ";
boxname += buffer; boxname += buffer;
} break;
break;
} }
boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE"; boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
hh->printf("%s\nMAC:%s\n", boxname.c_str(),eth_id.c_str()); hh->printf("%s\nMAC:%s\n", boxname.c_str(),eth_id.c_str());

61
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -647,48 +647,43 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
return yresult; return yresult;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// y-func : get boxtypetext (Nokia, Philips, Sagem) // y-func : get boxtypetext
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{ {
unsigned int system_rev = cs_get_revision(); unsigned int system_rev = cs_get_revision();
std::string boxname; std::string boxname = "Coolstream ";
static CNetAdapter netadapter;
std::string eth_id = netadapter.getMacAddr();
std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower);
if("00:c5:5c" == eth_id.substr(0, 8) ) #if HAVE_TRIPLEDRAGON
boxname = "Coolstream "; boxname = "Armas ";
else if("ba:dd:ad" == eth_id.substr(0, 8) ) #endif
boxname = "Armas ";
switch(system_rev) switch(system_rev)
{ {
case 1: case 1:
if( boxname == "Armas ") if( boxname == "Armas ")
boxname += "TripleDragon"; boxname += "TripleDragon";
break; break;
case 6: case 6:
boxname += "HD1"; boxname += "HD1";
break; break;
case 7: case 7:
boxname += "BSE"; boxname += "BSE";
break; break;
case 8: case 8:
case 9: case 9:
boxname += "Neo"; boxname += "Neo";
break; break;
case 10: case 10:
boxname += "Zee"; boxname += "Zee";
break; break;
default: { default:
char buffer[10]; char buffer[10];
snprintf(buffer, sizeof(buffer), "%u\n", system_rev); snprintf(buffer, sizeof(buffer), "%u\n", system_rev);
boxname += "Unknown nr. "; boxname += "Unknown nr. ";
boxname += buffer; boxname += buffer;
} break;
break;
} }
boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE"; boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.8.0.30 version=2.8.0.31
date=18.08.2012 date=19.11.2012
type=Release type=Release
info=Port Coolstream info=Port Coolstream