quaff 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a895465f0bde96df434080696bd6714559094e1e
-  data.tar.gz: 374f06b143b8a8521b74190ecb62f2d94ed46c3b
+  metadata.gz: 949d3d3297af3698c62260c05c9df90cddd4746f
+  data.tar.gz: 9dfd7365fa83aa3496e4899e350147aa835304f5
 SHA512:
-  metadata.gz: 53df81ef519babdb433ba3c50cc79de84b2db8943d57ca866750523db78ae0ddc51c932ba02271edb7bf81576a4f56813214b861dd855f9de27f7aacd3b20255
-  data.tar.gz: f4ade0985a3d7067eabbd2504a2a1eb759be9e472efd69b8ea27e39cf1bca1491331088dfb129daf833395cc37a03763bfc434dca8fbdf970e6202a847049058
+  metadata.gz: 64042022ef1b3a688894d32b0ada0fea9724dc0ea6e8c92cf2219a9e28bf4ae72197176ec44f65e2d794d087e96812b09290e8e4b512d3648fa29e86e5f28085
+  data.tar.gz: 25116f133f345cde8ecba6dd6c964dcc628e2ee501980ec1abc1bd8b32e892ee14b5c99194c35baa97ef42b66d30a9499807c525305f3b24fd4b1baf497cfd92

data/lib/call.rb

@@ -22,7 +22,7 @@ module Quaff
     def to_s
       "#{@num.to_s} #{@method}"
     end
-end
+  end
 
 class Call
   attr_reader :cid

data/lib/endpoint.rb

@@ -11,7 +11,7 @@ require 'digest/md5'
 
 module Quaff
   class BaseEndpoint
-    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket, :contact_header
+    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket
     attr_reader :msg_log, :local_port, :instance_id
 
     # Creates an SDP socket bound to an ephemeral port
@@ -36,9 +36,24 @@ module Quaff
     def add_sock sock
     end
 
+    def add_contact_param name, value
+      @contact_params[name] = value
+    end
+
+    def add_contact_uri_param name, value
+      @contact_uri_params[name] = value
+    end
+
+    def remove_contact_param name
+      @contact_params.delete name
+    end
+
+    def remove_contact_uri_param name
+      @contact_uri_params.delete name
+    end
+    
     def instance_id= id
-      @instance_id = id
-      @contact_header  += ";+sip.instance=\"<urn:uuid:"+@instance_id+">\""
+      add_contact_param "+sip.instance", "\"<urn:uuid:#{id}>\""
     end
     
     # Retrieves the next unhandled call for this endpoint and returns
@@ -96,11 +111,19 @@ module Quaff
         @outbound_connection = new_connection(outbound_proxy, outbound_port)
       end
       @hashes = []
-      @contact_header = "<sip:quaff@#{Utils::local_ip}:#{@local_port};transport=#{transport};ob>"
+      @contact_params = {}
+      @contact_uri_params = {"transport" => transport, "ob" => true}
+      @terminated = false
       initialize_queues
       start
     end
 
+    def contact_header
+      param_str = Utils.paramhash_to_str(@contact_params)
+      uri_param_str = Utils.paramhash_to_str(@contact_uri_params)
+      "<sip:quaff@#{Utils::local_ip}:#{@local_port}#{uri_param_str}>#{param_str}"
+    end
+
     def send_msg(data, source) # :nodoc:
       @msg_log.push "Endpoint on #{@local_port} sending:\n\n#{data.strip}\n\nto #{source.inspect}"
       puts "Endpoint on #{@local_port} sending #{data} to #{source.inspect}" if @msg_trace

data/lib/sip_parser.rb

@@ -137,7 +137,7 @@ module Quaff
     end
 
     def hostname
-      Repetition.new([:at_least, 1], Alternate.new(alphanum, Char.new(?.)))
+      Repetition.new([:at_least, 1], Alternate.new(alphanum, Char.new(?.), Char.new(?-)))
     end
 
     def port
@@ -223,7 +223,7 @@ module Quaff
     end
 
     def to_spec
-      Concat.new(Alternate.new(addr_spec, name_addr), Repetition.new(:any, Concat.new(Char.new(?;), from_param)))
+      Concat.new(Alternate.new(addr_spec, name_addr), Repetition.new(:any, Concat.new(Char.new(?;), to_param)))
     end
   end
 
@@ -242,7 +242,7 @@ module Quaff
     end
 
     def display_name
-      super.set_block {|p| @display_name = p; @is_nameaddr = true}
+      super.set_block {|p| @displayname = p.strip; @is_nameaddr = true}
     end
 
     def addr_spec
@@ -258,7 +258,7 @@ module Quaff
     end
 
     def to_s
-      paramstr = @params.collect {|k, v| if (v == true) then ";#{k}" else ";#{k}=#{v}" end}.join("")
+      paramstr = Utils.paramhash_to_str(@params)
       if @is_nameaddr
         "#{@displayname} <#{@uri}>#{paramstr}"
       else

data/lib/utils.rb

@@ -1,11 +1,18 @@
 require 'socket'
-require 'facter'
+require 'system/getifaddrs'
 
 module Quaff
 
 module Utils #:nodoc:
 def Utils.local_ip
-  Facter.value("ipaddress")
+  addrs = System.get_ifaddrs
+  if addrs.empty?
+    "0.0.0.0"
+  elsif (addrs.size == 1)
+    addrs[0][:inet_addr]
+  else
+    addrs.select {|k, v| k != :lo}.shift[1][:inet_addr]
+  end
 end
 
 def Utils.pid
@@ -19,5 +26,10 @@ end
 def Utils.new_branch
     "z9hG4bK#{Time.new.to_f}"
 end
+
+def Utils.paramhash_to_str params
+  params.collect {|k, v| if (v == true) then ";#{k}" else ";#{k}=#{v}" end}.join("")
+end
+
 end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: facter
+  name: system-getifaddrs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: milenage
   requirement: !ruby/object:Gem::Requirement
@@ -58,10 +58,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/call.rb
 - lib/endpoint.rb
-- lib/message.rb
+- lib/call.rb
 - lib/quaff.rb
+- lib/message.rb
 - lib/sources.rb
 - lib/utils.rb
 - lib/sip_parser.rb