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

fixed improper delete operator usage in normApp.cpp and minor tweaks

pull/86/head
bebopagogo 2024-01-24 13:43:38 -05:00
parent a992176873
commit 6188965887
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/normApp.cpp
View File

@ -96,6 +96,8 @@ class NormApp : public NormController, public ProtoApp
enum EcnMode {ECN_OFF, ECN_ON, ECN_ONLY}; enum EcnMode {ECN_OFF, ECN_ON, ECN_ONLY};
enum {MSG_BUFFER_SIZE = 65535};
#ifdef UNIX #ifdef UNIX
static void SignalHandler(int sigNum); static void SignalHandler(int sigNum);
#endif // UNIX #endif // UNIX
@ -115,7 +117,7 @@ class NormApp : public NormController, public ProtoApp
FILE* output; // output stream FILE* output; // output stream
char* output_io_buffer; char* output_io_buffer;
unsigned int output_io_bufsize; unsigned int output_io_bufsize;
char input_buffer[65535]; char input_buffer[MSG_BUFFER_SIZE];
unsigned int input_index; unsigned int input_index;
unsigned int input_length; unsigned int input_length;
bool input_active; bool input_active;
@ -127,7 +129,7 @@ class NormApp : public NormController, public ProtoApp
bool msg_test; bool msg_test;
unsigned int msg_test_length; unsigned int msg_test_length;
UINT32 msg_test_seq; UINT32 msg_test_seq;
char output_buffer[65535]; char output_buffer[MSG_BUFFER_SIZE];
UINT16 output_index; UINT16 output_index;
bool output_messaging; bool output_messaging;
UINT16 output_msg_length; UINT16 output_msg_length;
@ -161,7 +163,7 @@ class NormApp : public NormController, public ProtoApp
NormSession::ProbingMode grtt_probing_mode; NormSession::ProbingMode grtt_probing_mode;
double group_size; double group_size;
unsigned long tx_buffer_size; // bytes unsigned long tx_buffer_size; // bytes
unsigned int tx_sock_buffer_size; unsigned int tx_sock_buffer_size;
unsigned long tx_cache_min; unsigned long tx_cache_min;
unsigned long tx_cache_max; unsigned long tx_cache_max;
NormObjectSize tx_cache_size; NormObjectSize tx_cache_size;
@ -213,7 +215,6 @@ class NormApp : public NormController, public ProtoApp
}; // end class NormApp }; // end class NormApp
NormApp::FileCacheItem::FileCacheItem(const char* thePath) NormApp::FileCacheItem::FileCacheItem(const char* thePath)
{ {
strncpy(file_path, thePath, PATH_MAX); strncpy(file_path, thePath, PATH_MAX);
@ -603,7 +604,7 @@ bool NormApp::OnCommand(const char* cmd, const char* val)
else if (!strncmp("address", cmd, len)) else if (!strncmp("address", cmd, len))
{ {
size_t len = strlen(val); size_t len = strlen(val);
if (address) delete address; if (address) delete[] address;
if (!(address = new char[len+1])) if (!(address = new char[len+1]))
{ {
PLOG(PL_FATAL, "NormApp::OnCommand(address) allocation error:%s\n", PLOG(PL_FATAL, "NormApp::OnCommand(address) allocation error:%s\n",
@ -614,7 +615,7 @@ bool NormApp::OnCommand(const char* cmd, const char* val)
char* ptr = strchr(address, '/'); char* ptr = strchr(address, '/');
if (!ptr) if (!ptr)
{ {
delete address; delete[] address;
address = NULL; address = NULL;
PLOG(PL_FATAL, "NormApp::OnCommand(address) missing port number!\n"); PLOG(PL_FATAL, "NormApp::OnCommand(address) missing port number!\n");
return false; return false;
@ -623,7 +624,7 @@ bool NormApp::OnCommand(const char* cmd, const char* val)
int portNum = atoi(ptr); int portNum = atoi(ptr);
if ((portNum < 1) || (portNum > 65535)) if ((portNum < 1) || (portNum > 65535))
{ {
delete address; delete[] address;
address = NULL; address = NULL;
PLOG(PL_FATAL, "NormApp::OnCommand(address) invalid port number!\n"); PLOG(PL_FATAL, "NormApp::OnCommand(address) invalid port number!\n");
return false; return false;
@ -1405,7 +1406,7 @@ void NormApp::OnInputReady()
{ {
if (input_msg_length) if (input_msg_length)
{ {
UINT16 bufferSpace = 65535 - input_index; UINT16 bufferSpace = MSG_BUFFER_SIZE - input_index;
UINT16 msgRemainder = input_msg_length - input_msg_index; UINT16 msgRemainder = input_msg_length - input_msg_index;
readLength = MIN(bufferSpace, msgRemainder); readLength = MIN(bufferSpace, msgRemainder);
} }
@ -1418,7 +1419,7 @@ void NormApp::OnInputReady()
memcpy(&input_msg_length, input_buffer, 2); memcpy(&input_msg_length, input_buffer, 2);
input_msg_length = ntohs(input_msg_length); input_msg_length = ntohs(input_msg_length);
ASSERT(input_msg_length >= 2); ASSERT(input_msg_length >= 2);
UINT16 bufferSpace = 65535 - input_index; UINT16 bufferSpace = MSG_BUFFER_SIZE - input_index;
UINT16 msgRemainder = input_msg_length - 2; UINT16 msgRemainder = input_msg_length - 2;
readLength = MIN(bufferSpace, msgRemainder); readLength = MIN(bufferSpace, msgRemainder);
} }
@ -1443,7 +1444,7 @@ void NormApp::OnInputReady()
{ {
hdrOffset = 0; hdrOffset = 0;
} }
int hdrLen = sprintf(input_buffer + hdrOffset, "NORM Test Msg %08u ", msg_test_seq++); int hdrLen = snprintf(input_buffer + hdrOffset, MSG_BUFFER_SIZE - hdrOffset, "NORM Test Msg %08u ", msg_test_seq++);
char testChar = 'a' + msg_test_seq % 26; char testChar = 'a' + msg_test_seq % 26;
memset(input_buffer + hdrLen + hdrOffset, testChar, msg_test_length - (hdrLen + hdrOffset)); memset(input_buffer + hdrLen + hdrOffset, testChar, msg_test_length - (hdrLen + hdrOffset));
input_buffer[msg_test_length - 1] = '\n'; input_buffer[msg_test_length - 1] = '\n';

2
src/common/normPostProcess.cpp
View File

@ -15,6 +15,7 @@ NormPostProcessor::~NormPostProcessor()
SetCommand(NULL); SetCommand(NULL);
} }
/* This was defined/implemented, but unused so commented out (for now)
void NormPostProcessor::GetCommand(char* buffer, unsigned int buflen) void NormPostProcessor::GetCommand(char* buffer, unsigned int buflen)
{ {
if (process_argv && buffer) if (process_argv && buffer)
@ -52,6 +53,7 @@ void NormPostProcessor::GetCommand(char* buffer, unsigned int buflen)
if (buflen > 4) buffer[4] = '\0'; if (buflen > 4) buffer[4] = '\0';
} }
} // end NormPostProcessor::GetCommand() } // end NormPostProcessor::GetCommand()
*/
bool NormPostProcessor::SetCommand(const char* cmd) bool NormPostProcessor::SetCommand(const char* cmd)
{ {

2
src/pynorm/session.py
View File

@ -1,4 +1,4 @@
""" o"""
pynorm - Python wrapper for NRL's libnorm pynorm - Python wrapper for NRL's libnorm
By: Tom Wambold <wambold@itd.nrl.navy.mil> By: Tom Wambold <wambold@itd.nrl.navy.mil>
""" """