Add files via upload

Author: BojanJurca

servers/dmesg_functions.h

@@ -8,7 +8,7 @@
 
       - Use dmesg telnet command to display messages in message queue.
 
-    March 12, 2023, Bojan Jurca
+    December 25, 2023, Bojan Jurca
     
 */
 
@@ -94,19 +94,19 @@
 
     __dmesgType__ __dmesgCircularQueue__ [DMESG_CIRCULAR_QUEUE_LENGTH];
 
-    RTC_DATA_ATTR unsigned int bootCount = 0;
+    // RTC_DATA_ATTR unsigned int bootCount = 0;
 
     bool __initializeDmesgCircularQueue__ () {
         __dmesgCircularQueue__ [0].message = fsString<DMESG_MAX_MESSAGE_LENGTH> ("[ESP32] CPU0 reset reason: ") + resetReason (rtc_get_reset_reason (0));
         __dmesgCircularQueue__ [1].message = fsString<DMESG_MAX_MESSAGE_LENGTH> ("[ESP32] CPU1 reset reason: ") + resetReason (rtc_get_reset_reason (1));
         __dmesgCircularQueue__ [2].message = fsString<DMESG_MAX_MESSAGE_LENGTH> ("[ESP32] wakeup reason: ") + wakeupReason ();
-        __dmesgCircularQueue__ [3].message = fsString<DMESG_MAX_MESSAGE_LENGTH> ("[ESP32] (re)started ") + fsString<DMESG_MAX_MESSAGE_LENGTH> (++ bootCount) + (char *) " times";
+        // __dmesgCircularQueue__ [3].message = fsString<DMESG_MAX_MESSAGE_LENGTH> ("[ESP32] (re)started ") + fsString<DMESG_MAX_MESSAGE_LENGTH> (++ bootCount) + (char *) " times";
         return true;      
     }
     bool __initializedDmesgCircularQueue__ = __initializeDmesgCircularQueue__ ();
 
     byte __dmesgBeginning__ = 0; // first used location
-    byte __dmesgEnd__ = 4;       // the location next to be used
+    byte __dmesgEnd__ = 3; // 4;       // the location next to be used
     static SemaphoreHandle_t __dmesgSemaphore__= xSemaphoreCreateMutex (); 
 
     // adds message to dmesg circular queue

servers/ftpClient.h

@@ -112,7 +112,7 @@
                                               }
                                             }
             else if (ftpReplyIs ("230 "))   { // server said that we have logged in, initiate pasive data connection
-                                              if (sendAll (controlConnectionSocket, (char *) "PASV\r\n", FTP_CLIENT_TIME_OUT) == -1) {
+                                              if (sendAll (controlConnectionSocket, "PASV\r\n", FTP_CLIENT_TIME_OUT) == -1) {
                                                 string e = string (errno) + (char *) " " + strerror (errno);
                                                 close (controlConnectionSocket);
                                                 return string ("send error: ") + e;

servers/ftpServer.hpp

@@ -6,7 +6,7 @@
   
     FTP server reads and executes FTP commands. The transfer of files in active in passive mode is supported but some of the commands may 
 
-    October 23, 2023, Bojan Jurca
+    December 25, 2023, Bojan Jurca
 
     Nomenclature used here for easier understaning of the code:
 
@@ -90,6 +90,11 @@
     // control ftpServer critical sections
     static SemaphoreHandle_t __ftpServerSemaphore__ = xSemaphoreCreateMutex (); 
 
+    // log what is going on within telnetServer
+    byte ftpServerConcurentTasks = 0;
+    byte ftpServerConcurentTasksHighWatermark = 0;
+
+
     // cycle through set of port numbers when FTP server is working in pasive mode
     int __pasiveDataPort__ () {
         static int lastPasiveDataPort = 1024;                                                 // change pasive data port range if needed
@@ -132,12 +137,24 @@
                             if (pdPASS != taskCreated) {
                               dmesg ("[ftpControlConnection] xTaskCreate error");
                             } else {
-                              __state__ = RUNNING;           
-                            }
+                                __state__ = RUNNING;
 
+                                xSemaphoreTake (__ftpServerSemaphore__, portMAX_DELAY);
+                                    ftpServerConcurentTasks++;
+                                    if (ftpServerConcurentTasks > ftpServerConcurentTasksHighWatermark)
+                                        ftpServerConcurentTasksHighWatermark = ftpServerConcurentTasks;
+                                xSemaphoreGive (__ftpServerSemaphore__);
+
+                                return; // success                              
+                            }
+                            dmesg ("[ftpConnection] xTaskCreate error"); // failure
                           }
 
         ~ftpControlConnection ()  {
+                                xSemaphoreTake (__ftpServerSemaphore__, portMAX_DELAY);
+                                    ftpServerConcurentTasks--;
+                                xSemaphoreGive (__ftpServerSemaphore__);
+
                                 closeControlConnection ();
                                 closeDataConnection ();
                             }
@@ -182,7 +199,7 @@
 
         // writing output to FTP control connection with error logging (dmesg)
         int sendFtp (char *buf) { 
-            int i = sendAll (__controlConnectionSocket__, buf, strlen (buf), FTP_CONTROL_CONNECTION_TIME_OUT);
+            int i = sendAll (__controlConnectionSocket__, buf, FTP_CONTROL_CONNECTION_TIME_OUT);
             if (i <= 0)
                 dmesg ("[ftpControlConnection] send error: ", errno, strerror (errno));
             return i;
@@ -716,9 +733,9 @@
         STATE_TYPE state () { return __state__; }
 
         ftpServer (  // the following parameters will be handeled by ftpServer instance
-                     const char *serverIP,                                                          // FTP server IP address, 0.0.0.0 for all available IP addresses
-                     int serverPort,                                                                // FTP server port
-                     bool (*firewallCallback) (char *connectingIP)                                  // a reference to callback function that will be celled when new connection arrives 
+                     const char *serverIP = "0.0.0.0",                                                    // FTP server IP address, 0.0.0.0 for all available IP addresses
+                     int serverPort = 21,                                                                 // FTP server port
+                     bool (*firewallCallback) (char *connectingIP) = NULL                                 // a reference to callback function that will be celled when new connection arrives 
                    )  { 
                         // create a local copy of parameters for later use
                         strncpy (__serverIP__, serverIP, sizeof (__serverIP__)); __serverIP__ [sizeof (__serverIP__) - 1] = 0;
@@ -834,7 +851,7 @@
                                   close (connectingSocket); // normally ftpControlConnection would do this but if it is not created we have to do it here
                                 } else {
                                   if (fcn->state () != ftpControlConnection::RUNNING) {
-                                    sendAll (connectingSocket, ftpServiceUnavailable, strlen (ftpServiceUnavailable), FTP_CONTROL_CONNECTION_TIME_OUT);
+                                    sendAll (connectingSocket, ftpServiceUnavailable, FTP_CONTROL_CONNECTION_TIME_OUT);
                                     delete (fcn); // normally ftpControlConnection would do this but if it is not running we have to do it here
                                   }
                                 }

servers/httpClient.h

@@ -101,7 +101,7 @@
           close (connectionSocket);
           return "Out of memory";
       }
-      if (sendAll (connectionSocket, (char *) httpRequest, timeOut) == -1) {
+      if (sendAll (connectionSocket, httpRequest, timeOut) == -1) {
           int e = errno;
           close (connectionSocket);
           return "[httpClient] send() error: " + String (e) + " " + strerror (e);