jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use current IP address in PASV reply if localIP==0

Browse Source
This commit is contained in:
fvanroie 2022-01-30 21:50:00 +01:00
parent ad236feca1
commit 5052186e4a
1 changed files with 472 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/SimpleFTPServer/FtpServer.cpp
View File

@ -434,9 +434,13 @@ bool FtpServer::processCommand()
dataServer.begin(); dataServer.begin();
if((((uint32_t)NET_CLASS.localIP()) & ((uint32_t)NET_CLASS.subnetMask())) == if((((uint32_t)NET_CLASS.localIP()) & ((uint32_t)NET_CLASS.subnetMask())) ==
(((uint32_t)client.remoteIP()) & ((uint32_t)NET_CLASS.subnetMask()))) { (((uint32_t)client.remoteIP()) & ((uint32_t)NET_CLASS.subnetMask()))) {
dataIp = NET_CLASS.localIP(); if((uint32_t)localIp > 0) {
dataIp = localIp; // same subnet with manual IP set
} else { } else {
dataIp = localIp; dataIp = NET_CLASS.localIP(); // same subnet without manual IP set
}
} else{
dataIp = NET_CLASS.localIP(); // other subnet, no NAT
} }
dataPort = pasvPort; dataPort = pasvPort;
DEBUG_PRINTLN(F(" Connection management set to passive")); DEBUG_PRINTLN(F(" Connection management set to passive"));
@ -470,7 +474,8 @@ bool FtpServer::processCommand()
// //
// PORT - Data Port // PORT - Data Port
// //
else if(CommandIs("PORT")) { else if(CommandIs("PORT"))
{
data.stop(); data.stop();
// get IP of data client // get IP of data client
dataIp[0] = atoi(parameter); dataIp[0] = atoi(parameter);
@ -504,7 +509,8 @@ bool FtpServer::processCommand()
// //
// STRU - File Structure // STRU - File Structure
// //
else if(CommandIs("STRU")) { else if(CommandIs("STRU"))
{
if(ParameterIs("F")) { if(ParameterIs("F")) {
client.println(F("200 F Ok")); client.println(F("200 F Ok"));
// else if( ParameterIs( "R" )) // else if( ParameterIs( "R" ))
@ -516,7 +522,8 @@ bool FtpServer::processCommand()
// //
// TYPE - Data Type // TYPE - Data Type
// //
else if(CommandIs("TYPE")) { else if(CommandIs("TYPE"))
{
if(ParameterIs("A")) { if(ParameterIs("A")) {
client.println(F("200 TYPE is now ASCII")); client.println(F("200 TYPE is now ASCII"));
} else if(ParameterIs("I")) { } else if(ParameterIs("I")) {
@ -535,14 +542,16 @@ bool FtpServer::processCommand()
// //
// ABOR - Abort // ABOR - Abort
// //
else if(CommandIs("ABOR")) { else if(CommandIs("ABOR"))
{
abortTransfer(); abortTransfer();
client.println(F("226 Data connection closed")); client.println(F("226 Data connection closed"));
} }
// //
// DELE - Delete a File // DELE - Delete a File
// //
else if(CommandIs("DELE")) { else if(CommandIs("DELE"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
if(haveParameter() && makeExistsPath(path)) { if(haveParameter() && makeExistsPath(path)) {
if(remove(path)) { if(remove(path)) {
@ -563,7 +572,8 @@ bool FtpServer::processCommand()
// NLST - Name List // NLST - Name List
// MLSD - Listing for Machine Processing (see RFC 3659) // MLSD - Listing for Machine Processing (see RFC 3659)
// //
else if(CommandIs("LIST") || CommandIs("NLST") || CommandIs("MLSD")) { else if(CommandIs("LIST") || CommandIs("NLST") || CommandIs("MLSD"))
{
DEBUG_PRINT("List of file!!"); DEBUG_PRINT("List of file!!");
if(dataConnect()) { if(dataConnect()) {
@ -586,7 +596,8 @@ bool FtpServer::processCommand()
// //
// MLST - Listing for Machine Processing (see RFC 3659) // MLST - Listing for Machine Processing (see RFC 3659)
// //
else if(CommandIs("MLST")) { else if(CommandIs("MLST"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
uint16_t dat, tim; uint16_t dat, tim;
char dtStr[15]; char dtStr[15];
@ -618,13 +629,15 @@ bool FtpServer::processCommand()
// //
// NOOP // NOOP
// //
else if(CommandIs("NOOP")) { else if(CommandIs("NOOP"))
{
client.println(F("200 Zzz...")); client.println(F("200 Zzz..."));
} }
// //
// RETR - Retrieve // RETR - Retrieve
// //
else if(CommandIs("RETR")) { else if(CommandIs("RETR"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
if(haveParameter() && makeExistsPath(path)) { if(haveParameter() && makeExistsPath(path)) {
if(!openFile(path, FTP_FILE_READ)) { if(!openFile(path, FTP_FILE_READ)) {
@ -655,7 +668,8 @@ bool FtpServer::processCommand()
// STOR - Store // STOR - Store
// APPE - Append // APPE - Append
// //
else if(CommandIs("STOR") || CommandIs("APPE")) { else if(CommandIs("STOR") || CommandIs("APPE"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
if(haveParameter() && makePath(path)) { if(haveParameter() && makePath(path)) {
bool open; bool open;
@ -696,7 +710,8 @@ bool FtpServer::processCommand()
// //
// MKD - Make Directory // MKD - Make Directory
// //
else if(CommandIs("MKD")) { else if(CommandIs("MKD"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
if(haveParameter() && makePath(path)) { if(haveParameter() && makePath(path)) {
if(exists(path)) { if(exists(path)) {
@ -727,7 +742,8 @@ bool FtpServer::processCommand()
// //
// RMD - Remove a Directory // RMD - Remove a Directory
// //
else if(CommandIs("RMD")) { else if(CommandIs("RMD"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
if(haveParameter() && makeExistsPath(path)) { if(haveParameter() && makeExistsPath(path)) {
if(removeDir(path)) { if(removeDir(path)) {
@ -747,7 +763,8 @@ bool FtpServer::processCommand()
// //
// RNFR - Rename From // RNFR - Rename From
// //
else if(CommandIs("RNFR")) { else if(CommandIs("RNFR"))
{
rnfrName[0] = 0; rnfrName[0] = 0;
if(haveParameter() && makeExistsPath(rnfrName)) { if(haveParameter() && makeExistsPath(rnfrName)) {
DEBUG_PRINT(F(" Ready for renaming ")); DEBUG_PRINT(F(" Ready for renaming "));
@ -760,7 +777,8 @@ bool FtpServer::processCommand()
// //
// RNTO - Rename To // RNTO - Rename To
// //
else if(CommandIs("RNTO")) { else if(CommandIs("RNTO"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
char dirp[FTP_FIL_SIZE]; char dirp[FTP_FIL_SIZE];
if(strlen(rnfrName) == 0 || !rnfrCmd) { if(strlen(rnfrName) == 0 || !rnfrCmd) {
@ -816,7 +834,8 @@ bool FtpServer::processCommand()
// //
// MDTM && MFMT - File Modification Time (see RFC 3659) // MDTM && MFMT - File Modification Time (see RFC 3659)
// //
else if(CommandIs("MDTM") || CommandIs("MFMT")) { else if(CommandIs("MDTM") || CommandIs("MFMT"))
{
if(haveParameter()) { if(haveParameter()) {
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
char* fname = parameter; char* fname = parameter;
@ -856,7 +875,8 @@ bool FtpServer::processCommand()
// //
// SIZE - Size of the file // SIZE - Size of the file
// //
else if(CommandIs("SIZE")) { else if(CommandIs("SIZE"))
{
char path[FTP_CWD_SIZE]; char path[FTP_CWD_SIZE];
if(haveParameter() && makeExistsPath(path)) { if(haveParameter() && makeExistsPath(path)) {
if(!openFile(path, FTP_FILE_READ)) { if(!openFile(path, FTP_FILE_READ)) {
@ -872,7 +892,8 @@ bool FtpServer::processCommand()
// //
// SITE - System command // SITE - System command
// //
else if(CommandIs("SITE")) { else if(CommandIs("SITE"))
{
if(ParameterIs("FREE")) { if(ParameterIs("FREE")) {
uint32_t capa = capacity(); uint32_t capa = capacity();
if((capa >> 10) < 1000) { // less than 1 Giga if((capa >> 10) < 1000) { // less than 1 Giga
@ -896,8 +917,7 @@ bool FtpServer::processCommand()
// //
// Unrecognized commands ... // Unrecognized commands ...
// //
else else client.println(F("500 Unknow command"));
client.println(F("500 Unknow command"));
return true; return true;
} }