diff --git a/build b/build index 9d60796..3cacc0b 100644 --- a/build +++ b/build @@ -1 +1 @@ -11 \ No newline at end of file +12 \ No newline at end of file diff --git a/src/RESTAPI/RESTAPI_deviceInformation_handler.cpp b/src/RESTAPI/RESTAPI_deviceInformation_handler.cpp index a933208..9b7cd9b 100644 --- a/src/RESTAPI/RESTAPI_deviceInformation_handler.cpp +++ b/src/RESTAPI/RESTAPI_deviceInformation_handler.cpp @@ -25,11 +25,14 @@ namespace OpenWifi { LatestFirmwareCacheEntry LFE; LatestFirmwareCache()->FindLatestFirmware(DCI.deviceType,LFE); + FMSObjects::Firmware Latest; + StorageService()->FirmwaresDB().GetFirmware(LFE.Id,Latest); DI.serialNumber = SerialNumber; DI.currentFirmware = DCI.revision; DI.latestFirmware = LFE.Revision; DI.latestFirmwareDate = LFE.TimeStamp; + DI.latestFirmwareURI = Latest.uri; FirmwaresDB::RecordName FI; StorageService()->FirmwaresDB().GetFirmwareByRevision(DCI.revision,DCI.deviceType,FI); diff --git a/src/RESTObjects/RESTAPI_FMSObjects.cpp b/src/RESTObjects/RESTAPI_FMSObjects.cpp index 7d40630..f5de1a1 100644 --- a/src/RESTObjects/RESTAPI_FMSObjects.cpp +++ b/src/RESTObjects/RESTAPI_FMSObjects.cpp @@ -254,6 +254,7 @@ namespace OpenWifi::FMSObjects { field_to_json(Obj, "latestFirmware", latestFirmware); field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate); field_to_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable); + field_to_json(Obj, "latestFirmwareURI",latestFirmwareURI); } bool DeviceInformation::from_json(const Poco::JSON::Object::Ptr &Obj) { @@ -265,6 +266,7 @@ namespace OpenWifi::FMSObjects { field_from_json(Obj, "latestFirmware", latestFirmware); field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate); field_from_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable); + field_from_json(Obj, "latestFirmwareURI",latestFirmwareURI); return true; } catch(...) { diff --git a/src/RESTObjects/RESTAPI_FMSObjects.h b/src/RESTObjects/RESTAPI_FMSObjects.h index 954992e..10a6693 100644 --- a/src/RESTObjects/RESTAPI_FMSObjects.h +++ b/src/RESTObjects/RESTAPI_FMSObjects.h @@ -136,6 +136,7 @@ namespace OpenWifi::FMSObjects { std::string latestFirmware; uint64_t latestFirmwareDate=0; bool latestFirmwareAvailable; + std::string latestFirmwareURI; void to_json(Poco::JSON::Object &Obj) const; bool from_json(const Poco::JSON::Object::Ptr &Obj);