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

added 'reuse' and 'txport' command-line options in addition to 'txaddr' option

pull/74/head
bebopagogo 2022-09-10 20:20:34 -04:00
parent ea8a22c180
commit acbc31c1d0
2 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
examples/normCast.cpp
View File

@ -89,9 +89,9 @@ class NormCaster
assert(NORM_SESSION_INVALID != norm_session); assert(NORM_SESSION_INVALID != norm_session);
NormSetMulticastInterface(norm_session, ifaceName); NormSetMulticastInterface(norm_session, ifaceName);
} }
bool SetNormTxPort(UINT16 txPort, bool SetNormTxPort(UINT16 txPort,
bool enableReuse, bool enableReuse,
const char* txAddress) const char* txAddress)
{ {
assert(NORM_SESSION_INVALID != norm_session); assert(NORM_SESSION_INVALID != norm_session);
return NormSetTxPort(norm_session, txPort, enableReuse, txAddress); return NormSetTxPort(norm_session, txPort, enableReuse, txAddress);
@ -370,7 +370,7 @@ bool NormCaster::OpenNormSession(NormInstanceHandle instance, const char* addr,
//NormSetTxRobustFactor(norm_session, 20); //NormSetTxRobustFactor(norm_session, 20);
NormSetGrttProbingTOS(norm_session, probe_tos); NormSetGrttProbingTOS(norm_session, probe_tos); // this was for some experimental protocol work
NormSetGrttProbingMode(norm_session, probe_mode); NormSetGrttProbingMode(norm_session, probe_mode);
return true; return true;
@ -895,8 +895,8 @@ void Usage()
{ {
fprintf(stderr, "Usage: normCast {send <file/dir list> &| recv <rxCacheDir>} [silent {on|off}]\n" fprintf(stderr, "Usage: normCast {send <file/dir list> &| recv <rxCacheDir>} [silent {on|off}]\n"
" [repeat <interval> [updatesOnly]] [id <nodeIdInteger>]\n" " [repeat <interval> [updatesOnly]] [id <nodeIdInteger>]\n"
" [addr <addr>[/<port>]] [txAddr <addr>[/<port>]]\n" " [addr <addr>[/<port>]][txaddr <addr>[/<port>]][txport <port>]\n"
" [interface <name>] [loopback]\n" " [interface <name>][reuse][loopback]\n"
" [ack auto|<node1>[,<node2>,...]] [segment <bytes>]\n" " [ack auto|<node1>[,<node2>,...]] [segment <bytes>]\n"
" [block <count>] [parity <count>] [auto <count>]\n" " [block <count>] [parity <count>] [auto <count>]\n"
" [cc|cce|ccl|rate <bitsPerSecond>] [rxloss <lossFraction>]\n" " [cc|cce|ccl|rate <bitsPerSecond>] [rxloss <lossFraction>]\n"
@ -924,9 +924,8 @@ int main(int argc, char* argv[])
unsigned int sessionPort = 6003; unsigned int sessionPort = 6003;
char sessionTxAddr[64]; char sessionTxAddr[64];
strcpy(sessionTxAddr, ""); sessionTxAddr[0] = '\0';
unsigned int sessionTxPort = 0; unsigned int sessionTxPort = 0;
bool autoAck = false; bool autoAck = false;
@ -947,6 +946,7 @@ int main(int argc, char* argv[])
double grtt_estimate = 0.001; double grtt_estimate = 0.001;
NormProbingMode grtt_probing_mode = NORM_PROBE_ACTIVE; NormProbingMode grtt_probing_mode = NORM_PROBE_ACTIVE;
bool loopback = false; bool loopback = false;
bool reuse = false;
NormCaster normCast; NormCaster normCast;
if (!normCast.Init()) if (!normCast.Init())
@ -1068,7 +1068,7 @@ int main(int argc, char* argv[])
sessionPort = atoi(portPtr); sessionPort = atoi(portPtr);
} }
} }
else if (0 == strncmp(cmd, "txAddr", len)) else if (0 == strncmp(cmd, "txaddr", len))
{ {
const char* addrPtr = argv[i++]; const char* addrPtr = argv[i++];
const char* portPtr = strchr(addrPtr, '/'); const char* portPtr = strchr(addrPtr, '/');
@ -1080,14 +1080,46 @@ int main(int argc, char* argv[])
else else
{ {
size_t addrLen = portPtr - addrPtr; size_t addrLen = portPtr - addrPtr;
if (addrLen > 63) addrLen = 63; // should issue error message if (addrLen > 63)
{
fprintf(stderr, "normCast error: 'txaddr' value too long!\n");
Usage();
return -1;
}
strncpy(sessionTxAddr, addrPtr, addrLen); strncpy(sessionTxAddr, addrPtr, addrLen);
sessionTxAddr[addrLen] = '\0'; sessionTxAddr[addrLen] = '\0';
portPtr++; portPtr++;
sessionTxPort = atoi(portPtr); int txPort = atoi(argv[i++]);
if ((txPort <=0) || (txPort > 0x0000ffff))
{
fprintf(stderr, "normCast error: invalid 'txport' value!\n");
Usage();
return -1;
}
sessionTxPort = txPort;
} }
} }
else if (0 == strncmp(cmd, "txport", len))
{
if (i >= argc)
{
fprintf(stderr, "normCast error: missing 'txport' value!\n");
Usage();
return -1;
}
int txPort = atoi(argv[i++]);
if ((txPort <=0) || (txPort > 0x0000ffff))
{
fprintf(stderr, "normCast error: invalid 'txport' value!\n");
Usage();
return -1;
}
sessionTxPort = txPort;
}
else if (0 == strncmp(cmd, "reuse", len))
{
reuse = true;
}
else if (0 == strncmp(cmd, "id", len)) else if (0 == strncmp(cmd, "id", len))
{ {
if (i >= argc) if (i >= argc)
@ -1547,9 +1579,8 @@ int main(int argc, char* argv[])
normCast.SetNormTxRate(txRate); normCast.SetNormTxRate(txRate);
if (NULL != mcastIface) if (NULL != mcastIface)
normCast.SetNormMulticastInterface(mcastIface); normCast.SetNormMulticastInterface(mcastIface);
if (NULL != sessionTxAddr) { if ('\0' != sessionTxAddr[0])
normCast.SetNormSetTxPort(sessionTxPort, true, sessionTxAddr); normCast.SetNormTxPort(sessionTxPort, reuse, sessionTxAddr);
}
if (trace) normCast.SetNormMessageTrace(true); if (trace) normCast.SetNormMessageTrace(true);

4
makefiles/Makefile.macosx
View File

@ -44,8 +44,10 @@ SYSTEM_SRC = ../protolib/src/unix/bpfCap.cpp
# The "SYSTEM" keyword can be used for dependent makes # The "SYSTEM" keyword can be used for dependent makes
SYSTEM = macosx SYSTEM = macosx
# TBD - provide means to build universal Mac OSX library (x86/arm64)
CC = g++ CC = g++
SYSTEM_CFLAGS = -Wall -Wcast-align -fPIC -arch x86_64 SYSTEM_CFLAGS = -Wall -Wcast-align -fPIC
SYSTEM_SOFLAGS = -dynamiclib SYSTEM_SOFLAGS = -dynamiclib
SYSTEM_SOEXT = dylib SYSTEM_SOEXT = dylib
RANLIB = ranlib RANLIB = ranlib