Changeset 7485 for lang/c

Timestamp:

03/05/08 13:57:16 (5 years ago)

Author:

frsyuki

Message:

lang/c/partty: send SB OPT_NAWS only when the tenlnet client supports it

Location:

lang/c/partty/trunk

Files:

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

lang/c/partty/trunk/emtelnet.cc

@@ -124 +124 @@
 {
         owrite3(IAC, SB, cmd);
-        owrite((const byte*)msg, len);
+        // don't send IAC alone
+#ifdef EMTELNET_CONVERT_CRLF_LF
+        // don't convert CRLF to LF
+        const byte* p = (const byte*)msg;
+        const byte* endp = p + len;
+        for(; p != endp; ++p) {
+                if( *p == IAC ) {
+                        owrite2(IAC, IAC);
+                } else {
+                        owrite1(*p);
+                }
+        }
+#else
+        send(msg, len);
+#endif
         owrite2(IAC, SE);
 }

lang/c/partty/trunk/host.cc

@@ -219 +219 @@
         } else if( len == 0 ) { throw io_end_error("server connection closed"); }
         // ロック中ならServerからの入力は捨てる
-        if( m_locking ) { return 0; }
+        if( m_locking ) { return 0; }  // XXX Telnetの返答も無視している
         // Telnetフィルタ
         m_telnet.recv(shared_buffer, len);

lang/c/partty/trunk/multiplexer.cc

@@ -19 +19 @@
 // FIXME perror -> ログ
 
-filt_telnetd::filt_telnetd() :
+filt_telnetd::filt_telnetd(sender_telnetd& host_telnet) :
                 emtelnet((void*)this),
-                m_enable_ws(true)  // XXX デフォルトtrue
+                m_host_telnet(host_telnet),
+                m_enable_ws(false)
 {
         // use these options
@@ -60 +61 @@
 void filt_telnetd::enable_ws_handler(char cmd, bool sw, emtelnet& base)
 {
-        static_cast<filt_telnetd&>(base).m_enable_ws = sw;
+        filt_telnetd& self( static_cast<filt_telnetd&>(base) );
+        self.m_enable_ws = sw;
+        if(sw) {
+                sender_telnetd& host( self.m_host_telnet );
+                if( host.ws_initialized() ) {
+                        // 初期ウィンドウサイズを設定
+                        if( host.ws_initialized() ) {
+                                char sbbuf[4];
+                                *((short*)sbbuf) = htons(host.get_rows());
+                                *((short*)(sbbuf+2)) = htons(host.get_cols());
+                                self.send_ws(sbbuf, sizeof(sbbuf));
+                        }
+                }
+        }
 }
 
@@ -250 +264 @@
                 return 0;
         }
-        guest_set.set(guest);
+        guest_set.set<sender_telnetd&>(guest, m_host_telnet);
         // 書き込み待ちバッファにSERVER_WELCOME_MESSAGEを加える
         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;
 }

lang/c/partty/trunk/multiplexer.h

@@ -8 +8 @@
 namespace Partty {
 
+class sender_telnetd : public emtelnet {
+public:
+        sender_telnetd();
+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;
+};
+
+
 class filt_telnetd : public emtelnet {
 public:
@@ -15 +39 @@
         };
 public:
-        filt_telnetd();
+        explicit filt_telnetd(sender_telnetd& host_telnet);
         inline void send(const void* buf, size_t len, buffer_t* out);
         inline void recv(const void* buf, size_t len, buffer_t* in, buffer_t* out);
@@ -31 +55 @@
         static void pass_through_handler(char cmd, bool sw, emtelnet& base) {}
         static void enable_ws_handler(char cmd, bool sw, emtelnet& base);
+        sender_telnetd& m_host_telnet;
         bool m_enable_ws;
 };
@@ -69 +94 @@
         out->len = olength;
 }
-
-
-class sender_telnetd : public emtelnet {
-public:
-        sender_telnetd();
-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;
-};