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

fix for non ECN_SUPPORT build

pull/18/head
bebopagogo 2020-06-06 12:50:11 -04:00
parent 4b3b9351d0
commit 5519d06cee
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/normSession.cpp
View File

@ -45,7 +45,11 @@ enum NormSocketCommand
NormSession::NormSession(NormSessionMgr &sessionMgr, NormNodeId localNodeId) NormSession::NormSession(NormSessionMgr &sessionMgr, NormNodeId localNodeId)
: session_mgr(sessionMgr), notify_pending(false), tx_port(0), tx_port_reuse(false), : session_mgr(sessionMgr), notify_pending(false), tx_port(0), tx_port_reuse(false),
tx_socket_actual(ProtoSocket::UDP), tx_socket(&tx_socket_actual), tx_socket_actual(ProtoSocket::UDP), tx_socket(&tx_socket_actual),
rx_socket(ProtoSocket::UDP), proto_cap(NULL), rx_port_reuse(false), local_node_id(localNodeId), rx_socket(ProtoSocket::UDP),
#ifdef ECN_SUPPORT
proto_cap(NULL),
#endif // ECN_SUPPORT
rx_port_reuse(false), local_node_id(localNodeId),
ttl(DEFAULT_TTL), tos(0), loopback(false), mcast_loopback(false), fragmentation(false), ecn_enabled(false), ttl(DEFAULT_TTL), tos(0), loopback(false), mcast_loopback(false), fragmentation(false), ecn_enabled(false),
tx_rate(DEFAULT_TRANSMIT_RATE / 8.0), tx_rate_min(-1.0), tx_rate_max(-1.0), tx_residual(0), tx_rate(DEFAULT_TRANSMIT_RATE / 8.0), tx_rate_min(-1.0), tx_rate_max(-1.0), tx_residual(0),
backoff_factor(DEFAULT_BACKOFF_FACTOR), is_sender(false), backoff_factor(DEFAULT_BACKOFF_FACTOR), is_sender(false),
@ -5009,9 +5013,11 @@ NormSession::MessageStatus NormSession::SendMessage(NormMsg &msg)
{ {
unsigned int numBytes = msgSize; unsigned int numBytes = msgSize;
bool result; bool result;
#ifdef ECN_SUPPORT
if (sendRaw) if (sendRaw)
result = RawSendTo(msg.GetBuffer(), numBytes, msg.GetDestination(), probe_tos); result = RawSendTo(msg.GetBuffer(), numBytes, msg.GetDestination(), probe_tos);
else else
#endif // ECN_SUPPORT
result = tx_socket->SendTo(msg.GetBuffer(), numBytes, msg.GetDestination()); result = tx_socket->SendTo(msg.GetBuffer(), numBytes, msg.GetDestination());
if (result) if (result)
{ {