adjusted for changes to jinetd

darcs-hash:20050324074203-5007d-623d39275654ce246daec21ea7230d051e33f86b.gz

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index f3465c8..0095b1e 100644 (file)
--- a/src/org/ibex/mail/Main.java
+++ b/src/org/ibex/mail/Main.java
@@ -16,7 +16,7 @@ import org.ibex.crypto.*;
 
 public class Main implements Listener {
 
-    public void accept(Connection conn) {
+    public boolean accept(Connection conn) {
         try {
             if      (conn.getLocalPort() == 143)  new IMAP.Listener(auth).handleRequest(conn);
             else if (conn.getLocalPort() == 25)   new SMTP.Server().handleRequest(conn);
@@ -24,6 +24,8 @@ public class Main implements Listener {
             else if (conn.getLocalPort() == 8099) GMail.handleRequest(conn);
             else if (conn.getLocalPort() == 8080) Jetty.instance().accept(conn);
             else if (conn.getLocalPort() == 80)   Jetty.instance().accept(conn);
+           else return false;
+           return true;
         } finally {
             conn.close();
         }

diff --git a/src/org/ibex/mail/protocol/GMail.java b/src/org/ibex/mail/protocol/GMail.java
index 02b85e4..aadfa41 100644 (file)
--- a/src/org/ibex/mail/protocol/GMail.java
+++ b/src/org/ibex/mail/protocol/GMail.java
@@ -6,7 +6,6 @@ package org.ibex.mail.protocol;
 import org.ibex.crypto.*;
 import org.ibex.mail.protocol.*;
 import org.ibex.jinetd.Listener;
-import org.ibex.jinetd.Worker;
 import org.ibex.mail.*;
 import org.ibex.util.*;
 import org.ibex.net.*;

diff --git a/src/org/ibex/mail/protocol/IMAP.java b/src/org/ibex/mail/protocol/IMAP.java
index d8ada8d..c84fa78 100644 (file)
--- a/src/org/ibex/mail/protocol/IMAP.java
+++ b/src/org/ibex/mail/protocol/IMAP.java
@@ -6,7 +6,6 @@ package org.ibex.mail.protocol;
 import org.ibex.io.*;
 import org.ibex.crypto.*;
 import org.ibex.jinetd.Listener;
-import org.ibex.jinetd.Worker;
 import org.ibex.mail.*;
 import org.ibex.util.*;
 import org.ibex.mail.target.*;
@@ -245,7 +244,7 @@ public class IMAP {
     // Single Session Handler //////////////////////////////////////////////////////////////////////////////
 
     /** takes an IMAP.Server and exposes it to the world as an IMAP server on a TCP socket */
-    public static class Listener implements Worker, Client {
+    public static class Listener implements Client {
         String selectedName = null;
         Mailbox inbox = null, root = null;
         Server api;

diff --git a/src/org/ibex/mail/protocol/Mbox.java b/src/org/ibex/mail/protocol/Mbox.java
index 108fefa..5f1a2d0 100644 (file)
--- a/src/org/ibex/mail/protocol/Mbox.java
+++ b/src/org/ibex/mail/protocol/Mbox.java
@@ -6,7 +6,6 @@ package org.ibex.mail.protocol;
 import org.ibex.io.*;
 import org.ibex.crypto.*;
 import org.ibex.jinetd.Listener;
-import org.ibex.jinetd.Worker;
 import org.ibex.mail.*;
 import org.ibex.util.*;
 import org.ibex.mail.target.*;

diff --git a/src/org/ibex/mail/protocol/NNTP.java b/src/org/ibex/mail/protocol/NNTP.java
index c0f9517..dde6a85 100644 (file)
--- a/src/org/ibex/mail/protocol/NNTP.java
+++ b/src/org/ibex/mail/protocol/NNTP.java
@@ -108,7 +108,7 @@ public class NNTP {
         public String[] newnews(String[] groups, Date d, String[] distributions) { /* FIXME */  return null; }
     }
 
-    public static class Listener implements Worker {
+    public static class Listener {
         private Server api = null;
         private Login login;
         private Connection conn;

diff --git a/src/org/ibex/mail/protocol/POP3.java b/src/org/ibex/mail/protocol/POP3.java
index 921d0be..fd16972 100644 (file)
--- a/src/org/ibex/mail/protocol/POP3.java
+++ b/src/org/ibex/mail/protocol/POP3.java
@@ -29,7 +29,7 @@ public interface POP3 {
         public String[] uidl();         // FIXME, also needs message number
     }
 
-    public static class Listener implements Worker {
+    public static class Listener {
         Server api = null;
         public void handleRequest(Connection conn) {
             conn.setTimeout(30 * 60 * 1000);

diff --git a/src/org/ibex/mail/protocol/SMTP.java b/src/org/ibex/mail/protocol/SMTP.java
index 2fc51a3..cbba7ea 100644 (file)
--- a/src/org/ibex/mail/protocol/SMTP.java
+++ b/src/org/ibex/mail/protocol/SMTP.java
@@ -5,7 +5,6 @@
 package org.ibex.mail.protocol;
 import org.ibex.mail.*;
 import org.ibex.mail.target.*;
-import org.ibex.jinetd.Worker;
 import org.ibex.util.*;
 import org.ibex.io.*;
 import java.net.*;
@@ -44,7 +43,7 @@ public class SMTP {
 
     // Server //////////////////////////////////////////////////////////////////////////////
 
-    public static class Server implements Worker {
+    public static class Server {
         public void handleRequest(Connection conn) {
             conn.setTimeout(5 * 60 * 1000);
             conn.setNewline("\r\n");