rtsp_server 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372be55470885f88a585a23224c6ab1515333638
-  data.tar.gz: 6e48e3604608e14abd2f32fa22f1b5dadd294304
+  metadata.gz: e0f0e9d2cff96fa79d01dd739d0ae8758fa3e9e7
+  data.tar.gz: 0b9a1cac454571a76821a0fdc32c22caa525990e
 SHA512:
-  metadata.gz: ac7589b3ede843f3854fc7288e86cf2dd937cd44bfc641a5c939c8ea6dd2ebe4e79805f67061502a88819c134dc02317becba7196fb7cc31e735845d56ad1ef1
-  data.tar.gz: b1c6f34f9b02628347f0dd74516759ad47fdf7f0403f77d8b27c88fac087a51b7f7792fb37f986a32dc0b1c3cc60af2aa1067f28dfc613ac8e2353fde6aeab72
+  metadata.gz: 71f013548763868491beb43245bc259a7f84f78098239045020d82f5314d9440141ad57c9e4d59b92b771dddac1441dc075ae1a8dbeab457b6c6c2127d7e5fd2
+  data.tar.gz: 885711e91338eb3e8d296b862af6f2f60d1ae2b7a1d651ce76c7be27127633852b1a15f4a6562ea7723ca287d85e5604fa56f81d0034cc3b25d1fe0b1b3198ed

data/lib/rtsp/server.rb

@@ -101,11 +101,15 @@ module RTSP
       end
       
       responses = []
+      puts "REQUEST       **********************************"
+      p request_str
 
       request_str.split("\r\n\r\n").each do |r|
         responses << process_request(r, io)
       end
 
+      puts "RESPONSE      **********************************"
+      p responses
      io.send(responses.join, 0)
      return(-1) if request_str.include?("TEARDOWN")
     end
@@ -166,7 +170,7 @@ module RTSP
       @session = @session.next
       multicast_check = request.transport.include?('multicast')
       server_port = @stream_server.setup_streamer(@session,
-        request.transport_url, request.stream_index, multicast_check)
+        request, request.stream_index, multicast_check)
       response = []
       transport = generate_transport(request, server_port, request.stream_index)
       response << "Transport: #{transport.join}"
@@ -310,7 +314,9 @@ module RTSP
         transport = request.transport.split(port_specifier)
         transport[1] = port_specifier + transport[1] 
         transport[1] = "" if request.transport.include?("multicast")
-        transport[1] << ";port=#{server_port}-#{server_port + 1}"
+        /client_port=(?<p1>\d*)-(?<p2>\d*)/ =~ request.transport
+        transport[1] << ";port=#{p1}-#{p2}" unless p1.nil?
+        transport[1] << ";port=#{server_port}-#{server_port+1}" if p1.nil?
      else
        transport = [request.transport + ';', "port=#{server_port}-#{server_port + 1}"]
      end

data/lib/rtsp/socat_streaming.rb

@@ -65,10 +65,11 @@ module RTSP
     # Creates a RTP streamer using socat.
     #
     # @param [String] sid Session ID.
-    # @param [String] transport_url Destination IP:port.
+    # @param [RTSP::Requesti] reuuest RTSP request
     # @param [Fixnum] index Stream index.
     # @return [Fixnum] The port the streamer will stream on.
-    def setup_streamer(sid, transport_url, index=1, multicast=false)
+    def setup_streamer(sid, request, index=1, multicast=false)
+      transport_url = request.transport_url
       dest_ip, dest_port = transport_url.split ":" unless multicast
 
       @rtcp_source_identifier ||= RTCP_SOURCE.pack("H*")
@@ -92,7 +93,19 @@ module RTSP
       @processes ||= Sys::ProcTable.ps.map { |p| p.cmdline }
 
       if multicast
-        @sessions[sid] = :multicast
+        if request.transport.include?('cleint_port')
+          /client_port=(?<p1>\d*)-(?<p2>\d*)/ =~ request.transport
+          dest_port = p1
+          if dest_port == "64000"
+            @sessions[sid] = :multicast
+          else
+            puts "Request malformed client-port not found #{request.transport}" if dest_port.nil?
+            raise "Request malformed client-port not found #{request.transport}" if dest_port.nil?
+            @sessions[sid] = build_socat(@source_ip[index - 1], dest_port.to_i, local_port, index)
+          end
+        else
+          @sessions[sid] = :multicast
+        end
       else
         @sessions[sid] = build_socat(dest_ip, dest_port, local_port, index)
       end
@@ -272,15 +285,20 @@ EOF
     # talk to.
     # @
 
+    # @return [String] IP of the interface that would be used to talk to.
     # @return [String] IP of the interface that would be used to talk to.
     def build_socat(target_ip, target_port, server_port, index=1)
       bsd_options = BSD_OPTIONS if OS.mac?
       bsd_options ||= ""
+      multicast_options = MULTICAST_OPTIONS if target_ip.start_with?("239")
+      multicast_options ||= ""
+     src_port = "sourceport=#{server_port},"
+     src_port = "" if target_ip.start_with?("239")
 
       "socat -b #{BLOCK_SIZE} UDP-RECV:#{@source_port[index-1]},reuseaddr," +
         "#{bsd_options}"+ SOCAT_OPTIONS + ",ip-add-membership=#{@source_ip[index-1]}:" +
-        "#{@interface_ip} UDP:#{target_ip}:#{target_port},sourceport=#{server_port}," +
-        SOCAT_OPTIONS
+        "#{@interface_ip}#{multicast_options} UDP:#{target_ip}:#{target_port},#{src_port}" +
+        SOCAT_OPTIONS + multicast_options
     end
 
     # Attempts to find a random bindable port between 50000-65500

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp_server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Steve Loveless, Mike Kirby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -257,20 +257,20 @@ signing_key:
 specification_version: 4
 summary: Library to allow RTSP streaming from RTSP-enabled devices.
 test_files:
+- spec/rtsp/response_spec.rb
 - spec/rtsp/message_spec.rb
 - spec/rtsp/helpers_spec.rb
-- spec/rtsp/response_spec.rb
-- spec/rtsp/transport_parser_spec.rb
 - spec/rtsp/client_spec.rb
+- spec/rtsp/transport_parser_spec.rb
 - spec/rtsp_spec.rb
 - spec/support/fake_rtsp_server.rb
 - spec/spec_helper.rb
-- features/client_changes_state.feature
-- features/control_streams_as_client.feature
 - features/step_definitions/client_changes_state_steps.rb
-- features/step_definitions/control_streams_as_client_steps.rb
 - features/step_definitions/client_requests_steps.rb
-- features/client_requests.feature
-- features/support/env.rb
+- features/step_definitions/control_streams_as_client_steps.rb
 - features/support/hooks.rb
+- features/support/env.rb
+- features/client_changes_state.feature
+- features/control_streams_as_client.feature
+- features/client_requests.feature
 has_rdoc: