rtp 0.1.4 → 0.1.5

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.1.5 / 2012-12-7
+
+* gh-7: Receiver now uses non-blocking socket for receiving data.  Fixes
+  receiving data on Linux, which stopped working at 0.1.0.
+
 === 0.1.4 / 2012-12-06
 
 === Bug Fixes:

data/lib/rtp/receiver.rb

@@ -245,12 +245,16 @@ module RTP
 
       Thread.start(socket) do
         loop do
-          msg = socket.recvmsg(MAX_BYTES_TO_RECEIVE)
-          data = msg.first
-          log "Received data at size: #{data.size}"
-
-          log "RTP timestamp from socket info: #{msg.last.timestamp}"
-          @packets << [data, msg.last.timestamp]
+          begin
+            msg = socket.recvmsg_nonblock(MAX_BYTES_TO_RECEIVE)
+            data = msg.first
+            log "Received data at size: #{data.size}"
+
+            log "RTP timestamp from socket info: #{msg.last.timestamp}"
+            @packets << [data, msg.last.timestamp]
+          rescue Errno::EAGAIN
+            # Waiting for data on the socket...
+          end
         end
       end
     end

data/lib/rtp/version.rb

@@ -1,3 +1,3 @@
 module RTP
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/rtp/receiver_spec.rb

@@ -318,7 +318,7 @@ describe RTP::Receiver do
     let(:data) { double "socket data", size: 10 }
     let(:socket_info) { double "socket info", timestamp: '12345' }
     let(:message) { [data, socket_info] }
-    let(:socket) { double "Socket", recvmsg: message }
+    let(:socket) { double "Socket", recvmsg_nonblock: message }
 
     it "starts a new Thread and returns that" do
       Thread.should_receive(:start).with(socket).and_return listener
@@ -329,7 +329,7 @@ describe RTP::Receiver do
       Thread.stub(:start).and_yield
       subject.stub(:loop).and_yield
 
-      socket.should_receive(:recvmsg).with(1500).and_return message
+      socket.should_receive(:recvmsg_nonblock).with(1500).and_return message
 
       subject.send(:start_listener, socket)
 
@@ -376,8 +376,10 @@ describe RTP::Receiver do
 
   describe "#stop_packet_writer" do
     let(:packet_writer) { double "@packet_writer" }
+    before { subject.instance_variable_set(:@packet_writer, packet_writer) }
 
     it "closes the @capture_file" do
+      subject.stub(:writing_packets?)
       subject.instance_variable_get(:@capture_file).should_receive(:close)
       subject.send(:stop_packet_writer)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata