BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some 'norp' code cleanup

pull/86/head
bebopagogo 2024-06-08 17:22:13 -04:00
parent 0015af3bb6
commit 8da63844ed
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
norp/include/protoPktSOCKS.h
View File

@ -242,14 +242,13 @@ namespace ProtoPktSOCKS
bool freeOnDestruct = false) bool freeOnDestruct = false)
{return ProtoPkt::InitFromBuffer(replyLength, bufferPtr, numBytes, freeOnDestruct);} {return ProtoPkt::InitFromBuffer(replyLength, bufferPtr, numBytes, freeOnDestruct);}
AddrType GetAddressType() const
UINT8 GetVersion() const UINT8 GetVersion() const
{return ((pkt_length > OFFSET_VERSION) ? {return ((pkt_length > OFFSET_VERSION) ?
GetUINT8(OFFSET_VERSION) : 0);} GetUINT8(OFFSET_VERSION) : 0);}
Type GetType() const Type GetType() const
{return ((pkt_length > OFFSET_TYPE) ? {return ((pkt_length > OFFSET_TYPE) ?
(Type)GetUINT8(OFFSET_TYPE) : CMD_INVALID);} (Type)GetUINT8(OFFSET_TYPE) : TYPE_INVALID);}
AddrType GetAddressType() const AddrType GetAddressType() const
{return ((pkt_length > OFFSET_ATYPE) ? {return ((pkt_length > OFFSET_ATYPE) ?
@ -344,7 +343,7 @@ namespace ProtoPktSOCKS
{ {
((UINT8*)buffer_ptr)[OFFSET_RESERVED] = 0; ((UINT8*)buffer_ptr)[OFFSET_RESERVED] = 0;
SetUINT8(OFFSET_RESERVED, 0); SetUINT8(OFFSET_RESERVED, 0);
SetUINT8(OFFSET_FRAG], fragId); SetUINT8(OFFSET_FRAG, fragId);
pkt_length = OFFSET_FRAG + 1; pkt_length = OFFSET_FRAG + 1;
} }
void SetAddress(AddrType addrType, const char* addrPtr, UINT8 addrLen); void SetAddress(AddrType addrType, const char* addrPtr, UINT8 addrLen);