LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PacketBuilder: correct IPv6 header payload length

Browse Source 
Ipv6 payload length doesn't include header length.

rfc8200 section 3
https://tools.ietf.org/html/rfc8200
Payload Length      16-bit unsigned integer. Length of the IPv6
                    payload, i.e., the rest of the packet
                    following this IPv6 header, in octets.

Bug: 215655463
Test: atest NetworkStaticLibTests
Change-Id: Ifdc871125b0fe2eb3a8909b8b0723a62dbe44bcf
This commit is contained in:
Hungming Chen
2022-05-27 17:51:02 +08:00
committed by Nucca Chen
parent ec25765f96
commit 690d1e15f5
2 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
staticlibs/device/com/android/net/module/util/PacketBuilder.java
View File

@@ -26,6 +26,7 @@ import static com.android.net.module.util.IpUtils.tcpChecksum;
import static com.android.net.module.util.IpUtils.udpChecksum; import static com.android.net.module.util.IpUtils.udpChecksum;
import static com.android.net.module.util.NetworkStackConstants.IPV4_CHECKSUM_OFFSET; import static com.android.net.module.util.NetworkStackConstants.IPV4_CHECKSUM_OFFSET;
import static com.android.net.module.util.NetworkStackConstants.IPV4_LENGTH_OFFSET; import static com.android.net.module.util.NetworkStackConstants.IPV4_LENGTH_OFFSET;
import static com.android.net.module.util.NetworkStackConstants.IPV6_HEADER_LEN;
import static com.android.net.module.util.NetworkStackConstants.IPV6_LEN_OFFSET; import static com.android.net.module.util.NetworkStackConstants.IPV6_LEN_OFFSET;
import static com.android.net.module.util.NetworkStackConstants.TCP_CHECKSUM_OFFSET; import static com.android.net.module.util.NetworkStackConstants.TCP_CHECKSUM_OFFSET;
import static com.android.net.module.util.NetworkStackConstants.UDP_CHECKSUM_OFFSET; import static com.android.net.module.util.NetworkStackConstants.UDP_CHECKSUM_OFFSET;
@@ -100,9 +101,9 @@ public class PacketBuilder {
*/ */
public void writeL2Header(MacAddress srcMac, MacAddress dstMac, short etherType) throws public void writeL2Header(MacAddress srcMac, MacAddress dstMac, short etherType) throws
IOException { IOException {
final EthernetHeader ethv4Header = new EthernetHeader(dstMac, srcMac, etherType); final EthernetHeader ethHeader = new EthernetHeader(dstMac, srcMac, etherType);
try { try {
ethv4Header.writeToByteBuffer(mBuffer); ethHeader.writeToByteBuffer(mBuffer);
} catch (IllegalArgumentException | BufferOverflowException e) { } catch (IllegalArgumentException | BufferOverflowException e) {
throw new IOException("Error writing to buffer: ", e); throw new IOException("Error writing to buffer: ", e);
} }
@@ -218,7 +219,7 @@ public class PacketBuilder {
*/ */
@NonNull @NonNull
public ByteBuffer finalizePacket() throws IOException { public ByteBuffer finalizePacket() throws IOException {
// Finalize IPv4 or IPv6 header. // [1] Finalize IPv4 or IPv6 header.
int ipHeaderOffset = INVALID_OFFSET; int ipHeaderOffset = INVALID_OFFSET;
if (mIpv4HeaderOffset != INVALID_OFFSET) { if (mIpv4HeaderOffset != INVALID_OFFSET) {
ipHeaderOffset = mIpv4HeaderOffset; ipHeaderOffset = mIpv4HeaderOffset;
@@ -234,13 +235,14 @@ public class PacketBuilder {
ipHeaderOffset = mIpv6HeaderOffset; ipHeaderOffset = mIpv6HeaderOffset;
// Populate the IPv6 payloadLength field. // Populate the IPv6 payloadLength field.
// The payload length doesn't include IPv6 header length. See rfc8200 section 3.
mBuffer.putShort(mIpv6HeaderOffset + IPV6_LEN_OFFSET, mBuffer.putShort(mIpv6HeaderOffset + IPV6_LEN_OFFSET,
(short) (mBuffer.position() - mIpv6HeaderOffset)); (short) (mBuffer.position() - mIpv6HeaderOffset - IPV6_HEADER_LEN));
} else { } else {
throw new IOException("Packet is missing neither IPv4 nor IPv6 header"); throw new IOException("Packet is missing neither IPv4 nor IPv6 header");
} }
// Finalize TCP or UDP header. // [2] Finalize TCP or UDP header.
if (mTcpHeaderOffset != INVALID_OFFSET) { if (mTcpHeaderOffset != INVALID_OFFSET) {
// Populate the TCP header checksum field. // Populate the TCP header checksum field.
mBuffer.putShort(mTcpHeaderOffset + TCP_CHECKSUM_OFFSET, tcpChecksum(mBuffer, mBuffer.putShort(mTcpHeaderOffset + TCP_CHECKSUM_OFFSET, tcpChecksum(mBuffer,

47
staticlibs/tests/unit/src/com/android/net/module/util/PacketBuilderTest.java
View File

@@ -24,7 +24,6 @@ import static android.system.OsConstants.IPPROTO_UDP;
import static com.android.net.module.util.NetworkStackConstants.ETHER_TYPE_IPV4; import static com.android.net.module.util.NetworkStackConstants.ETHER_TYPE_IPV4;
import static com.android.net.module.util.NetworkStackConstants.ETHER_TYPE_IPV6; import static com.android.net.module.util.NetworkStackConstants.ETHER_TYPE_IPV6;
import static com.android.net.module.util.NetworkStackConstants.IPV4_HEADER_MIN_LEN; import static com.android.net.module.util.NetworkStackConstants.IPV4_HEADER_MIN_LEN;
import static com.android.net.module.util.NetworkStackConstants.IPV6_HEADER_LEN;
import static com.android.net.module.util.NetworkStackConstants.TCPHDR_ACK; import static com.android.net.module.util.NetworkStackConstants.TCPHDR_ACK;
import static com.android.net.module.util.NetworkStackConstants.TCP_HEADER_MIN_LEN; import static com.android.net.module.util.NetworkStackConstants.TCP_HEADER_MIN_LEN;
import static com.android.net.module.util.NetworkStackConstants.UDP_HEADER_LEN; import static com.android.net.module.util.NetworkStackConstants.UDP_HEADER_LEN;
@@ -271,9 +270,8 @@ public class PacketBuilderTest {
// packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff", // packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff",
// type='IPv6') / // type='IPv6') /
// scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=48, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.UDP(sport=9876, dport=433)) // scapy.UDP(sport=9876, dport=433))
// Note that plen(48) = ipv6hdr(40) + udphdr(8).
// Ether header // Ether header
(byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd,
(byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22, (byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22,
@@ -281,7 +279,7 @@ public class PacketBuilderTest {
(byte) 0x86, (byte) 0xdd, (byte) 0x86, (byte) 0xdd,
// IP header // IP header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x30, (byte) 0x11, (byte) 0x40, (byte) 0x00, (byte) 0x08, (byte) 0x11, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -300,10 +298,9 @@ public class PacketBuilderTest {
// packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff", // packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff",
// type='IPv6') / // type='IPv6') /
// scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=52, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.UDP(sport=9876, dport=433) / // scapy.UDP(sport=9876, dport=433) /
// b'\xde\xad\xbe\xef') // b'\xde\xad\xbe\xef')
// Note that plen(52) = ipv6hdr(40) + udphdr(8) + data(4).
// Ether header // Ether header
(byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd,
(byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22, (byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22,
@@ -311,7 +308,7 @@ public class PacketBuilderTest {
(byte) 0x86, (byte) 0xdd, (byte) 0x86, (byte) 0xdd,
// IP header // IP header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x34, (byte) 0x11, (byte) 0x40, (byte) 0x00, (byte) 0x0c, (byte) 0x11, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -332,11 +329,10 @@ public class PacketBuilderTest {
// packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff", // packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff",
// type='IPv6') / // type='IPv6') /
// scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=64, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680, // scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680,
// flags='A', window=8192, urgptr=0) / // flags='A', window=8192, urgptr=0) /
// b'\xde\xad\xbe\xef') // b'\xde\xad\xbe\xef')
// Note that plen(64) = ipv6hdr(40) + udphdr(20) + data(4).
// Ether header // Ether header
(byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd,
(byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22, (byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22,
@@ -344,7 +340,7 @@ public class PacketBuilderTest {
(byte) 0x86, (byte) 0xdd, (byte) 0x86, (byte) 0xdd,
// IPv6 header // IPv6 header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x40, (byte) 0x06, (byte) 0x40, (byte) 0x00, (byte) 0x18, (byte) 0x06, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -368,10 +364,9 @@ public class PacketBuilderTest {
// packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff", // packet = (scapy.Ether(src="11:22:33:44:55:66", dst="aa:bb:cc:dd:ee:ff",
// type='IPv6') / // type='IPv6') /
// scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=60, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680, // scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680,
// flags='A', window=8192, urgptr=0)) // flags='A', window=8192, urgptr=0))
// Note that plen(60) = ipv6hdr(40) + udphdr(20).
// Ether header // Ether header
(byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd,
(byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22, (byte) 0xee, (byte) 0xff, (byte) 0x11, (byte) 0x22,
@@ -379,7 +374,7 @@ public class PacketBuilderTest {
(byte) 0x86, (byte) 0xdd, (byte) 0x86, (byte) 0xdd,
// IPv6 header // IPv6 header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x3c, (byte) 0x06, (byte) 0x40, (byte) 0x00, (byte) 0x14, (byte) 0x06, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -399,14 +394,13 @@ public class PacketBuilderTest {
private static final byte[] TEST_PACKET_IPV6HDR_TCPHDR_DATA = private static final byte[] TEST_PACKET_IPV6HDR_TCPHDR_DATA =
new byte[] { new byte[] {
// packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=64, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680, // scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680,
// flags='A', window=8192, urgptr=0) / // flags='A', window=8192, urgptr=0) /
// b'\xde\xad\xbe\xef') // b'\xde\xad\xbe\xef')
// Note that plen(64) = ipv6hdr(40) + udphdr(20) + data(4).
// IPv6 header // IPv6 header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x40, (byte) 0x06, (byte) 0x40, (byte) 0x00, (byte) 0x18, (byte) 0x06, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -428,13 +422,12 @@ public class PacketBuilderTest {
private static final byte[] TEST_PACKET_IPV6HDR_TCPHDR = private static final byte[] TEST_PACKET_IPV6HDR_TCPHDR =
new byte[] { new byte[] {
// packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=60, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680, // scapy.TCP(sport=9876, dport=433, seq=13579, ack=24680,
// flags='A', window=8192, urgptr=0)) // flags='A', window=8192, urgptr=0))
// Note that plen(60) = ipv6hdr(40) + udphdr(20).
// IPv6 header // IPv6 header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x3c, (byte) 0x06, (byte) 0x40, (byte) 0x00, (byte) 0x14, (byte) 0x06, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -454,12 +447,11 @@ public class PacketBuilderTest {
private static final byte[] TEST_PACKET_IPV6HDR_UDPHDR = private static final byte[] TEST_PACKET_IPV6HDR_UDPHDR =
new byte[] { new byte[] {
// packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=48, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.UDP(sport=9876, dport=433)) // scapy.UDP(sport=9876, dport=433))
// Note that plen(48) = ipv6hdr(40) + udphdr(8).
// IP header // IP header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x30, (byte) 0x11, (byte) 0x40, (byte) 0x00, (byte) 0x08, (byte) 0x11, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -476,13 +468,12 @@ public class PacketBuilderTest {
private static final byte[] TEST_PACKET_IPV6HDR_UDPHDR_DATA = private static final byte[] TEST_PACKET_IPV6HDR_UDPHDR_DATA =
new byte[] { new byte[] {
// packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80, // packet = (scapy.IPv6(src="2001:db8::1", dst="2001:db8::2", tc=0x80,
// fl=0x515ca, plen=52, hlim=0x40) / // fl=0x515ca, hlim=0x40) /
// scapy.UDP(sport=9876, dport=433) / // scapy.UDP(sport=9876, dport=433) /
// b'\xde\xad\xbe\xef') // b'\xde\xad\xbe\xef')
// Note that plen(52) = ipv6hdr(40) + udphdr(8) + data(4).
// IP header // IP header
(byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca, (byte) 0x68, (byte) 0x05, (byte) 0x15, (byte) 0xca,
(byte) 0x00, (byte) 0x34, (byte) 0x11, (byte) 0x40, (byte) 0x00, (byte) 0x0c, (byte) 0x11, (byte) 0x40,
(byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
@@ -653,12 +644,10 @@ public class PacketBuilderTest {
final int dataLength = hasData ? DATA.limit() : 0; final int dataLength = hasData ? DATA.limit() : 0;
if (l4proto == IPPROTO_TCP) { if (l4proto == IPPROTO_TCP) {
assertEquals(IPV6_HEADER_LEN + TCP_HEADER_MIN_LEN + dataLength, assertEquals(TCP_HEADER_MIN_LEN + dataLength, ipv6Header.payloadLength);
ipv6Header.payloadLength);
assertEquals((byte) IPPROTO_TCP, ipv6Header.nextHeader); assertEquals((byte) IPPROTO_TCP, ipv6Header.nextHeader);
} else if (l4proto == IPPROTO_UDP) { } else if (l4proto == IPPROTO_UDP) {
assertEquals(IPV6_HEADER_LEN + UDP_HEADER_LEN + dataLength, assertEquals(UDP_HEADER_LEN + dataLength, ipv6Header.payloadLength);
ipv6Header.payloadLength);
assertEquals((byte) IPPROTO_UDP, ipv6Header.nextHeader); assertEquals((byte) IPPROTO_UDP, ipv6Header.nextHeader);
} }
} }