quaff 0.4.2 → 0.5.0

data/lib/call.rb

@@ -27,6 +27,7 @@ class Call
 
   def initialize(cxn,
                  cid,
+                 instance_id=nil,
                  uri="sip:5557777888@#{Utils::local_ip}",
                  destination=nil,
                  target_uri=nil)
@@ -42,6 +43,7 @@ class Call
     setdest(destination, recv_from_this: true) if destination
     set_callee target_uri if target_uri
     @routeset = []
+    @instance_id = instance_id
   end
 
   def change_cid cid
@@ -194,6 +196,10 @@ class Call
       "Contact" => "<sip:quaff@#{Utils::local_ip}:#{@cxn.local_port};transport=#{@cxn.transport};ob>",
     }
 
+    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

@@ -10,7 +10,8 @@ require_relative './sources.rb'
 
 module Quaff
   class BaseEndpoint
-    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket
+    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket, :instance_id
+    attr_reader :msg_log
 
     def setup_sdp
       @sdp_socket = UDPSocket.new
@@ -31,13 +32,13 @@ module Quaff
     def incoming_call *args
       call_id ||= get_new_call_id
       puts "Call-Id for endpoint on #{@lport} is #{call_id}" if @msg_trace
-      Call.new(self, call_id, *args)
+      Call.new(self, call_id, @instance_id, *args)
     end
 
     def outgoing_call to_uri
       call_id = generate_call_id
       puts "Call-Id for endpoint on #{@lport} is #{call_id}" if @msg_trace
-      Call.new(self, call_id, @uri, @outbound_connection, to_uri)
+      Call.new(self, call_id, @instance_id, @uri, @outbound_connection, to_uri)
     end
 
     def create_client(uri, username, password, outbound_proxy, outbound_port=5060)
@@ -51,6 +52,7 @@ module Quaff
     end
 
     def initialize(uri, username, password, local_port, outbound_proxy=nil, outbound_port=5060)
+      @msg_log = Array.new
       @uri = uri
       @resolver = Resolv::DNS.new
       @username = username
@@ -88,7 +90,8 @@ module Quaff
     end
 
     def send_msg(data, source)
-        puts "Endpoint on #{@lport} sending #{data} to #{source.inspect}" if @msg_trace
+      @msg_log.push "Endpoint on #{@lport} sending:\n\n#{data.strip}\n\nto #{source.inspect}"
+      puts "Endpoint on #{@lport} sending #{data} to #{source.inspect}" if @msg_trace
         source.send_msg(@cxn, data)
     end
 
@@ -139,6 +142,7 @@ module Quaff
     end
 
     def queue_msg(msg, source)
+      @msg_log.push "Endpoint on #{@lport} received:\n\n#{msg.to_s.strip}\n\nfrom #{source.inspect}"
       puts "Endpoint on #{@lport} received #{msg} from
                           ##{source.inspect}" if @msg_trace
       msg.source = source

data/lib/sources.rb

@@ -1,12 +1,12 @@
 require 'socket'
 module Quaff
-class Source
+  class Source
     def remote_ip
-        @ip
+      @ip
     end
 
     def remote_port
-        @port
+      @port
     end
 
     def close cxn
@@ -15,47 +15,55 @@ class Source
     def sock
       nil
     end
-end
 
-class UDPSource < Source
+    def to_s
+      "#{@ip}:#{@port} (#{@transport})"
+    end
+  end
+
+  class UDPSource < Source
     def initialize ip, port
-        @ip, @port = ip, port
+      @transport = "UDP"
+      @ip, @port = ip, port
     end
 
     def send_msg cxn, data
-        cxn.send(data, 0, @ip, @port)
+      cxn.send(data, 0, @ip, @port)
     end
-end
+  end
 
-class UDPSourceFromAddrinfo < UDPSource
+  class UDPSourceFromAddrinfo < UDPSource
     def initialize addrinfo
-        @ip, @port = addrinfo[3], addrinfo[1]
+      @transport = "UDP"
+      @ip, @port = addrinfo[3], addrinfo[1]
     end
-end
+  end
 
 
-class TCPSource < Source
-  attr_reader :sock
+  class TCPSource < Source
+    attr_reader :sock
 
     def initialize ip, port
-        @sock = TCPSocket.new ip, port
-        @port, @ip = port, ip
+      @transport = "TCP"
+      @sock = TCPSocket.new ip, port
+      @port, @ip = port, ip
     end
 
     def send_msg _, data
-        @sock.sendmsg data
+      @sock.sendmsg data
     end
 
     def close cxn
-        @sock.close
-        cxn.sockets.delete(@sock)
+      @sock.close
+      cxn.sockets.delete(@sock)
     end
-end
+  end
 
-class TCPSourceFromSocket < TCPSource
+  class TCPSourceFromSocket < TCPSource
     def initialize sock
+      @transport = "TCP"
       @sock = sock
       @port, @ip = Socket.unpack_sockaddr_in(@sock.getpeername)
     end
-end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors: