quaff 0.8.0pre2 → 0.8.0pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3642e3cc0f0fc8d533940c0c00484e0e2b1a2660
-  data.tar.gz: 9f25a2b75fae66447a07f44b659d0fd656ca6a47
+  metadata.gz: a0505dc9bc1965dfc470e373754f8509ee65094d
+  data.tar.gz: a4c6ba63ae5bf0f1429160d61143314e132b99b0
 SHA512:
-  metadata.gz: bc48e208ff133151f6090d4b0fe58fa67142fe6d56ca897ac982ae0def6dd935675d20bda9c3523b625c8ced2743ceefc344f96130b3d00b31c314e4fce35863
-  data.tar.gz: 1bcbc503165d3647b3419cb3fccd36efa0fbbe7d949ecc5a7b83c3a3745f0627318ae8a268c4272ecc8d65529c0319c650b39ba5af2f3fa9d32d63dcc4188611
+  metadata.gz: dce2ab83565cbc8c9e972da8826849ece5676a8acff9eff7759dea95df7fd060ee060a9889a568b801540880dc2bb437f46d1d6852d2a5f646c688f184fd018e
+  data.tar.gz: fbaec7c7469823851642cb47c97e0ff9975ffd9fb7c678c89df397aa2ed4ee627af8be8e61f832fad3b3616f9974fbe13101d76b765dfdce612896042227a5f5

data/lib/quaff/call.rb

@@ -116,7 +116,6 @@ class Call
     end
 
     found_match = false
-    dialog_creating = nil
     
     possible_messages.each do
       | what, this_dialog_creating |
@@ -133,7 +132,12 @@ class Call
         end
 
       if found_match
-        dialog_creating = this_dialog_creating
+        if this_dialog_creating && (type == :request)
+          create_dialog_from_request msg
+        end
+        if this_dialog_creating && (type == :response)
+          create_dialog_from_response msg
+        end
         break
       end
     end
@@ -142,9 +146,6 @@ class Call
       raise((msg.to_s || "Message is nil!"))
     end
 
-    if dialog_creating
-      create_dialog msg
-    end
     msg
   end
 
@@ -232,7 +233,18 @@ class Call
   def send_request(method, options={})
     body = options[:body] || ""
     headers = options[:headers] || {}
-    new_tsx = options[:new_tsx].nil? ? true : options[:new_tsx]
+    new_tsx = if options[:new_tsx].nil?
+                # new_tsx was not given. Default it to true, unless
+                # same_tsx_as was given.
+                unless options[:same_tsx_as]
+                  true
+                else
+                  false
+                end
+              else
+                # new_tsx was given, use that value.
+                options[:new_tsx]
+              end
     retrans =
       if options[:retrans].nil?
         if method == "ACK"

data/lib/quaff/endpoint.rb

@@ -226,7 +226,7 @@ module Quaff
     end
 
     def is_retransmission? msg
-      @hashes.include? Digest::MD5.hexdigest(msg.to_s)
+      @hashes.include? msg.unique_key
     end
 
     def queue_msg(msg, source)

data/lib/quaff/message.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 module Quaff
 class SipMessage
   attr_accessor :method, :requri, :reason, :status_code, :headers, :source
@@ -19,6 +21,17 @@ class SipMessage
     end
   end
 
+  def unique_key
+    via = if @headers['Via']
+            @headers['Via'][-1]
+          end
+
+    contact = header("Contact")
+    cid = header("Call-ID")
+    s = "#{via} #{@method} #{@status_code} #{contact} #{cid} #{@requri}"
+    Digest::MD5.hexdigest(s)
+  end
+  
   def type
     if @method
       :request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.8.0pre2
+  version: 0.8.0pre3
 platform: ruby
 authors:
 - Rob Day