can now open up a shell channel properly

node-migrator-bot · Mar 20, 2011 · 2cd9bfc · 2cd9bfc
1 parent be84adc
commit 2cd9bfc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/chan.cc b/src/chan.cc
@@ -61,17 +61,16 @@ int Chan::ReadChannelAfter(eio_req *req) {
 
     while (!chan->buffers.empty()) {
         std::pair<int, char *> p = chan->buffers.front();
-        int i = p.first;
-        if (i == 0) {
+        chan->buffers.pop_front();
+        if (p.first == 0) {
             chan->Emit(String::NewSymbol("end"), 0, NULL);
         }
         else {
-            char *buf = p.second;
-            Handle<Object> bufObj;
-            Buffer::New(p.second, i)->Wrap(bufObj);;
+            Buffer *b = Buffer::New(p.second, p.first);
+            b->Ref();
 
             Handle<Value> argv[1];
-            argv[0] = bufObj;
+            argv[0] = b->handle_;
             chan->Emit(String::NewSymbol("data"), 1, argv);
             delete p.second;
         }

diff --git a/src/chan.h b/src/chan.h
@@ -2,6 +2,7 @@
 #define NODE_SSH_CHAN_H
 
 #define protected public
+#define private public
 
 #include <node.h>
 #include <node_object_wrap.h>

diff --git a/test.js b/test.js
@@ -30,11 +30,9 @@ server.on('session', function (s) {
         }
         else if (m.type === sshd.constants.SSH_REQUEST_CHANNEL_OPEN
         && m.subtype === sshd.constants.SSH_CHANNEL_SESSION) {
-            console.log('channel!');
             var ch = m.openChannel();
             console.dir({ ch : ch });
             ch.on('data', function (buf) {
-                console.log('!!!!!!!!!!!!!!!!!!!!!!! got data!');
                 console.log(buf);
             });
             ch.on('end', function () {
@@ -43,7 +41,6 @@ server.on('session', function (s) {
         }
         else if (m.type === sshd.constants.SSH_REQUEST_CHANNEL
         && m.subtype === sshd.constants.SSH_CHANNEL_REQUEST_SHELL) {
-console.log("reply success!");
             m.channelReplySuccess();
         }
         else {