Merge branch 'USNavalResearchLaboratory:master' into master

mullerj · Jun 14, 2024 · 0eb0b82 · 0eb0b82
2 parents 662e1fa + 669fc4f
commit 0eb0b82
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git 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
@@ -244,16 +244,16 @@ namespace ProtoPktSOCKS
 
             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) : TYPE_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 +266,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 +316,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 +342,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/makefiles/Makefile.common b/norp/makefiles/Makefile.common
@@ -44,7 +44,7 @@ norp: $(LIBPROTO) $(LIBNORM) $(NORP_OBJ)
 	$(CC) $(LDFLAGS) -o $@ $(NORP_OBJ) $(LIBS) $(LIBNORM) $(LIBPROTO)
 
 clean:
-	rm -f norp $(COMMON)/*.o;
+	rm -f norp $(COMMON)/*.o $(COMMON)/protoPktSOCKS.o;
 	$(MAKE) -C $(NORM)/makefiles -f Makefile.$(SYSTEM) clean;
 	$(MAKE) -C $(PROTOLIB)/makefiles -f Makefile.$(SYSTEM) clean;
 

diff --git a/norp/makefiles/Makefile.macosx b/norp/makefiles/Makefile.macosx
@@ -8,8 +8,8 @@ WX_CFLAGS = `$(WX_CONFIG_PATH) --cxxflags`
 WX_LIBS = `$(WX_CONFIG_PATH) --libs`
 
 # 2) System-specific flags and libs
-SYSTEM_CFLAGS = -arch x86_64
-SYSTEM_LIBS = -arch x86_64 -lresolv
+SYSTEM_CFLAGS = 
+SYSTEM_LIBS = -lresolv -lpcap
 
 # 3) System-specific Protolib flags (_must_ correspond to Protolib SYSTEM_HAVES)
 # Must choose appropriate for the following:

diff --git 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;

diff --git a/protolib b/protolib
+3 −1		CMakeLists.txt
+1 −0		android/lib/CMakeLists.txt
+1 −0		examples/pipeExample.cpp
+5 −1		examples/protoPipeRecv.py
+15 −4		examples/protoPipeSend.py
+1 −0		include/protoDebug.h
+480 −0		include/protoFlow.h
+1 −2		include/protoSpace.h
+9 −9		makefiles/Makefile.common
+15 −20		src/bsd/bsdDetour.cpp
+3 −3		src/bsd/bsdRouteMgr.cpp
+837 −0		src/common/protoFlow.cpp
+3 −0		src/common/protoNet.cpp
+1 −0		src/common/protoSocket.cpp
+25 −11		src/common/protoSpace.cpp
+6 −0		src/common/protoTree.cpp
+2 −0		src/linux/linuxDetour.cpp
+22 −11		src/python/protokit.cpp
+93 −26		src/python/protopipe.cpp
+502 −0		src/python/protospace.cpp
+10 −10		src/unix/unixVif.cpp
+1 −0		src/win32/win32Net.cpp
+8 −8		waf
+1 −0		wscript