Changeset 7417

Timestamp:

03/03/08 22:03:15 (5 years ago)

Author:

frsyuki

Message:

lang/c/partty: added window size negotiation on host-server comunication

Location:

lang/c/partty/trunk

Files:

• emtelnet.cc (modified) (1 diff)
• host.cc (modified) (3 diffs)
• host.h (modified) (2 diffs)
• multiplexer.cc (modified) (5 diffs)
• multiplexer.h (modified) (2 diffs)

lang/c/partty/trunk/emtelnet.cc

@@ -354 +354 @@
                 // will is sent and receive dont
                 // I can't use the option
-                m_do_waiting.reset(c);
+                if( m_my_option_handler[(size_t)c] ) {
+                        m_my_option_handler[(size_t)c](c, false, *this);
+                }
         } else {
                 // the partner wants not to use the option
                 // the partner can't use the option
                 // reply dont
-                if( m_partner_option_handler[(size_t)c] ) {
-                        m_partner_option_handler[(size_t)c](c, false, *this);
+                if( m_my_option_handler[(size_t)c] ) {
+                        m_my_option_handler[(size_t)c](c, false, *this);
                 }
                 owrite3(IAC, WONT, c);

lang/c/partty/trunk/host.cc

@@ -18 +18 @@
 // FIXME Serverとのコネクションが切断したら再接続する？
 
-reverce_telnetd::reverce_telnetd() :
+receiver_telnetd::receiver_telnetd() :
                 emtelnet(this)
 {
-        // TODO
+        // use these options
+        set_my_option_handler( emtelnet::OPT_SGA,
+                        receiver_telnetd::pass_through_handler );
+        set_my_option_handler( emtelnet::OPT_BINARY,
+                        receiver_telnetd::pass_through_handler );
+        set_my_option_handler( emtelnet::OPT_NAWS,
+                        receiver_telnetd::pass_through_handler );
+
+        // supported partner options
+        set_partner_option_handler( emtelnet::OPT_SGA,
+                        receiver_telnetd::pass_through_handler );
+        set_partner_option_handler( emtelnet::OPT_BINARY,
+                        receiver_telnetd::pass_through_handler );
+
+        // skip useless negotiation
 }
 
@@ -168 +182 @@
                 throw io_error("pty is broken");
         }
-        // 標準入力のウィンドウサイズが変更されたら子仮想端末にも反映する
+        // 標準入力のウィンドウサイズが変更されたら、
+        // 子仮想端末に反映し、サーバーにも転送する
         struct winsize next;
         get_window_size(fd, &next);
@@ -174 +189 @@
                 set_window_size(sh, &next);
                 winsz = next;
+                unsigned char sbbuf[4];
+                *((short*)sbbuf) = htons(next.ws_col);
+                *((short*)(sbbuf+2)) = htons(next.ws_row);
+                m_telnet.send_sb(emtelnet::OPT_NAWS, sbbuf, sizeof(sbbuf));
+                // XXX ウィンドウサイズは後で転送
         }
         // lock_codeが含まれていたらm_lockingをトグルする

lang/c/partty/trunk/host.h

@@ -6 +6 @@
 namespace Partty {
 
-class reverce_telnetd : public emtelnet {
+class receiver_telnetd : public emtelnet {
 public:
-        reverce_telnetd();
+        receiver_telnetd();
 private:
         static void pass_through_handler(char cmd, bool sw, emtelnet& base) {}
@@ -39 +39 @@
         static const size_t SHARED_BUFFER_SIZE = 32 * 1024;
         char shared_buffer[SHARED_BUFFER_SIZE];
-        reverce_telnetd m_telnet;
+        receiver_telnetd m_telnet;
 private:
         struct winsize winsz;

lang/c/partty/trunk/multiplexer.cc

@@ -18 +18 @@
 // FIXME perror -> ログ
 
-filt_telnetd::filt_telnetd() : emtelnet((void*)this)
+filt_telnetd::filt_telnetd() :
+                emtelnet((void*)this),
+                m_enable_ws(true)  // XXX デフォルトtrue
 {
         // use these options
@@ -27 +29 @@
         set_my_option_handler( emtelnet::OPT_BINARY,
                         filt_telnetd::pass_through_handler );
+        set_my_option_handler( emtelnet::OPT_NAWS,
+                        filt_telnetd::enable_ws_handler );
 
         // supported partner options
@@ -41 +45 @@
         send_will(emtelnet::OPT_BINARY);
         send_do(emtelnet::OPT_BINARY);
-}
-
-
-sender_telnetd::sender_telnetd() : emtelnet((void*)this)
-{
-        // TODO
+
+        // window size
+        send_will(emtelnet::OPT_NAWS);
+}
+
+void filt_telnetd::send_ws(const char* sbbuf, size_t sz4)
+{
+        if(m_enable_ws) {
+                send_sb(emtelnet::OPT_NAWS, sbbuf, sz4);
+        }
+}
+
+void filt_telnetd::enable_ws_handler(char cmd, bool sw, emtelnet& base)
+{
+        static_cast<filt_telnetd&>(base).m_enable_ws = sw;
+}
+
+
+sender_telnetd::sender_telnetd() :
+                emtelnet((void*)this),
+                m_cols(0), m_rows(0), m_ws_changed(false)
+{
+        // use these options
+        set_my_option_handler( emtelnet::OPT_SGA,
+                        sender_telnetd::pass_through_handler );
+        set_my_option_handler( emtelnet::OPT_BINARY,
+                        sender_telnetd::pass_through_handler );
+
+        // supported partner options
+        set_partner_option_handler( emtelnet::OPT_SGA,
+                        sender_telnetd::pass_through_handler );
+        set_partner_option_handler( emtelnet::OPT_BINARY,
+                        sender_telnetd::pass_through_handler );
+        set_partner_option_handler( emtelnet::OPT_NAWS,
+                        sender_telnetd::pass_through_handler );
+
+        set_sb_handler(OPT_NAWS, sender_telnetd::window_size_handler);
+
+        // skip useless negotiation
+}
+
+void sender_telnetd::window_size_handler(char cmd, const char* msg, size_t len, emtelnet& self)
+{
+        if(len != 4) { return; }
+        short cols = ntohs(*((short*)msg));
+        short rows = ntohs(*((short*)(msg+2)));
+        static_cast<sender_telnetd&>(self).ws_change(cols, rows);
 }
 
@@ -208 +253 @@
         guest_set.data(guest).send(SERVER_WELCOME_MESSAGE, strlen(SERVER_WELCOME_MESSAGE), NULL);
         num_guest++;
+        // 初期ウィンドウサイズを設定
+        if( m_host_telnet.ws_initialized() ) {
+                char sbbuf[4];
+                *((short*)sbbuf) = htons(m_host_telnet.get_rows());
+                *((short*)(sbbuf+2)) = htons(m_host_telnet.get_cols());
+                guest_set.data(guest).send_ws(sbbuf, sizeof(sbbuf));
+        }
         return 0;
 }
@@ -232 +284 @@
                 }
                 m_host_telnet.olength = 0;
+        }
+        // 画面サイズ
+        if( m_host_telnet.ws_changed() ) {
+                m_recorder->set_window_size(
+                                m_host_telnet.get_rows(),
+                                m_host_telnet.get_cols()
+                                );
+                if( num_guest > 0 ) {
+                        char sbbuf[4];
+                        *((short*)sbbuf) = htons(m_host_telnet.get_rows());
+                        *((short*)(sbbuf+2)) = htons(m_host_telnet.get_cols());
+                        int n = 0;
+                        for(int fd = 0; fd < INT_MAX; ++fd) {
+                                if( guest_set.test(fd) ) {
+                                        guest_set.data(fd).send_ws(sbbuf, sizeof(sbbuf));
+                                        ++n;
+                                        if( n >= num_guest ) { break; }
+                                }
+                        }
+                }
         }
         if( !m_host_telnet.ilength ) { return 0; }

lang/c/partty/trunk/multiplexer.h

@@ -26 +26 @@
         inline void get_ibuffer(buffer_t* in);
         inline void get_obuffer(buffer_t* out);
+public:
+        void send_ws(const char* sbbuf, size_t sz4);
 private:
         static void pass_through_handler(char cmd, bool sw, emtelnet& base) {}
+        static void enable_ws_handler(char cmd, bool sw, emtelnet& base);
+        bool m_enable_ws;
 };
 
@@ -72 +76 @@
 private:
         static void pass_through_handler(char cmd, bool sw, emtelnet& base) {}
+        static void window_size_handler(char cmd, const char* msg, size_t len, emtelnet& self);
+public:
+        void ws_change(short cols, short rows) {
+                m_cols = cols;
+                m_rows = rows;
+                m_ws_changed = true;
+        }
+        bool ws_changed(void) const { return m_ws_changed; }
+        short get_cols(void) const { return m_cols; }
+        short get_rows(void) const { return m_rows; }
+        void ws_flush(void) { m_ws_changed = false; }
+        bool ws_initialized(void) const { return (m_cols != 0 && m_rows != 0); }
+private:
+        short m_cols;
+        short m_rows;
+        bool m_ws_changed;
 };