RubyGems - p2p2 - Versions diffs - 0.14.0 → 0.18.0 - Mend

p2p2 0.14.0 → 0.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +4 -4
data/lib/p2p2.rb +3 -3
data/lib/p2p2/{hex.rb → custom.rb} +2 -5
data/lib/p2p2/head.rb +28 -26
data/lib/p2p2/p1.rb +114 -945
data/lib/p2p2/p1_custom.rb +7 -0
data/lib/p2p2/p1_worker.rb +924 -0
data/lib/p2p2/p2.rb +114 -1013
data/lib/p2p2/p2_custom.rb +7 -0
data/lib/p2p2/p2_worker.rb +963 -0
data/lib/p2p2/p2pd.rb +120 -135
data/lib/p2p2/p2pd_worker.rb +78 -0
data/lib/p2p2/version.rb +3 -3
data/p2p2.gemspec +34 -29
metadata +10 -4

data/lib/p2p2/p2pd.rb CHANGED

@@ -1,135 +1,120 @@
-require 'p2p2/head'
-require 'p2p2/version'
-require 'socket'
-##
-# P2p2::P2pd - 内网里的任意应用，访问另一个内网里的应用服务端。配对服务器端。
-#
-# 1.
-#
-# ```
-#                    p2pd
-#                    ^  ^
-#                  ^    ^
-#      “周立波的房间”     “周立波的房间”
-#      ^                         ^
-#     ^                         ^
-#   p1 --> nat --><-- nat <-- p2
-#
-# ```
-#
-# 2.
-#
-# ```
-#   ssh --> p2 --> (encode) --> p1 --> (decode) --> sshd
-# ```
-#
-# usage
-# =====
-#
-# 1. Girl::P2pd.new( 5050 ).looping # @server
-#
-# 2. Girl::P1.new( 'your.server.ip', 5050, '127.0.0.1', 22, '周立波' ).looping # @home1
-#
-# 3. Girl::P2.new( 'your.server.ip', 5050, '0.0.0.0', 2222, '周立波' ).looping # @home2
-#
-# 4. ssh -p2222 libo@localhost
-#
-# 包结构
-# ======
-#
-# Q>: 1+ app/shadow_id -> Q>: pack_id  -> traffic
-#     0  ctlmsg        -> C:  1 peer addr     -> p1/p2_sockaddr
-#                             2 heartbeat     -> C: random char
-#                             3 a new app     -> Q>: app_id
-#                             4 paired        -> Q>Q>: app_id shadow_id
-#                             5 shadow status -> Q>Q>Q>: shadow_id biggest_shadow_pack_id continue_app_pack_id
-#                             6 app status    -> Q>Q>Q>: app_id biggest_app_pack_id continue_shadow_pack_id
-#                             7 miss          -> Q>Q>Q>: app/shadow_id pack_id_begin pack_id_end
-#                             8 fin1          -> Q>: app/shadow_id
-#                             9 got fin1      -> Q>: app/shadow_id
-#                            10 fin2          -> Q>: app/shadow_id
-#                            11 got fin2      -> Q>: app/shadow_id
-#                            12 p1 fin
-#                            13 p2 fin
-#
-module P2p2
-  class P2pd
-    ##
-    # p2pd_port 配对服务器端口
-    # p2pd_dir  可在该目录下看到所有的房间
-    def initialize( p2pd_port = 5050, p2pd_dir = '/tmp' )
-      p2pd = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
-      p2pd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      p2pd.bind( Socket.pack_sockaddr_in( p2pd_port, '0.0.0.0' ) )
-      @p2pd = p2pd
-      @p2pd_dir = p2pd_dir
-    end
-    def looping
-      puts 'looping'
-      loop do
-        rs, _ = IO.select( [ @p2pd ] )
-        read_p2pd( rs.first )
-      end
-    rescue Interrupt => e
-      puts e.class
-      quit!
-    end
-    def quit!
-      exit
-    end
-    private
-    def read_p2pd( p2pd )
-      data, addrinfo, rflags, *controls = p2pd.recvmsg
-      return if ( data.bytesize == 1 ) || ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
-      sockaddr = addrinfo.to_sockaddr
-      title_path = File.join( @p2pd_dir, data )
-      unless File.exist?( title_path )
-        write_title( title_path, sockaddr )
-        return
-      end
-      if Time.new - File.mtime( title_path ) > 300
-        write_title( title_path, sockaddr )
-        return
-      end
-      op_sockaddr = IO.binread( title_path )
-      if Addrinfo.new( op_sockaddr ).ip_address == addrinfo.ip_address
-        write_title( title_path, sockaddr )
-        return
-      end
-      send_pack( p2pd, "#{ [ 0, PEER_ADDR ].pack( 'Q>C' ) }#{ op_sockaddr }", sockaddr )
-      send_pack( p2pd, "#{ [ 0, PEER_ADDR ].pack( 'Q>C' ) }#{ sockaddr }", op_sockaddr )
-    end
-    def write_title( title_path, sockaddr )
-      begin
-        # puts "debug write title #{ title_path } #{ Time.new }"
-        IO.binwrite( title_path, sockaddr )
-      rescue Errno::EISDIR, Errno::ENAMETOOLONG, Errno::ENOENT, ArgumentError => e
-        puts "binwrite #{ e.class } #{ Time.new }"
-      end
-    end
-    def send_pack( sock, data, target_sockaddr )
-      begin
-        # puts "debug sendmsg #{ data.inspect } #{ Time.new }"
-        sock.sendmsg( data, 0, target_sockaddr )
-      rescue IO::WaitWritable, Errno::EINTR => e
-        puts "sendmsg #{ e.class } #{ Time.new }"
-      end
-    end
-  end
-end
+require 'json'
+require 'p2p2/head'
+require 'p2p2/p2pd_worker'
+require 'p2p2/version'
+require 'socket'
+##
+# P2p2::P2pd - 内网里的任意应用，访问另一个内网里的应用服务端。配对服务器端。
+#
+# 包结构
+# ======
+#
+# tund-p2pd, tun-p2pd:
+#
+# room
+#
+# p2pd-tund, p2pd-tun:
+#
+# Q>: 0  ctlmsg -> C:  1 peer addr -> tun sockaddr / tund sockaddr
+#
+# tun-tund:
+#
+# Q>: 0  ctlmsg -> C: 2 heartbeat     -> C: random char
+#                     3 a new source  -> Q>: src id
+#                     4 paired        -> Q>: src id -> n: dst port
+#                     5 dest status   -> n: dst port -> Q>: biggest relayed dst pack id -> Q>: continue src pack id
+#                     6 source status -> Q>: src id -> Q>: biggest relayed src pack id -> Q>: continue dst pack id
+#                     7 miss          -> Q>/n: src id / dst port -> Q>: pack id begin -> Q>: pack id end
+#                     8 fin1          -> Q>/n: src id / dst port -> Q>: biggest src pack id / biggest dst pack id -> Q>: continue dst pack id / continue src pack id
+#                     9 not use
+#                    10 fin2          -> Q>/n: src id / dst port
+#                    11 not use
+#                    12 tund fin
+#                    13 tun fin
+#
+# Q>: 1+ pack_id -> Q>/n: src id / dst port -> traffic
+#
+# close logic
+# ===========
+#
+# 1-1. after close src -> dst closed ? no -> send fin1
+# 1-2. tun recv fin2 -> del src ext
+#
+# 2-1. tun recv fin1 -> all traffic received ? -> close src after write
+# 2-2. tun recv traffic -> dst closed and all traffic received ? -> close src after write
+# 2-3. after close src -> dst closed ? yes -> del src ext -> send fin2
+#
+# 3-1. after close dst -> src closed ? no -> send fin1
+# 3-2. tund recv fin2 -> del dst ext
+#
+# 4-1. tund recv fin1 -> all traffic received ? -> close dst after write
+# 4-2. tund recv traffic -> src closed and all traffic received ? -> close dst after write
+# 4-3. after close dst -> src closed ? yes -> del dst ext -> send fin2
+#
+module P2p2
+  class P2pd
+    def initialize( config_path = nil )
+      unless config_path
+        config_path = File.expand_path( '../p2p2.conf.json', __FILE__ )
+      end
+      unless File.exist?( config_path )
+        raise "missing config file #{ config_path }"
+      end
+      conf = JSON.parse( IO.binread( config_path ), symbolize_names: true )
+      p2pd_port = conf[ :p2pd_port ]
+      p2pd_tmp_dir = conf[ :p2pd_tmp_dir ]
+      unless p2pd_port
+        p2pd_port = 2020
+      end
+      unless p2pd_tmp_dir
+        p2pd_tmp_dir = '/tmp/p2p2.p2pd'
+      end
+      unless File.exist?( p2pd_tmp_dir )
+        Dir.mkdir( p2pd_tmp_dir )
+      end
+      title = "p2p2 p2pd #{ P2p2::VERSION }"
+      puts title
+      puts "p2pd port #{ p2pd_port }"
+      puts "p2pd tmp dir #{ p2pd_tmp_dir }"
+      if RUBY_PLATFORM.include?( 'linux' )
+        $0 = title
+        pid = fork do
+          $0 = 'p2p2 p2pd worker'
+          worker = P2p2::P2pdWorker.new( p2pd_port, p2pd_tmp_dir )
+          Signal.trap( :TERM ) do
+            puts 'exit'
+            worker.quit!
+          end
+          worker.looping
+        end
+        Signal.trap( :TERM ) do
+          puts 'trap TERM'
+          begin
+            Process.kill( :TERM, pid )
+          rescue Errno::ESRCH => e
+            puts e.class
+          end
+        end
+        Process.waitall
+      else
+        P2p2::P2pdWorker.new( p2pd_port, p2pd_tmp_dir ).looping
+      end
+    end
+  end
+end

data/lib/p2p2/p2pd_worker.rb ADDED

@@ -0,0 +1,78 @@
+module P2p2
+  class P2pdWorker
+    def initialize( p2pd_port, p2pd_tmp_dir )
+      p2pd = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+      p2pd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+      p2pd.bind( Socket.pack_sockaddr_in( p2pd_port, '0.0.0.0' ) )
+      @p2pd = p2pd
+      @p2pd_tmp_dir = p2pd_tmp_dir
+    end
+    def looping
+      puts 'looping'
+      loop do
+        rs, _ = IO.select( [ @p2pd ] )
+        read_p2pd( rs.first )
+      end
+    rescue Interrupt => e
+      puts e.class
+      quit!
+    end
+    def quit!
+      exit
+    end
+    private
+    def read_p2pd( p2pd )
+      data, addrinfo, rflags, *controls = p2pd.recvmsg
+      return if ( data.bytesize == 1 ) || ( data.bytesize > 255 ) || ( data =~ /\/|\.|\ / )
+      from_addr = addrinfo.to_sockaddr
+      room_path = File.join( @p2pd_tmp_dir, data.gsub( "\u0000" , '' ) )
+      unless File.exist?( room_path )
+        puts "#{ Time.new } create #{ room_path } #{ addrinfo.inspect }"
+        write_room( room_path, from_addr )
+        return
+      end
+      if Time.new - File.mtime( room_path ) > EXPIRE_AFTER
+        puts "#{ Time.new } overwrite #{ room_path } #{ addrinfo.inspect }"
+        write_room( room_path, from_addr )
+        return
+      end
+      op_addr = IO.binread( room_path )
+      op_addrinfo = Addrinfo.new( op_addr )
+      if ( addrinfo.ip_address == op_addrinfo.ip_address ) || ( addrinfo.ip_port == op_addrinfo.ip_port )
+        write_room( room_path, from_addr )
+      else
+        puts "#{ Time.new } paired #{ addrinfo.inspect } #{ op_addrinfo.inspect }"
+        send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), op_addr ].join, from_addr )
+        send_pack( [ [ 0, PEER_ADDR ].pack( 'Q>C' ), from_addr ].join, op_addr )
+      end
+    end
+    def write_room( room_path, data )
+      begin
+        IO.binwrite( room_path, data )
+      rescue Errno::EISDIR, Errno::ENAMETOOLONG, Errno::ENOENT, ArgumentError => e
+        puts "binwrite #{ e.class } #{ Time.new }"
+      end
+    end
+    def send_pack( data, target_addr )
+      begin
+        @p2pd.sendmsg( data, 0, target_addr )
+      rescue IO::WaitWritable, Errno::EINTR => e
+        puts "#{ Time.new } sendmsg ignore #{ e.class }"
+      end
+    end
+  end
+end

data/lib/p2p2/version.rb CHANGED

@@ -1,3 +1,3 @@
-module P2p2
-  VERSION = '0.14.0'.freeze
-end
+module P2p2
+  VERSION = '0.18.0'.freeze
+end

data/p2p2.gemspec CHANGED

@@ -1,29 +1,34 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "p2p2/version"
-Gem::Specification.new do |spec|
-  spec.name          = "p2p2"
-  spec.version       = P2p2::VERSION
-  spec.authors       = ["takafan"]
-  spec.email         = ["qqtakafan@gmail.com"]
-  spec.summary       = %q{p2p}
-  spec.description   = %q{内网里的任意应用，访问另一个内网里的应用服务端。}
-  spec.homepage      = "https://github.com/takafan/p2p2"
-  spec.license       = "MIT"
-  spec.files         = %w[
-p2p2.gemspec
-lib/p2p2.rb
-lib/p2p2/head.rb
-lib/p2p2/hex.rb
-lib/p2p2/p1.rb
-lib/p2p2/p2.rb
-lib/p2p2/p2pd.rb
-lib/p2p2/version.rb
-  ]
-  spec.require_paths = ["lib"]
-end
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "p2p2/version"
+Gem::Specification.new do |spec|
+  spec.name          = "p2p2"
+  spec.version       = P2p2::VERSION
+  spec.authors       = ["takafan"]
+  spec.email         = ["qqtakafan@gmail.com"]
+  spec.summary       = %q{p2p}
+  spec.description   = %q{内网里的任意应用，访问另一个内网里的应用服务端。}
+  spec.homepage      = "https://github.com/takafan/p2p2"
+  spec.license       = "MIT"
+  spec.files         = %w[
+p2p2.gemspec
+lib/p2p2.rb
+lib/p2p2/custom.rb
+lib/p2p2/head.rb
+lib/p2p2/p1_custom.rb
+lib/p2p2/p1_worker.rb
+lib/p2p2/p1.rb
+lib/p2p2/p2_custom.rb
+lib/p2p2/p2_worker.rb
+lib/p2p2/p2.rb
+lib/p2p2/p2pd_worker.rb
+lib/p2p2/p2pd.rb
+lib/p2p2/version.rb
+  ]
+  spec.require_paths = ["lib"]
+end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.18.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies: []
 description: 内网里的任意应用，访问另一个内网里的应用服务端。
 email:
@@ -18,11 +18,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/p2p2.rb
+- lib/p2p2/custom.rb
 - lib/p2p2/head.rb
-- lib/p2p2/hex.rb
 - lib/p2p2/p1.rb
+- lib/p2p2/p1_custom.rb
+- lib/p2p2/p1_worker.rb
 - lib/p2p2/p2.rb
+- lib/p2p2/p2_custom.rb
+- lib/p2p2/p2_worker.rb
 - lib/p2p2/p2pd.rb
+- lib/p2p2/p2pd_worker.rb
 - lib/p2p2/version.rb
 - p2p2.gemspec
 homepage: https://github.com/takafan/p2p2
@@ -44,7 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project:
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: p2p