p2p2 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304436e9d7374bc6e93585c3a5eb19e9609de9781847893b86d6c3d4743de621
-  data.tar.gz: 5fe0577da9088b012a45e48637b867bb0e5a9e008bc7e16d4365dc324a3a42e1
+  metadata.gz: ca1bca606c23b34a5ee3a3f73b8e0764f8f965be5724a7e8fafd478c449c5d37
+  data.tar.gz: 2afdaf91bc5df9b534d322c1b1e3d46588aeff0369a87badf44e575f60d39c7b
 SHA512:
-  metadata.gz: 40543a3591a792096d3b663deb762132fbf15f09c7cc7df2c342e97d1a2aab566a5744bf616005e0a3e3eae15c6479adbfd270ed628145373c6b4354e7790506
-  data.tar.gz: 730b27755bdd1033e2310ae86f3dab1f6b8e25c2bc42c4ceaa109e2c03cdd2728e64aab553e49abc63f58dfee3befd55c29df4b52f07c6e9ed25b0790790b26a
+  metadata.gz: 57e9f9faebd08006a37d7a71529bc2db8b6f445011717652f23a66b5fbe984bdb36e857cc8c379d1dbbba58dda5f20031f9f59083bca11d357c3a471ce7a2af0
+  data.tar.gz: b2610f153384a3b6eb4bcfd474072cabb7a95e08bbc1f1340a54c45ad1cab5406cdf533ce0034a244e7085b4542890dba7bcacd4988897f17b835b62978d2630

data/lib/p2p2.rb

@@ -1,6 +1,6 @@
-require "p2p2/version"
-
-module P2p2
-  class Error < StandardError; end
-  # Your code goes here...
-end
+require "p2p2/version"
+
+module P2p2
+  class Error < StandardError; end
+  # Your code goes here...
+end

data/lib/p2p2/head.rb

@@ -1,10 +1,10 @@
-module P2p2
-  PACK_SIZE = 1448 # 包大小
-  CHUNK_SIZE = PACK_SIZE * 1000 # 块大小
-  REP2P_LIMIT = 5 # p2p重试次数。到早了另一头还没从洞里出来，会吃ECONNREFUSED，不慌，再来一发。
-  HEARTBEAT = 1
-  SET_TITLE = 2
-  PAIRING = 3
-  NEED_CHUNK = true
-  NEED_RENEW = true
-end
+module P2p2
+  PACK_SIZE = 1448 # 包大小
+  CHUNK_SIZE = PACK_SIZE * 1000 # 块大小
+  REP2P_LIMIT = 5 # p2p重试次数。到早了另一头还没从洞里出来，会吃ECONNREFUSED，不慌，再来一发。
+  HEARTBEAT = 1
+  SET_TITLE = 2
+  PAIRING = 3
+  NEED_CHUNK = true
+  NEED_RENEW = true
+end

data/lib/p2p2/p1.rb

@@ -1,413 +1,410 @@
-require 'p2p2/head'
-require 'p2p2/hex'
-require 'p2p2/version'
-require 'socket'
-
-##
-# P2p2::P1 - 处于各自nat里的两端p2p。p1端。
-#
-module P2p2
-  class P1
-
-    ##
-    # roomd_host    匹配服务器ip
-    # roomd_port    匹配服务器端口
-    # appd_host     任意的一个应用的ip
-    # appd_port     应用端口
-    # title         约定的房间名
-    # app_chunk_dir 文件缓存目录，缓存app来不及写的流量
-    # p1_chunk_dir  文件缓存目录，缓存p1来不及写的流量
-    def initialize( roomd_host, roomd_port, appd_host, appd_port, title, app_chunk_dir = '/tmp', p1_chunk_dir = '/tmp' )
-      @roomd_sockaddr = Socket.sockaddr_in( roomd_port, roomd_host )
-      @appd_sockaddr = Socket.sockaddr_in( appd_port, appd_host )
-      @title = title
-      @app_chunk_dir = app_chunk_dir
-      @p1_chunk_dir = p1_chunk_dir
-      @hex = P2p2::Hex.new
-      @mutex = Mutex.new
-      @roles = {}  # sock => :room / :p1 / :app
-      @infos = {}
-      @closings = {} # sock => need_renew
-      @reads = []
-      @writes = []
-      @is_renew = false
-
-      new_room
-    end
-
-    def looping
-      puts 'looping'
-
-      loop_heartbeat
-
-      loop do
-        rs, ws = IO.select( @reads, @writes )
-
-        @mutex.synchronize do
-          rs.each do | sock |
-            case @roles[ sock ]
-            when :room
-              read_room( sock )
-            when :p1
-              read_p1( sock )
-            when :app
-              read_app( sock )
-            end
-          end
-
-          ws.each do | sock |
-            case @roles[ sock ]
-            when :room
-              write_room( sock )
-            when :p1
-              write_p1( sock )
-            when :app
-              write_app( sock )
-            end
-          end
-        end
-      end
-    rescue Interrupt => e
-      puts e.class
-      quit!
-    end
-
-    def quit!
-      exit
-    end
-
-    private
-
-    def loop_heartbeat
-      Thread.new do
-        loop do
-          sleep 59
-
-          @mutex.synchronize do
-            @room.write( [ HEARTBEAT ].pack( 'C' ) )
-          end
-        end
-      end
-    end
-
-    def read_room( sock )
-      begin
-        data = sock.read_nonblock( PACK_SIZE )
-      rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
-        return
-      rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
-        puts "read room #{ e.class } #{ Time.new }"
-
-        if @is_renew
-          raise e
-        end
-
-        add_closing( sock )
-        return
-      end
-
-      @is_renew = false
-      info = @infos[ sock ]
-      info[ :p2_sockaddr ] = data
-      new_p1
-    end
-
-    def read_p1( sock )
-      begin
-        data = sock.read_nonblock( PACK_SIZE )
-      rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
-        return
-      rescue Errno::ECONNREFUSED => e
-        if @room_info[ :rep2p ] >= REP2P_LIMIT
-          raise e
-        end
-
-        add_closing( sock, NEED_RENEW )
-        return
-      rescue Exception => e
-        add_closing( sock )
-        return
-      end
-
-      unless @app
-        @room_info[ :rep2p ] = 0
-        app = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-        app.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-
-        begin
-          app.connect_nonblock( @appd_sockaddr )
-        rescue IO::WaitWritable, Errno::EINTR
-        end
-
-        app_info = {
-          wbuff: '',
-          cache: '',
-          filename: [ Process.pid, app.object_id ].join( '-' ),
-          chunk_dir: @app_chunk_dir,
-          chunks: [],
-          chunk_seed: 0,
-          p1: sock,
-          need_encode: true
-        }
-
-        @app = app
-        @app_info = app_info
-        @roles[ app ] = :app
-        @infos[ app ] = app_info
-        @reads << app
-      end
-
-      info = @infos[ sock ]
-
-      if info[ :need_decode ]
-        len = data[ 0, 2 ].unpack( 'n' ).first
-        head = @hex.decode( data[ 2, len ] )
-        data = head + data[ ( 2 + len )..-1 ]
-        info[ :need_decode ] = false
-      end
-
-      add_write( @app, data, NEED_CHUNK )
-    end
-
-    def read_app( sock )
-      begin
-        data = sock.read_nonblock( PACK_SIZE )
-      rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
-        return
-      rescue Exception => e
-        add_closing( sock )
-        return
-      end
-
-      info = @infos[ sock ]
-
-      if info[ :need_encode ]
-        data = @hex.encode( data )
-        data = [ [ data.size ].pack( 'n' ), data ].join
-        info[ :need_encode ] = false
-      end
-
-      add_write( @p1, data, NEED_CHUNK )
-    end
-
-    def write_room( sock )
-      if @closings.include?( sock )
-        close_sock( sock )
-        sleep 5
-        new_room
-        @is_renew = true
-        @closings.delete( sock )
-
-        return
-      end
-
-      info = @infos[ sock ]
-      data = info[ :wbuff ]
-
-      if data.empty?
-        @writes.delete( sock )
-        return
-      end
-
-      sock.write( data )
-      info[ :wbuff ].clear
-    end
-
-    def write_p1( sock )
-      if @closings.include?( sock )
-        close_sock( sock )
-        @p1 = nil
-
-        if @app && !@app.closed?
-          add_closing( @app )
-        end
-
-        need_renew = @closings.delete( sock )
-
-        if need_renew
-          sleep 1
-          new_p1
-          @room_info[ :rep2p ] += 1
-        end
-
-        return
-      end
-
-      info = @infos[ sock ]
-      data, from = get_buff( info )
-
-      if data.empty?
-        @writes.delete( sock )
-        return
-      end
-
-      begin
-        written = sock.write_nonblock( data )
-      rescue IO::WaitWritable, Errno::EINTR, IO::WaitReadable
-        return
-      rescue Exception => e
-        add_closing( sock )
-        return
-      end
-
-      data = data[ written..-1 ]
-      info[ from ] = data
-    end
-
-    def write_app( sock )
-      if @closings.include?( sock )
-        close_sock( sock )
-        @app = nil
-
-        if @p1 && !@p1.closed?
-          add_closing( @p1 )
-        end
-
-        @closings.delete( sock )
-        return
-      end
-
-      info = @infos[ sock ]
-      data, from = get_buff( info )
-
-      if data.empty?
-        @writes.delete( sock )
-        return
-      end
-
-      begin
-        written = sock.write_nonblock( data )
-      rescue IO::WaitWritable, Errno::EINTR, IO::WaitReadable
-        return
-      rescue Exception => e
-        add_closing( sock )
-        return
-      end
-
-      data = data[ written..-1 ]
-      info[ from ] = data
-    end
-
-    def get_buff( info )
-      data, from = info[ :cache ], :cache
-
-      if data.empty?
-        if info[ :chunks ].any?
-          path = File.join( info[ :chunk_dir ], info[ :chunks ].shift )
-          data = info[ :cache ] = IO.binread( path )
-
-          begin
-            File.delete( path )
-          rescue Errno::ENOENT
-          end
-        else
-          data, from = info[ :wbuff ], :wbuff
-        end
-      end
-
-      [ data, from ]
-    end
-
-    def add_closing( sock, need_renew = false )
-      unless @closings.include?( sock )
-        @closings[ sock ] = need_renew
-      end
-
-      add_write( sock )
-    end
-
-    def add_write( sock, data = nil, need_chunk = false )
-      if data
-        info = @infos[ sock ]
-        info[ :wbuff ] << data
-
-        if need_chunk && info[ :wbuff ].size >= CHUNK_SIZE
-          filename = [ info[ :filename ], info[ :chunk_seed ] ].join( '.' )
-          chunk_path = File.join( info[ :chunk_dir ], filename )
-          IO.binwrite( chunk_path, info[ :wbuff ] )
-          info[ :chunks ] << filename
-          info[ :chunk_seed ] += 1
-          info[ :wbuff ].clear
-        end
-      end
-
-      unless @writes.include?( sock )
-        @writes << sock
-      end
-    end
-
-    def close_sock( sock )
-      sock.close
-      @roles.delete( sock )
-      @reads.delete( sock )
-      @writes.delete( sock )
-      info = @infos.delete( sock )
-
-      if info && info[ :chunks ]
-        info[ :chunks ].each do | filename |
-          begin
-            File.delete( File.join( info[ :chunk_dir ], filename ) )
-          rescue Errno::ENOENT
-          end
-        end
-      end
-
-      info
-    end
-
-    def new_room
-      room = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      room.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      room.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-
-      begin
-        room.connect_nonblock( @roomd_sockaddr )
-      rescue IO::WaitWritable, Errno::EINTR
-      end
-
-      bytes = @title.unpack( "C*" ).map{ | c | c.chr }.join
-      room_info = {
-        wbuff: [ [ SET_TITLE, bytes.size ].pack( 'Cn' ), bytes ].join,
-        p2_sockaddr: nil,
-        rep2p: 0
-      }
-      @room = room
-      @room_info = room_info
-      @roles[ room ] = :room
-      @infos[ room ] = room_info
-      @reads << room
-      @writes << room
-    end
-
-    def new_p1
-      p1 = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      p1.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      p1.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      p1.bind( @room.local_address ) # use the hole
-
-      begin
-        p1.connect_nonblock( @room_info[ :p2_sockaddr ] )
-      rescue IO::WaitWritable, Errno::EINTR
-      rescue Exception => e
-        puts "connect p2 #{ e.class } #{ Time.new }"
-        p1.close
-        return
-      end
-
-      p1_info = {
-        wbuff: '',
-        cache: '',
-        filename: [ Process.pid, p1.object_id ].join( '-' ),
-        chunk_dir: @p1_chunk_dir,
-        chunks: [],
-        chunk_seed: 0,
-        need_decode: true
-      }
-      @p1 = p1
-      @p1_info = p1_info
-      @roles[ p1 ] = :p1
-      @infos[ p1 ] = p1_info
-      @reads << p1
-    end
-  end
-end
+require 'p2p2/head'
+require 'p2p2/hex'
+require 'p2p2/version'
+require 'socket'
+
+##
+# P2p2::P1 - 处于各自nat里的两端p2p。p1端。
+#
+module P2p2
+  class P1
+
+    ##
+    # roomd_host    匹配服务器ip
+    # roomd_port    匹配服务器端口
+    # appd_host     任意的一个应用的ip
+    # appd_port     应用端口
+    # title         约定的房间名
+    # app_chunk_dir 文件缓存目录，缓存app来不及写的流量
+    # p1_chunk_dir  文件缓存目录，缓存p1来不及写的流量
+    def initialize( roomd_host, roomd_port, appd_host, appd_port, title, app_chunk_dir = '/tmp', p1_chunk_dir = '/tmp' )
+      @roomd_sockaddr = Socket.sockaddr_in( roomd_port, roomd_host )
+      @appd_sockaddr = Socket.sockaddr_in( appd_port, appd_host )
+      @title = title
+      @app_chunk_dir = app_chunk_dir
+      @p1_chunk_dir = p1_chunk_dir
+      @hex = P2p2::Hex.new
+      @mutex = Mutex.new
+      @roles = {}  # sock => :room / :p1 / :app
+      @infos = {}
+      @closings = {} # sock => need_renew
+      @reads = []
+      @writes = []
+      @is_renew = false
+
+      new_room
+    end
+
+    def looping
+      puts 'looping'
+
+      loop_heartbeat
+
+      loop do
+        rs, ws = IO.select( @reads, @writes )
+
+        @mutex.synchronize do
+          rs.each do | sock |
+            case @roles[ sock ]
+            when :room
+              read_room( sock )
+            when :p1
+              read_p1( sock )
+            when :app
+              read_app( sock )
+            end
+          end
+
+          ws.each do | sock |
+            case @roles[ sock ]
+            when :room
+              write_room( sock )
+            when :p1
+              write_p1( sock )
+            when :app
+              write_app( sock )
+            end
+          end
+        end
+      end
+    rescue Interrupt => e
+      puts e.class
+      quit!
+    end
+
+    def quit!
+      exit
+    end
+
+    private
+
+    def loop_heartbeat
+      Thread.new do
+        loop do
+          sleep 59
+
+          @mutex.synchronize do
+            @room.write( [ HEARTBEAT ].pack( 'C' ) )
+          end
+        end
+      end
+    end
+
+    def read_room( sock )
+      begin
+        data = sock.read_nonblock( PACK_SIZE )
+      rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
+        return
+      rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
+        puts "read room #{ e.class } #{ Time.new }"
+
+        if @is_renew
+          raise e
+        end
+
+        add_closing( sock )
+        return
+      end
+
+      @is_renew = false
+      info = @infos[ sock ]
+      info[ :p2_sockaddr ] = data
+      new_p1
+    end
+
+    def read_p1( sock )
+      begin
+        data = sock.read_nonblock( PACK_SIZE )
+      rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
+        return
+      rescue Errno::ECONNREFUSED => e
+        if @room_info[ :rep2p ] >= REP2P_LIMIT
+          raise e
+        end
+
+        add_closing( sock, NEED_RENEW )
+        return
+      rescue Exception => e
+        add_closing( sock )
+        return
+      end
+
+      @room_info[ :rep2p ] = 0
+      info = @infos[ sock ]
+
+      if info[ :need_decode ]
+        len = data[ 0, 2 ].unpack( 'n' ).first
+        head = @hex.decode( data[ 2, len ] )
+        data = head + data[ ( 2 + len )..-1 ]
+        info[ :need_decode ] = false
+      end
+
+      add_write( @app, data, NEED_CHUNK )
+    end
+
+    def read_app( sock )
+      begin
+        data = sock.read_nonblock( PACK_SIZE )
+      rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
+        return
+      rescue Exception => e
+        add_closing( sock )
+        return
+      end
+
+      info = @infos[ sock ]
+
+      if info[ :need_encode ]
+        data = @hex.encode( data )
+        data = [ [ data.size ].pack( 'n' ), data ].join
+        info[ :need_encode ] = false
+      end
+
+      add_write( @p1, data, NEED_CHUNK )
+    end
+
+    def write_room( sock )
+      if @closings.include?( sock )
+        close_sock( sock )
+        sleep 5
+        new_room
+        @is_renew = true
+        @closings.delete( sock )
+
+        return
+      end
+
+      info = @infos[ sock ]
+      data = info[ :wbuff ]
+
+      if data.empty?
+        @writes.delete( sock )
+        return
+      end
+
+      sock.write( data )
+      info[ :wbuff ].clear
+    end
+
+    def write_p1( sock )
+      if @closings.include?( sock )
+        close_sock( sock )
+        @p1 = nil
+
+        if @app && !@app.closed?
+          add_closing( @app )
+        end
+
+        need_renew = @closings.delete( sock )
+
+        if need_renew
+          sleep 1
+          new_p1
+          @room_info[ :rep2p ] += 1
+        end
+
+        return
+      end
+
+      info = @infos[ sock ]
+      data, from = get_buff( info )
+
+      if data.empty?
+        @writes.delete( sock )
+        return
+      end
+
+      begin
+        written = sock.write_nonblock( data )
+      rescue IO::WaitWritable, Errno::EINTR, IO::WaitReadable
+        return
+      rescue Exception => e
+        add_closing( sock )
+        return
+      end
+
+      data = data[ written..-1 ]
+      info[ from ] = data
+    end
+
+    def write_app( sock )
+      if @closings.include?( sock )
+        close_sock( sock )
+        @app = nil
+
+        if @p1 && !@p1.closed?
+          add_closing( @p1 )
+        end
+
+        @closings.delete( sock )
+        return
+      end
+
+      info = @infos[ sock ]
+      data, from = get_buff( info )
+
+      if data.empty?
+        @writes.delete( sock )
+        return
+      end
+
+      begin
+        written = sock.write_nonblock( data )
+      rescue IO::WaitWritable, Errno::EINTR, IO::WaitReadable
+        return
+      rescue Exception => e
+        add_closing( sock )
+        return
+      end
+
+      data = data[ written..-1 ]
+      info[ from ] = data
+    end
+
+    def get_buff( info )
+      data, from = info[ :cache ], :cache
+
+      if data.empty?
+        if info[ :chunks ].any?
+          path = File.join( info[ :chunk_dir ], info[ :chunks ].shift )
+          data = info[ :cache ] = IO.binread( path )
+
+          begin
+            File.delete( path )
+          rescue Errno::ENOENT
+          end
+        else
+          data, from = info[ :wbuff ], :wbuff
+        end
+      end
+
+      [ data, from ]
+    end
+
+    def add_closing( sock, need_renew = false )
+      unless @closings.include?( sock )
+        @closings[ sock ] = need_renew
+      end
+
+      add_write( sock )
+    end
+
+    def add_write( sock, data = nil, need_chunk = false )
+      if data
+        info = @infos[ sock ]
+        info[ :wbuff ] << data
+
+        if need_chunk && info[ :wbuff ].size >= CHUNK_SIZE
+          filename = [ info[ :filename ], info[ :chunk_seed ] ].join( '.' )
+          chunk_path = File.join( info[ :chunk_dir ], filename )
+          IO.binwrite( chunk_path, info[ :wbuff ] )
+          info[ :chunks ] << filename
+          info[ :chunk_seed ] += 1
+          info[ :wbuff ].clear
+        end
+      end
+
+      unless @writes.include?( sock )
+        @writes << sock
+      end
+    end
+
+    def close_sock( sock )
+      sock.close
+      @roles.delete( sock )
+      @reads.delete( sock )
+      @writes.delete( sock )
+      info = @infos.delete( sock )
+
+      if info && info[ :chunks ]
+        info[ :chunks ].each do | filename |
+          begin
+            File.delete( File.join( info[ :chunk_dir ], filename ) )
+          rescue Errno::ENOENT
+          end
+        end
+      end
+
+      info
+    end
+
+    def new_room
+      room = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      room.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+      room.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      begin
+        room.connect_nonblock( @roomd_sockaddr )
+      rescue IO::WaitWritable, Errno::EINTR
+      end
+
+      bytes = @title.unpack( "C*" ).map{ | c | c.chr }.join
+      room_info = {
+        wbuff: [ [ SET_TITLE, bytes.size ].pack( 'Cn' ), bytes ].join,
+        p2_sockaddr: nil,
+        rep2p: 0
+      }
+      @room = room
+      @room_info = room_info
+      @roles[ room ] = :room
+      @infos[ room ] = room_info
+      @reads << room
+      @writes << room
+    end
+
+    def new_p1
+      p1 = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      p1.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+      p1.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      p1.bind( @room.local_address ) # use the hole
+
+      begin
+        p1.connect_nonblock( @room_info[ :p2_sockaddr ] )
+      rescue IO::WaitWritable, Errno::EINTR
+      rescue Exception => e
+        puts "connect p2 #{ e.class } #{ Time.new }"
+        p1.close
+        return
+      end
+
+      p1_info = {
+        wbuff: '',
+        cache: '',
+        filename: [ Process.pid, p1.object_id ].join( '-' ),
+        chunk_dir: @p1_chunk_dir,
+        chunks: [],
+        chunk_seed: 0,
+        need_decode: true
+      }
+      @p1 = p1
+      @p1_info = p1_info
+      @roles[ p1 ] = :p1
+      @infos[ p1 ] = p1_info
+      @reads << p1
+
+      app = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      app.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      begin
+        app.connect_nonblock( @appd_sockaddr )
+      rescue IO::WaitWritable, Errno::EINTR
+      end
+
+      app_info = {
+        wbuff: '',
+        cache: '',
+        filename: [ Process.pid, app.object_id ].join( '-' ),
+        chunk_dir: @app_chunk_dir,
+        chunks: [],
+        chunk_seed: 0,
+        need_encode: true
+      }
+
+      @app = app
+      @app_info = app_info
+      @roles[ app ] = :app
+      @infos[ app ] = app_info
+      @reads << app
+    end
+  end
+end