From 2ae69e6e96d1ea5dab9d8353d2b8ca80b3a7683b Mon Sep 17 00:00:00 2001 From: bebopagogo Date: Sun, 28 Jan 2024 20:26:15 -0500 Subject: [PATCH 1/3] fix to NormFile::Open() where 'flags' were not properly saved and affected NormFile::Rename() --- src/common/normFile.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/common/normFile.cpp b/src/common/normFile.cpp index a723586..84faaf4 100755 --- a/src/common/normFile.cpp +++ b/src/common/normFile.cpp @@ -136,6 +136,7 @@ bool NormFile::Open(const char* thePath, int theFlags) if((fd = open(thePath, theFlags, 0640)) >= 0) { offset = 0; + flags = theFlags; return true; // no error } else @@ -246,9 +247,11 @@ bool NormFile::Rename(const char* oldName, const char* newName) #endif // WIN32 // In Win32, the old file can't be open and on Unix (Linux at least), it's better // performance to close/reopen a file being renamed + bool wasOpen = false; int oldFlags = 0; if (IsOpen()) { + wasOpen = true; oldFlags = flags; oldFlags &= ~(O_CREAT | O_TRUNC); // unset these Close(); @@ -321,22 +324,19 @@ bool NormFile::Rename(const char* oldName, const char* newName) { PLOG(PL_ERROR, "NormFile::Rename() rename() error: %s\n", GetErrorString()); #endif // if/else _WIN32_WCE / WIN32|UNIX - if (oldFlags) - { - if (!Open(oldName, oldFlags)) - PLOG(PL_ERROR, "NormFile::Rename() error re-opening file w/ old name\n"); - } + if (wasOpen && !Open(oldName, oldFlags)) + PLOG(PL_ERROR, "NormFile::Rename() error re-opening file w/ old name\n"); return false; } else { - if (oldFlags) + if (wasOpen && !Open(newName, oldFlags)) { - if (!Open(newName, oldFlags)) - PLOG(PL_ERROR, "NormFile::Rename() error opening file w/ new name\n"); + PLOG(PL_ERROR, "NormFile::Rename() error opening file w/ new name\n"); + return false; } - return true; } + return true; } // end NormFile::Rename() size_t NormFile::Read(char* buffer, size_t len) @@ -388,10 +388,11 @@ size_t NormFile::Write(const char* buffer, size_t len) #endif // if/else _WIN32_WCE #else size_t result = write(fd, buffer+put, len-put); + if (result <= 0) perror("NormFile::Write() write() error"); #endif // if/else WIN32 if (result <= 0) { - #ifndef _WIN32_WCE +#ifndef _WIN32_WCE if (EINTR != errno) #endif // !_WIN32_WCE { From 0015af3bb60a6f123ef4cc4a459d85c7cf980d60 Mon Sep 17 00:00:00 2001 From: bebopagogo Date: Sat, 8 Jun 2024 17:20:27 -0400 Subject: [PATCH 2/3] some 'norp' code cleanup --- norp/include/protoPktSOCKS.h | 34 ++++++++++++++++++---------------- norp/src/common/norp.cpp | 3 ++- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/norp/include/protoPktSOCKS.h b/norp/include/protoPktSOCKS.h index 9624525..2a1f0ae 100755 --- a/norp/include/protoPktSOCKS.h +++ b/norp/include/protoPktSOCKS.h @@ -152,15 +152,15 @@ namespace ProtoPktSOCKS UINT8 GetVersion() const {return ((pkt_length > OFFSET_VERSION) ? - (((UINT8*)buffer_ptr)[OFFSET_VERSION]) : 0);} + GetUINT8(OFFSET_VERSION) : 0);} Command GetCommand() const {return ((pkt_length > OFFSET_COMMAND) ? - (Command)(((UINT8*)buffer_ptr)[OFFSET_COMMAND]) : CMD_INVALID);} + (Command)GetUINT8(OFFSET_COMMAND) : CMD_INVALID);} AddrType GetAddressType() const {return ((pkt_length > OFFSET_ATYPE) ? - (AddrType)(((UINT8*)buffer_ptr)[OFFSET_ATYPE]) : ADDR_INVALID);} + (AddrType)GetUINT8(OFFSET_ATYPE) : ADDR_INVALID);} UINT8 GetAddressLength() const; @@ -175,18 +175,18 @@ namespace ProtoPktSOCKS void SetVersion(UINT8 version) { - ((UINT8*)buffer_ptr)[OFFSET_VERSION] = version; + SetUINT8(OFFSET_VERSION, version); pkt_length = 1; } void SetCommand(Command cmd) { - ((UINT8*)buffer_ptr)[OFFSET_COMMAND] = (UINT8)cmd; + SetUINT8(OFFSET_COMMAND, (UINT8)cmd); pkt_length = 2; } void SetAddressType(AddrType addrType) { ((UINT8*)buffer_ptr)[OFFSET_RESERVED] = 0; - ((UINT8*)buffer_ptr)[OFFSET_ATYPE] = (UINT8)addrType; + SetUINT8(OFFSET_ATYPE, (UINT8)addrType); pkt_length = 4; } bool SetAddress(const ProtoAddress& theAddr); // note this sets port, too @@ -242,18 +242,19 @@ namespace ProtoPktSOCKS bool freeOnDestruct = false) {return ProtoPkt::InitFromBuffer(replyLength, bufferPtr, numBytes, freeOnDestruct);} + AddrType GetAddressType() const UINT8 GetVersion() const {return ((pkt_length > OFFSET_VERSION) ? - (((UINT8*)buffer_ptr)[OFFSET_VERSION]) : 0);} + GetUINT8(OFFSET_VERSION) : 0);} Type GetType() const {return ((pkt_length > OFFSET_TYPE) ? - (Type)(((UINT8*)buffer_ptr)[OFFSET_TYPE]) : TYPE_INVALID);} + (Type)GetUINT8(OFFSET_TYPE) : CMD_INVALID);} AddrType GetAddressType() const {return ((pkt_length > OFFSET_ATYPE) ? - (AddrType)(((UINT8*)buffer_ptr)[OFFSET_ATYPE]) : ADDR_INVALID);} - + (AddrType)GetUINT8(OFFSET_ATYPE) : ADDR_INVALID);} + UINT8 GetAddressLength() const; const char* GetAddressPtr() const @@ -266,12 +267,12 @@ namespace ProtoPktSOCKS // Reply building (call these in order void SetVersion(UINT8 version) { - ((UINT8*)buffer_ptr)[OFFSET_VERSION] = version; + SetUINT8(OFFSET_VERSION, version); pkt_length = 1; } void SetType(Type replyType) { - ((UINT8*)buffer_ptr)[OFFSET_TYPE] = (UINT8)replyType; + SetUINT8(OFFSET_TYPE, (UINT8)replyType); pkt_length = 2; } void SetAddress(AddrType addrType, const char* addrPtr, UINT8 addrLen); @@ -316,12 +317,12 @@ namespace ProtoPktSOCKS UINT8 GetFrag() const {return ((pkt_length > OFFSET_FRAG) ? - (((UINT8*)buffer_ptr)[OFFSET_FRAG]) : 0);} + GetUINT8(OFFSET_FRAG) : 0);} AddrType GetAddressType() const {return ((pkt_length > OFFSET_ATYPE) ? - (AddrType)(((UINT8*)buffer_ptr)[OFFSET_ATYPE]) : ADDR_INVALID);} - + (AddrType)GetUINT8(OFFSET_ATYPE) : ADDR_INVALID);} + UINT8 GetAddressLength() const; const char* GetAddressPtr() const @@ -342,7 +343,8 @@ namespace ProtoPktSOCKS void SetFragment(UINT8 fragId) { ((UINT8*)buffer_ptr)[OFFSET_RESERVED] = 0; - ((UINT8*)buffer_ptr)[OFFSET_FRAG] = fragId; + SetUINT8(OFFSET_RESERVED, 0); + SetUINT8(OFFSET_FRAG], fragId); pkt_length = OFFSET_FRAG + 1; } void SetAddress(AddrType addrType, const char* addrPtr, UINT8 addrLen); diff --git a/norp/src/common/norp.cpp b/norp/src/common/norp.cpp index 2579232..84a429c 100755 --- a/norp/src/common/norp.cpp +++ b/norp/src/common/norp.cpp @@ -12,7 +12,7 @@ // numbers for NORM traffic. // Uncomment this to enable new NORM port handling to improve NAT compatibility -#define NEW_PORT +#define NEW_PORT 1 PortPool::PortPool(UINT16 basePort) : base_port(basePort) @@ -533,6 +533,7 @@ bool NorpSession::PutClientAuthReply() else { // AuthReply was fully sent + TRACE("AuthReply fully sent %d bytes ...\n", remote_index); socks_client_socket.StopOutputNotification(); socks_state = SOCKS_GET_REQUEST; remote_pending = remote_index = 0; From 8da63844ed0de380d53a55d16722dc87f4164df6 Mon Sep 17 00:00:00 2001 From: bebopagogo Date: Sat, 8 Jun 2024 17:22:13 -0400 Subject: [PATCH 3/3] some 'norp' code cleanup --- norp/include/protoPktSOCKS.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/norp/include/protoPktSOCKS.h b/norp/include/protoPktSOCKS.h index 2a1f0ae..53fae78 100755 --- a/norp/include/protoPktSOCKS.h +++ b/norp/include/protoPktSOCKS.h @@ -242,14 +242,13 @@ namespace ProtoPktSOCKS bool freeOnDestruct = false) {return ProtoPkt::InitFromBuffer(replyLength, bufferPtr, numBytes, freeOnDestruct);} - AddrType GetAddressType() const UINT8 GetVersion() const {return ((pkt_length > OFFSET_VERSION) ? GetUINT8(OFFSET_VERSION) : 0);} Type GetType() const {return ((pkt_length > OFFSET_TYPE) ? - (Type)GetUINT8(OFFSET_TYPE) : CMD_INVALID);} + (Type)GetUINT8(OFFSET_TYPE) : TYPE_INVALID);} AddrType GetAddressType() const {return ((pkt_length > OFFSET_ATYPE) ? @@ -344,7 +343,7 @@ namespace ProtoPktSOCKS { ((UINT8*)buffer_ptr)[OFFSET_RESERVED] = 0; SetUINT8(OFFSET_RESERVED, 0); - SetUINT8(OFFSET_FRAG], fragId); + SetUINT8(OFFSET_FRAG, fragId); pkt_length = OFFSET_FRAG + 1; } void SetAddress(AddrType addrType, const char* addrPtr, UINT8 addrLen);