Merge pull request #114 from ShaneMcC/DisconnectQuit

Send QUIT on disconnect. (Close #7)

common/src/com/dmdirc/parser/common/QueuePriority.java

@@ -26,6 +26,8 @@ package com.dmdirc.parser.common;
  * Queue Priority.
  */
 public enum QueuePriority {
+    /** Immediate priority (Skip Queue). */
+    IMMEDIATE,
     /** High priority. */
     HIGH,
     /** Normal priority. */

irc/src/com/dmdirc/parser/irc/IRCParser.java

@@ -52,6 +52,7 @@ import com.dmdirc.parser.irc.events.IRCDataOutEvent;
 import com.dmdirc.parser.irc.outputqueue.OutputQueue;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.URI;
@@ -207,9 +208,9 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
     protected SocketState currentSocketState = SocketState.NULL;
     /**
      * The underlying socket used for reading/writing to the IRC server.
-     * For normal sockets this will be the same as {@link #socket} but for SSL
+     * For normal sockets this will be the same as {@link #mySocket} but for SSL
      * connections this will be the underlying {@link Socket} while
-     * {@link #socket} will be an {@link SSLSocket}.
+     * {@link #mySocket} will be an {@link SSLSocket}.
      */
     private Socket rawSocket;
     /** Used for writing to the server. */
@@ -739,7 +740,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
 
         rawSocket = getSocketFactory().createSocket(connectUri.getHost(), connectUri.getPort());
 
-        final Socket socket;
+        final Socket mySocket;
         if (getURI().getScheme().endsWith("s")) {
             callDebugInfo(DEBUG_SOCKET, "Server is SSL.");
 
@@ -751,27 +752,27 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
             sc.init(myKeyManagers, myTrustManager, new SecureRandom());
 
             final SSLSocketFactory socketFactory = sc.getSocketFactory();
-            socket = socketFactory.createSocket(rawSocket, getURI().getHost(), getURI()
+            mySocket = socketFactory.createSocket(rawSocket, getURI().getHost(), getURI()
                     .getPort(), false);
 
             // Manually start a handshake so we get proper SSL errors here,
             // and so that we can control the connection timeout
-            final int timeout = socket.getSoTimeout();
-            socket.setSoTimeout(10000);
-            ((SSLSocket) socket).startHandshake();
-            socket.setSoTimeout(timeout);
+            final int timeout = mySocket.getSoTimeout();
+            mySocket.setSoTimeout(10000);
+            ((SSLSocket) mySocket).startHandshake();
+            mySocket.setSoTimeout(timeout);
 
             currentSocketState = SocketState.OPENING;
         } else {
-            socket = rawSocket;
+            mySocket = rawSocket;
         }
 
         callDebugInfo(DEBUG_SOCKET, "\t-> Opening socket output stream PrintWriter");
-        out.setOutputStream(socket.getOutputStream());
+        out.setOutputStream(mySocket.getOutputStream());
         out.setQueueEnabled(true);
         currentSocketState = SocketState.OPEN;
         callDebugInfo(DEBUG_SOCKET, "\t-> Opening socket input stream BufferedReader");
-        in = new IRCReader(socket.getInputStream(), encoder);
+        in = new IRCReader(mySocket.getInputStream(), encoder);
         callDebugInfo(DEBUG_SOCKET, "\t-> Socket Opened");
     }
 
@@ -1724,17 +1725,22 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
 
     @Override
     public void quit(final String reason) {
-        sendString("QUIT", reason);
+        // Don't attempt to send anything further.
+        getOutputQueue().clearQueue();
+        final String output = (reason == null || reason.isEmpty()) ? "QUIT" : "QUIT :" + reason;
+        doSendString(output, QueuePriority.IMMEDIATE, true);
+        // Don't bother queueing anything else.
+        getOutputQueue().setDiscarding(true);
     }
 
     @Override
     public void disconnect(final String message) {
         super.disconnect(message);
         if (currentSocketState == SocketState.OPENING || currentSocketState == SocketState.OPEN) {
-            currentSocketState = SocketState.CLOSING;
             if (got001) {
                 quit(message);
             }
+            currentSocketState = SocketState.CLOSING;
         }
 
         try {

irc/src/com/dmdirc/parser/irc/outputqueue/OutputQueue.java

@@ -38,6 +38,8 @@ public class OutputQueue {
     private PrintWriter out;
     /** Is queueing enabled? */
     private boolean queueEnabled = true;
+    /** Are we discarding all futher input? */
+    private boolean discarding = false;
     /** The output queue! */
     private final BlockingQueue<QueueItem> queue = new PriorityBlockingQueue<>();
     /** Object for synchronising access to the {@link #queueHandler}. */
@@ -111,6 +113,8 @@ public class OutputQueue {
         final boolean old = this.queueEnabled;
         this.queueEnabled = queueEnabled;
 
+        // If the new value is not the same as the old one, and we used to be enabled
+        // then flush the queue.
         if (old != queueEnabled && old) {
             synchronized (queueHandlerLock) {
                 if (queueHandler != null) {
@@ -129,6 +133,24 @@ public class OutputQueue {
         }
     }
 
+    /**
+     * Should we be discarding?
+     *
+     * @param newValue true to enable discarding.
+     */
+    public void setDiscarding(final boolean newValue) {
+        discarding = newValue;
+    }
+
+    /**
+     * Are we discarding?
+     *
+     * @return true if discarding
+     */
+    public boolean isDiscarding() {
+        return discarding;
+    }
+
     /**
      * Clear the queue and stop the thread that is sending stuff.
      */
@@ -174,11 +196,12 @@ public class OutputQueue {
      * @param priority Priority of item (ignored if queue is disabled)
      */
     public void sendLine(final String line, final QueuePriority priority) {
+        if (discarding) { return; }
         if (out == null) {
             throw new NullPointerException("No output stream has been set.");
         }
 
-        if (queueEnabled) {
+        if (queueEnabled && priority != QueuePriority.IMMEDIATE) {
             synchronized (queueHandlerLock) {
                 if (queueHandler == null || !queueHandler.isAlive()) {
                     queueHandler = queueFactory.getQueueHandler(this, queue, out);