muby 0.7.5 → 0.7.6

data/lib/muby/configuration.rb

@@ -4,7 +4,7 @@ require 'ncurses'
 module Muby
 
 
-  VERSION = "0.7.5" unless defined?(Muby::VERSION)
+  VERSION = "0.7.6" unless defined?(Muby::VERSION)
   
   #
   # The class that encapsulates all configuration.

data/lib/muby/connection.rb

@@ -150,15 +150,68 @@ class Muby::Connection
     c
   end
 
+  TELNET_COMMANDS = {
+    240 => :end_of_sub_negotiation,
+    241 => :noop,
+    242 => :data_mark,
+    243 => :break,
+    249 => :go_ahead,
+    250 => :sub_negotiation,
+    251 => :will,
+    252 => :wont,
+    253 => :do,
+    254 => :dont,
+    255 => :iac
+  }
+
+  #
+  # This is not telnet command OR ansi, lets treat it as nice MUD text!
+  #
+  # Debug about it, add it to match buffer, add it to show buffer and show if we want to show.
+  # Then check it for triggers.
+  #
+  def handle_regular_character(c)
+    @matchBuffer = @matchBuffer + c.chr
+    append_show_buffer(c.chr)
+    manage_buffers(c)
+  end
+
   def handle(c)
     #
     # The telnet support (just so we dont explode or something)
     #
-    # We are just plain ignoring it atm.
+    # We are just plain ignoring most of it atm.
     #
-    if c == 255 # telnet interpret as command (IAC)
-      c = getc # get the request (DO|DONT)
-      c = getc # get the latest part whatever that is
+    if TELNET_COMMANDS[c] == :iac # this is an "interpret as command"
+      c = getc
+      if (next_command = TELNET_COMMANDS[c]) == :iac # if the next one as well is an iac, we actually want to display a 255
+        handle_regular_character(c)
+      else
+        case next_command
+        when :do # ignore the option negotiation
+          c = getc
+        when :dont # ignore the option negotiation
+          c = getc
+        when :will # ignore the option negotiation
+          c = getc
+        when :wont # ignore the option negotiation
+          c = getc
+        when :noop # waf?
+          # do nothing
+        when :data_mark
+          warn("Got a data_mark (TELNET protocol) which I don't know how to handle. Expect strange behaviour...")
+        when :break
+          warn("Got a break (TELNET protocol) which I don't know how to handle. Expect strange behaviour...")
+        when :go_ahead
+          display_buffer # on a go ahead the server obviously wants us to display the @displayBuffer regardless of our conf.flush setting
+        when :sub_negotiation # we just skip ahead to the end of the sub negotiation
+          while TELNET_COMMANDS[c] != :end_of_sub_negotiation
+            c = getc
+          end
+        else
+          warn("Got an unknown TELNET command (#{c.chr}) which I don't know how to handle. Expect strange behaviour...")
+        end
+      end
     elsif c == 27 # escape char! this is probably some ANSI color or shite
       c = getc
       if c.chr == "[" # this is an ansi-something that is more than one char long
@@ -233,15 +286,7 @@ class Muby::Connection
         end
       end
     elsif !conf.broken_keycodes.include?(c)
-      #
-      # This is not telnet command OR ansi, lets treat it as nice MUD text!
-      #
-      # Debug about it, add it to match buffer, add it to show buffer and show if we want to show.
-      # Then check it for triggers.
-      #
-      @matchBuffer = @matchBuffer + c.chr
-      append_show_buffer(c.chr)
-      manage_buffers(c)
+      handle_regular_character(c)
     end
   end
 
@@ -283,7 +328,6 @@ class Muby::Connection
     trigger(@matchBuffer, conf.remote_character_triggers, true)
     if c == 10 || conf.flush
       display_buffer
-      @showBuffer = []
       if c == 10
         trigger(@matchBuffer, conf.remote_triggers, false)
         @matchBuffer = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muby
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Martin Kihlgren, Sy Ali
@@ -9,7 +9,7 @@ autorequire: muby
 bindir: bin
 cert_chain: []
 
-date: 2008-02-26 00:00:00 +01:00
+date: 2008-02-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency