quaff 0.5.1 → 0.5.2

data/lib/call.rb

@@ -1,4 +1,5 @@
 # -*- coding: us-ascii -*-
+require 'securerandom'
 require_relative './utils.rb'
 require_relative './sources.rb'
 require_relative './auth.rb'
@@ -32,18 +33,11 @@ class Call
                  destination=nil,
                  target_uri=nil)
     @cxn = cxn
-    @cseq_number = 1
-    change_cid cid
-    @uri = uri
+    setdest(destination, recv_from_this: true) if destination
     @retrans = nil
     @t1, @t2 = 0.5, 32
-    @last_From = "<#{uri}>"
-    update_branch
-    @last_To = "<#{target_uri}>"
-    setdest(destination, recv_from_this: true) if destination
-    set_callee target_uri if target_uri
-    @routeset = []
     @instance_id = instance_id
+    set_default_headers cid, uri, target_uri
   end
 
   def change_cid cid
@@ -87,11 +81,24 @@ class Call
     rescue
       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
+      @in_dialog = true
+
       set_callee msg.first_header("Contact")
       unless msg.all_headers("Record-Route").nil?
         @routeset = msg.all_headers("Record-Route")
@@ -110,12 +117,20 @@ class Call
       and Regexp.new(code) =~ msg.status_code
       raise "Expected #{ code}, got #{msg.status_code || msg}"
     end
+
     if dialog_creating
+      @in_dialog = true
       set_callee msg.first_header("Contact")
       unless msg.all_headers("Record-Route").nil?
         @routeset = msg.all_headers("Record-Route").reverse
       end
     end
+
+    if @in_dialog
+      @has_To_tag = true
+      @last_To = msg.header("To")
+    end
+
     msg
   end
 
@@ -138,21 +153,11 @@ class Call
     @cxn.mark_call_dead @cid
   end
 
-  def clear_tag str
-    str
-  end
-
   def assoc_with_msg(msg)
     @last_Via = msg.all_headers("Via")
     @last_CSeq = CSeq.new(msg.header("CSeq"))
   end
 
-  def clone_details other_message
-    @headers['To'] = [clear_tag(other_message.header("To"))]
-    @headers['From'] = [clear_tag(other_message.header("From"))]
-    @headers['Route'] = [other_message.header("Route")]
-  end
-
   def get_next_hop header
     /<sip:(.+@)?(.+):(\d+);(.*)>/ =~ header
     sock = TCPSocket.new $2, $3
@@ -164,8 +169,6 @@ class Call
     msg = @cxn.get_new_message @cid
     @retrans = nil
     @src = msg.source
-    @last_To = msg.header("To")
-    @last_From = msg.header("From")
     set_callee msg.header("From")
     @last_Via = msg.headers["Via"]
     @last_CSeq = CSeq.new(msg.header("CSeq"))
@@ -233,5 +236,22 @@ class Call
     end
   end
 
+  def set_default_headers cid, uri, target_uri
+    @cseq_number = 1
+    change_cid cid
+    @uri = uri
+    @last_From = "<#{uri}>;tag=" + generate_random_tag
+    @in_dialog = false
+    @has_To_tag = false
+    update_branch
+    @last_To = "<#{target_uri}>"
+    set_callee target_uri if target_uri
+    @routeset = []
+  end
+
+  def generate_random_tag
+    SecureRandom::base64
+  end
+
 end
 end

data/lib/sip_parser.rb

@@ -1,5 +1,6 @@
 # -*- coding: us-ascii -*-
 require 'digest/md5'
+require 'abnf'
 require_relative './message.rb'
 
 module Quaff
@@ -98,4 +99,172 @@ module Quaff
 
   end
 
+  class ABNFSipParser
+    include ABNF
+
+    # Rules
+
+    def alphanum
+      Alternate.new(Alpha.new, Digit.new)
+    end
+
+    def reserved
+      AlternateChars.new(";/?:@&=+$,")
+    end
+
+    def mark
+      AlternateChars.new("-_.!~*'()")
+    end
+
+    def unreserved
+      Alternate.new(alphanum, mark)
+    end
+
+    def escaped
+      Concat.new(Char.new(?%), HexDigit.new, HexDigit.new)
+    end
+
+    def user_unreserved
+      AlternateChars.new "&=+$,;?/"
+    end
+
+    def user
+      Repetition.new([:at_least, 1], Alternate.new(unreserved, escaped, user_unreserved))
+    end
+
+    def userinfo
+      Concat.new(user, Char.new(?@))
+    end
+
+    def hostname
+      Repetition.new([:at_least, 1], Alternate.new(alphanum, Char.new(?.)))
+    end
+
+    def port
+      Repetition.new([:at_least, 1], Digit.new)
+    end
+
+    def hostport
+      Concat.new(hostname, OptionalConcat.new(Char.new(?:), port))
+    end
+
+    def paramchar
+      paramunreserved = AlternateChars.new("[]/:&+%")
+      Alternate.new(paramunreserved, unreserved, escaped)
+    end
+
+    def pname
+      Repetition.new([:at_least, 1], paramchar)
+    end
+
+    def pvalue
+      Repetition.new([:at_least, 1], paramchar)
+    end
+
+
+    def param
+      Concat.new(pname, OptionalConcat.new(Char.new(?=), pvalue))
+    end
+
+    def uri_parameters
+      Repetition.new(:any,
+                     Concat.new(Char.new(?;), param))
+    end
+
+    def sip_uri
+      Concat.new(Literal.new("sip:"),
+                 Optional.new(userinfo),
+                 hostport,
+                 uri_parameters)
+    end
+
+    def addr_spec
+      sip_uri
+    end
+
+    def wsp
+      Alternate.new(Char.new(" "), Char.new("\t"))
+    end
+
+    def lws
+      Concat.new(OptionalConcat.new(Repetition.new([:at_least, 1], wsp), Literal.new("\r\n")), Repetition.new([:at_least, 1], wsp))
+    end
+
+    def sws
+      Optional.new(lws)
+    end
+
+    def raquot
+      Concat.new(Char.new(">"), sws)
+    end
+
+    def laquot
+      Concat.new(sws, Char.new("<"))
+    end
+
+    def display_name
+      Repetition.new(:any, Alternate.new(alphanum, wsp, Char.new(?")))
+    end
+
+    def name_addr
+      Concat.new(display_name, laquot, addr_spec, raquot)
+    end
+
+    def from_param
+      param
+    end
+
+    def from_spec
+      Concat.new(Alternate.new(addr_spec, name_addr), Repetition.new(:any, Concat.new(Char.new(?;), from_param)))
+    end
+
+    def to_param
+      param
+    end
+
+    def to_spec
+      Concat.new(Alternate.new(addr_spec, name_addr), Repetition.new(:any, Concat.new(Char.new(?;), from_param)))
+    end
+  end
+
+  class ToSpec < ABNFSipParser
+    attr_accessor :params, :uri, :displayname, :is_nameaddr
+    def initialize
+      super
+      @params = {}
+      @uri = nil
+      @displayname = nil
+      @is_nameaddr = false
+    end
+
+    def to_param
+      super.set_block {|p| k, v = p.split("="); @params[k] = if v.nil? then true else v end}
+    end
+
+    def display_name
+      super.set_block {|p| @display_name = p; @is_nameaddr = true}
+    end
+
+    def addr_spec
+      super.set_block {|p| @uri = p}
+    end
+
+    def parse(str)
+      if to_spec.match(Stream.new(str))
+        true
+      else
+        false
+      end
+    end
+
+    def to_s
+      paramstr = @params.collect {|k, v| if (v == true) then ";#{k}" else ";#{k}=#{v}" end}.join("")
+      if @is_nameaddr
+        puts "#{@displayname} <#{@uri}>#{paramstr}"
+      else
+        puts "#{@uri}#{paramstr}"
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: abnf-parsing
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: A Ruby library for writing SIP test scenarios
 email: rkd@rkd.me.uk
 executables: []