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

update to track Protolib ProtoPkt changes

pull/9/head
bebopagogo 2020-01-20 00:21:49 -05:00
parent 2188afe82f
commit 260109ea70
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/normCast.cpp
View File

@ -23,8 +23,9 @@
// request is pending acknowledgment. This potentially allows the flow control // request is pending acknowledgment. This potentially allows the flow control
// to be advanced sooner instead of the sender "chasing its own tail" with the // to be advanced sooner instead of the sender "chasing its own tail" with the
// SHOOT_FIRST strategy. Both strategies are implemented here, because under // SHOOT_FIRST strategy. Both strategies are implemented here, because under
// certain cases, the SHOOT_FIRST _may_ have benefit. Try them both, and you // certain cases, the SHOOT_FIRST _may_ have benefit. For example, low duty cycle
// decide ... // transmission may benefit if acknowledgment is requested after each object.
// Try them both, and you decide ...
// By the way, this SHOOT_FIRST/ACK_LATER only applies to the case when both // By the way, this SHOOT_FIRST/ACK_LATER only applies to the case when both
// the "ack" and "flush" options are used. The "flush" option controls the // the "ack" and "flush" options are used. The "flush" option controls the

10
src/common/pcap2norm.cpp
View File

@ -113,7 +113,9 @@ int main(int argc, char* argv[])
} }
ethType = ethPkt.GetType(); ethType = ethPkt.GetType();
payloadLength = ethPkt.GetPayloadLength(); payloadLength = ethPkt.GetPayloadLength();
payloadPtr = (UINT32*)ethPkt.AccessPayload(); // This is done know we offset the ethBuffer above
payloadPtr = alignedBuffer + (2 + ethPkt.GetLength() - ethPkt.GetPayloadLength())/4;
//payloadPtr = (UINT32*)ethPkt.AccessPayload();
} }
ProtoPktIP ipPkt; ProtoPktIP ipPkt;
@ -264,7 +266,7 @@ void NormTrace2(const struct timeval& currentTime,
seq, seq,
//data.IsData() ? "DATA" : "PRTY", //data.IsData() ? "DATA" : "PRTY",
(UINT16)data.GetObjectId(), (UINT16)data.GetObjectId(),
(UINT32)data.GetFecBlockId(fecM), (UINT32)data.GetFecBlockId(fecM).GetValue(),
(UINT16)data.GetFecSymbolId(fecM)); (UINT16)data.GetFecSymbolId(fecM));
if (data.IsStream()) if (data.IsStream())
@ -308,7 +310,7 @@ void NormTrace2(const struct timeval& currentTime,
static_cast<const NormCmdSquelchMsg&>(msg); static_cast<const NormCmdSquelchMsg&>(msg);
PLOG(PL_ALWAYS, " obj>%hu blk>%lu seg>%hu ", PLOG(PL_ALWAYS, " obj>%hu blk>%lu seg>%hu ",
(UINT16)squelch.GetObjectId(), (UINT16)squelch.GetObjectId(),
(UINT32)squelch.GetFecBlockId(fecM), (UINT32)squelch.GetFecBlockId(fecM).GetValue(),
(UINT16)squelch.GetFecSymbolId(fecM)); (UINT16)squelch.GetFecSymbolId(fecM));
break; break;
} }
@ -318,7 +320,7 @@ void NormTrace2(const struct timeval& currentTime,
static_cast<const NormCmdFlushMsg&>(msg); static_cast<const NormCmdFlushMsg&>(msg);
PLOG(PL_ALWAYS, " obj>%hu blk>%lu seg>%hu ", PLOG(PL_ALWAYS, " obj>%hu blk>%lu seg>%hu ",
(UINT16)flush.GetObjectId(), (UINT16)flush.GetObjectId(),
(UINT32)flush.GetFecBlockId(fecM), (UINT32)flush.GetFecBlockId(fecM).GetValue(),
(UINT16)flush.GetFecSymbolId(fecM)); (UINT16)flush.GetFecSymbolId(fecM));
// Print acking node list (if any) // Print acking node list (if any)