[dmdirc commit] r5829 - trunk/modules/parser/src/com/dmdirc/parser/irc
com...@dmdirc.com
Date: 2010-01-24 18:53:04 +0000 (Sun, 24 Jan 2010)
New Revision: 5829
Modified:
trunk/modules/parser/src/com/dmdirc/parser/irc/IRCParser.java
Log:
Update submodules: parser
Git-version: 0.6.3m2-368-g3c37519
Modified: trunk/modules/parser/src/com/dmdirc/parser/irc/IRCParser.java
===================================================================
--- trunk/modules/parser/src/com/dmdirc/parser/irc/IRCParser.java 2010-01-24 16:53:04 UTC (rev 5828)
+++ trunk/modules/parser/src/com/dmdirc/parser/irc/IRCParser.java 2010-01-24 18:53:04 UTC (rev 5829)
@@ -163,6 +163,9 @@
/** Has the thread started execution yet, (Prevents run() being called multiple times). */
boolean hasBegan;
+ /** Connect timeout. */
+ private int connectTimeout = 5000;
+
/** Hashtable storing known prefix modes (ohv). */
final Map<Character, Long> prefixModes = new Hashtable<Character, Long>();
/**
@@ -418,13 +421,26 @@
/**
* Get the current Value of addLastLine.
- * This returns "this" and thus can be used in the construction line.
*
* @param newValue New value to set addLastLine
*/
public void setAddLastLine(final boolean newValue) { addLastLine = newValue; }
/**
+ * Get the current Value of connectTimeout.
+ *
+ * @return The value of getConnectTimeout.
+ */
+ public int getConnectTimeout() { return connectTimeout; }
+
+ /**
+ * Set the Value of connectTimeout.
+ *
+ * @param newValue new value for value of getConnectTimeout.
+ */
+ public void setConnectTimeout(final int newValue) { connectTimeout = newValue; }
+
+ /**
* Get the current socket State.
*
* @since 0.6.3m1
@@ -718,28 +734,26 @@
try {
try { ia.getSemaphore().acquire(); } catch (InterruptedException ex) { }
ia.addAuthentication(server);
- socket.connect(new InetSocketAddress(server.getHost(), server.getPort()));
+ socket.connect(new InetSocketAddress(server.getHost(), server.getPort()), connectTimeout);
} finally {
ia.removeAuthentication(server);
ia.getSemaphore().release();
}
} else {
callDebugInfo(DEBUG_SOCKET, "Not using Proxy");
- if (!server.getSSL()) {
- socket = new Socket();
+ socket = new Socket();
- if (bindIP != null && !bindIP.isEmpty()) {
- callDebugInfo(DEBUG_SOCKET, "Binding to IP: "+bindIP);
- try {
- socket.bind(new InetSocketAddress(InetAddress.getByName(bindIP), 0));
- } catch (IOException e) {
- callDebugInfo(DEBUG_SOCKET, "Binding failed: "+e.getMessage());
- }
+ if (bindIP != null && !bindIP.isEmpty()) {
+ callDebugInfo(DEBUG_SOCKET, "Binding to IP: "+bindIP);
+ try {
+ socket.bind(new InetSocketAddress(InetAddress.getByName(bindIP), 0));
+ } catch (IOException e) {
+ callDebugInfo(DEBUG_SOCKET, "Binding failed: "+e.getMessage());
}
+ }
- currentSocketState = SocketState.OPENING;
- socket.connect(new InetSocketAddress(server.getHost(), server.getPort()));
- }
+ currentSocketState = SocketState.OPENING;
+ socket.connect(new InetSocketAddress(server.getHost(), server.getPort()), connectTimeout);
}
if (server.getSSL()) {
@@ -751,22 +765,8 @@
sc.init(myKeyManagers, myTrustManager, new java.security.SecureRandom());
final SSLSocketFactory socketFactory = sc.getSocketFactory();
- if (server.getUseSocks()) {
- socket = socketFactory.createSocket(socket, server.getHost(), server.getPort(), false);
- } else {
- if (bindIP == null || bindIP.isEmpty()) {
- socket = socketFactory.createSocket(server.getHost(), server.getPort());
- } else {
- callDebugInfo(DEBUG_SOCKET, "Binding to IP: "+bindIP);
- try {
- socket = socketFactory.createSocket(server.getHost(), server.getPort(), InetAddress.getByName(bindIP), 0);
- } catch (UnknownHostException e) {
- callDebugInfo(DEBUG_SOCKET, "Bind failed: "+e.getMessage());
- socket = socketFactory.createSocket(server.getHost(), server.getPort());
- }
- }
- }
-
+ socket = socketFactory.createSocket(socket, server.getHost(), server.getPort(), false);
+
currentSocketState = SocketState.OPENING;
}