quaff 0.7.3 → 0.8.0pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd835927c3eee7a4ba02cd376b8967d0cea3c5e8
-  data.tar.gz: bad0aed037d35fbbae1996f95e7145dab1d43543
+  metadata.gz: 3c2cf0abc7f41e6977f8bec2c36a4c7f614cf319
+  data.tar.gz: 58d82abdf2ea57652f5fa14d81ce1fbbbaf770be
 SHA512:
-  metadata.gz: 9e6aeafc9f296e0718b366ea52eb17943d79ccb207515d5ee85f9e128ef3fe7eaca03f3ca63a450beb46edf30ca04fdfe0505153e1c3cb23bfcd9ae2e7d3d0a9
-  data.tar.gz: e8ecea0abae1644e6494dcd9a3aadd1d647cbb479b7e2be29fbb2f1a27b235515ec4bfa37971e0335abaad245cac53be96d243d3447faf964d0a4f98c394455b
+  metadata.gz: c3e44bb218bf436fc72fefb1c1113c3eb52ddea5694706fdfccf7e2d9c5a7bf7d7c12940b08ca2ee4252f0cdad87415bade59eea460cad27cecdbca8a34cd8d6
+  data.tar.gz: 2f696985ca1e300e8a61eda9ea89c7a239e05688db511cfbd7b03c8bcac634ca22889621d5f174c19e73fbe605f2fe3358415e303d63ac0726a5b1254ff7d1db

data/lib/quaff.rb

@@ -1,3 +1,3 @@
-require_relative './call.rb'
-require_relative './endpoint.rb'
+require_relative './quaff/call.rb'
+require_relative './quaff/endpoint.rb'
 

data/lib/{auth.rb → quaff/auth.rb}

@@ -2,18 +2,14 @@ require 'base64'
 
 module Quaff
   module Auth #:nodoc:
-    def Auth.gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1="", qop="", nc=1, cnonce=""
+    def Auth.gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1=""
       if ha1.empty?
         a1 = username + ":" + auth_pairs["realm"] + ":" + passwd
         ha1 = Digest::MD5::hexdigest(a1)
       end
       a2 = method + ":" + sip_uri
       ha2 = Digest::MD5::hexdigest(a2)
-      if qop == "auth"
-        digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + nc.to_s(16).rjust(8, "0") + ":" + cnonce + ":" + qop + ":" + ha2)
-      else
-        digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + ha2)
-      end
+      digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + ha2)
       return digest
     end
 
@@ -35,22 +31,15 @@ module Quaff
       # the SIP URI
     end
 
-    def Auth.gen_auth_header auth_line, username, passwd, method, sip_uri, ha1="", qop="", nc=1, cnonce=""
+    def Auth.gen_auth_header auth_line, username, passwd, method, sip_uri, ha1=""
       # Split auth line on commas
       auth_pairs = {}
       auth_line.sub("Digest ", "").split(",") .each do |pair|
         key, value = pair.split "="
         auth_pairs[key.gsub(" ", "")] = value.gsub("\"", "").gsub(" ", "")
       end
-      if !qop.empty? and cnonce.empty?
-        cnonce = (0...16).map { (rand(16)).to_s(16) }.join
-      end
-      digest = gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1, qop, nc, cnonce
-      if !qop.empty?
-        return %Q!Digest username="#{username}",realm="#{auth_pairs['realm']}",nonce="#{auth_pairs['nonce']}",uri="#{sip_uri}",response="#{digest}",algorithm="#{auth_pairs['algorithm']}",opaque="#{auth_pairs['opaque']}",qop="#{qop}",nc="#{nc.to_s(16).rjust(8, "0")}",cnonce="#{cnonce}"!
-      else
-        return %Q!Digest username="#{username}",realm="#{auth_pairs['realm']}",nonce="#{auth_pairs['nonce']}",uri="#{sip_uri}",response="#{digest}",algorithm="#{auth_pairs['algorithm']}",opaque="#{auth_pairs['opaque']}"!
-      end
+      digest = gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1
+      return %Q!Digest username="#{username}",realm="#{auth_pairs['realm']}",nonce="#{auth_pairs['nonce']}",uri="#{sip_uri}",response="#{digest}",algorithm="#{auth_pairs['algorithm']}",opaque="#{auth_pairs['opaque']}"!
       # Return Authorization header with fields username, realm, nonce, uri, nc, cnonce, response, opaque
     end
   end

data/lib/quaff/call.rb

@@ -0,0 +1,385 @@
+# -*- coding: us-ascii -*-
+require 'securerandom'
+require 'timeout'
+require_relative './utils.rb'
+require_relative './sources.rb'
+require_relative './auth.rb'
+require_relative './message.rb'
+require_relative './sip_dialog.rb'
+
+module Quaff
+  class CSeq # :nodoc:
+    attr_reader :num
+    def initialize cseq_str
+      @num, @method = cseq_str.split
+      @num = @num.to_i
+    end
+
+    def increment
+      @num = @num + 1
+      to_s
+    end
+
+    def to_s
+      "#{@num.to_s} #{@method}"
+    end
+  end
+
+class Call
+  attr_reader :cid, :dialog
+
+  def initialize(cxn,
+                 cid,
+                 my_uri,
+                 target_uri,
+                 destination=nil,
+                 instance_id=nil)
+    @cxn = cxn
+    setdest(destination, recv_from_this: true) if destination
+    @current_retrans = nil
+    @retrans_keys = {}
+    @t1, @t2 = 0.5, 32
+    @instance_id = instance_id
+    @dialog = SipDialog.new cid, my_uri, target_uri
+    update_branch
+  end
+
+  def set_callee uri
+    if /<(.*?)>/ =~ uri
+      uri = $1
+    end
+
+    @dialog.target = uri unless uri.nil?
+  end
+
+  alias_method :set_dialog_target, :set_callee
+  
+  # Sets the Source where messages in this call should be sent to by
+  # default.
+  #
+  # Options:
+  #    :recv_from_this - if true, also listens for any incoming
+  #    messages over this source's connection. (This is only
+  #    meaningful for connection-oriented transports.)
+  def setdest source, options={}
+    @src = source
+    if options[:recv_from_this] and source.sock
+      @cxn.add_sock source.sock
+    end
+  end
+
+  # Receives a SIP request.
+  #
+  # Options:
+  #    :dialog_creating - whether the dialog state (peer tags, etc.)
+  #    should be updated with information from this request. Defaults to true.
+  def recv_request(method, options={})
+    dialog_creating = options[:dialog_creating] || true
+    begin
+      msg = recv_something
+    rescue Timeout::Error
+      raise "#{ @uri } timed out waiting for #{ method }"
+    end
+
+    unless msg.type == :request \
+      and Regexp.new(method) =~ msg.method
+      raise((msg.to_s || "Message is nil!"))
+    end
+
+    @dialog.cseq = CSeq.new(msg.header("CSeq")).num
+    
+    if dialog_creating
+      create_dialog_from_request msg
+    end
+    msg
+  end
+
+  # Waits until the next message comes in, and handles it if it is one
+  # of possible_messages.
+  #
+  # possible_messages is a list of things that can be received.
+  # Elements can be:
+  # * a string representing the SIP method, e.g. "INVITE"
+  # * a number representing the SIP status code, e.g. 200
+  # * a two-item list, containing one of the above and a boolean
+  # value, which indicates whether this message is dialog-creating. by
+  # default, requests are assumed to be dialog-creating and responses
+  # are not.
+  #
+  # For example, ["INVITE", 301, ["ACK", false], [200, true]] is a
+  # valid value for possible_messages.
+  def recv_any_of(possible_messages)
+    begin
+      msg = recv_something
+    rescue Timeout::Error
+      raise "#{ @uri } timed out waiting for one of these: #{possible_messages}"
+    end
+
+    found_match = false
+    dialog_creating = nil
+    
+    possible_messages.each do
+      | what, this_dialog_creating |
+      type = if (what.class == String) then :request else :response end
+      if this_dialog_creating.nil?
+        this_dialog_creating = (type == :request)
+      end
+
+      found_match =
+        if type == :request 
+          msg.type == :request and what == msg.method
+        else
+          msg.type == :response and what.to_s == msg.status_code
+        end
+
+      if found_match
+        dialog_creating = this_dialog_creating
+        break
+      end
+    end
+
+    unless found_match
+      raise((msg.to_s || "Message is nil!"))
+    end
+
+    if dialog_creating
+      create_dialog msg
+    end
+    msg
+  end
+
+  # Receives a SIP response.
+  #
+  # Options:
+  #    :dialog_creating - whether the dialog state (peer tags, etc.)
+  #    should be updated with information from this response. Defaults
+  #    to false.
+  #    :ignore_responses - a list of status codes to ignore (e.g.
+  #    [100] will mean that 100 Tryings are ignored rather than
+  #    treated as unexpected).
+  def recv_response(code, options={})
+    dialog_creating = options[:dialog_creating] || false
+    ignore_responses = options[:ignore_responses] || [] 
+    begin
+      msg = recv_something
+    rescue Timeout::Error
+      raise "#{ @uri } timed out waiting for #{ code }"
+    end
+
+    if msg.type != :response
+      raise "Expected #{code}, got #{msg}"
+    elsif ignore_responses.include? msg.status_code
+      return recv_response(code, options)
+    else
+      unless Regexp.new(code) =~ msg.status_code
+        raise "Expected #{code}, got #{msg.status_code}"
+      end
+    end
+
+    if dialog_creating
+      create_dialog_from_response msg
+    end
+
+    msg
+  end
+
+  # Sends a SIP response with the given status code and reason phrase.
+  #
+  # Options:
+  #    :body - the SIP body to use.
+  #    :sdp_body - as :body, but an appropriate Content-Type header is
+  #    automatically added.
+  #    :response_to - a message to use the branch and CSeq from.
+  #    Useful for responding to an INVITE after handling a CANCEL
+  #    transaction.
+  #    :retrans - whether or not to retransmit this periodically until
+  #    the next message is received. Defaults to false.
+  #    :headers - a map of headers to use in this message
+  
+  def send_response(code, phrase, options={})
+    body = options[:body] || ""
+    retrans = options[:retrans] || false
+    headers = options[:headers] || {}
+    if options[:sdp_body]
+      body = options[:sdp_body]
+      headers['Content-Type'] = "application/sdp"
+    end
+
+    if options[:response_to]
+      assoc_with_msg(options[:response_to])
+      headers['CSeq'] ||= CSeq.new(options[:response_to].header("CSeq"))
+    end
+
+    method = nil
+    msg = build_message headers, body, :response, method, code, phrase
+    send_something(msg, retrans)
+  end
+
+  # Sends a SIP request with the given method.
+  #
+  # Options:
+  #    :body - the SIP body to use.
+  #    :sdp_body - as :body, but an appropriate Content-Type header is
+  #    automatically added.
+  #    :new_tsx - whether to generate a new branch ID. Defaults to true.
+  #    :same_tsx_as - a message to use the branch and CSeq from.
+  #    Useful for ACKing to an INVITE after handling a PRACK
+  #    transaction.
+  #    :retrans - whether or not to retransmit this periodically until
+  #    the next message is received. Defaults to true unless the
+  #    method is ACK.
+  #    :headers - a map of headers to use in this message
+  def send_request(method, options={})
+    body = options[:body] || ""
+    headers = options[:headers] || {}
+    new_tsx = options[:new_tsx].nil? ? true : options[:new_tsx]
+    retrans =
+      if options[:retrans].nil?
+        if method == "ACK"
+          false
+        else
+          true
+        end
+      else
+        options[:retrans]
+      end
+
+    if options[:sdp_body]
+      body = options[:sdp_body]
+      headers['Content-Type'] = "application/sdp"
+    end
+
+    if options[:same_tsx_as]
+      assoc_with_msg(options[:same_tsx_as])
+    end
+
+    if new_tsx
+      update_branch
+    end
+    
+    msg = build_message headers, body, :request, method
+    send_something(msg, retrans)
+  end
+
+  def end_call
+    @cxn.mark_call_dead @dialog.call_id
+  end
+
+  def get_next_hop header
+    /<sip:(.+@)?(.+):(\d+);(.*)>/ =~ header
+    sock = TCPSocket.new $2, $3
+    return TCPSource.new sock
+  end
+
+  private
+  def assoc_with_msg(msg)
+    @last_Via = msg.all_headers("Via")
+  end
+
+  # Changes the branch parameter if the Via header, creating a new transaction
+  def update_branch via_hdr=nil
+    via_hdr ||= get_new_via_hdr
+    @last_Via = via_hdr
+  end
+
+  alias_method :new_transaction, :update_branch
+
+  def get_new_via_hdr
+    "SIP/2.0/#{@cxn.transport} #{Quaff::Utils.local_ip}:#{@cxn.local_port};rport;branch=#{Quaff::Utils::new_branch}"
+  end
+
+  def recv_something
+    msg = @cxn.get_new_message @dialog.call_id
+    @retrans_keys.delete @current_retrans
+    @src = msg.source
+    @last_Via = msg.headers["Via"]
+    @last_CSeq = CSeq.new(msg.header("CSeq"))
+    msg
+  end
+
+  def calculate_cseq type, method
+    if (type == :response)
+      @last_CSeq.to_s
+    else
+      if (method != "ACK") and (method != "CANCEL")
+        @dialog.cseq += 1
+      end
+      "#{@dialog.cseq} #{method}"
+    end
+  end
+
+  def build_message headers, body, type, method=nil, code=nil, phrase=nil
+    is_request = code.nil?
+
+    defaults = {
+      "Call-ID" => @dialog.call_id,
+      "CSeq" => calculate_cseq(type, method),
+      "Via" => @last_Via,
+      "Max-Forwards" => "70",
+      "Content-Length" => "0",
+      "User-Agent" => "Quaff SIP Scripting Engine",
+      "Contact" => @cxn.contact_header
+    }
+
+    if is_request
+      defaults['From'] = @dialog.local_fromto
+      defaults['To'] = @dialog.peer_fromto
+      defaults['Route'] = @dialog.routeset
+    else
+      defaults['To'] = @dialog.local_fromto
+      defaults['From'] = @dialog.peer_fromto
+      defaults['Record-Route'] = @dialog.routeset
+    end
+
+    defaults.merge! headers
+
+    SipMessage.new(method, code, phrase, @dialog.target, body, defaults.merge!(headers)).to_s
+  end
+
+  def send_something(msg, retrans)
+    @cxn.send_msg(msg, @src)
+    if retrans and (@cxn.transport == "UDP") then
+      key = SecureRandom::hex
+      @current_retrans = key
+      @retrans_keys[key] = true
+      Thread.new do
+        timer = @t1
+        sleep timer
+        while @retrans_keys[key] do
+          #puts "Retransmitting #{ msg } on call #{ @dialog.call_id }"
+          @cxn.send_msg(msg, @src)
+          timer *=2
+          if timer > @t2 then
+            raise "Too many retransmits!"
+          end
+          sleep timer
+        end
+      end
+    end
+  end
+
+  def create_dialog_from_request msg
+    @dialog.established = true
+
+    set_dialog_target msg.first_header("Contact")
+
+    unless msg.all_headers("Record-Route").nil?
+      @dialog.routeset = msg.all_headers("Record-Route")
+    end
+
+    @dialog.get_peer_info msg.header("From")
+  end
+
+  def create_dialog_from_response msg
+    @dialog.established = true
+
+    set_dialog_target msg.first_header("Contact")
+
+    unless msg.all_headers("Record-Route").nil?
+        @dialog.routeset = msg.all_headers("Record-Route").reverse
+    end
+
+    @dialog.get_peer_info msg.header("To")
+  end
+end
+end

data/lib/{endpoint.rb → quaff/endpoint.rb}

@@ -14,6 +14,58 @@ module Quaff
     attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket, :local_hostname
     attr_reader :msg_log, :local_port, :instance_id
 
+    # Constructs a new endpoint
+    # Params:
+    # +uri+:: The SIP URI of this endpoint
+    # +username+:: The authentication username of this endpoint
+    # +password+:: The authentication password of this endpoint
+    # +local_port+:: The port this endpoint should bind to. Use
+    # ':anyport' to bind to an ephemeral port.
+    # +outbound_proxy+:: The outbound proxy where all requests should
+    # be directed. Optional, but it only makes sense to omit it when
+    # Quaff is emulating a server rather than a client.
+    # +outbound_port+:: The port of the outbound proxy
+    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
+      @password = password
+      @local_hostname = Utils::local_ip
+      @local_port = local_port
+      initialize_connection
+      if outbound_proxy
+        @outbound_connection = new_connection(outbound_proxy, outbound_port)
+      end
+      @hashes = []
+      @contact_params = {}
+      @contact_uri_params = {"transport" => transport, "ob" => true}
+      @terminated = false
+      @last_sent_msg = nil
+      initialize_queues
+      start
+    end
+
+    # Retrieves the next unhandled call for this endpoint and returns
+    # a +Call+ object representing it
+    def incoming_call
+      begin
+        call_id = get_new_call_id
+      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, @uri, nil)
+    end
+
+    # Creates a +Call+ object representing a new outbound call
+    def outgoing_call to_uri
+      call_id = generate_call_id
+      puts "Call-Id for endpoint on #{@local_port} is #{call_id}" if @msg_trace
+      Call.new(self, call_id, @uri, to_uri, @outbound_connection, @instance_id)
+    end
+
     # Creates an SDP socket bound to an ephemeral port
     def setup_sdp
       @sdp_socket = UDPSocket.new
@@ -56,26 +108,6 @@ module Quaff
       add_contact_param "+sip.instance", "\"<urn:uuid:#{id}>\""
     end
     
-    # Retrieves the next unhandled call for this endpoint and returns
-    # a +Call+ object representing it
-    def incoming_call
-      begin
-        call_id = get_new_call_id
-      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
-
-    # Creates a +Call+ object representing a new outbound call
-    def outgoing_call to_uri
-      call_id = generate_call_id
-      puts "Call-Id for endpoint on #{@local_port} is #{call_id}" if @msg_trace
-      Call.new(self, call_id, @instance_id, @uri, @outbound_connection, to_uri)
-    end
-
     # Not yet ready for use
     def create_client(uri, username, password, outbound_proxy, outbound_port=5060) # :nodoc:
     end
@@ -88,38 +120,6 @@ module Quaff
     def create_aka_client(uri, username, key, op, outbound_proxy, outbound_port=5060) # :nodoc:
     end
 
-    # Constructs a new endpoint
-    # Params:
-    # +uri+:: The SIP URI of this endpoint
-    # +username+:: The authentication username of this endpoint
-    # +password+:: The authentication password of this endpoint
-    # +local_port+:: The port this endpoint should bind to. Use
-    # ':anyport' to bind to an ephemeral port.
-    # +outbound_proxy+:: The outbound proxy where all requests should
-    # be directed. Optional, but it only makes sense to omit it when
-    # Quaff is emulating a server rather than a client.
-    # +outbound_port+:: The port of the outbound proxy
-    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
-      @password = password
-      @local_host = Utils::local_ip
-      @local_port = local_port
-      initialize_connection
-      if outbound_proxy
-        @outbound_connection = new_connection(outbound_proxy, outbound_port)
-      end
-      @hashes = []
-      @contact_params = {}
-      @contact_uri_params = {"transport" => transport, "ob" => true}
-      @terminated = false
-      @local_hostname = Utils::local_ip
-      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)
@@ -129,7 +129,8 @@ module Quaff
     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
-        source.send_msg(@cxn, data)
+      source.send_msg(@cxn, data)
+      @last_sent_msg = data
     end
 
     # Not yet ready for use
@@ -150,8 +151,8 @@ module Quaff
       @reg_call ||= outgoing_call(@uri)
       auth_hdr = Quaff::Auth.gen_empty_auth_header @username
       @reg_call.update_branch
-      @reg_call.send_request("REGISTER", "", {"Authorization" =>  auth_hdr, "Expires" => expires.to_s})
-      response_data = @reg_call.recv_response("401|200")
+      @reg_call.send_request("REGISTER", retrans: true, headers: {"Authorization" =>  auth_hdr, "Expires" => expires.to_s})
+      response_data = @reg_call.recv_response_and_create_dialog("401|200")
       if response_data.status_code == "401"
         if aka
           rand = Quaff::Auth.extract_rand response_data.header("WWW-Authenticate")
@@ -161,7 +162,7 @@ module Quaff
         end
         auth_hdr = Quaff::Auth.gen_auth_header response_data.header("WWW-Authenticate"), @username, @password, "REGISTER", @uri
         @reg_call.update_branch
-        @reg_call.send_request("REGISTER", "", {"Authorization" =>  auth_hdr, "Expires" => expires.to_s})
+        @reg_call.send_request("REGISTER", retrans: true, headers: {"Authorization" =>  auth_hdr, "Expires" => expires.to_s})
         response_data = @reg_call.recv_response("200")
       end
       return response_data # always the 200 OK
@@ -234,6 +235,7 @@ module Quaff
       if is_retransmission? msg
         @msg_log.push "Endpoint on #{@local_port} received retransmission"
         puts "Endpoint on #{@local_port} received retransmission" if @msg_trace
+        source.send_msg(@cxn, @last_sent_msg) if @last_sent_msg
         return
       end
 

data/lib/quaff/sip_dialog.rb

@@ -0,0 +1,43 @@
+# -*- coding: us-ascii -*-
+require 'securerandom'
+require_relative './sip_parser.rb'
+
+module Quaff
+  class SipDialog
+    attr_accessor :local_uri, :local_tag, :peer_uri, :peer_tag, :target, :call_id, :cseq, :routeset, :established
+
+    def initialize call_id, local_uri, peer_uri
+      @cseq = 1
+      @call_id = call_id
+      @established = false
+      @routeset = []
+      @local_tag = SecureRandom::hex
+      @peer_uri = peer_uri
+      @target = peer_uri
+      @local_uri = local_uri
+    end
+
+    def get_peer_info fromto_hdr
+      tospec = ToSpec.new
+      tospec.parse(fromto_hdr)
+      @peer_tag = tospec.params['tag']
+      @peer_uri = tospec.uri  
+    end
+
+    def local_fromto
+      if @local_tag
+        "<#{@local_uri}>;tag=#{@local_tag}"
+      else
+        "<#{@local_uri}>"      
+      end
+    end
+
+    def peer_fromto
+      if @peer_tag
+        "<#{@peer_uri}>;tag=#{@peer_tag}"
+      else
+        "<#{@peer_uri}>"      
+      end
+    end
+  end
+end

data/lib/{sip_parser.rb → quaff/sip_parser.rb}

@@ -35,7 +35,7 @@ module Quaff
       elsif udp and msg.header("Content-Length").nil?
         add_body io.read(1500)
       end        
-      @msg
+      msg
     end
 
     def parse_start
@@ -195,13 +195,8 @@ module Quaff
                  uri_parameters)
     end
 
-    def tel_uri
-      Concat.new(Literal.new("tel:"),
-                 Repetition.new([:at_least, 1], Digit.new))
-    end
-
     def addr_spec
-      Alternate.new(sip_uri, tel_uri)
+      sip_uri
     end
 
     def wsp

data/lib/{utils.rb → quaff/utils.rb}

@@ -19,10 +19,6 @@ def Utils.pid
     Process.pid
 end
 
-def Utils.new_call_id
-    "#{pid}_#{Time.new.to_i}@#{local_ipv4}"
-end
-
 def Utils.new_branch
     "z9hG4bK#{Time.new.to_f}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0pre1
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
@@ -58,14 +58,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/auth.rb
-- lib/call.rb
-- lib/endpoint.rb
-- lib/message.rb
 - lib/quaff.rb
-- lib/sip_parser.rb
-- lib/sources.rb
-- lib/utils.rb
+- lib/quaff/auth.rb
+- lib/quaff/call.rb
+- lib/quaff/endpoint.rb
+- lib/quaff/message.rb
+- lib/quaff/sip_dialog.rb
+- lib/quaff/sip_parser.rb
+- lib/quaff/sources.rb
+- lib/quaff/utils.rb
 homepage: http://github.com/rkday/quaff
 licenses:
 - GPL3
@@ -82,14 +83,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Quaff
 test_files: []
-has_rdoc: 

data/lib/call.rb

@@ -1,339 +0,0 @@
-# -*- coding: us-ascii -*-
-require 'securerandom'
-require 'timeout'
-require_relative './utils.rb'
-require_relative './sources.rb'
-require_relative './auth.rb'
-require_relative './message.rb'
-
-module Quaff
-  class CSeq # :nodoc:
-    attr_reader :num
-    def initialize cseq_str
-      @num, @method = cseq_str.split
-      @num = @num.to_i
-    end
-
-    def increment
-      @num = @num + 1
-      to_s
-    end
-
-    def to_s
-      "#{@num.to_s} #{@method}"
-    end
-  end
-
-class Call
-  attr_reader :cid, :last_To, :last_From, :sip_destination
-
-  def initialize(cxn,
-                 cid,
-                 instance_id=nil,
-                 uri=nil,
-                 destination=nil,
-                 target_uri=nil)
-    @cxn = cxn
-    setdest(destination, recv_from_this: true) if destination
-    @retrans = nil
-    @t1, @t2 = 0.5, 32
-    @instance_id = instance_id
-    @cid = cid
-    set_default_headers cid, uri, target_uri
-  end
-
-  # Changes the branch parameter if the Via header, creating a new transaction
-  def update_branch via_hdr=nil
-    via_hdr ||= get_new_via_hdr
-    @last_Via = via_hdr
-  end
-
-  alias_method :new_transaction, :update_branch
-
-  def get_new_via_hdr
-    "SIP/2.0/#{@cxn.transport} #{Quaff::Utils.local_ip}:#{@cxn.local_port};rport;branch=#{Quaff::Utils::new_branch}"
-  end
-
-  def set_callee uri
-    if /<(.*?)>/ =~ uri
-      uri = $1
-    end
-
-    @sip_destination = "#{uri}"
-  end
-  
-  def create_dialog msg
-    if @in_dialog
-      return
-    end
-
-    @in_dialog = true
-
-    uri = msg.first_header("Contact")
-
-    if /<(.*?)>/ =~ uri
-      uri = $1
-    end
-
-    @sip_destination = uri
-
-    unless msg.all_headers("Record-Route").nil?
-      if msg.type == :request
-        @routeset = msg.all_headers("Record-Route")
-      else
-        @routeset = msg.all_headers("Record-Route").reverse
-      end
-    end
-
-  end
-
-  # Sets the Source where messages in this call should be sent to by
-  # default.
-  #
-  # Options:
-  #    :recv_from_this - if true, also listens for any incoming
-  #    messages over this source's connection. (This is only
-  #    meaningful for connection-oriented transports.)
-  def setdest source, options={}
-    @src = source
-    if options[:recv_from_this] and source.sock
-      @cxn.add_sock source.sock
-    end
-  end
-
-  def recv_request(method, dialog_creating=true)
-    begin
-      msg = recv_something
-    rescue Timeout::Error
-      raise "#{ @uri } timed out waiting for #{ method }"
-    end
-
-    unless msg.type == :request \
-      and Regexp.new(method) =~ msg.method
-      raise((msg.to_s || "Message is nil!"))
-    end
-
-    unless @has_To_tag
-      @has_To_tag = true
-      tospec = ToSpec.new
-      tospec.parse(msg.header("To"))
-      tospec.params['tag'] = generate_random_tag
-      @last_To = tospec.to_s
-      @last_From = msg.header("From")
-    end
-
-    if dialog_creating
-      create_dialog msg
-    end
-    msg
-  end
-
-  # Waits until the next message comes in, and handles it if it is one
-  # of possible_messages.
-  #
-  # possible_messages is a list of things that can be received.
-  # Elements can be:
-  # * a string representing the SIP method, e.g. "INVITE"
-  # * a number representing the SIP status code, e.g. 200
-  # * a two-item list, containing one of the above and a boolean
-  # value, which indicates whether this message is dialog-creating. by
-  # default, requests are assumed to be dialog-creating and responses
-  # are not.
-  #
-  # For example, ["INVITE", 301, ["ACK", false], [200, true]] is a
-  # valid value for possible_messages.
-  def recv_any_of(possible_messages)
-    begin
-      msg = recv_something
-    rescue Timeout::Error
-      raise "#{ @uri } timed out waiting for one of these: #{possible_messages}"
-    end
-
-    found_match = false
-    dialog_creating = nil
-    
-    possible_messages.each do
-      | what, this_dialog_creating |
-      type = if (what.class == String) then :request else :response end
-      if this_dialog_creating.nil?
-        this_dialog_creating = (type == :request)
-      end
-
-      found_match =
-        if type == :request 
-          msg.type == :request and what == msg.method
-        else
-          msg.type == :response and what.to_s == msg.status_code
-        end
-
-      if found_match
-        dialog_creating = this_dialog_creating
-        break
-      end
-    end
-
-    unless found_match
-      raise((msg.to_s || "Message is nil!"))
-    end
-
-    if msg.type == :request
-      unless @has_To_tag
-        @has_To_tag = true
-        tospec = ToSpec.new
-        tospec.parse(msg.header("To"))
-        tospec.params['tag'] = generate_random_tag
-        @last_To = tospec.to_s
-        @last_From = msg.header("From")
-      end
-    else
-      if @in_dialog
-        @has_To_tag = true
-        @last_To = msg.header("To")
-      end    
-    end
-
-    if dialog_creating
-      create_dialog msg
-    end
-    msg
-  end
-
-  def recv_response(code, dialog_creating=false)
-    begin
-      msg = recv_something
-    rescue Timeout::Error
-      raise "#{ @uri } timed out waiting for #{ code }"
-    end
-    unless msg.type == :response \
-      and Regexp.new(code) =~ msg.status_code
-      raise "Expected #{ code}, got #{msg.status_code || msg}"
-    end
-
-    if dialog_creating
-      create_dialog msg
-    end
-
-    if @in_dialog
-      @has_To_tag = true
-      @last_To = msg.header("To")
-    end
-
-    msg
-  end
-
-  def recv_response_and_create_dialog(code)
-    recv_response code, true
-  end
-
-  def send_response(code, phrase, body="", retrans=nil, headers={})
-    method = nil
-    msg = build_message headers, body, :response, method, code, phrase
-    send_something(msg, retrans)
-  end
-
-  def send_request(method, body="", headers={})
-    msg = build_message headers, body, :request, method
-    send_something(msg, nil)
-  end
-
-  def end_call
-    @cxn.mark_call_dead @cid
-  end
-
-  def assoc_with_msg(msg)
-    @last_Via = msg.all_headers("Via")
-    @last_CSeq = CSeq.new(msg.header("CSeq"))
-  end
-
-  def get_next_hop header
-    /<sip:(.+@)?(.+):(\d+);(.*)>/ =~ header
-    sock = TCPSocket.new $2, $3
-    return TCPSource.new sock
-  end
-
-  private
-  def recv_something
-    msg = @cxn.get_new_message @cid
-    @retrans = nil
-    @src = msg.source
-    set_callee msg.header("From")
-    @last_Via = msg.headers["Via"]
-    @last_CSeq = CSeq.new(msg.header("CSeq"))
-    msg
-  end
-
-  def calculate_cseq type, method
-    if (type == :response)
-      @last_CSeq.to_s
-    elsif (method == "ACK")
-      "#{@last_CSeq.num} ACK"
-    else
-      @cseq_number = @cseq_number + 1
-      "#{@cseq_number} #{method}"
-    end
-  end
-
-  def build_message headers, body, type, method=nil, code=nil, phrase=nil
-    defaults = {
-      "From" => @last_From,
-      "To" => @last_To,
-      "Call-ID" => @cid,
-      "CSeq" => calculate_cseq(type, method),
-      "Via" => @last_Via,
-      "Max-Forwards" => "70",
-      "Content-Length" => "0",
-      "User-Agent" => "Quaff SIP Scripting Engine",
-      "Contact" => @cxn.contact_header
-    }
-
-    is_request = code.nil?
-    if is_request
-      defaults['Route'] = @routeset
-    else
-      defaults['Record-Route'] = @routeset
-    end
-
-    defaults.merge! headers
-
-    SipMessage.new(method, code, phrase, @sip_destination, body, defaults.merge!(headers)).to_s
-
-  end
-
-  def send_something(msg, retrans)
-    @cxn.send_msg(msg, @src)
-    if retrans and (@transport == "UDP") then
-      @retrans = true
-      Thread.new do
-        timer = @t1
-        sleep timer
-        while @retrans do
-          #puts "Retransmitting on call #{ @cid }"
-          @cxn.send(msg, @src)
-          timer *=2
-          if timer < @t2 then
-            raise "Too many retransmits!"
-          end
-          sleep timer
-        end
-      end
-    end
-  end
-
-  def set_default_headers cid, uri, target_uri
-    @cseq_number = 1
-    @uri = uri
-    @last_From = "<#{uri}>;tag=" + generate_random_tag
-    @in_dialog = false
-    @has_To_tag = false
-    update_branch
-    @last_To = "<#{target_uri}>"
-    @sip_destination = target_uri
-    @routeset = []
-  end
-
-  def generate_random_tag
-    SecureRandom::hex
-  end
-
-end
-end