Skip to content

Add jumbograms and proxy extension parsing to dump command #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfallows merged 22 commits into from
Dec 14, 2023
Merged

Add jumbograms and proxy extension parsing to dump command #635

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
490c145
print exception stack trace
attilakreiner Dec 11, 2023
9006c55
fix buffer capacity
attilakreiner Dec 11, 2023
cdc4b68
jumbo
attilakreiner Dec 12, 2023
37988a2
core, offset
attilakreiner Dec 12, 2023
b8df7b8
test
attilakreiner Dec 12, 2023
4fce11b
fix ip when streamId is 0
attilakreiner Dec 12, 2023
272cda9
WIP proxy extension
attilakreiner Dec 12, 2023
842ff12
subtree
attilakreiner Dec 13, 2023
1287054
rm slices
attilakreiner Dec 13, 2023
8b9d35a
worker
attilakreiner Dec 13, 2023
f7caf29
fmt
attilakreiner Dec 13, 2023
a8da0e0
flags, payload
attilakreiner Dec 13, 2023
60e6e21
ref
attilakreiner Dec 13, 2023
8839d74
switch -w
attilakreiner Dec 13, 2023
7b84434
mv zilla.lua src -> resources
attilakreiner Dec 13, 2023
96f9673
fix address
attilakreiner Dec 13, 2023
14d1a81
mv core -> worker
attilakreiner Dec 13, 2023
f313ccd
fix data frame extension bug
attilakreiner Dec 14, 2023
47f63e6
install wireshark plugin
attilakreiner Dec 14, 2023
e7dc3ce
add version info to the zilla.lua plugin
attilakreiner Dec 14, 2023
1c0e5a1
create plugin dir
attilakreiner Dec 14, 2023
490bf6e
fix
attilakreiner Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
jumbo
  • Loading branch information
@attilakreiner
attilakreiner committed Dec 12, 2023
commit cdc4b683a231fc222227d5f58dd66fdc174c13ef
77 changes: 56 additions & 21 deletions ...c/main/java/io/aklivity/zilla/runtime/command/dump/internal/airline/ZillaDumpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import io.aklivity.zilla.runtime.command.dump.internal.airline.spy.RingBufferSpy;
import io.aklivity.zilla.runtime.command.dump.internal.types.Flyweight;
import io.aklivity.zilla.runtime.command.dump.internal.types.IPv6HeaderFW;
import io.aklivity.zilla.runtime.command.dump.internal.types.IPv6JumboHeaderFW;
import io.aklivity.zilla.runtime.command.dump.internal.types.PcapGlobalHeaderFW;
import io.aklivity.zilla.runtime.command.dump.internal.types.PcapPacketHeaderFW;
import io.aklivity.zilla.runtime.command.dump.internal.types.TcpFlag;
Expand Down Expand Up @@ -100,10 +101,15 @@ public final class ZillaDumpCommand extends ZillaCommand
private static final int PCAP_GLOBAL_SIZE = 24;
private static final int PCAP_LINK_TYPE_IPV6 = 1;

private static final byte[] PSEUDO_ETHERNET_FRAME = BitUtil.fromHex("2052454356002053454e440086dd");
private static final int PSEUDO_IPV6_PREFIX = 1629561669;
private static final short PSEUDO_NEXT_HEADER_AND_HOP_LIMIT = 0x0640;
private static final byte[] ETHERNET_FRAME = BitUtil.fromHex("2052454356002053454e440086dd");

private static final int IPV6_PREFIX = 0x61212345;
private static final byte IPV6_NEXT_HEADER_TCP = 0x06;
private static final byte IPV6_NEXT_HEADER_JUMBO = 0x00;
private static final byte IPV6_HOP_LIMIT = 0x40;
private static final long IPV6_LOCAL_ADDRESS = 0xfe80L << 48;
private static final int IPV6_JUMBO_PREFIX = 0x0600c204;
private static final int IPV6_JUMBO_THRESHOLD = 0xffff;

private static final int PCAP_HEADER_OFFSET = 0;
private static final int PCAP_HEADER_SIZE = 16;
Expand All @@ -116,6 +122,8 @@ public final class ZillaDumpCommand extends ZillaCommand
private static final int IPV6_HEADER_OFFSET = ETHER_HEADER_LIMIT;
private static final int IPV6_HEADER_SIZE = 40;
private static final int IPV6_HEADER_LIMIT = IPV6_HEADER_OFFSET + IPV6_HEADER_SIZE;
private static final int IPV6_JUMBO_HEADER_OFFSET = IPV6_HEADER_LIMIT;
private static final int IPV6_JUMBO_HEADER_SIZE = 8;

private static final int TCP_HEADER_OFFSET = IPV6_HEADER_LIMIT;
private static final int TCP_HEADER_SIZE = 20;
Expand Down Expand Up @@ -196,6 +204,7 @@ public final class ZillaDumpCommand extends ZillaCommand
private final FlushFW.Builder flushRW = new FlushFW.Builder();
private final ChallengeFW.Builder challengeRW = new ChallengeFW.Builder();
private final IPv6HeaderFW.Builder ipv6HeaderRW = new IPv6HeaderFW.Builder();
private final IPv6JumboHeaderFW.Builder ipv6JumboHeaderRW = new IPv6JumboHeaderFW.Builder();
private final TcpHeaderFW.Builder tcpHeaderRW = new TcpHeaderFW.Builder();
private final MutableDirectBuffer patchBuffer;
private final MutableDirectBuffer writeBuffer;
Expand Down Expand Up @@ -654,22 +663,24 @@ private void writeFrame(
final int labelsLength = encodeZillaLabels(labelsBuffer, originId, routedId);
final int tcpSegmentLength = ZILLA_HEADER_SIZE + labelsLength + frame.sizeof();
final int ipv6Length = TCP_HEADER_SIZE + tcpSegmentLength;
final int pcapLength = ETHER_HEADER_SIZE + IPV6_HEADER_SIZE + ipv6Length;
final boolean jumbo = ipv6Length > IPV6_JUMBO_THRESHOLD;
final int ipv6JumboLength = jumbo ? IPV6_JUMBO_HEADER_SIZE : 0;
final int pcapLength = ETHER_HEADER_SIZE + IPV6_HEADER_SIZE + ipv6Length + ipv6JumboLength;

encodePcapHeader(writeBuffer, pcapLength, timestamp);
encodeEtherHeader(writeBuffer);
encodeIpv6Header(writeBuffer, streamId ^ 1L, streamId, ipv6Length);
encodeIpv6Header(writeBuffer, jumbo, streamId ^ 1L, streamId, ipv6Length);

final boolean initial = streamId % 2 != 0;
final long seq = sequence.get(streamId);
final long ack = sequence.get(streamId ^ 1L);
sequence.put(streamId, sequence.get(streamId) + tcpSegmentLength);
encodeTcpHeader(writeBuffer, initial, seq, ack, tcpFlags);
encodeTcpHeader(writeBuffer, ipv6JumboLength, initial, seq, ack, tcpFlags);

final int protocolTypeId = resolveProtocolTypeId(originId, routedId);
encodeZillaHeader(writeBuffer, frameTypeId, protocolTypeId);
encodeZillaHeader(writeBuffer, ipv6JumboLength, frameTypeId, protocolTypeId);

writePcapOutput(writer, writeBuffer, PCAP_HEADER_OFFSET, ZILLA_HEADER_LIMIT);
writePcapOutput(writer, writeBuffer, PCAP_HEADER_OFFSET, ZILLA_HEADER_LIMIT + ipv6JumboLength);
writePcapOutput(writer, labelsBuffer, 0, labelsLength);
writePcapOutput(writer, frame.buffer(), frame.offset(), frame.sizeof());
}
Expand Down Expand Up @@ -714,28 +725,51 @@ private void encodePcapHeader(
private void encodeEtherHeader(
MutableDirectBuffer buffer)
{
buffer.putBytes(ETHER_HEADER_OFFSET, PSEUDO_ETHERNET_FRAME);
buffer.putBytes(ETHER_HEADER_OFFSET, ETHERNET_FRAME);
}

private void encodeIpv6Header(
MutableDirectBuffer buffer,
boolean jumbo,
long source,
long destination,
int payloadLength)
{
ipv6HeaderRW.wrap(buffer, IPV6_HEADER_OFFSET, buffer.capacity())
.prefix(PSEUDO_IPV6_PREFIX)
.payload_length((short) payloadLength)
.next_header_and_hop_limit(PSEUDO_NEXT_HEADER_AND_HOP_LIMIT)
.src_addr_part1(IPV6_LOCAL_ADDRESS)
.src_addr_part2(source)
.dst_addr_part1(IPV6_LOCAL_ADDRESS)
.dst_addr_part2(destination)
.build();
if (jumbo)
{
ipv6HeaderRW.wrap(buffer, IPV6_HEADER_OFFSET, buffer.capacity())
.prefix(IPV6_PREFIX)
.payload_length((short) 0)
.next_header(IPV6_NEXT_HEADER_JUMBO)
.hop_limit(IPV6_HOP_LIMIT)
.src_addr_part1(IPV6_LOCAL_ADDRESS)
.src_addr_part2(source)
.dst_addr_part1(IPV6_LOCAL_ADDRESS)
.dst_addr_part2(destination)
.build();
ipv6JumboHeaderRW.wrap(buffer, IPV6_JUMBO_HEADER_OFFSET, buffer.capacity())
.prefix(IPV6_JUMBO_PREFIX)
.payload_length(payloadLength + IPV6_JUMBO_HEADER_SIZE)
.build();
}
else
{
ipv6HeaderRW.wrap(buffer, IPV6_HEADER_OFFSET, buffer.capacity())
.prefix(IPV6_PREFIX)
.payload_length((short) payloadLength)
.next_header(IPV6_NEXT_HEADER_TCP)
.hop_limit(IPV6_HOP_LIMIT)
.src_addr_part1(IPV6_LOCAL_ADDRESS)
.src_addr_part2(source)
.dst_addr_part1(IPV6_LOCAL_ADDRESS)
.dst_addr_part2(destination)
.build();
}
}

private void encodeTcpHeader(
MutableDirectBuffer buffer,
int ipv6JumboLength,
boolean initial,
long sequence,
long acknowledge,
Expand All @@ -745,7 +779,7 @@ private void encodeTcpHeader(
short sourcePort = initial ? TCP_SRC_PORT : TCP_DEST_PORT;
short destPort = initial ? TCP_DEST_PORT : TCP_SRC_PORT;

tcpHeaderRW.wrap(buffer, TCP_HEADER_OFFSET, buffer.capacity())
tcpHeaderRW.wrap(buffer, TCP_HEADER_OFFSET + ipv6JumboLength, buffer.capacity())
.src_port(sourcePort)
.dst_port(destPort)
.sequence_number((int) sequence)
Expand All @@ -759,11 +793,12 @@ private void encodeTcpHeader(

private void encodeZillaHeader(
MutableDirectBuffer buffer,
int ipv6JumboLength,
int frameTypeId,
int protocolTypeId)
{
buffer.putInt(ZILLA_HEADER_OFFSET, frameTypeId);
buffer.putInt(ZILLA_PROTOCOL_TYPE_OFFSET, protocolTypeId);
buffer.putInt(ZILLA_HEADER_OFFSET + ipv6JumboLength, frameTypeId);
buffer.putInt(ZILLA_PROTOCOL_TYPE_OFFSET + ipv6JumboLength, protocolTypeId);
}

private int encodeZillaLabels(
Expand Down
9 changes: 8 additions & 1 deletion incubator/command-dump/src/main/resources/META-INF/zilla/pcap.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,20 @@ scope pcap
{
int32 prefix; /* Version + Traffic class + Flow label = 32 bit */
int16 payload_length;
int16 next_header_and_hop_limit;
int8 next_header;
int8 hop_limit;
int64 src_addr_part1;
int64 src_addr_part2;
int64 dst_addr_part1;
int64 dst_addr_part2;
}

struct IPv6JumboHeader
{
int32 prefix; /* Next Header + Header Ext Length + Option Type + Option Data Length */
int32 payload_length;
}

struct TcpHeader
{
int16 src_port;
Expand Down