svn commit: r766258 - /mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java

[gnodet]

Author: gnodet
Date: Sat Apr 18 07:26:10 2009
New Revision: 766258

URL: http://svn.apache.org/viewvc?rev=766258&view=rev
Log:
SSHD-14: Fix 'channel_by_id: 1: bad id: channel free' client error

Modified:
    
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java

Modified: 
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java?rev=766258&r1=766257&r2=766258&view=diff
==============================================================================
--- 
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 (original)
+++ 
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 Sat Apr 18 07:26:10 2009
@@ -146,7 +146,7 @@
         log.info("Received channel request: {}", type);
         if (!handleRequest(type, buffer)) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_FAILURE);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
     }
@@ -227,7 +227,7 @@
         log.debug("env for channel {}: {} = {}", new Object[] { id, name, 
value });
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;
@@ -266,7 +266,7 @@
         // TODO: handle pty request correctly
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;
@@ -282,7 +282,7 @@
         // TODO: handle window-change request correctly
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;
@@ -295,7 +295,7 @@
         // TODO: handle signal request correctly
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;
@@ -335,7 +335,7 @@
 
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
 
@@ -392,7 +392,7 @@
 
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
 
@@ -407,7 +407,7 @@
         // TODO: start subsystem
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;
@@ -418,7 +418,7 @@
         // TODO: start agent forwarding
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;
@@ -429,7 +429,7 @@
         // TODO: start x11 forwarding
         if (wantReply) {
             buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-            buffer.putInt(id);
+            buffer.putInt(recipient);
             session.writePacket(buffer);
         }
         return true;