Skip to content
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

Allow the QuicConnectionIdGenerator also take the source connection i… #766

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Allow the QuicConnectionIdGenerator also take the source connection i… #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18c4b22
Allow the QuicConnectionIdGenerator also take the source connection i…
normanmaurer Dec 11, 2024
4bc4b85
Fix
normanmaurer Dec 12, 2024
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
8 changes: 8 additions & 0 deletions codec-classes-quic/src/main/java/io/netty/incubator/codec/quic/QuicCodecDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,14 @@ public ByteBuffer newId(ByteBuffer input, int length) {
return idGenerator.newId(input, length);
}

@Override
public ByteBuffer newId(ByteBuffer scid, ByteBuffer dcid, int length) {
if (length > Short.BYTES) {
return encodeIdx(idGenerator.newId(scid, dcid, length - Short.BYTES), idx);
}
return idGenerator.newId(scid, dcid, length);
}

@Override
public int maxConnectionIdLength() {
return idGenerator.maxConnectionIdLength();
Expand Down
13 changes: 13 additions & 0 deletions ...c-classes-quic/src/main/java/io/netty/incubator/codec/quic/QuicConnectionIdGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,19 @@ public interface QuicConnectionIdGenerator {
*/
ByteBuffer newId(ByteBuffer input, int length);

/**
* Creates a new connection id with the given length. The given source connection id and destionation connection id
* may be used to sign or seed the id, or may be ignored (depending on the implementation).
*
* @param scid the source connection id which may be used to generate the id.
* @param dcid the destination connection id which may be used to generate the id.
* @param length the length of the id.
* @return the id.
*/
default ByteBuffer newId(ByteBuffer scid, ByteBuffer dcid, int length) {
return newId(dcid, length);
}

/**
* Returns the maximum length of a connection id.
*
Expand Down
8 changes: 6 additions & 2 deletions codec-classes-quic/src/main/java/io/netty/incubator/codec/quic/QuicheQuicServerCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ private QuicheQuicChannel handleServer(ChannelHandlerContext ctx, InetSocketAddr
// The remote peer did not send a token.
if (tokenHandler.writeToken(mintTokenBuffer, dcid, sender)) {
ByteBuffer connId = connectionIdAddressGenerator.newId(
dcid.internalNioBuffer(dcid.readerIndex(), dcid.readableBytes()), localConnIdLength);
scid.internalNioBuffer(scid.readerIndex(), scid.readableBytes()),
dcid.internalNioBuffer(dcid.readerIndex(), dcid.readableBytes()),
localConnIdLength);
connIdBuffer.writeBytes(connId);

ByteBuf out = ctx.alloc().directBuffer(Quic.MAX_DATAGRAM_SIZE);
Expand Down Expand Up @@ -205,7 +207,9 @@ private QuicheQuicChannel handleServer(ChannelHandlerContext ctx, InetSocketAddr
if (noToken) {
connIdBuffer.clear();
key = connectionIdAddressGenerator.newId(
dcid.internalNioBuffer(dcid.readerIndex(), dcid.readableBytes()), localConnIdLength);
scid.internalNioBuffer(scid.readerIndex(), scid.readableBytes()),
dcid.internalNioBuffer(dcid.readerIndex(), dcid.readableBytes()),
localConnIdLength);
connIdBuffer.writeBytes(key.duplicate());
scidAddr = Quiche.readerMemoryAddress(connIdBuffer);
scidLen = localConnIdLength;
Expand Down
Loading