quaff 0.2.0 → 0.3.0

data/lib/call.rb

@@ -31,12 +31,14 @@ class Call
                  destination=nil,
                  target_uri=nil)
     @cxn = cxn
+    @cseq_number = 1
     change_cid cid
     @uri = uri
     @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 = []
@@ -65,7 +67,6 @@ class Call
     end
 
     @sip_destination = "#{uri}"
-    @last_To = "<#{uri}>"
   end
 
   def setdest source, options={}
@@ -133,25 +134,6 @@ class Call
     return TCPSource.new sock
   end
 
-  def register username=@username, password=@password, expires="3600"
-    @username, @password = username, password
-    set_callee(@uri)
-    send_request("REGISTER", "", { "Expires" => expires.to_s })
-    response_data = recv_response("401|200")
-    if response_data['message'].status_code == "401"
-      send_request("ACK")
-      auth_hdr = Quaff::Auth.gen_auth_header response_data['message'].header("WWW-Authenticate"), username, password, "REGISTER", @uri
-      update_branch
-      send_request("REGISTER", "", {"Authorization" =>  auth_hdr, "Expires" => expires.to_s, "CSeq" => "2 REGISTER"})
-      recv_response("200")
-    end
-    return true
-  end
-
-  def unregister
-    register @username, @password, 0
-  end
-
   private
   def recv_something
     data = @cxn.get_new_message @cid
@@ -165,14 +147,23 @@ class Call
     data
   end
 
-
+  def calculate_cseq type, method
+    if (type == :response)
+      @last_CSeq.to_s
+    elsif (method == "ACK")
+      @last_CSeq.to_s
+    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" => (type == :response) ? @last_CSeq.to_s : (method == "ACK") ? @last_CSeq.increment : "1 #{method}",
+      "CSeq" => calculate_cseq(type, method),
       "Via" => @last_Via,
       "Max-Forwards" => "70",
       "Content-Length" => "0",
@@ -194,7 +185,7 @@ class Call
   end
 
   def send_something(msg, retrans)
-    @cxn.send(msg, @src)
+    @cxn.send_msg(msg, @src)
     if retrans and (@transport == "UDP") then
       @retrans = true
       Thread.new do

data/lib/endpoint.rb

@@ -2,12 +2,17 @@
 require 'socket'
 require 'thread'
 require 'timeout'
+require 'digest/md5'
 require_relative './sip_parser.rb'
 require_relative './sources.rb'
 
 module Quaff
-class BaseEndpoint
-    attr_accessor :msg_trace
+  class BaseEndpoint
+    attr_accessor :msg_trace, :uri
+
+    def generate_call_id
+      digest = Digest::MD5.hexdigest(rand(60000).to_s)
+    end
 
     def terminate
     end
@@ -15,17 +20,29 @@ class BaseEndpoint
     def add_sock sock
     end
 
-    def new_call call_id=nil, *args
+    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)
     end
 
-    def initialize(lport)
-        @lport = lport
-        initialize_connection lport
-        initialize_queues
-        start
+    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)
+    end
+
+    def initialize(uri, username, password, local_port, outbound_proxy=nil, outbound_port=5060)
+      @uri = uri
+      @username = username
+      @password = password
+      @lport = local_port
+      initialize_connection @lport
+      if outbound_proxy
+        @outbound_connection = new_connection(outbound_proxy, outbound_port)
+      end
+      initialize_queues
+      start
     end
 
     def local_port
@@ -36,12 +53,12 @@ class BaseEndpoint
         @messages[cid] ||= Queue.new
     end
 
-    def get_new_call_id time_limit=5
+    def get_new_call_id time_limit=30
         Timeout::timeout(time_limit) { @call_ids.deq }
     end
 
-    def get_new_message(cid, time_limit=5)
-        Timeout::timeout(time_limit) { @messages[cid].deq }
+    def get_new_message(cid, time_limit=30)
+      Timeout::timeout(time_limit) { @messages[cid].deq }
     end
 
     def mark_call_dead(cid)
@@ -51,9 +68,27 @@ class BaseEndpoint
         @dead_calls = @dead_calls.keep_if {|k, v| v > now}
     end
 
-    def send(data, source)
+    def send_msg(data, source)
         puts "Endpoint on #{@lport} sending #{data} to #{source.inspect}" if @msg_trace
-        source.send(@cxn, data)
+        source.send_msg(@cxn, data)
+    end
+
+    def register expires="3600"
+      call = outgoing_call(@uri)
+      call.send_request("REGISTER", "", { "Expires" => expires.to_s })
+      response_data = call.recv_response("401|200")
+      if response_data['message'].status_code == "401"
+        call.send_request("ACK")
+        auth_hdr = Quaff::Auth.gen_auth_header response_data['message'].header("WWW-Authenticate"), @username, @password, "REGISTER", @uri
+        call.update_branch
+        call.send_request("REGISTER", "", {"Authorization" =>  auth_hdr, "Expires" => expires.to_s, "CSeq" => "2 REGISTER"})
+        call.recv_response("200")
+      end
+      return true
+    end
+
+    def unregister
+      register 0
     end
 
     private
@@ -85,9 +120,9 @@ class BaseEndpoint
         end
     end
 
-end
+  end
 
-class TCPSIPEndpoint < BaseEndpoint
+  class TCPSIPEndpoint < BaseEndpoint
     attr_accessor :sockets
 
     def initialize_connection(lport)
@@ -139,16 +174,15 @@ class TCPSIPEndpoint < BaseEndpoint
     def recv_msg_from_sock(sock)
         @parser.parse_start
         msg = nil
-        while msg.nil? and not sock.closed? do
-            line = sock.gets
-            msg = @parser.parse_partial line
-        end
+      while msg.nil? and not sock.closed? do
+        line = sock.gets
+        msg = @parser.parse_partial line
+      end
         queue_msg msg, TCPSourceFromSocket.new(sock)
     end
+  end
 
-end
-
-class UDPSIPEndpoint < BaseEndpoint
+  class UDPSIPEndpoint < BaseEndpoint
 
     def transport
       "UDP"
@@ -174,8 +208,6 @@ class UDPSIPEndpoint < BaseEndpoint
         msg = @parser.parse_partial(data)
         queue_msg msg, UDPSourceFromAddrinfo.new(addrinfo) unless msg.nil?
     end
-
-
-end
+  end
 
 end

data/lib/sip_parser.rb

@@ -64,11 +64,6 @@ module Quaff
       if line.start_with? " "
         @msg.headers[@cur_hdr][-1] += " "
         @msg.headers[@cur_hdr][-1] += line.lstrip
-        if $1 == "Content-Length"
-          @state = :got_content_length
-        else
-          @state = :middle_of_headers
-        end
       elsif line.include? ":"
         parts = line.split ":", 2
         header_name, header_value = parts[0].rstrip, parts[1].lstrip
@@ -79,10 +74,12 @@ module Quaff
           @state = :got_content_length
           @msg.headers[header_name] = [header_value]
         else
-          @state = :middle_of_headers
+          if (@state != :got_content_length)
+            @state = :middle_of_headers
+          end
         end
       elsif line == ""
-        if @state == :got_content_length and @msg.header("Content-Length").to_i > 0
+        if (@state == :got_content_length) and (@msg.header("Content-Length").to_i > 0)
           @state = :parsing_body
         else
           @state = :done

data/lib/sources.rb

@@ -22,7 +22,7 @@ class UDPSource < Source
         @ip, @port = ip, port
     end
 
-    def send cxn, data
+    def send_msg cxn, data
         cxn.send(data, 0, @ip, @port)
     end
 end
@@ -35,14 +35,14 @@ end
 
 
 class TCPSource < Source
-	attr_reader :sock
+  attr_reader :sock
 
     def initialize ip, port
         @sock = TCPSocket.new ip, port
         @port, @ip = port, ip
     end
 
-    def send _, data
+    def send_msg _, data
         @sock.sendmsg data
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter