quaff 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ddf7205f6389ce8025f6f4603efcb2c96802bf
-  data.tar.gz: 53d6859c95082cfb58a6aa1f65641041f2a9db32
+  metadata.gz: 20c9f3e778c12a6af9fbef86b334bc7708c47c34
+  data.tar.gz: 723bc3efb24e71e50b51fa0a45c7e70a04dc791a
 SHA512:
-  metadata.gz: 4c2bd36727ba79e1c1108938d944fa1a0907a3bb3e139541aab08fdf8f785eac5c645017fb980adfa1f8c9c762c6432c5848da73ac30af9561d2eba9e6edcc0b
-  data.tar.gz: 67a217de9d2bcf196f5cdc910ea7fb6c2065492180abd68d9134356960999057487d47fedfb98c3bfccb54195744ba2b812835359476b022462e9c2e19a72837
+  metadata.gz: 310387f9435b9692b61ac26cdf62cc5d335edca91ef98409d117b157a0d78a98610bd0e389cb5a8f16dc3916e30cae1c928172b6bb62716f1d7a9d3b4a670d11
+  data.tar.gz: 06c032f15eea07f990b2af515061edf05742e720dfa80a6603c4b1cf42e6cff021e52e437e936330e2e4b9b686b0d76b134a61ae41ff535ecdc5e1b2ed470794

data/lib/call.rb

@@ -283,13 +283,9 @@ class Call
       "Max-Forwards" => "70",
       "Content-Length" => "0",
       "User-Agent" => "Quaff SIP Scripting Engine",
-      "Contact" => "<sip:quaff@#{Utils::local_ip}:#{@cxn.local_port};transport=#{@cxn.transport};ob>",
+      "Contact" => @cxn.contact_header
     }
 
-    if @instance_id
-      defaults["Contact"] += ";+sip.instance=\"<urn:uuid:"+@instance_id+">\""
-    end
-
     is_request = code.nil?
     if is_request
       defaults['Route'] = @routeset

data/lib/endpoint.rb

@@ -11,8 +11,8 @@ require 'digest/md5'
 
 module Quaff
   class BaseEndpoint
-    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket, :instance_id
-    attr_reader :msg_log, :local_port
+    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket, :contact_header
+    attr_reader :msg_log, :local_port, :instance_id
 
     # Creates an SDP socket bound to an ephemeral port
     def setup_sdp
@@ -36,6 +36,11 @@ module Quaff
     def add_sock sock
     end
 
+    def instance_id= id
+      @instance_id = id
+      @contact_header  += ";+sip.instance=\"<urn:uuid:"+@instance_id+">\""
+    end
+    
     # Retrieves the next unhandled call for this endpoint and returns
     # a +Call+ object representing it
     def incoming_call
@@ -91,6 +96,7 @@ module Quaff
         @outbound_connection = new_connection(outbound_proxy, outbound_port)
       end
       @hashes = []
+      @contact_header = "<sip:quaff@#{Utils::local_ip}:#{@local_port};transport=#{@transport};ob>"
       initialize_queues
       start
     end
@@ -171,6 +177,10 @@ module Quaff
         Timeout::timeout(time_limit) { @call_ids.deq }
     end
 
+    def no_new_calls?
+      return @call_ids.empty?
+    end
+
     # Sets up the internal structures needed to handle calls for a new Call-ID.
     def add_call_id cid
         @messages[cid] ||= Queue.new

metadata

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