From 7cc9ca31e1a0e9358ebf6f4e9be7853887e2ea33 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 26 Mar 2014 12:57:48 +0100 Subject: [PATCH] controlapi: add boxmodel to control/info?hwinfo Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a3e8142fae2ceb61b5f5e0be72ac861aa9b797a4 Author: vanhofen Date: 2014-03-26 (Wed, 26 Mar 2014) Origin message was: ------------------ - controlapi: add boxmodel to control/info?hwinfo ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index 3bb368d39..805176c64 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -630,12 +630,13 @@ void CControlAPI::InfoCGI(CyhookHandler *hh) void CControlAPI::HWInfoCGI(CyhookHandler *hh) { std::string boxname = NeutrinoAPI->NeutrinoYParser->func_get_boxtype(hh, ""); + std::string boxmodel = NeutrinoAPI->NeutrinoYParser->func_get_boxmodel(hh, ""); static CNetAdapter netadapter; std::string eth_id = netadapter.getMacAddr(); std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower); - hh->printf("%s\nMAC:%s\n", boxname.c_str(),eth_id.c_str()); + hh->printf("%s (%s)\nMAC:%s\n", boxname.c_str(), boxmodel.c_str(), eth_id.c_str()); } //----------------------------------------------------------------------------- void CControlAPI::ShutdownCGI(CyhookHandler *hh)