net-telnet-rfc2217 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b5b2b5e014b1fc9906ae0be1e7d33fb5d3971cce0b4eda74332e6a1ee24a9e
-  data.tar.gz: b56a17ffee69e60c4c8f805fd5fb16a0195a95719ed3b93a4fc5417c1dbb0e2f
+  metadata.gz: 8c22526ce99613e2c561a64f7b7c9063591eaac34fce16602374afbc7461287c
+  data.tar.gz: 18d1b8c6679c93ec46d69ad0a6f6e0942b868f3bb2b82022d6d50f88a01b411d
 SHA512:
-  metadata.gz: 1b4b82e214841d59828c733e9c15a65d2e623ee807f42df97353054564cb6bd7991f6900182ecd35cedebf83876c9388ecdce8574639a86b0e4d237e3e8f0a96
-  data.tar.gz: 35da8ce422ca87cfc75ad2c4461582d9ec54f8335f74bb381fe178d12890bae4f5034e7338488187c07cdfb6a900e2eb89f95909c7cdd536a33581062b0c5861
+  metadata.gz: a92d336bd6cc302a1f1b2d3aba4ab57d45115556e954da8937afbdef7a4f7a1056ebdb5911fa6f3685b01e2123734c66166fef9c510c9055e6959f855b117108
+  data.tar.gz: cceb6cf145dcbffa1fb0132f7bc7d2f9c73b9b80c2bc993d2865e339e0e5a52aca0330f0b0eeb799c39b1984a41697bc56cdbee0c99b65f70fe82129fb9e3944

data/lib/net/telnet/rfc2217.rb

@@ -73,7 +73,12 @@ module Net
         telnet.write(IAC + WILL + COM_PORT_OPTION)
         sock.flush
         @buffer = ''
-        readpartial(0)
+        start = Time.now.to_f
+        loop do
+          raise "could not negotiate serial port in time" if Time.now.to_f - start > 5
+          break if @negotiated
+          readpartial(0)
+        end
       end
 
       def get_modem_params
@@ -121,8 +126,9 @@ module Net
 
       def readpartial(length, outbuf = '')
         loop do
-          # 0 is special and means 'read at least one control sequence'
-          break if length != 0 || @buffer.length != 0
+          # 0 is special and means "just see if there's data to read"
+          break if length != 0 && @buffer.length != 0
+          raise "could not negotiate serial port in first 1MB of data" if @buffer.length >= 1024 * 1024
 
           data = sock.sysread([length - @buffer.length, 64 * 1024].max)
 
@@ -131,12 +137,11 @@ module Net
             data.concat(sock.sysread(16))
           end
 
-          saw_control = false
           data = @telnet.preprocess(data) do |control|
-            saw_control = true
             if DO[0] == control[0] && COM_PORT_OPTION == control[1]
               # start negotiation
               write_modem_params
+              @negotiated = true
               true
             elsif DONT[0] == control[0] && COM_PORT_OPTION == control[1]
               raise "Serial port control not supported"
@@ -148,7 +153,8 @@ module Net
             end
           end
           @buffer.concat(data)
-          break if length == 0 && saw_control
+
+          break if length == 0
         end
 
         length = [length, @buffer.length].min

data/lib/net/telnet/rfc2217/version.rb

@@ -1,7 +1,7 @@
 module Net
   class Telnet
     class RFC2217
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-telnet-rfc2217
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cody Cutrer