Skip to content

[Fix] TCP buffer not flushing without PSH flag #127

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

Open
utkabobr wants to merge 2 commits into
base: 1.20.1
Choose a base branch
from
Open

[Fix] TCP buffer not flushing without PSH flag #127

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
a7b41f2
Fix TCP buffer not flushing without PSH flag
utkabobr Mar 12, 2026
4e70b63
Fix ConcurrentModificationException in onStop
utkabobr Mar 12, 2026
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
4 changes: 3 additions & 1 deletion src/main/java/li/cil/oc2/common/inet/DefaultTransportLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,9 @@ public Optional<Tag> onSave() {

@Override
public void onStop() {
for (final SessionBase session : sessions.values()) {
// Avoid concurrent modifications
final HashMap<SessionDiscriminator<?>, SessionBase> clone = new HashMap<>(sessions);
for (final SessionBase session : clone.values()) {
session.expire();
sessionLayer.sendSession(session, null);
closeSession(session);
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/li/cil/oc2/common/inet/StreamSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,13 @@ SessionActions send(final StreamSessionImpl session, final ByteBuffer segment) {
}
}
session.vmWindow = header.window;
if (header.psh) {
// Data to be sent
session.vmSequence += length;
final ByteBuffer sendBuffer = session.sendBuffer;
sendBuffer.compact();
sendBuffer.put(segment);
sendBuffer.flip();
// Data to be sent
session.vmSequence += length;
final ByteBuffer sendBuffer = session.sendBuffer;
sendBuffer.compact();
sendBuffer.put(segment);
sendBuffer.flip();
if (header.psh || length > 0) {
session.needsAcknowledgment = true;
}
if (header.fin) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/li/cil/oc2/common/inet/TcpHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void acceptConnection(final int sequence, final int acknowledgment, final
}

public boolean isAcceptanceOrRejectionAcknowledged() {
return !syn && !urg && ack && !psh && !rst && !fin;
return !syn && !urg && ack && !rst && !fin;
}

public void rejectConnection(final int sequence, final int acknowledgment) {
Expand Down