Changeset 6609 for lang/java

Timestamp:

02/12/08 23:32:13 (5 years ago)

Author:

nori090

Message:

lang/java/jimmy: connectionの間違い修正

Location:

lang/java/jimmy/trunk/jimmy/src

Files:

• main/java/jimmy/Connection.java (modified) (7 diffs)
• test/java/jimmy/ConnectionTest.java (added)
• test/java/jimmy/SocketDumpTest.java (modified) (1 diff)

lang/java/jimmy/trunk/jimmy/src/main/java/jimmy/Connection.java

@@ -21 +21 @@
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
@@ -27 +28 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.commons.lang.ArrayUtils;
-
 import jimmy.command.Command;
 import jimmy.command.Command00;
 import jimmy.command.Command97;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.ArrayUtils;
 
 /**
@@ -81 +83 @@
     ConcurrentLinkedQueue<Command> queue = new ConcurrentLinkedQueue<Command>();
 
-    void send( byte[] packet )
+    public void send( byte[] packet )
         throws WinnyProtocolException {
         long cur;
@@ -160 +162 @@
     }
 
-    Command00 authorize()
+    public Command00 authorize()
         throws WinnyProtocolException {
         Command00 header = new Command00();
@@ -176 +178 @@
             send_rc4key = new ARC4Cipher( Command.toStep2Key( key ) );
 
+            authorize_block = new byte[6];
             rsize = receive( authorize_block, false );
             if ( rsize != authorize_block.length ) {
@@ -203 +206 @@
     }
 
-    Command receiveOneCommand() throws WinnyProtocolException {
+    public Command receiveOneCommand()
+        throws WinnyProtocolException {
         if ( !queue.isEmpty() ) {
             return queue.poll();
@@ -209 +213 @@
         byte[] head = new byte[5];
         int rsize = receive( head, true );
-        if (rsize != head.length) {
-            throw new WinnyProtocolException("read packet error");
+        if ( rsize != head.length ) {
+            throw new WinnyProtocolException( "read packet error" );
         }
         int block_length = littleEndianBytes2int( ArrayUtils.subarray( head, 0, 4 ) );
-        if (block_length > BUFFER_SIZE) {
-            throw new WinnyProtocolException("read packet error");
+        if ( block_length > BUFFER_SIZE ) {
+            throw new WinnyProtocolException( "read packet error" );
         }
         byte[] data = new byte[block_length - 1];
-        rsize = receive( data, true );
-        if (rsize == 0) {
-            throw new WinnyProtocolException("read packet error");
-        }
-        return Command.getCommandInstance( data );
-    }
-    
+        if ( block_length - 1 != 0 ) {
+            rsize = receive( data, true );
+            if ( rsize == 0 ) {
+                throw new WinnyProtocolException( "read packet error" );
+            }
+        }
+        return Command.getCommandInstance( ArrayUtils.addAll( head, data ) );
+    }
+
     // TODO バッファリング受信は良く分からないので見送り
     void replenish() {
         // キューに入れる作業
     }
-    
+
     long rate() {
         long cur = System.currentTimeMillis();
         long rate;
-        
+
         long recv = cur - last_recv_time;
         long send = cur - last_send_time;
-        
-        if (recv == 0 && send == 0) {
+
+        if ( recv == 0 && send == 0 ) {
             return 0;
-        } else if (recv == 0) {
+        }
+        else if ( recv == 0 ) {
             rate = send_size_sec / send;
-        } else if (send == 0) {
+        }
+        else if ( send == 0 ) {
             rate = recv_size_sec / recv;
-        } else {
-            rate = (send_size_sec/ send) + (recv_size_sec/recv);
+        }
+        else {
+            rate = ( send_size_sec / send ) + ( recv_size_sec / recv );
         }
         // maybe int size;
         return rate;
     }
-    
+
+    Command00 connect( InetAddress address, int port )
+        throws WinnyProtocolException {
+
+        this.address = address;
+        try {
+            socket = SocketChannel.open( new InetSocketAddress( address, port ) );
+            return authorize();
+        }
+        catch ( IOException e ) {
+            throw new WinnyProtocolException( e );
+        }
+    }
+
     void close() {
         try {

lang/java/jimmy/trunk/jimmy/src/test/java/jimmy/SocketDumpTest.java

@@ -44 +44 @@
         InputStream in = null;
         try {
-            Node target = new Node( "@d9d162a23cc199f08f40b3b45704846392a6d73d" );
-            s = new Socket( target.address, target.port );
+            s = new Socket( "192.168.77.128", 6191 );
             s.setSoTimeout( 5000 );
             in = s.getInputStream();