Changeset 8076 for lang/c

Timestamp:

03/18/08 18:09:49 (9 months ago)

Author:

frsyuki

Message:

lang/c/partty: added view-only host mode

Location:

lang/c/partty/trunk/src

Files:

• cmd_host.cc (modified) (4 diffs)
• host.cc (modified) (3 diffs)
• host.h (modified) (1 diff)
• partty.h (modified) (1 diff)

lang/c/partty/trunk/src/cmd_host.cc

@@ -57 +57 @@
                 << "     -w <oparation password>  password to operate the session\n"
                 << "     -r <view-only password>  password to view the session\n"
+                << "     -k                       disable all gust operation regardless of operation password\n"
                 << "     -c <lock character>      control key to lock guest operation (default: ']')\n"
                 << "\n"
@@ -112 +113 @@
         std::string writable_password;
         std::string readonly_password;
+        bool view_only;
         char lock_char = ']';
         bool session_name_set;
@@ -131 +133 @@
                 kz.on("-w", "--password",  Accept::String(writable_password), writable_password_set);
                 kz.on("-r", "--view-only", Accept::String(readonly_password), readonly_password_set);
+                kz.on("-k", "--locked",    Accept::Boolean(view_only));
                 kz.on("-c", "--lock",      Accept::Character(lock_char), lock_char_set);
                 kz.on("-h", "--help",      Accept::Action(usage_action()));
@@ -243 +246 @@
                 Partty::Host::config_t config(ssock, info);
                 config.lock_code = lock_char - 'a' + 1;;
+                config.view_only = view_only;
                 Partty::Host host(config);
                 if( argc > 0 ) {

lang/c/partty/trunk/src/host.cc

@@ -71 +71 @@
         server(config.server_socket),
         m_lock_code(config.lock_code), m_locking(false),
+        m_view_only(config.view_only),
         m_info(config.info) {}
 
@@ -223 +224 @@
         for(const char *p=shared_buffer, *p_end=p+len; p != p_end; ++p) {
                 if(*p == m_lock_code) {
-                        m_locking = !m_locking;
+                        if(m_lock_code) {
+                                m_lock_code = false;
+                                std::cout << " *unlocked* " << std::flush;
+                        } else {
+                                m_lock_code = true;
+                                std::cout << " *locked* " << std::flush;
+                        }
                 }
         }
@@ -237 +244 @@
                 else { throw io_error("server connection is broken"); }
         } else if( len == 0 ) { throw io_end_error("server connection closed"); }
-        // ロック中ならServerからの入力は捨てる
-        if( m_locking ) { return 0; }  // XXX Telnetの返答も無視している
+        // view_onlyモードまたはロック中ならServerからの入力は捨てる
+        if( m_view_only || m_locking ) { return 0; }  // XXX Telnetの返答も無視している
         // Telnetフィルタ
         m_telnet.recv(shared_buffer, len);

lang/c/partty/trunk/src/host.h

@@ -47 +47 @@
         bool m_locking;
 
+        bool m_view_only;
+
         session_info_t m_info;
 private:

lang/c/partty/trunk/src/partty.h

@@ -295 +295 @@
                                 const session_info_ref_t& info_) :
                         lock_code(0),
+                        view_only(false),
                         server_socket(_server_socket),
                         info(info_) {}
         public:
                 int lock_code;
+                bool view_only;
         private:
                 int server_socket;