fix log upload

Author: matth-x

src/MicroOcpp.cpp

@@ -1868,7 +1868,7 @@ MO_FilesystemAdapter *mo_getFilesystem2(MO_Context *ctx) {
 }
 
 #if MO_ENABLE_MBEDTLS
-void mo_setFtpConfig(MO_Context *ctx, MO_FTPConfig ftpConfig) {
+void mo_setFtpConfig2(MO_Context *ctx, MO_FTPConfig ftpConfig) {
     if (!ctx) {
         MO_DBG_ERR("OCPP uninitialized"); //need to call mocpp_initialize before
         return;

src/MicroOcpp.h

@@ -473,7 +473,7 @@ MO_FilesystemAdapter *mo_getFilesystem2(MO_Context *ctx);
 #if MO_ENABLE_MBEDTLS
 //Set FTP security parameters (e.g. client cert). See "FtpMbedTLS.h" for all options
 //To use a custom FTP client, subclass `FtpClient` (see "Ftp.h") and pass to C++ `Context` object
-void mo_setFtpConfig(MO_Context *ctx, MO_FTPConfig ftpConfig);
+void mo_setFtpConfig2(MO_Context *ctx, MO_FTPConfig ftpConfig);
 
 #if MO_ENABLE_DIAGNOSTICS
 //Provide MO with diagnostics data for the "GetDiagnostics" operation. Should contain human-readable text which

src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp

@@ -347,7 +347,7 @@ bool DiagnosticsService::requestDiagnosticsUpload(const char *location, unsigned
 }
 #endif //MO_ENABLE_V16
 
-MO_GetLogStatus DiagnosticsService::getLog(MO_LogType type, int requestId, int retries, unsigned int retryInterval, const char *remoteLocation, Timestamp oldestTimestamp, Timestamp latestTimestamp, char filenameOut[MO_GETLOG_FNAME_SIZE]) {
+MO_GetLogStatus DiagnosticsService::getLog(MO_LogType type, int requestId, int retries, unsigned int retryInterval, const char *location, Timestamp oldestTimestamp, Timestamp latestTimestamp, char filenameOut[MO_GETLOG_FNAME_SIZE]) {
 
     if (runCustomUpload || this->retries > 0) {
         MO_DBG_INFO("upload still running");
@@ -405,13 +405,21 @@ MO_GetLogStatus DiagnosticsService::getLog(MO_LogType type, int requestId, int r
 
     MO_FREE(this->location);
     this->location = nullptr;
-    size_t locationSize = strlen(location);
+    size_t locationSize = strlen(location) + 1;
     this->location = static_cast<char*>(MO_MALLOC(getMemoryTag(), locationSize));
     if (!this->location) {
         MO_DBG_ERR("OOM");
         goto fail;
     }
 
+    {
+        int ret = snprintf(this->location, locationSize, "%s", location);
+        if (ret < 0 || (size_t)ret >= locationSize) {
+            MO_DBG_ERR("snprintf: %i", ret);
+            goto fail;
+        }
+    }
+
     MO_FREE(this->filename);
     this->filename = nullptr;
 
@@ -636,6 +644,7 @@ bool DiagnosticsService::uploadDiagnostics() {
     }
 
     diagPreambleLen += (size_t)ret;
+    ret = 0;
 
     #if MO_ENABLE_V16
     if (ocppVersion == MO_OCPP_V16) {
@@ -654,8 +663,6 @@ bool DiagnosticsService::uploadDiagnostics() {
         auto availSvcEvse1 = availSvc ? availSvc->getEvse(1) : nullptr;
         auto availSvcEvse2 = availSvc ? availSvc->getEvse(2) : nullptr;
 
-        ret = 0;
-
         if (ret >= 0 && (size_t)ret + diagPostambleLen < MO_DIAG_POSTAMBLE_SIZE) {
             diagPostambleLen += (size_t)ret;
             ret = snprintf(diagPostamble + diagPostambleLen, MO_DIAG_POSTAMBLE_SIZE - diagPostambleLen,
@@ -923,7 +930,6 @@ bool DiagnosticsService::startFtpUpload() {
 
                         memcpy(buf + written, fileHeading, (size_t)writeLen);
                         written += (size_t)writeLen;
-                        filesystem->close(file);
                     }
 
                     filesystem->seek(file, diagFilesBackTransferred);

src/MicroOcpp/Operations/GetLog.cpp

@@ -70,7 +70,7 @@ std::unique_ptr<JsonDoc> GetLog::createConf(){
     auto doc = makeJsonDoc(getMemoryTag(), JSON_OBJECT_SIZE(2));
     JsonObject payload = doc->to<JsonObject>();
     payload["status"] = mo_serializeGetLogStatus(status);
-    payload["fileName"] = (const char*)filename; //force zero-copy
+    payload["filename"] = (const char*)filename; //force zero-copy
     return doc;
 }