quaff 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362b974b90ecc19d0352dad44e9c959d393cd812
-  data.tar.gz: 1c112cb8a544ea07a7aacde674ac4ee4fbb9cb1a
+  metadata.gz: 74ddf7205f6389ce8025f6f4603efcb2c96802bf
+  data.tar.gz: 53d6859c95082cfb58a6aa1f65641041f2a9db32
 SHA512:
-  metadata.gz: a3622b09d5d9962a72fa8df86329b1200ed72be6804b468c32291ad1aff7818b746fcf1be6f55f48aaf640192e30c7d51844739fcc879acc69649c4e2e76d902
-  data.tar.gz: 97abb2bacd2bcbdc0b3656025a80c183321105e40d1c089e74a3053e1446d1aae51d8912539fe8a29e93bee829b5424b22ba4fd52147350f611f6bf16ca2b222
+  metadata.gz: 4c2bd36727ba79e1c1108938d944fa1a0907a3bb3e139541aab08fdf8f785eac5c645017fb980adfa1f8c9c762c6432c5848da73ac30af9561d2eba9e6edcc0b
+  data.tar.gz: 67a217de9d2bcf196f5cdc910ea7fb6c2065492180abd68d9134356960999057487d47fedfb98c3bfccb54195744ba2b812835359476b022462e9c2e19a72837

data/lib/endpoint.rb

@@ -7,6 +7,7 @@ require 'securerandom'
 #require 'milenage'
 require_relative './sip_parser.rb'
 require_relative './sources.rb'
+require 'digest/md5'
 
 module Quaff
   class BaseEndpoint
@@ -20,9 +21,14 @@ module Quaff
       @sdp_port = @sdp_socket.addr[1]
     end
 
+    def terminate
+      @terminated = true
+      terminate_specific
+    end
+
     # Cleans up the endpoint - designed to be overriden by
     # per-transport subclasses
-    def terminate
+    def terminate_specific
     end
 
     # Adds a socket connection to another UA - designed to be
@@ -38,7 +44,7 @@ module Quaff
       rescue Timeout::Error
         raise "#{ @uri } timed out waiting for new incoming call"
       end
-      
+
       puts "Call-Id for endpoint on #{@local_port} is #{call_id}" if @msg_trace
       Call.new(self, call_id, @instance_id, @uri)
     end
@@ -84,6 +90,7 @@ module Quaff
       if outbound_proxy
         @outbound_connection = new_connection(outbound_proxy, outbound_port)
       end
+      @hashes = []
       initialize_queues
       start
     end
@@ -178,16 +185,27 @@ module Quaff
 
     def start
         Thread.new do
-            loop do
+            until @terminated do
                 recv_msg
             end
         end
     end
 
+    def is_retransmission? msg
+      @hashes.include? Digest::MD5.hexdigest(msg.to_s)
+    end
+
     def queue_msg(msg, source)
+      if is_retransmission? msg
+        @msg_log.push "Endpoint on #{@local_port} received retransmission"
+        puts "Endpoint on #{@local_port} received retransmission" if @msg_trace
+        return
+      end
+
+      @hashes.push Digest::MD5.hexdigest(msg.to_s)
+
       @msg_log.push "Endpoint on #{@local_port} received:\n\n#{msg.to_s.strip}\n\nfrom #{source.inspect}"
-      puts "Endpoint on #{@local_port} received #{msg} from
-                          ##{source.inspect}" if @msg_trace
+      puts "Endpoint on #{@local_port} received #{msg} from #{source.inspect}" if @msg_trace
       msg.source = source
       cid = @parser.message_identifier msg
       if cid and not @dead_calls.has_key? cid then
@@ -215,7 +233,7 @@ module Quaff
       @sockets.push sock
     end
 
-    def terminate
+    def terminate_specific
       oldsockets = @sockets.dup
       @sockets = []
       oldsockets.each do |s| s.close unless s.closed? end
@@ -242,8 +260,10 @@ module Quaff
 
 
     def recv_msg
+        warn "recv_msg called for an endpoint with no sockets - will tight-loop" if (@sockets.empty? and @cxn.nil?)
         select_response = IO.select(@sockets, [], [], 0) || [[]]
         readable = select_response[0]
+
         for sock in readable do
             recv_msg_from_sock sock
         end
@@ -258,13 +278,13 @@ module Quaff
     end
 
     def recv_msg_from_sock(sock)
-        @parser.parse_start
-        msg = nil
+      @parser.parse_start
+      msg = nil
       while msg.nil? and not sock.closed? do
         line = sock.gets
         msg = @parser.parse_partial line
       end
-        queue_msg msg, TCPSourceFromSocket.new(sock)
+      queue_msg msg, TCPSourceFromSocket.new(sock)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter