[Azureus-commitlog] azureus2/org/gudy/azureus2/core3/ipchecker/natchecker NatCheckerServer.java,1.8,1.9

[Alon R. <no...@us...>]

Update of /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/ipchecker/natchecker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22682/org/gudy/azureus2/core3/ipchecker/natchecker

Modified Files:
	NatCheckerServer.java 
Log Message:
More network code refactoring.

Index: NatCheckerServer.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/ipchecker/natchecker/NatCheckerServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NatCheckerServer.java	5 Feb 2005 00:46:04 -0000	1.8
+++ NatCheckerServer.java	20 Apr 2005 08:03:04 -0000	1.9
@@ -23,13 +23,14 @@
 
 import java.net.*;
 import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
 
 import org.gudy.azureus2.core3.config.*;
 import org.gudy.azureus2.core3.logging.LGLogger;
 import org.gudy.azureus2.core3.util.*;
 
 import com.aelitis.azureus.core.networkmanager.*;
+import com.aelitis.azureus.core.peermanager.messaging.*;
+import com.aelitis.azureus.core.peermanager.messaging.azureus.*;
 
 
 
@@ -70,16 +71,16 @@
           }
         };
         
-        NetworkManager.getSingleton().getIncomingSocketChannelManager().registerMatchBytes( 
+        NetworkManager.getSingleton().requestIncomingConnectionRouting(
             matcher,
-            new IncomingSocketChannelManager.MatchListener() {
-              public void connectionMatched( SocketChannel channel, ByteBuffer read_so_far ) {
-                LGLogger.log( "Incoming connection from [" +channel+ "] successfully routed to NAT CHECKER" );
+            new NetworkManager.RoutingListener() {
+              public void connectionRouted( NetworkConnection connection ) {
+                LGLogger.log( "Incoming connection from [" +connection+ "] successfully routed to NAT CHECKER" );
                 
                 try{
                   ByteBuffer msg = ByteBuffer.wrap( check.getBytes() );
                   while( msg.hasRemaining() ) {
-                    channel.write( msg );
+                    connection.getTCPTransport().getSocketChannel().write( msg );
                     Thread.sleep( 20 );
                   }
                 }
@@ -87,8 +88,12 @@
                   Debug.out( "Nat check write failed", t );
                 }
                 
-                NetworkManager.getSingleton().closeSocketChannel( channel ); 
+                connection.close();
               }
+            },
+            new MessageStreamFactory() {
+              public MessageStreamEncoder createEncoder() {  return new AZMessageEncoder();  /* unused */}
+              public MessageStreamDecoder createDecoder() {  return new AZMessageDecoder();  /* unused */}
             }
         );
         
@@ -147,7 +152,7 @@
       bContinue = false;
       
       if( use_incoming_router ) {
-        NetworkManager.getSingleton().getIncomingSocketChannelManager().deregisterMatchBytes( matcher );
+        NetworkManager.getSingleton().cancelIncomingConnectionRouting( matcher );
       }
       else if( server != null ) {
         try {