bogus patch

[org.ibex.mail.git] / src / org / ibex / mail / Main.java

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index f607f5f..bafbebb 100644 (file)
--- a/src/org/ibex/mail/Main.java
+++ b/src/org/ibex/mail/Main.java
@@ -2,53 +2,24 @@ package org.ibex.mail;
 import org.ibex.mail.target.*;
 import org.ibex.mail.protocol.*;
 import org.ibex.util.*;
+import org.ibex.jinetd.*;
+import org.ibex.io.*;
 import java.io.*;
 import java.net.*;
 import java.util.*;
 
-public class Main {
+public class Main implements Listener {
 
-    /*
-    public static class Resin {
-        new extends com.caucho.server.port.Protocol() {
-            public String getProtocolName() { return "imap"; }
-            public com.caucho.server.port.ServerRequest createRequest(com.caucho.server.connection.Connection conn) {
-                try {
-                    return new Listener(conn);
-                } catch (Exception e) {
-                    Log.error(this, e);
-                    return null;
-                }
-            }
+    public void accept(Connection conn) {
+        Log.error(this, "connection port is " + conn.getLocalPort());
+        if (conn.getLocalPort() == 25) {
+            new SMTP.Server().handleRequest(conn);
+        } else if (conn.getLocalPort() == 143) {
+            new IMAP.Listener().handleRequest(conn);
         }
-
-    public SMTP() { }
-    public String getProtocolName() { return "smtp"; }
-    public com.caucho.server.port.ServerRequest createRequest(com.caucho.server.connection.Connection conn) {
-       try {
-           return new Server(conn);
-       } catch (Exception e) {
-           Log.error(this, e);
-           return null;
-       }
-    }
-
+        conn.close();
     }
 
-    public static void main(String[] s) throws Exception {
-
-        // set up logging
-        String logto = System.getProperty("ibex.mail.root", File.separatorChar + "var" + File.separatorChar + "org.ibex.mail");
-        logto += File.separatorChar + "log";
-
-        //Log.file(logto);
-       Log.color = true;
-
-        new IMAPThread().start();
-        new SMTPThread().start();
-
-    }
-    */
     public static class BogusAuthenticator implements IMAP.Server.Authenticator {
         final Mailbox root =
            FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT, true).slash("user", true).slash("megacz", true);
@@ -57,56 +28,5 @@ public class Main {
             return null;
         }
     }
-    /*
-    private static class IMAPThread extends Thread {
-        final int port = Integer.parseInt(System.getProperty("ibex.mail.imap.port", "143"));
-        public void run() {
-            try {
-                Log.info(this, "binding to port " + port + "...");
-                ServerSocket ss = new ServerSocket(port);
-                Log.info(this, "listening for connections...");
-                for(;;) {
-                    final Socket sock = ss.accept();
-                    new Thread() {
-                        public void run() {
-                            try {
-                                new IMAP.Listener(sock, "megacz.com", new BogusAuthenticator()).handle();
-                            } catch (Exception e) {
-                                Log.warn(this, e);
-                            }
-                        }
-                    }.start();
-                }
-            } catch (Exception e) {
-                Log.warn(this, e);
-            }
-        }
-    }
 
-    private static class SMTPThread extends Thread {
-        final int port = Integer.parseInt(System.getProperty("ibex.mail.smtp.port", "25"));
-        public void run() {
-            try {
-                Log.info(this, "binding to port " + port + "...");
-                ServerSocket ss = new ServerSocket(port);
-                Log.info(this, "listening for connections...");
-                while(true) {
-                    final Socket sock = ss.accept();
-                    final SMTP.Server smtp = new SMTP.Server(sock, "megacz.com");
-                    new Thread() {
-                        public void run() {
-                            try {
-                                smtp.handle();
-                            } catch (Exception e) {
-                                Log.warn(this, e);
-                            }
-                        }
-                    }.start();
-                }
-            } catch (Exception e) {
-                Log.warn(this, e);
-            }
-        }
-    }
-    */
 }