diff --git a/kernel-tests/network_traffic/UlsoPacket.h b/kernel-tests/network_traffic/UlsoPacket.h index f3936af88c..f98ef3ea4e 100644 --- a/kernel-tests/network_traffic/UlsoPacket.h +++ b/kernel-tests/network_traffic/UlsoPacket.h @@ -148,7 +148,7 @@ public: UlsoPacket(){ mQmapHeader.setmPacketLength(mInternetHeader.size() + mTransportHeader.size() + mPayload.size()); mInternetHeader.adjust(mTransportHeader.size() + mPayload.size(), mTransportHeader.protocolNum()); - adjustHeader(mTransportHeader); + adjustHeader(mTransportHeader, 0, true); } vector asVector() const { diff --git a/kernel-tests/network_traffic/main.cpp b/kernel-tests/network_traffic/main.cpp index e5a124eee3..5d341aa8b5 100644 --- a/kernel-tests/network_traffic/main.cpp +++ b/kernel-tests/network_traffic/main.cpp @@ -121,7 +121,7 @@ void testIpv4Tcp(){ using L3Type = TcpHeader; using PacketType = UlsoPacket; size_t payloadSize = 91, segmentSize = 32; - size_t packetSize = QmapHeader::size() + L2Type::size() + L3Type::size() + payloadSize; + size_t packetSize = QmapHeader::mSize + L2Type::mSize + L3Type::mSize + payloadSize; PacketType p1(segmentSize, payloadSize); cout << p1 << endl; @@ -143,13 +143,13 @@ void testIpv4Udp(){ using L3Type = UdpHeader; using PacketType = UlsoPacket; size_t payloadSize = 80, segmentSize = 32; - size_t packetSize = QmapHeader::size() + L2Type::size() + L3Type::size() + payloadSize; + size_t packetSize = QmapHeader::mSize + L2Type::mSize + L3Type::mSize + payloadSize; PacketType p1(segmentSize, payloadSize); cout << p1 << endl; uint8_t ipv4UdpHeaderBuf[packetSize]; p1.asArray(ipv4UdpHeaderBuf); - uint8_t *udpHeaderPtr = ipv4UdpHeaderBuf + QmapHeader::size() + L2Type::size(); + uint8_t *udpHeaderPtr = ipv4UdpHeaderBuf + QmapHeader::mSize + L2Type::mSize; uint8_t *goldBuf = udpPacket.l3Packet(); for(unsigned int i=0; i size_t packetTestOffset(const struct Packet& p){ - return QmapHeader::size() + (p.l2Size == 0) * L2Type::size() + (p.l3Size == 0) * L3Type::size(); + return QmapHeader::mSize + (p.l2Size == 0) * L2Type::mSize + (p.l3Size == 0) * L3Type::mSize; } template