X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=88059ba2ab8b7ce8a56eca0a688cab278ddacc3e;hb=11a34fab9b919a200c58b17f36a4895d21dd1f16;hp=fd7748f5cd9e2fd88778e99fabdcc7cba4cbed1f;hpb=414efda90e3473263ebcf3e82aedb7c6d3ab0da8;p=xudocci.git diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java index fd7748f..88059ba 100644 --- a/src/main/java/net/pterodactylus/irc/Connection.java +++ b/src/main/java/net/pterodactylus/irc/Connection.java @@ -27,7 +27,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.UnsupportedEncodingException; +import java.net.InetAddress; import java.net.Socket; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -37,25 +39,33 @@ import java.util.logging.Logger; import javax.net.SocketFactory; import net.pterodactylus.irc.event.ChannelJoined; +import net.pterodactylus.irc.event.ChannelLeft; import net.pterodactylus.irc.event.ChannelMessageReceived; import net.pterodactylus.irc.event.ChannelNicknames; import net.pterodactylus.irc.event.ChannelNotJoined; import net.pterodactylus.irc.event.ChannelNotJoined.Reason; import net.pterodactylus.irc.event.ChannelTopic; +import net.pterodactylus.irc.event.ClientQuit; +import net.pterodactylus.irc.event.ConnectionClosed; import net.pterodactylus.irc.event.ConnectionEstablished; import net.pterodactylus.irc.event.ConnectionFailed; +import net.pterodactylus.irc.event.DccAcceptReceived; +import net.pterodactylus.irc.event.DccSendReceived; import net.pterodactylus.irc.event.MotdReceived; +import net.pterodactylus.irc.event.NicknameChanged; import net.pterodactylus.irc.event.NicknameInUseReceived; import net.pterodactylus.irc.event.NoNicknameGivenReceived; import net.pterodactylus.irc.event.PrivateMessageReceived; import net.pterodactylus.irc.event.UnknownReplyReceived; import net.pterodactylus.irc.util.RandomNickname; -import com.beust.jcommander.internal.Maps; -import com.beust.jcommander.internal.Sets; import com.google.common.base.Optional; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.common.eventbus.EventBus; import com.google.common.io.Closeables; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import com.google.common.util.concurrent.AbstractExecutionThreadService; import com.google.common.util.concurrent.Service; @@ -105,6 +115,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic /** The connection handler. */ private ConnectionHandler connectionHandler; + /** Whether the connection has already been established. */ + private boolean established; + /** * Creates a new connection. * @@ -129,6 +142,16 @@ public class Connection extends AbstractExecutionThreadService implements Servic // /** + * Returns whether this connection has already been established. + * + * @return {@code true} as long as this connection is established, {@code + * false} otherwise + */ + public boolean established() { + return established; + } + + /** * Returns the nickname that is currently in use by this connection. The * nickname is only available once the connection has been {@link #start()}ed. * @@ -160,7 +183,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic * * @param username * The username to use - * @return + * @return This connection */ public Connection username(String username) { this.username = Optional.fromNullable(username); @@ -196,11 +219,23 @@ public class Connection extends AbstractExecutionThreadService implements Servic // /** + * Checks whether the given source is the client represented by this + * connection. + * + * @param source + * The source to check + * @return {@code true} if this connection represents the given source, {@code + * false} otherwise + */ + public boolean isSource(Source source) { + return source.nick().isPresent() && source.nick().get().equals(nickname); + } + + /** * Joins the given channel. * * @param channel * The channel to join - * @return {@code true} if the channel was joined, {@code false} otherwise * @throws IOException * if an I/O error occurs */ @@ -208,6 +243,39 @@ public class Connection extends AbstractExecutionThreadService implements Servic connectionHandler.sendCommand("JOIN", channel); } + /** + * Sends a message to the given recipient, which may be a channel or another + * nickname. + * + * @param recipient + * The recipient of the message + * @param message + * The message + * @throws IOException + * if an I/O error occurs + */ + public void sendMessage(String recipient, String message) throws IOException { + connectionHandler.sendCommand("PRIVMSG", recipient, message); + } + + /** + * Sends a DCC RESUME request to the given recipient. + * + * @param recipient + * The recipient of the request + * @param filename + * The name of the file to resume + * @param port + * The port number from the original DCC SEND request + * @param position + * The position at which to resume the transfer + * @throws IOException + * if an I/O error occurs + */ + public void sendDccResume(String recipient, String filename, int port, long position) throws IOException { + connectionHandler.sendCommand("PRIVMSG", recipient, String.format("\u0001DCC RESUME %s %d %d\u0001", filename, port, position)); + } + // // ABSTRACTEXECUTIONTHREADSERVICE METHODS // @@ -261,10 +329,35 @@ public class Connection extends AbstractExecutionThreadService implements Servic /* most common events. */ if (command.equalsIgnoreCase("PRIVMSG")) { String recipient = parameters.get(0); - if (!channelTypes.contains(recipient.charAt(0))) { - eventBus.post(new PrivateMessageReceived(this, reply.source().get(), parameters.get(1))); + String message = parameters.get(1); + if (message.startsWith("\u0001") && message.endsWith("\u0001")) { + /* CTCP! */ + String[] messageWords = message.substring(1, message.length() - 1).split(" +"); + String ctcpCommand = messageWords[0]; + if (ctcpCommand.equalsIgnoreCase("DCC")) { + if (messageWords[1].equalsIgnoreCase("SEND")) { + Optional inetAddress = parseInetAddress(messageWords[3]); + Optional port = Optional.fromNullable(Ints.tryParse(messageWords[4])); + long fileSize = Optional.fromNullable(Longs.tryParse(messageWords[5])).or(-1L); + if (inetAddress.isPresent() && port.isPresent()) { + eventBus.post(new DccSendReceived(this, reply.source().get(), messageWords[2], inetAddress.get(), port.get(), fileSize)); + } else { + logger.warning(String.format("Received malformed DCC SEND: “%s”", message)); + } + } else if (messageWords[1].equalsIgnoreCase("ACCEPT")) { + Optional port = Optional.fromNullable(Ints.tryParse(messageWords[3])); + long position = Optional.fromNullable(Longs.tryParse(messageWords[4])).or(-1L); + if (port.isPresent()) { + eventBus.post(new DccAcceptReceived(this, reply.source().get(), messageWords[2], port.get(), position)); + } else { + logger.warning(String.format("Received malformed DCC ACCEPT: “%s”", message)); + } + } + } + } else if (!channelTypes.contains(recipient.charAt(0))) { + eventBus.post(new PrivateMessageReceived(this, reply.source().get(), message)); } else { - eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), parameters.get(1))); + eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), message)); } /* replies 001-004 don’t hold information but they have to be sent on a successful connection. */ @@ -321,6 +414,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic eventBus.post(new NicknameInUseReceived(this, reply)); } + /* client stuff. */ + } else if (command.equalsIgnoreCase("NICK")) { + eventBus.post(new NicknameChanged(this, reply.source().get(), parameters.get(0))); + /* channel stuff. */ } else if (command.equalsIgnoreCase("JOIN")) { eventBus.post(new ChannelJoined(this, parameters.get(0), reply.source().get())); @@ -339,6 +436,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic } else if (command.equals("366")) { eventBus.post(new ChannelNicknames(this, parameters.get(1), nicks)); nicks.clear(); + } else if (command.equalsIgnoreCase("PART")) { + eventBus.post(new ChannelLeft(this, parameters.get(0), reply.source().get(), getOptional(parameters, 1))); + } else if (command.equalsIgnoreCase("QUIT")) { + eventBus.post(new ClientQuit(this, reply.source().get(), parameters.get(0))); /* common channel join errors. */ } else if (command.equals("474")) { @@ -359,13 +460,17 @@ public class Connection extends AbstractExecutionThreadService implements Servic if ((connectionStatus == 0x0f) && (connectionStatus != oldConnectionStatus)) { /* connection succeeded! */ + established = true; eventBus.post(new ConnectionEstablished(this)); } oldConnectionStatus = connectionStatus; } + eventBus.post(new ConnectionClosed(this)); } catch (IOException ioe1) { logger.log(Level.WARNING, "I/O error", ioe1); + eventBus.post(new ConnectionClosed(this, ioe1)); } finally { + established = false; logger.info("Closing Connection."); try { Closeables.close(connectionHandler, true); @@ -400,6 +505,32 @@ public class Connection extends AbstractExecutionThreadService implements Servic return Optional.absent(); } + /** + * Parses the given {@code ip} and returns an {@link InetAddress} from it. + * + * @param ip + * The IP to parse + * @return The parsed inet address, or {@link Optional#absent()} if no inet + * address could be parsed + */ + private Optional parseInetAddress(String ip) { + Long ipNumber = Longs.tryParse(ip); + if (ipNumber == null) { + return Optional.absent(); + } + + StringBuilder hostname = new StringBuilder(15); + hostname.append((ipNumber >>> 24) & 0xff).append('.'); + hostname.append((ipNumber >>> 16) & 0xff).append('.'); + hostname.append((ipNumber >>> 8) & 0xff).append('.'); + hostname.append(ipNumber & 0xff); + try { + return Optional.of(InetAddress.getByName(hostname.toString())); + } catch (UnknownHostException uhe1) { + return Optional.absent(); + } + } + /** Handles input and output for the connection. */ private class ConnectionHandler implements Closeable { @@ -447,7 +578,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic setParameters.add(maybeSetParameter.get()); } } - sendCommand(command, setParameters.toArray(new String[0])); + sendCommand(command, setParameters.toArray(new String[setParameters.size()])); } /**