rtsp_server 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783ad8ca36979572a087b869a22583dec31dfe7e
-  data.tar.gz: 42156099ccb1369858211185d2df201ad551d864
+  metadata.gz: e2e47197e6b28f0761ec7faf33a18d9924aa26b5
+  data.tar.gz: d5aeeffafe5493aa17087b045a79dbcdb6a7c47a
 SHA512:
-  metadata.gz: 6182fbd29371b51cc517119160aaea998c78779aecc1efdd186bbf668efc2f7942893d7a6c0746cabd66d3f22734ac2f67cfcf1d01e0d001a1f918656c6d6128
-  data.tar.gz: 2a854b637b8ad307a199b225a1276554bcc99bc7601e483267fab45d0e4943376492d594549a4c99c3dda7afa6c2feaa54901cd298507f9db2134f2cf471147d
+  metadata.gz: b3192fd082fe4f2c6372a468b309800bc1baf5a702cf1179f40f53a611babb76bfbea34f69b1fc3ec7dd1a7042ae3e171d7fef194f4386e04b90e9545bb8756d
+  data.tar.gz: 05c443abd96199f29b577489063c54670baf81932e985223738d3159d521e5b958371adf0acdc2ee9e11ab0983ff900ad30ec41eb0bd86a9d340063d8ef1ef92

data/lib/rtsp/common.rb

@@ -62,7 +62,7 @@ module RTSP
       /client_port=(?<port>.*)-/ =~ transport
 
       if port.nil?
-        log("Could not find client port associated with transport", :warn)
+        RTSP::Request.log("Could not find client port associated with transport", :warn)
       else
         "#{@remote_host}:#{port}"
       end

data/lib/rtsp/server.rb

@@ -110,7 +110,7 @@ module RTSP
       remote_address = io.remote_address.ip_address
       /(?<action>.*) rtsp:\/\// =~ request_str
       request = RTSP::Request.new(request_str, remote_address)
-      @agent[io] = request.user_agent
+      @agent[io] = request.user_agent rescue NoMethodError
       response, body = send(action.downcase.to_sym, request)
 
       add_headers(request, response, body)
@@ -292,8 +292,14 @@ module RTSP
     # @param [Fixnum] server_port Port on which the stream_server is streaming from.
     def generate_transport request, server_port, index=1
       port_specifier = 'client_port'
-      transport = request.transport.split(port_specifier)
-      transport[1] = port_specifier + transport[1]
+
+      if request.transport.include?(port_specifier)
+        transport = request.transport.split(port_specifier)
+        transport[1] = port_specifier + transport[1]
+     else
+       stream_port = RTSP::StreamServer.instance.source_port.first
+       transport = [request.transport + ';', "port=#{stream_port}-#{stream_port + 1}"]
+     end
 
       if request.transport.include?("unicast")
         transport[0] << "destination=#{request.remote_host};"

data/lib/rtsp/socat_streaming.rb

@@ -69,7 +69,7 @@ module RTSP
     # @param [Fixnum] index Stream index.
     # @return [Fixnum] The port the streamer will stream on.
     def setup_streamer(sid, transport_url, index=1, multicast=false)
-      dest_ip, dest_port = transport_url.split ":"
+      dest_ip, dest_port = transport_url.split ":" unless multicast
 
       @rtcp_source_identifier ||= RTCP_SOURCE.pack("H*")
       local_port = multicast ? @source_port[index - 1] : free_port(true)

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp_server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Steve Loveless, Mike Kirby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet