caldecott 0.0.3 → 0.0.4

data/lib/caldecott/client/client.rb

@@ -29,7 +29,7 @@ module Caldecott
           puts "Starting local server on port #{local_port} to #{tun_url}"
         end
 
-        EM.start_server("localhost", local_port, TcpConnection) do |conn|
+        EM.start_server("0.0.0.0", local_port, TcpConnection) do |conn|
           # avoid races between tunnel setup and incoming local data
           conn.pause
 

data/lib/caldecott/client/http_tunnel.rb

@@ -11,7 +11,6 @@ module Caldecott
       def initialize(logger, url, dst_host, dst_port, auth_token)
         @log, @auth_token = logger, auth_token
         @closing = false
-        @retries = 0
         init_msg = ""
 
         # FIXME: why is this optional?
@@ -64,8 +63,8 @@ module Caldecott
         @onreceive.call(data)
       end
 
-      def start(base_uri, init_msg)
-        if (@retries += 1) > MAX_RETRIES
+      def start(base_uri, init_msg, attempts = MAX_RETRIES)
+        if attempts <= 0
           trigger_on_close
           return
         end
@@ -75,14 +74,13 @@ module Caldecott
           parsed_uri.path = '/tunnels'
 
           @log.debug "post #{parsed_uri.to_s}"
-          req = EM::HttpRequest.new(parsed_uri.to_s).post :body => init_msg, :head => { "Auth-Token" => @auth_token }
+          req = EM::HttpRequest.new(parsed_uri.to_s).post :body => init_msg, :head => { "Auth-Token" => @auth_token, "Content-Length" => init_msg.bytesize }
 
           req.callback do
             @log.debug "post #{parsed_uri.to_s} #{req.response_header.status}"
             unless [200, 201, 204].include?(req.response_header.status)
-              start(base_uri, init_msg)
+              start(base_uri, init_msg, attempts - 1)
             else
-              @retries = 0
               resp = JSON.parse(req.response)
 
               parsed_uri.path = resp["path"]
@@ -99,7 +97,7 @@ module Caldecott
 
           req.errback do
             @log.debug "post #{parsed_uri.to_s} error"
-            start(base_uri, init_msg)
+            start(base_uri, init_msg, attempts - 1)
           end
 
         rescue Exception => e
@@ -109,8 +107,8 @@ module Caldecott
         end
       end
 
-      def stop
-        if (@retries += 1) > MAX_RETRIES
+      def stop(attempts = MAX_RETRIES)
+        if attempts <= 0
           trigger_on_close
           return
         end
@@ -122,7 +120,7 @@ module Caldecott
 
         req.errback do
           @log.debug "delete #{@tun_uri} error"
-          stop
+          stop(attempts - 1)
         end
 
         req.callback do
@@ -130,7 +128,7 @@ module Caldecott
           if [200, 202, 204, 404].include?(req.response_header.status)
             trigger_on_close
           else
-            stop
+            stop(attempts - 1)
           end
         end
       end
@@ -138,7 +136,6 @@ module Caldecott
       class Reader
         def initialize(log, uri, conn, auth_token)
           @log, @base_uri, @conn, @auth_token = log, uri, conn, auth_token
-          @retries = 0
           @closing = false
           start
         end
@@ -147,13 +144,14 @@ module Caldecott
           @closing = true
         end
 
-        def start(seq = 1)
-          if (@retries += 1) > MAX_RETRIES
+        def start(seq = 1, attempts = MAX_RETRIES)
+          return if @closing
+
+          if attempts <= 0
             @conn.trigger_on_close
             return
           end
 
-          return if @closing
           uri = "#{@base_uri}/#{seq}"
           @log.debug "get #{uri}"
           req = EM::HttpRequest.new(uri).get :timeout => 0, :head => { "Auth-Token" => @auth_token }
@@ -168,7 +166,6 @@ module Caldecott
             case req.response_header.status
             when 200
               @conn.trigger_on_receive(req.response)
-              @retries = 0
               start(seq + 1)
             when 404
               @conn.trigger_on_close
@@ -182,51 +179,58 @@ module Caldecott
       class Writer
         def initialize(log, uri, conn, auth_token)
           @log, @uri, @conn, @auth_token = log, uri, conn, auth_token
-          @retries = 0
           @seq, @write_buffer = 1, ""
           @closing = @writing = false
         end
 
         def send_data(data)
           @write_buffer << data
-          send_data_buffered
+          send_data_buffered unless @writing
         end
 
         def close
           @closing = true
         end
 
-        def send_data_buffered
-          if (@retries += 1) > MAX_RETRIES
+        private
+
+        def send_data_buffered(attempts = MAX_RETRIES)
+          return if @closing
+
+          @writing = true
+
+          @log.debug "attempts left: #{attempts}"
+          if attempts <= 0
             @conn.trigger_on_close
             return
           end
 
-          return if @closing
-          data, @write_buffer = @write_buffer, "" unless @writing
+          data, @write_buffer = @write_buffer, ""
 
-          @writing = true
           uri = "#{@uri}/#{@seq}"
           @log.debug "put #{uri}"
-          req = EM::HttpRequest.new(uri).put :body => data, :head => { "Auth-Token" => @auth_token }
+          req = EM::HttpRequest.new(uri).put :body => data, :head => { "Auth-Token" => @auth_token, "Content-Length" => data.bytesize }
 
           req.errback do
             @log.debug "put #{uri} error"
-            send_data_buffered
+            send_data_buffered(attempts - 1)
           end
 
           req.callback do
             @log.debug "put #{uri} #{req.response_header.status}"
             case req.response_header.status
             when 200, 202, 204
-              @writing = false
               @seq += 1
-              @retries = 0
-              send_data_buffered unless @write_buffer.empty?
+
+              if @write_buffer.empty?
+                @writing = false
+              else
+                send_data_buffered
+              end
             when 404
               @conn.trigger_on_close
             else
-              send_data_buffered
+              send_data_buffered(attempts - 1)
             end
           end
         end

data/lib/caldecott/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2009-2011 VMware, Inc.
 
 module Caldecott
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/caldecott.rb

@@ -1,7 +1,6 @@
 # Copyright (c) 2009-2011 VMware, Inc.
 
 require 'rubygems'
-require 'bundler'
 
 require 'caldecott/client'
 require 'caldecott/server'

metadata

@@ -2,7 +2,7 @@
 name: caldecott
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - VMware
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -08:00
+date: 2012-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency