Soft AP IP management, more disconnect event #30 and SD_MCC

Invalid #28, tested with this version

Author: xreef

FtpServer.cpp

@@ -117,6 +117,10 @@ void FtpServer::end()
 
     DEBUG_PRINTLN(F("Stop server!"));
 
+    if (FtpServer::_callback) {
+  	  FtpServer::_callback(FTP_DISCONNECT, free(), capacity());
+    }
+
     cmdStage = FTP_Init;
     transferStage = FTP_Close;
     dataConn = FTP_NoConn;
@@ -224,6 +228,10 @@ uint8_t FtpServer::handleFTP() {
 			else
 				millisEndConnection = millis() + 1000L * FTP_TIME_OUT;
 		} else if (!client.connected()) {
+			if (FtpServer::_callback) {
+			  FtpServer::_callback(FTP_DISCONNECT, free(), capacity());
+			}
+
 			cmdStage = FTP_Init;
 		}
 		if (transferStage == FTP_Retrieve)   // Retrieve data
@@ -498,6 +506,22 @@ bool FtpServer::processCommand()
     } else {
       dataIp = localIp;
     }
+    DEBUG_PRINT( F(" IP: ") );
+    DEBUG_PRINT( int( dataIp[0]) ); DEBUG_PRINT( F(".") ); DEBUG_PRINT( int( dataIp[1]) ); DEBUG_PRINT( F(".") );
+    DEBUG_PRINT( int( dataIp[2]) ); DEBUG_PRINT( F(".") ); DEBUG_PRINTLN( int( dataIp[3]) );
+
+    DEBUG_PRINT( F(" IP 0.0.0.0: ") );
+    DEBUG_PRINT(dataIp.toString());
+
+#if (FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_ESP8266_ASYNC) || (FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_ESP8266) || (FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_ESP8266) || (FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_ESP32) || 	(FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_WiFiNINA)  || (FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_SEEED_RTL8720DN)
+    if (dataIp.toString() ==  F("0.0.0.0")) {
+    	dataIp = NET_CLASS.softAPIP();
+    }
+#endif
+    DEBUG_PRINT( F(" Soft IP: ") );
+	DEBUG_PRINT( int( dataIp[0]) ); DEBUG_PRINT( F(".") ); DEBUG_PRINT( int( dataIp[1]) ); DEBUG_PRINT( F(".") );
+	DEBUG_PRINT( int( dataIp[2]) ); DEBUG_PRINT( F(".") ); DEBUG_PRINTLN( int( dataIp[3]) );
+
     dataPort = pasvPort;
     DEBUG_PRINTLN( F(" Connection management set to passive") );
     DEBUG_PRINT( F(" Listening at ") );
@@ -1031,7 +1055,7 @@ bool FtpServer::openDir( FTP_DIR * pdir )
   if( ! openD ) {
     client.print( F("550 Can't open directory ") ); client.println( cwdName );
   }
-#elif STORAGE_TYPE == STORAGE_SD
+#elif STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
   if( cwdName == 0 ) {
 	    dir = STORAGE_MANAGER.open( "/" );
 	  } else {
@@ -1398,7 +1422,7 @@ bool FtpServer::doList()
     nbMatch ++;
     return true;
   }
-#elif STORAGE_TYPE == STORAGE_SD
+#elif STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
 	  FTP_FILE fileDir = dir.openNextFile();
 	  if( fileDir )
 	  {
@@ -1604,7 +1628,7 @@ bool FtpServer::doMlsd()
 		return true;
 	  }
 
-#elif STORAGE_TYPE == STORAGE_SD
+#elif STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
 	  DEBUG_PRINTLN("DIR MLSD ");
 	  File fileDir = dir.openNextFile();
 	  if( fileDir )
@@ -1840,6 +1864,62 @@ int utf8_strlen(const String& str)
     return q;
 }
 
+//// ****** UTF8-Decoder: convert UTF8-string to extended ASCII *******
+//static byte c1;  // Last character buffer
+//
+//// Convert a single Character from UTF8 to Extended ASCII
+//// Return "0" if a byte has to be ignored
+//byte utf8ascii(byte ascii) {
+//    if ( ascii<128 )   // Standard ASCII-set 0..0x7F handling
+//    {   c1=0;
+//        return( ascii );
+//    }
+//
+//    // get previous input
+//    byte last = c1;   // get last char
+//    c1=ascii;         // remember actual character
+//
+//    switch (last)     // conversion depending on first UTF8-character
+//    {   case 0xC2: return  (ascii);  break;
+//        case 0xC3: return  (ascii | 0xC0);  break;
+//        case 0x82: if(ascii==0xAC) return(0x80);       // special case Euro-symbol
+//    }
+//
+//    return  (0);                                     // otherwise: return zero, if character has to be ignored
+//}
+//
+//// convert String object from UTF8 String to Extended ASCII
+//String utf8ascii(String s)
+//{
+//        String r="";
+//        char c;
+//        for (int i=0; i<s.length(); i++)
+//        {
+//                c = utf8ascii(s.charAt(i));
+//                if (c!=0) r+=c;
+//        }
+//        return r;
+//}
+//
+//// In Place conversion UTF8-string to Extended ASCII (ASCII is shorter!)
+//void utf8ascii(char* s)
+//{
+//        int k=0;
+//        char c;
+//        for (int i=0; i<strlen(s); i++)
+//        {
+//                c = utf8ascii(s[i]);
+//                if (c!=0)
+//                        s[k++]=c;
+//        }
+//        s[k]=0;
+//}
+//
+//int utf8_strlen(const String& str)
+//{
+//	String ascii = utf8ascii(str);
+//	return ascii.length();
+//}
 // Make complete path/name from cwdName and param
 //
 // 3 possible cases: param can be absolute path, relative path or only the name
@@ -1884,6 +1964,12 @@ bool FtpServer::makePath( char * fullName, char * param )
 //  for( uint8_t i = 0; i < utf8_strlen( fullName ); i ++ ) {
 //
 //  }
+
+  DEBUG_PRINT(F("utf8_strlen"));
+  DEBUG_PRINTLN(utf8_strlen(fullName));
+//  DEBUG_PRINT(F("utf8_strlen2"));
+//  DEBUG_PRINTLN(utf8_strlen2(fullName));
+
   if (utf8_strlen(fullName)>=FILENAME_LENGTH) {
       client.println(F("553 File name not allowed. Too long.") );
       return false;
@@ -1910,7 +1996,7 @@ bool FtpServer::makeExistsPath( char * path, char * param )
     return false;
   // RoSchmi
   //#if STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_SD
-#if (STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_SD  || STORAGE_TYPE == STORAGE_SEEED_SD)
+#if (STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC  || STORAGE_TYPE == STORAGE_SEEED_SD)
   if (strcmp(path, "/") == 0)  return true;
 #endif
   DEBUG_PRINT("PATH --> ")
@@ -2000,7 +2086,7 @@ char * FtpServer::makeDateTimeStr( char * tstr, uint16_t date, uint16_t time )
 
 
 uint32_t FtpServer::fileSize( FTP_FILE file ) {
-#if (STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_LITTLEFS || STORAGE_TYPE == STORAGE_FFAT || STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SEEED_SD)
+#if (STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_LITTLEFS || STORAGE_TYPE == STORAGE_FFAT || STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC || STORAGE_TYPE == STORAGE_SEEED_SD)
 	return file.size();
 #else
 	return file.fileSize();
@@ -2029,7 +2115,7 @@ uint32_t FtpServer::fileSize( FTP_FILE file ) {
 			return true;
 		}
 }
-#elif (STORAGE_TYPE == STORAGE_SD && defined(ESP8266))// FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_ESP8266_242)
+#elif ((STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC) && defined(ESP8266))// FTP_SERVER_NETWORK_TYPE_SELECTED == NETWORK_ESP8266_242)
   bool FtpServer::openFile( char path[ FTP_CWD_SIZE ], int readTypeInt ){
 		DEBUG_PRINT(F("File to open ") );
 		DEBUG_PRINT( path );
@@ -2066,7 +2152,7 @@ uint32_t FtpServer::fileSize( FTP_FILE file ) {
   			return true;
   		}
   }
-#elif STORAGE_TYPE <= STORAGE_SDFAT2 || STORAGE_TYPE == STORAGE_SPIFM || (STORAGE_TYPE == STORAGE_SD && ARDUINO_ARCH_SAMD)
+#elif STORAGE_TYPE <= STORAGE_SDFAT2 || STORAGE_TYPE == STORAGE_SPIFM || ((STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC) && ARDUINO_ARCH_SAMD)
   bool FtpServer::openFile( char path[ FTP_CWD_SIZE ], int readTypeInt ){
 		DEBUG_PRINT(F("File to open ") );
 		DEBUG_PRINT( path );
@@ -2092,7 +2178,7 @@ uint32_t FtpServer::fileSize( FTP_FILE file ) {
   		DEBUG_PRINT( path );
   		DEBUG_PRINT(F(" readType ") );
   		DEBUG_PRINTLN(readType);
-  #if (STORAGE_TYPE == STORAGE_SD && !defined(ESP32))
+  #if ((STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC) && !defined(ESP32))
   		if (readType == 0X01) {
   			readType = FILE_READ;
   		}else {
@@ -2150,7 +2236,7 @@ bool FtpServer::isDir( char * path )
   if( ! openFile( path, FTP_FILE_READ )) {
     return false;
   }
-#if STORAGE_TYPE == STORAGE_SD
+#if STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
 //  if (strcmp(path, "/") == 0) return true;
 //  res = file.isDirectory();
 //  DEBUG_PRINT(path);
@@ -2170,7 +2256,7 @@ bool FtpServer::isDir( char * path )
 bool FtpServer::timeStamp( char * path, uint16_t year, uint8_t month, uint8_t day,
                            uint8_t hour, uint8_t minute, uint8_t second )
 {
-#if STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_LITTLEFS  || STORAGE_TYPE == STORAGE_FFAT || STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SEEED_SD
+#if STORAGE_TYPE == STORAGE_SPIFFS || STORAGE_TYPE == STORAGE_LITTLEFS  || STORAGE_TYPE == STORAGE_FFAT || STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC || STORAGE_TYPE == STORAGE_SEEED_SD
 //	struct tm tmDate = { second, minute, hour, day, month, year };
 //    time_t rawtime = mktime(&tmDate);
 
@@ -2235,7 +2321,7 @@ bool FtpServer::getFileModTime( uint16_t * pdate, uint16_t * ptime )
 }
 #endif
 
-#if STORAGE_TYPE == STORAGE_SD
+#if STORAGE_TYPE == STORAGE_SD ||  STORAGE_TYPE == STORAGE_SD_MMC
   bool     FtpServer::rename( const char * path, const char * newpath ){
 
 		FTP_FILE myFileIn = STORAGE_MANAGER.open(path, FILE_READ);

FtpServer.h

@@ -20,7 +20,7 @@
 #ifndef FTP_SERVER_H
 #define FTP_SERVER_H
 
-#define FTP_SERVER_VERSION "2.1.2 (2022-07-06)"
+#define FTP_SERVER_VERSION "2.1.3 (2022-09-20)"
 
 #if ARDUINO >= 100
 #include "Arduino.h"
@@ -298,13 +298,18 @@
 		#define FTP_FILE_WRITE_APPEND "a+"
 		#define FTP_FILE_WRITE_CREATE "w+"
 	#else
-#if ESP_ARDUINO_VERSION_MAJOR >= 2
-		#include "FS.h"
-		#include "LittleFS.h"
-		#define STORAGE_MANAGER LittleFS
+#ifdef ESP32
+	#if ESP_ARDUINO_VERSION_MAJOR >= 2
+			#include "FS.h"
+			#include "LittleFS.h"
+			#define STORAGE_MANAGER LittleFS
+	#else
+			#include "LITTLEFS.h"
+			#define STORAGE_MANAGER LITTLEFS
+	#endif
 #else
-		#include "LITTLEFS.h"
-		#define STORAGE_MANAGER LITTLEFS
+	#include "LittleFS.h"
+	#define STORAGE_MANAGER LittleFS
 #endif
 		#define FTP_FILE File
 		#define FTP_DIR File
@@ -324,6 +329,17 @@
   	#define FTP_FILE File
   	#define FTP_DIR File
 
+	#define FTP_FILE_READ FILE_READ
+	#define FTP_FILE_READ_ONLY FILE_READ
+	#define FTP_FILE_READ_WRITE FILE_WRITE
+#elif(STORAGE_TYPE == STORAGE_SD_MMC)
+	#include <SPI.h>
+	#include <SD_MMC.h>
+
+	#define STORAGE_MANAGER SD
+  	#define FTP_FILE File
+  	#define FTP_DIR File
+
 	#define FTP_FILE_READ FILE_READ
 	#define FTP_FILE_READ_ONLY FILE_READ
 	#define FTP_FILE_READ_WRITE FILE_WRITE
@@ -584,7 +600,7 @@ class FtpServer
   bool     removeDir( const char * path ) { return STORAGE_MANAGER.rmdir( path ); };
 #endif
 
-#if STORAGE_TYPE == STORAGE_SD
+#if STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
   bool     rename( const char * path, const char * newpath );
 #else
   bool     rename( const char * path, const char * newpath ) { return STORAGE_MANAGER.rename( path, newpath ); };
@@ -630,7 +646,7 @@ class FtpServer
 			  STORAGE_MANAGER.usedBytes()) >> 1;
   };
 #endif
-#elif STORAGE_TYPE == STORAGE_SD
+#elif STORAGE_TYPE == STORAGE_SD || STORAGE_TYPE == STORAGE_SD_MMC
   uint32_t capacity() { return true; };
   uint32_t free() { return true; };
 #elif STORAGE_TYPE == STORAGE_SEEED_SD

FtpServerKey.h

@@ -32,6 +32,7 @@
 #define STORAGE_LITTLEFS 	7 	// LITTLEFS
 #define STORAGE_SEEED_SD 	8 	// Seeed_SD library
 #define STORAGE_FFAT  		9 	// ESP32 FFAT
+#define STORAGE_SD_MMC		10 	// SD_MMC library
 
 #define NETWORK_ESP8266_ASYNC 	(1)
 #define NETWORK_ESP8266 		(2) 	// Standard ESP8266WiFi

README.md

@@ -11,6 +11,7 @@
  - Wio Terminal (SdFat 2, Seed SD, and native FAT)
 
 #### Changelog
+- 2022-09-20 2.1.3 Soft AP IP management, more disconnect event and SD_MCC
 - 2022-05-21 2.1.2 Fix SD path (#19)
 - 2022-05-21 2.1.1 Minor fix
 - 2022-03-30 2.1.0 Add UTF8 support and enabled It by default (Thanks to @plaber)

library.json

@@ -16,6 +16,6 @@
 	},
 	"url": "https://www.mischianti.org",
 	"frameworks": "Arduino",
-    "version": "2.1.2",
+    "version": "2.1.3",
 	"platforms": "*"
 }

library.properties

@@ -1,5 +1,5 @@
 name=SimpleFTPServer
-version=2.1.2
+version=2.1.3
 author=Renzo Mischianti <[email protected]>
 maintainer=Renzo Mischianti <[email protected]>
 sentence=Simple FTP server for esp8266, esp32 and Arduino