implement #88

Author: issue

.gitignore

@@ -13,4 +13,5 @@ satpi
 bootID
 plantuml.jar
 cppcheck.log
-test.ts
+test.ts
+.DS_Store

src/Properties.cpp

@@ -31,6 +31,7 @@ Properties::Properties(
 		const std::string &currentPathOpt,
 		const std::string &appdataPathOpt,
 		const std::string &webPathOpt,
+		const std::string &ipAddress,
 		const unsigned int httpPortOpt,
 		const unsigned int rtspPortOpt) :
 	XMLSupport(),
@@ -45,6 +46,7 @@ Properties::Properties(
 	_rtspPort = rtspPortOpt == 0 ? 554 : rtspPortOpt;
 	_httpPortOpt = httpPortOpt;
 	_rtspPortOpt = rtspPortOpt;
+	_ipAddress = ipAddress;
 
 	_webPath = webPathOpt.empty() ? (currentPathOpt + "/" + "web") : webPathOpt;
 	_appdataPath = appdataPathOpt.empty() ? currentPathOpt : appdataPathOpt;
@@ -95,6 +97,7 @@ void Properties::doAddToXML(std::string &xml) const {
 	base::MutexLock lock(_mutex);
 	ADD_XML_NUMBER_INPUT(xml, "httpport", _httpPort, 0, 65535);
 	ADD_XML_NUMBER_INPUT(xml, "rtspport", _rtspPort, 0, 65535);
+	ADD_XML_TEXT_INPUT(xml, "ipaddress", _ipAddress);
 	ADD_XML_TEXT_INPUT(xml, "xsatipm3u", _xSatipM3U);
 	ADD_XML_TEXT_INPUT(xml, "xmldesc", _xmlDeviceDescriptionFile);
 	ADD_XML_TEXT_INPUT(xml, "webPath", _webPath);
@@ -161,6 +164,11 @@ unsigned int Properties::getRtspPort() const {
 	return _rtspPort;
 }
 
+std::string Properties::getIpAddress() const {
+	base::MutexLock lock(_mutex);
+	return _ipAddress;
+}
+
 std::time_t Properties::getApplicationStartTime() const {
 	base::MutexLock lock(_mutex);
 	return _appStartTime;

src/Properties.h

@@ -39,6 +39,7 @@ class Properties :
 			const std::string &currentPathOpt,
 			const std::string &appdataPathOpt,
 			const std::string &webPathOpt,
+			const std::string &ipAddress,
 			unsigned int httpPortOpt,
 			unsigned int rtspPortOpt);
 
@@ -90,6 +91,9 @@ class Properties :
 		/// Get RtspPort
 		unsigned int getRtspPort() const;
 
+		/// Get IP Adress
+		std::string getIpAddress() const;
+
 		/// Get application start time
 		std::time_t getApplicationStartTime() const;
 
@@ -113,6 +117,7 @@ class Properties :
 		std::string _xmlDeviceDescriptionFile;
 		std::string _webPath;
 		std::string _appdataPath;
+		std::string _ipAddress;
 		unsigned int _httpPort;
 		unsigned int _rtspPort;
 		std::string _webPathOpt;

src/Satpi.cpp

@@ -77,7 +77,7 @@ class SatPI :
 			XMLSaveSupport((appdataPath.empty() ? currentPath : appdataPath) + "/" + "SatPI.xml"),
 			_interface(ifaceName),
 			_streamManager(),
-			_properties(_interface.getUUID(), currentPath, appdataPath, webPath, httpPort, rtspPort),
+			_properties(_interface.getUUID(), currentPath, appdataPath, webPath, _interface.getIPAddress(), httpPort, rtspPort),
 			_httpServer(*this, _streamManager, _interface.getIPAddress(), _properties),
 			_rtspServer(_streamManager, _interface.getIPAddress()),
 			_ssdpServer(_interface.getIPAddress(), _properties) {

web/index.html

@@ -21,6 +21,8 @@
 	function xmlloaded(xml) {
 		appdata = xml.getElementsByTagName("appdata");
 		ssdpdata = xml.getElementsByTagName("ssdp");
+		configdata = xml.getElementsByTagName("configdata");
+
 		var uptime = appdata[0].getElementsByTagName("uptime")[0].childNodes[0].nodeValue;
 		var sec = uptime % 60;
 		var min = Math.round((uptime/60) - 0.5);
@@ -35,6 +37,8 @@
 		InfoPage.rows[2].cells[1].innerHTML = appdata[0].getElementsByTagName("uuid")[0].childNodes[0].nodeValue;
 		InfoPage.rows[3].cells[1].innerHTML = ssdpdata[0].getElementsByTagName("bootID")[0].childNodes[0].nodeValue;
 		InfoPage.rows[4].cells[1].innerHTML = ssdpdata[0].getElementsByTagName("deviceID")[0].childNodes[0].nodeValue;
+		InfoPage.rows[5].cells[1].innerHTML = configdata[0].getElementsByTagName("ipaddress")[0].getElementsByTagName("value")[0].childNodes[0].nodeValue;
+		InfoPage.rows[6].cells[1].innerHTML = configdata[0].getElementsByTagName("rtspport")[0].getElementsByTagName("value")[0].childNodes[0].nodeValue;
 	}
 
 	function stopSatPI() {
@@ -82,6 +86,8 @@ <h4 class="modal-title">Stop SatPI Server?</h4>
 			<tr><td class=\"col-xs-1\">UUID</td><td class="col-xs-2">...</td> </tr>
 			<tr><td class=\"col-xs-1\">Boot ID</td><td class="col-xs-2">...</td> </tr>
 			<tr><td class=\"col-xs-1\">Device ID</td><td class="col-xs-2">...</td> </tr>
+			<tr><td class=\"col-xs-1\">IP Address</td><td class="col-xs-2">...</td> </tr>
+			<tr><td class=\"col-xs-1\">RTSP Port</td><td class="col-xs-2">...</td> </tr>
 		</table>
 		<button class="btn btn-danger" type="button" onclick="stopSatPI()"><i class="fas fa-power-off"></i> Stop</button>
 		<script>