rendezvous-socket 0.0.1 → 0.0.2

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p448

data/README.md

@@ -1,6 +1,6 @@
 # Rendezvous::Socket
 
-Using the help of a well known rendezvous endpoint establish a peer to
+Using the help of a known publically routable [rendezvous-server](https://github.com/mikehale/rendezvous-server) endpoint establish a peer to
 peer connection between clients which may be behind NAT firewalls. In
 the event that NAT traversal techniques are not successful fallback to
 relaying the connection through the rendezvous server. All connections
@@ -22,15 +22,18 @@ Or install it yourself as:
 
 ## Usage
 
-1. On a server with a known IP address run the server.
+1. Deploy the server
 
   ```bash
-  rendezvous-server
+  git clone https://github.com/mikehale/rendezvous-server.git
+  heroku create
+  git push heroku master
+  heroku labs:enable websockets
   ```
 2. On 2 peer machines that wish to establish a direct connection with each other run the client.
 
   ```bash
-  RENDEZVOUS_SERVER=n.n.n.n:5000 rendezvous-client
+  RENDEZVOUS_URL=https://rendezvous-server.herokuapp.com bundle exec bin/rendezvous-client
   ```
 
 You will know it worked when you see the hostname of each peer in the
@@ -46,11 +49,12 @@ output of it's peer.
 
 ## TODO
 
-* Speed. Can a connection be established in < 4 seconds?
 * Server managed sessions
 * SSL
 * Clean interface (as similar to socket interface as possible)
 * Fallback to relay mode
+* Link local connection attempt
+* Figure out why linux does not even attempt to send packets somtimes. Connect vs Accept first?
 
 ## Inspiration
 

data/bin/rendezvous-client

@@ -6,14 +6,7 @@ require 'rendezvous/socket'
 
 $DEBUG = true if ENV['DEBUG']
 
-s = Rendezvous::Socket.new(ENV['RENDEZVOUS_SERVER']).open
-s.close
+s, addrinfo, type = Rendezvous::Socket.new(ENV['RENDEZVOUS_URL']).open
 s.puts Socket.gethostname
 puts s.gets
-
-i = 0
-while true
-  s.puts i = i + 1
-  puts s.gets
-  sleep 1
-end
+s.close

data/lib/rendezvous/socket.rb

@@ -1,19 +1,23 @@
 require "rendezvous/socket/version"
 require "rendezvous/socket/custom_socket"
+require "rendezvous/socket/accept_or_connect"
+require "timeout"
+require "excon"
+
+Excon.defaults[:ssl_verify_peer] = false
 
 module Rendezvous
   module Socket
 
-    def self.new(server)
-      RendezvousSocket.new(server)
+    def self.new(url)
+      RendezvousSocket.new(url)
     end
 
     class RendezvousSocket
-      attr_reader :rendezvous_server
+      attr_reader :rendezvous_url
 
-      def initialize(rendezvous_server)
-        @rendezvous_server = rendezvous_server
-        super()
+      def initialize(rendezvous_url)
+        @rendezvous_url = rendezvous_url
       end
 
       def log(args={})
@@ -25,30 +29,43 @@ module Rendezvous
         result
       end
 
+      def punch_nat_nonblock(lport, rhost, rport)
+        log(step: :punch_nat) {
+          #Thread.new do
+            begin
+              socket = CustomSocket.new
+              # set ttl low enough so it crosses our nat but won't reach remote peer.
+              socket.setsockopt(::Socket::IPPROTO_IP, ::Socket::IP_TTL, [2].pack("L"))
+              socket.bind(lport)
+
+              Timeout::timeout(0.3) do
+                socket.connect(rhost,rport)
+              end
+            rescue Timeout::Error, Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
+              socket.close
+            end
+        #end
+        }
+      end
+
       # lport=0 causes OS to select a random high port
       def get_peer_endpoint(lport=0)
-        socket = CustomSocket.new
-        socket.bind(lport)
-        socket.connect(*rendezvous_server.split(":"))
-
-        rhost, rport = socket.gets.chomp.split(":")
-        [socket.local_port, rhost, rport.to_i]
+        log(step: :get_peer_endpoint) {
+          response = Excon.get(rendezvous_url, reuseaddr: true)
+          rhost, rport = response.body.split(":")
+          [response.local_port, response.local_address, rport.to_i, rhost]
+        }
       end
 
-      def peer_socket(lport, rhost, rport)
-        peer = CustomSocket.new
-        peer.bind(lport)
-        peer if peer.connect(rhost, rport)
+      def peer_socket(lport, lhost, rport, rhost)
+        log(step: :connect, lport: lport, rport: rport, rhost: rhost) {
+          #punch_nat_nonblock(lport, rhost, rport)
+          AcceptOrConnect.new(lport, lhost, rport, rhost).socket
+        }
       end
 
       def open
-        lport, rhost, rport = nil
-        log(step: :get_peer_endpoint) {
-          lport, rhost, rport = get_peer_endpoint
-        }
-        log(step: :connect) {
-          peer_socket(lport, rhost, rport)
-        }
+        peer_socket(*get_peer_endpoint)
       end
     end
   end

data/lib/rendezvous/socket/accept_or_connect.rb

@@ -0,0 +1,87 @@
+require 'timeout'
+require 'socket'
+module Rendezvous
+
+  class AcceptOrConnect
+    include ::Socket::Constants
+
+    CONN_REFUSED_DELAY = 0.5
+    ADDR_IN_USE_DELAY = 0.5
+    CONNECTION_TIMEOUT = 10
+
+    attr_reader :bind_port, :bind_addr, :dest_port, :dest_addr
+
+    def initialize(bind_port, bind_addr, dest_port, dest_addr)
+      @bind_port = bind_port
+      @bind_addr = bind_addr
+      @dest_port = dest_port
+      @dest_addr = dest_addr
+    end
+
+    def new_socket
+      ::Socket.new(AF_INET, SOCK_STREAM, 0).tap do |s|
+        s.setsockopt(SOL_SOCKET, SO_REUSEADDR, true)
+        s.setsockopt(SOL_SOCKET, SO_REUSEPORT, true) if defined?(SO_REUSEPORT)
+        s.bind(::Socket.sockaddr_in(bind_port, bind_addr))
+      end
+    end
+
+    def socket
+      Timeout::timeout(CONNECTION_TIMEOUT) {
+        wait_for_accept_or_connect
+      }
+    end
+
+    def wait_for_accept_or_connect
+      a_thread = Thread.new {
+        # prefer connect over accept
+        if RUBY_PLATFORM =~ /linux/
+          sleep 2
+        end
+
+        s = new_socket
+        s.listen(5)
+        client_socket, addrinfo = s.accept
+        Thread.current["socket"] = client_socket
+        Thread.current["addrinfo"] = addrinfo
+        Thread.current.exit
+      }
+      a_thread.abort_on_exception = true
+
+      c_thread = Thread.new {
+        begin
+          s = new_socket
+          sockaddr = ::Socket.sockaddr_in(dest_port, dest_addr)
+          s.connect(sockaddr)
+          Thread.current["socket"] = s
+          Thread.current["addrinfo"] = Addrinfo.new(sockaddr)
+        rescue Errno::ECONNREFUSED
+          sleep CONN_REFUSED_DELAY
+          retry
+        rescue Errno::EADDRINUSE
+          sleep ADDR_IN_USE_DELAY
+          retry
+        end
+        Thread.current.exit
+      }
+      c_thread.abort_on_exception = true
+
+      # wait while both a and c are alive
+      while a_thread.alive? && c_thread.alive?
+        sleep 0.1
+      end
+
+      if a_thread.status == false
+        # accept succeded
+        Thread.kill(c_thread)
+        [a_thread["socket"], a_thread["addrinfo"], :accept]
+      elsif c_thread.status == false
+        # connect succeded
+        Thread.kill(a_thread)
+        [c_thread["socket"], c_thread["addrinfo"], :connect]
+      end
+
+    end
+  end
+
+end

data/lib/rendezvous/socket/custom_socket.rb

@@ -29,7 +29,19 @@ module Rendezvous
         super(addr_remote)
       end
 
+      def connect_nonblock(ip, port)
+        $stderr.puts "attempting to connect_nonblock to #{ip}:#{port}" if $DEBUG
+        addr_remote = ::Socket.pack_sockaddr_in(port, ip)
+        super(addr_remote)
+      end
+
       def accept
+        $stderr.puts "attempting to accept" if $DEBUG
+        super[0]
+      end
+
+      def accept_nonblock
+        $stderr.puts "attempting to accept_nonblock" if $DEBUG
         super[0]
       end
 

data/lib/rendezvous/socket/version.rb

@@ -1,5 +1,5 @@
 module Rendezvous
   module Socket
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/rendezvous-socket.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "excon", "~> 0.32.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rendezvous-socket
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.32.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -43,8 +59,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Using the help of a well known rendezvous endpoint establish a peer
-  to
+description: ! 'Using the help of a known publically routable [rendezvous-server](https://github.com/mikehale/rendezvous-server)
+  endpoint establish a peer to
 
   peer connection between clients which may be behind NAT firewalls. In
 
@@ -62,6 +78,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,6 +86,7 @@ files:
 - bin/rendezvous-client
 - bin/rendezvous-server
 - lib/rendezvous/socket.rb
+- lib/rendezvous/socket/accept_or_connect.rb
 - lib/rendezvous/socket/custom_socket.rb
 - lib/rendezvous/socket/version.rb
 - rendezvous-socket.gemspec
@@ -85,12 +103,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1685353518646290618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1685353518646290618
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23