ffwd-tunnel 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 345b23611c880a3c3828a110a2c822b480f90754
+  data.tar.gz: 5d3e61598542c9ee58da1f0d6e155acc134a4368
+SHA512:
+  metadata.gz: a7a419e95c90f292a3cd98a3648c23a16c159598fac7e7f862d53cdbd5a1e6e826b1e2d27a4dce851e7ad59382bc1638f5eb0e1cddf5e1a4dcdb15b162619c59
+  data.tar.gz: ca8ebe5059f72a20499d05b64fb78c2782ed72dbc38fbb3abf0be4f7b4b75a0138fe0182e8eb6e7184cac656d556c534b30a8bc50aed95cc7d90306d4d5f44a1

data/lib/ffwd/plugin/tunnel.rb

@@ -17,7 +17,6 @@ require 'eventmachine'
 require 'base64'
 
 require_relative 'tunnel/connection_tcp'
-require_relative 'tunnel/binary_protocol'
 
 require 'ffwd/logging'
 require 'ffwd/plugin'
@@ -38,20 +37,17 @@ module FFWD::Plugin::Tunnel
     :tcp => ConnectionTCP
   }
 
-  def self.setup_input opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
-    protocol_type = opts[:protocol_type] || DEFAULT_PROTOCOL_TYPE
+  def self.setup_input config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:protocol] ||= DEFAULT_PROTOCOL
+
+    protocol = FFWD.parse_protocol config[:protocol]
 
     unless connection = CONNECTIONS[protocol.family]
       raise "No connection for protocol family: #{protocol.family}"
     end
 
-    if core.tunnel_plugins.empty?
-      raise "Nothing requires tunneling"
-    end
-
-    protocol.bind opts, core, log, connection, BinaryProtocol
+    protocol.bind config, log, connection
   end
 end

data/lib/ffwd/plugin/tunnel/binary_protocol.rb

@@ -22,108 +22,11 @@ require 'ffwd/plugin_channel'
 require 'ffwd/tunnel/plugin'
 require 'ffwd/utils'
 
+require_relative 'bind_tcp'
+require_relative 'bind_udp'
+
 module FFWD::Plugin::Tunnel
   class BinaryProtocol < FFWD::Tunnel::Plugin
-    class BindUDP
-      class Handle < FFWD::Tunnel::Plugin::Handle
-        attr_reader :addr
-
-        def initialize bind, addr
-          @bind = bind
-          @addr = addr
-        end
-
-        def send_data data
-          @bind.send_data @addr, data
-        end
-      end
-
-      def initialize port, family, tunnel, block
-        @port = port
-        @family = family
-        @tunnel = tunnel
-        @block = block
-      end
-
-      def send_data addr, data
-        @tunnel.send_data Socket::SOCK_DGRAM, @family, @port, addr, data
-      end
-
-      def data! addr, data
-        handle = Handle.new self, addr
-        @block.call handle, data
-      end
-    end
-
-    class BindTCP
-      class Handle < FFWD::Tunnel::Plugin::Handle
-        attr_reader :addr
-
-        def initialize bind, addr
-          @bind = bind
-          @addr = addr
-          @close = nil
-          @data = nil
-        end
-
-        def send_data data
-          @bind.send_data @addr, data
-        end
-
-        def close &block
-          @close = block
-        end
-
-        def data &block
-          @data = block
-        end
-
-        def recv_close
-          return if @close.nil?
-          @close.call
-          @close = nil
-          @data = nil
-        end
-
-        def recv_data data
-          return if @data.nil?
-          @data.call data
-        end
-      end
-
-      def initialize port, family, tunnel, block
-        @port = port
-        @family = family
-        @tunnel = tunnel
-        @block = block
-        @handles = {}
-      end
-
-      def open addr
-        raise "Already open: #{addr}" if @handles[addr]
-        handle = @handles[addr] = Handle.new self, addr
-        @block.call handle
-      end
-
-      def close addr
-        raise "Not open: #{addr}" unless handle = @handles[addr]
-        handle.recv_close
-        @handles.delete addr
-      end
-
-      def data addr, data
-        unless handle = @handles[addr]
-          raise "Not available: #{addr}"
-        end
-
-        handle.recv_data data
-      end
-
-      def send_data addr, data
-        @tunnel.send_data Socket::SOCK_STREAM, @family, @port, addr, data
-      end
-    end
-
     include FFWD::Logging
     include FFWD::Lifecycle
 
@@ -153,62 +56,41 @@ module FFWD::Plugin::Tunnel
       @c = c
       @tcp_bind = {}
       @udp_bind = {}
-      @input = FFWD::PluginChannel.build 'tunnel_input'
 
-      @metadata = nil
-      @processor = nil
-      @channel_id = nil
-      @statistics_id = nil
       @header = nil
+      @parent = core
+    end
 
-      starting do
-        raise "no metadata" if @metadata.nil?
-
-        if host = @metadata[:host]
-          @statistics_id = "tunnel/#{host}"
-          @channel_id = "tunnel.input/#{host}"
-        else
-          @statistics_id = "tunnel/#{@c.get_peer}"
-          @channel_id = "tunnel.input/#{@c.get_peer}"
-        end
-
-        # setup a small core
-        emitter = FFWD::Core::Emitter.build @core.output, @metadata
-        @processor = FFWD::Core::Processor.build @input, emitter, @core.processors
+    def setup metadata
+      unless id = metadata[:host]
+        id = @c.get_peer
+      end
 
-        @reporter = FFWD::Core::Reporter.new [@input, @processor]
+      input = FFWD::PluginChannel.build "tunnel.input/#{id}"
+      core = @parent.reconnect input
 
-        if @core.debug
-          @core.debug.monitor @channel_id, @input, FFWD::Debug::Input
-        end
+      # setup a small core
+      emitter = FFWD::Core::Emitter.build core.output, metadata
+      processor = FFWD::Core::Processor.build input, emitter, core.processors
 
-        if @core.statistics
-          @core.statistics.register @statistics_id, @reporter
-        end
+      if core.debug
+        core.debug.monitor input, FFWD::Debug::Input
       end
 
-      stopping do
-        if @core.statistics and @statistics_id
-          @core.statistics.unregister @statistics_id
-          @statistics_id = nil
-        end
-
-        @metadata = nil
-        @processor = nil
-        @channel_id = nil
-        @tcp_bind = {}
-        @udp_bind = {}
+      if core.statistics
+        reporters = [input, processor]
+        reporter = FFWD::Core::Reporter.new reporters
+        core.statistics.register self, "tunnel/#{id}", reporter
       end
 
-      @core = core.reconnect @input
-
-      @core.tunnel_plugins.each do |t|
-        instance = t.setup @core, self
-        instance.depend_on self
+      core.tunnel_plugins.each do |factory|
+        factory.call(core, self).depend_on self
       end
 
-      @input.depend_on self
-      @core.depend_on self
+      input.depend_on self
+      core.depend_on self
+
+      start
     end
 
     def tcp port, &block
@@ -224,8 +106,8 @@ module FFWD::Plugin::Tunnel
     def read_metadata data
       d = {}
 
-      d[:tags] = FFWD.merge_sets @core.tags, data["tags"]
-      d[:attributes] = FFWD.merge_sets @core.attributes, data["attributes"]
+      d[:tags] = FFWD.merge_sets @parent.tags, data["tags"]
+      d[:attributes] = FFWD.merge_sets @parent.attributes, data["attributes"]
 
       if host = data["host"]
         d[:host] = host
@@ -257,8 +139,7 @@ module FFWD::Plugin::Tunnel
     end
 
     def receive_metadata data
-      @metadata = read_metadata data
-      start
+      setup read_metadata(data)
       send_config
     end
 
@@ -353,7 +234,6 @@ module FFWD::Plugin::Tunnel
 
     def tunnel_state header, addr, state
       if header.protocol == Socket::SOCK_DGRAM
-        # ignored
         log.error "UDP does not handle: #{state}"
         return
       end

data/lib/ffwd/plugin/tunnel/bind_tcp.rb

@@ -0,0 +1,89 @@
+# $LICENSE
+# Copyright 2013-2014 Spotify AB. All rights reserved.
+#
+# The contents of this file are licensed under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'ffwd/tunnel/plugin'
+
+module FFWD::Plugin::Tunnel
+  class BindTCP
+    class Handle < FFWD::Tunnel::Plugin::Handle
+      attr_reader :addr
+
+      def initialize bind, addr
+        @bind = bind
+        @addr = addr
+        @close = nil
+        @data = nil
+      end
+
+      def send_data data
+        @bind.send_data @addr, data
+      end
+
+      def close &block
+        @close = block
+      end
+
+      def data &block
+        @data = block
+      end
+
+      def recv_close
+        return if @close.nil?
+        @close.call
+        @close = nil
+        @data = nil
+      end
+
+      def recv_data data
+        return if @data.nil?
+        @data.call data
+      end
+    end
+
+    def initialize port, family, tunnel, block
+      @port = port
+      @family = family
+      @tunnel = tunnel
+      @block = block
+      @handles = {}
+    end
+
+    def open addr
+      raise "Already open: #{addr}" if @handles[addr]
+      handle = @handles[addr] = Handle.new self, addr
+      @block.call handle
+    end
+
+    def close addr
+      raise "Not open: #{addr}" unless handle = @handles[addr]
+      handle.recv_close
+      @handles.delete addr
+    end
+
+    def data addr, data
+      return if data.empty?
+
+      unless handle = @handles[addr]
+        raise "Not available: #{addr}"
+      end
+
+      handle.recv_data data
+    end
+
+    def send_data addr, data
+      @tunnel.send_data Socket::SOCK_STREAM, @family, @port, addr, data
+    end
+  end
+end

data/lib/ffwd/plugin/tunnel/bind_udp.rb

@@ -0,0 +1,49 @@
+# $LICENSE
+# Copyright 2013-2014 Spotify AB. All rights reserved.
+#
+# The contents of this file are licensed under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'ffwd/tunnel/plugin'
+
+module FFWD::Plugin::Tunnel
+  class BindUDP
+    class Handle < FFWD::Tunnel::Plugin::Handle
+      attr_reader :addr
+
+      def initialize bind, addr
+        @bind = bind
+        @addr = addr
+      end
+
+      def send_data data
+        @bind.send_data @addr, data
+      end
+    end
+
+    def initialize port, family, tunnel, block
+      @port = port
+      @family = family
+      @tunnel = tunnel
+      @block = block
+    end
+
+    def send_data addr, data
+      @tunnel.send_data Socket::SOCK_DGRAM, @family, @port, addr, data
+    end
+
+    def data! addr, data
+      handle = Handle.new self, addr
+      @block.call handle, data
+    end
+  end
+end

data/lib/ffwd/plugin/tunnel/connection_tcp.rb

@@ -15,6 +15,8 @@
 
 require 'ffwd/connection'
 
+require_relative 'binary_protocol'
+
 module FFWD::Plugin::Tunnel
   class ConnectionTCP < FFWD::Connection
     include FFWD::Logging
@@ -24,10 +26,10 @@ module FFWD::Plugin::Tunnel
       "tunnel_in_tcp"
     end
 
-    def initialize bind, core, tunnel_protocol
+    def initialize bind, core, config
       @bind = bind
       @core = core
-      @tunnel_protocol = tunnel_protocol
+      @tunnel_protocol = BinaryProtocol
       @protocol_instance = nil
     end
 
@@ -43,6 +45,8 @@ module FFWD::Plugin::Tunnel
       peer = get_peername
       port, ip = Socket.unpack_sockaddr_in(peer)
       "#{ip}:#{port}"
+    rescue
+      nil
     end
 
     def post_init

data/lib/ffwd/plugin/tunnel/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Tunnel
-      VERSION = "0.1.7"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-tunnel
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffwd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -68,33 +61,34 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ffwd-tunnel-agent
-- lib/ffwd/plugin/tunnel/connection_tcp.rb
+- lib/ffwd/plugin/tunnel.rb
+- lib/ffwd/plugin/tunnel/bind_udp.rb
+- lib/ffwd/plugin/tunnel/bind_tcp.rb
 - lib/ffwd/plugin/tunnel/binary_protocol.rb
 - lib/ffwd/plugin/tunnel/version.rb
-- lib/ffwd/plugin/tunnel.rb
+- lib/ffwd/plugin/tunnel/connection_tcp.rb
 homepage: https://github.com/spotify/ffwd
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple tunneling support for FFWD.
 test_files: []