X-Git-Url: https://git.pterodactylus.net/?p=xudocci.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2Fconnection%2FCtcpHandler.java;h=fb59ea751e1dc4a5a202f7db46f2638fa0777613;hp=8dc6933a126eb1f878f25c8b01323d75ead5cf7b;hb=HEAD;hpb=f9cf4d6e8deb6bcb1a9c8fe8e2d880ab6323e689 diff --git a/src/main/java/net/pterodactylus/irc/connection/CtcpHandler.java b/src/main/java/net/pterodactylus/irc/connection/CtcpHandler.java index 8dc6933..fb59ea7 100644 --- a/src/main/java/net/pterodactylus/irc/connection/CtcpHandler.java +++ b/src/main/java/net/pterodactylus/irc/connection/CtcpHandler.java @@ -81,7 +81,8 @@ public class CtcpHandler implements Handler { dccSendInformation.get().filename, dccSendInformation.get().internetAddress, dccSendInformation.get().port, - dccSendInformation.get().size)); + dccSendInformation.get().size, + dccSendInformation.get().token)); } else { logger.warn(format("Received malformed DCC SEND: “%s”", message)); } @@ -97,7 +98,11 @@ public class CtcpHandler implements Handler { if (!internetAddress.isPresent() || !port.isPresent()) { return absent(); } - return of(new DccSendInformation(messageWords[2], internetAddress.get(), port.get(), fileSize)); + String token = null; + if (messageWords.length > 6) { + token = messageWords[6]; + } + return of(new DccSendInformation(messageWords[2], internetAddress.get(), port.get(), fileSize, token)); } private static class DccSendInformation { @@ -106,13 +111,14 @@ public class CtcpHandler implements Handler { private final InetAddress internetAddress; private final int port; private final long size; + private final String token; - private DccSendInformation(String filename, - InetAddress internetAddress, int port, long size) { + private DccSendInformation(String filename, InetAddress internetAddress, int port, long size, String token) { this.filename = filename; this.internetAddress = internetAddress; this.port = port; this.size = size; + this.token = token; } }