X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=f48b20547536d4ffcd3f6a240ebed854975bf2b3;hb=53bbea2c3dcdba5d4a66800cccd8c320d8548a69;hp=ac29809ba34af27ab440bd7feea70563462b8662;hpb=202d800ae7fa28b80ee047bed157e08a8afcc4f9;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index ac29809..f48b205 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.irc;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
@@ -58,8 +59,11 @@ import net.pterodactylus.irc.event.NicknameInUseReceived;
 import net.pterodactylus.irc.event.NoNicknameGivenReceived;
 import net.pterodactylus.irc.event.PrivateMessageReceived;
 import net.pterodactylus.irc.event.PrivateNoticeReceived;
+import net.pterodactylus.irc.event.ReplyReceived;
 import net.pterodactylus.irc.event.UnknownReplyReceived;
 import net.pterodactylus.irc.util.RandomNickname;
+import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
+import net.pterodactylus.xdcc.util.io.BandwidthCountingOutputStream;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Maps;
@@ -144,6 +148,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 	//
 
 	/**
+	 * Returns the hostname of the remote end of the connection.
+	 *
+	 * @return The remote’s hostname
+	 */
+	public String hostname() {
+		return hostname;
+	}
+
+	/**
+	 * Returns the port number of the remote end of the connection.
+	 *
+	 * @return The remote’s port number
+	 */
+	public int port() {
+		return port;
+	}
+
+	/**
 	 * Returns whether this connection has already been established.
 	 *
 	 * @return {@code true} as long as this connection is established, {@code
@@ -221,6 +243,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 	//
 
 	/**
+	 * Returns the current rate of the connection’s incoming side.
+	 *
+	 * @return The current input rate (in bytes per second)
+	 */
+	public long getInputRate() {
+		return (connectionHandler != null) ? connectionHandler.getInputRate() : 0;
+	}
+
+	/**
+	 * Returns the current rate of the connection’s outgoing side.
+	 *
+	 * @return The current output rate (in bytes per second)
+	 */
+	public long getOutputRate() {
+		return (connectionHandler != null) ? connectionHandler.getOutputRate() : 0;
+	}
+
+	/**
 	 * Checks whether the given source is the client represented by this
 	 * connection.
 	 *
@@ -285,7 +325,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 	 * 		if an I/O error occurs
 	 */
 	public void close() throws IOException {
-		connectionHandler.close();
+		if (connectionHandler != null) {
+			connectionHandler.close();
+		}
 	}
 
 	//
@@ -334,6 +376,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 
 			while (connected) {
 				Reply reply = connectionHandler.readReply();
+				eventBus.post(new ReplyReceived(this, reply));
 				logger.finest(String.format("<< %s", reply));
 				String command = reply.command();
 				List<String> parameters = reply.parameters();
@@ -472,6 +515,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		} catch (IOException ioe1) {
 			logger.log(Level.WARNING, "I/O error", ioe1);
 			eventBus.post(new ConnectionClosed(this, ioe1));
+		} catch (RuntimeException re1) {
+			logger.log(Level.SEVERE, "Runtime error", re1);
+			eventBus.post(new ConnectionClosed(this, re1));
 		} finally {
 			established = false;
 			logger.info("Closing Connection.");
@@ -511,7 +557,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 				}
 			} else if (messageWords[1].equalsIgnoreCase("ACCEPT")) {
 				Optional<Integer> port = Optional.fromNullable(Ints.tryParse(messageWords[3]));
-				long position = Optional.fromNullable(Longs.tryParse(messageWords[4])).or(-1L);
+				long position = (messageWords.length > 4) ? Optional.fromNullable(Longs.tryParse(messageWords[4])).or(-1L) : -1;
 				if (port.isPresent()) {
 					eventBus.post(new DccAcceptReceived(this, client, messageWords[2], port.get(), position));
 				} else {
@@ -571,7 +617,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 	private class ConnectionHandler implements Closeable {
 
 		/** The output stream of the connection. */
-		private final OutputStream outputStream;
+		private final BandwidthCountingOutputStream outputStream;
+
+		/** The input stream. */
+		private final BandwidthCountingInputStream inputStream;
 
 		/** The input stream of the connection. */
 		private final BufferedReader inputStreamReader;
@@ -588,8 +637,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		 * 		if the encoding (currently “UTF-8”) is not valid
 		 */
 		private ConnectionHandler(InputStream inputStream, OutputStream outputStream) throws UnsupportedEncodingException {
-			this.outputStream = outputStream;
-			inputStreamReader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+			this.outputStream = new BandwidthCountingOutputStream(outputStream, 5, SECONDS);
+			this.inputStream = new BandwidthCountingInputStream(inputStream, 5, SECONDS);
+			inputStreamReader = new BufferedReader(new InputStreamReader(this.inputStream, "UTF-8"));
 		}
 
 		//
@@ -597,6 +647,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		//
 
 		/**
+		 * Returns the current rate of the connection’s incoming side.
+		 *
+		 * @return The current input rate (in bytes per second)
+		 */
+		public long getInputRate() {
+			return inputStream.getCurrentRate();
+		}
+
+		/**
+		 * Returns the current rate of the connection’s outgoing side.
+		 *
+		 * @return The current output rate (in bytes per second)
+		 */
+		public long getOutputRate() {
+			return outputStream.getCurrentRate();
+		}
+
+		/**
 		 * Sends a command with the given parameters, skipping all {@link
 		 * Optional#absent()} optionals.
 		 *