projects
/
org.ibex.mail.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d04327
)
more robustness in Main
author
adam
<adam@megacz.com>
Sat, 17 Mar 2007 08:58:59 +0000
(08:58 +0000)
committer
adam
<adam@megacz.com>
Sat, 17 Mar 2007 08:58:59 +0000
(08:58 +0000)
darcs-hash:
20070317085859
-5007d-
aaefab92a040390d9632afbfd775695e2b7ae321
.gz
src/org/ibex/mail/Main.java
patch
|
blob
|
history
diff --git
a/src/org/ibex/mail/Main.java
b/src/org/ibex/mail/Main.java
index
8bfa8c1
..
f354734
100644
(file)
--- a/
src/org/ibex/mail/Main.java
+++ b/
src/org/ibex/mail/Main.java
@@
-3,11
+3,10
@@
// You may not use this file except in compliance with the License.
package org.ibex.mail;
// You may not use this file except in compliance with the License.
package org.ibex.mail;
-import org.ibex.mail.target.*;
-import org.ibex.mail.protocol.*;
import org.ibex.util.*;
import org.ibex.jetty.*;
import org.ibex.io.*;
import org.ibex.util.*;
import org.ibex.jetty.*;
import org.ibex.io.*;
+import org.ibex.net.*;
import java.io.*;
import java.net.*;
import java.util.*;
import java.io.*;
import java.net.*;
import java.util.*;
@@
-34,14
+33,14
@@
public class Main {
System.setProperty("javax.net.ssl.keyStorePassword", "changeit");
SSLServerSocketFactory sslserversocketfactory =
(SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
System.setProperty("javax.net.ssl.keyStorePassword", "changeit");
SSLServerSocketFactory sslserversocketfactory =
(SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
- ServerSocket sslserversocket =
- (ServerSocket) sslserversocketfactory.createServerSocket(9999);
+ ServerSocket sslserversocket = (ServerSocket) sslserversocketfactory.createServerSocket(9999);
+ ServerSocket sock8025 = new ServerSocket(8025);
ServerSocket sock143 = new ServerSocket(143);
ServerSocket sock119 = new ServerSocket(119);
ServerSocket sock25 = new ServerSocket(25);
ServerSocket sock143 = new ServerSocket(143);
ServerSocket sock119 = new ServerSocket(119);
ServerSocket sock25 = new ServerSocket(25);
- ServerSocket sock8025 = new ServerSocket(8025);
- ServerSocket sock993 = new ServerSocket(993);
- ServerSocket sock563 = new ServerSocket(563);
+ ServerSocket sock465 = (ServerSocket) sslserversocketfactory.createServerSocket(465);
+ ServerSocket sock993 = (ServerSocket) sslserversocketfactory.createServerSocket(993);
+ ServerSocket sock563 = (ServerSocket) sslserversocketfactory.createServerSocket(563);
//ServerSocket sock995 = new ServerSocket(995);
//ServerSocket sock113 = new ServerSocket(113);
new Thread() {
//ServerSocket sock995 = new ServerSocket(995);
//ServerSocket sock113 = new ServerSocket(113);
new Thread() {
@@
-61,6
+60,7
@@
public class Main {
new Acceptor(sock143).start();
new Acceptor(sock119).start();
new Acceptor(sock25).start();
new Acceptor(sock143).start();
new Acceptor(sock119).start();
new Acceptor(sock25).start();
+ new Acceptor(sock465).start();
new Acceptor(sock8025).start();
new Acceptor(sock993).start();
new Acceptor(sock563).start();
new Acceptor(sock8025).start();
new Acceptor(sock993).start();
new Acceptor(sock563).start();
@@
-73,6
+73,8
@@
public class Main {
public Acceptor(ServerSocket ss) { this.ss = ss; }
public void run() {
try {
public Acceptor(ServerSocket ss) { this.ss = ss; }
public void run() {
try {
+ ss.setReuseAddress(true);
+
while(true) {
final Socket s = ss.accept();
try {
while(true) {
final Socket s = ss.accept();
try {
@@
-96,6
+98,8
@@
public class Main {
else if (conn.getLocalPort() == 119) new NNTP.Listener(auth).handleRequest(conn);
else if (conn.getLocalPort() == 563) new NNTP.Listener(auth).handleRequest(conn);
else if (conn.getLocalPort() == 25) new SMTP.Server().handleRequest(conn);
else if (conn.getLocalPort() == 119) new NNTP.Listener(auth).handleRequest(conn);
else if (conn.getLocalPort() == 563) new NNTP.Listener(auth).handleRequest(conn);
else if (conn.getLocalPort() == 25) new SMTP.Server().handleRequest(conn);
+ else if (conn.getLocalPort() == 465) new SMTP.Server().handleRequest(conn);
+ else if (conn.getLocalPort() == 465) new SMTP.Server().handleRequest(conn);
else if (conn.getLocalPort() == 8025) SMTP.whitelist.handleRequest(conn);
//else if (conn.getLocalPort() == 110) new POP3.Listener(auth).handleRequest(conn);
//else if (conn.getLocalPort() == 995) new POP3.Listener(auth).handleRequest(conn);
else if (conn.getLocalPort() == 8025) SMTP.whitelist.handleRequest(conn);
//else if (conn.getLocalPort() == 110) new POP3.Listener(auth).handleRequest(conn);
//else if (conn.getLocalPort() == 995) new POP3.Listener(auth).handleRequest(conn);