diameter 0.1.0 → 0.2.0pre1

data/lib/diameter/constants.rb

@@ -10,45 +10,27 @@ module Diameter
     # as.
     module AVPType
       # Represents an AVP of Grouped type
-      GROUPED = :Grouped
+      Grouped = :Grouped
       
       # Represents an AVP of Unsigned32 type
-      U32 = :Unsigned32
+      Unsigned32 = :Unsigned32
+      Enumerated = Unsigned32
 
+      Unsigned64 = :Unsigned64
+      Integer32 = :Integer32
+      Integer64 = :Integer64
+      Float32 = :Float32
+      Float64 = :Float64
+      
       # Represents an AVP of OctetString type
-      OCTETSTRING = :OctetString
+      OctetString = :OctetString
+      DiameterIdentity = OctetString
+      DiameterURI = OctetString
+      UTF8String = OctetString
+      
 
       # Represents an AVP of IPAddress type
-      IPADDR = :Address
+      IPAddress = :Address
     end
-
-    include AVPType
-    include Vendors
-
-    # The AVPs that can be looked up by name.
-    AVAILABLE_AVPS = {
-      'Vendor-Specific-Application-Id' => [260, GROUPED],
-      'Vendor-Id' => [266, U32],
-      'Auth-Application-Id' => [258, U32],
-      'Acct-Application-Id' => [259, U32],
-      'Session-Id' => [263, OCTETSTRING],
-      'Product-Name' => [269, OCTETSTRING],
-      'Auth-Session-State' => [277, U32],
-      'Inband-Security-Id' => [299, U32],
-      'Origin-Host' => [264, OCTETSTRING],
-      'Firmware-Revision' => [267, U32],
-      'Result-Code' => [268, U32],
-      'Origin-Realm' => [296, OCTETSTRING],
-      'Destination-Host' => [293, OCTETSTRING],
-      'Destination-Realm' => [283, OCTETSTRING],
-      'User-Name' => [1, OCTETSTRING],
-      'Host-IP-Address' => [257, IPADDR],
-      'Public-Identity' => [601, OCTETSTRING, TGPP],
-      'Server-Name' => [602, OCTETSTRING, TGPP],
-      'SIP-Number-Auth-Items' => [607, U32, TGPP],
-      'SIP-Auth-Data-Item' => [612, GROUPED, TGPP],
-      'SIP-Item-Number' => [613, U32, TGPP],
-      'SIP-Authentication-Scheme' => [608, OCTETSTRING, TGPP] }
-
   end
 end

data/lib/diameter/message.rb

@@ -26,22 +26,23 @@ module Diameter
 
     # Creates a new Diameter message.
     #
-    # @option opts [Fixnum] command_code
+    # @param [Hash] options The options
+    # @option options [Fixnum] command_code
     #   The Diameter Command-Code of this messsage.
-    # @option opts [Fixnum] app_id
+    # @option options [Fixnum] app_id
     #   The Diameter application ID of this message, or 0 for base
     #   protocol messages.
-    # @option opts [Fixnum] hbh
+    # @option options [Fixnum] hbh
     #   The hop-by-hop identifier of this message.
-    # @option opts [Fixnum] ete
+    # @option options [Fixnum] ete
     #   The end-to-end identifier of this message.
-    # @option opts [true, false] request
+    # @option options [true, false] request
     #   Whether this message is a request. Defaults to true.
-    # @option opts [true, false] proxyable
+    # @option options [true, false] proxyable
     #   Whether this message can be forwarded on. Defaults to true.
-    # @option opts [true, false] error
+    # @option options [true, false] error
     #   Whether this message is a Diameter protocol error. Defaults to false.
-    # @option opts [Array<AVP>] avps
+    # @option options [Array<AVP>] avps
     #   The list of AVPs to include on this message.
     def initialize(options = {})
       @version = 1
@@ -234,7 +235,9 @@ module Diameter
       
       avps = opts.fetch(:avps, [])
       avps << if opts[:experimental_result_vendor]
-                fail
+                AVP.create("Experimental-Result",
+                           [AVP.create("Experimental-Result-Code", result_code),
+                            AVP.create("Vendor-Id", opts[:experimental_result_vendor])])
               else
                 AVP.create("Result-Code", result_code)
               end

data/lib/diameter/stack.rb

@@ -5,6 +5,7 @@ require 'diameter/message'
 require 'diameter/stack_transport_helpers'
 require 'diameter/diameter_logger'
 require 'concurrent'
+require 'dnsruby'
 
 module Diameter
   class Stack
@@ -21,7 +22,10 @@ module Diameter
     #  the Origin-Host AVP).
     # @param realm [String] The Diameter realm of this stack (for
     #  the Origin-Realm AVP).
-    def initialize(host, realm)
+    # @option opts [Fixnum] timeout (60)
+    #   The number of seconds to wait for an answer before notifying
+    #   the caller of a timeout and forgetting about the request.
+    def initialize(host, realm, opts={})
       @local_host = host
       @local_realm = realm
 
@@ -34,14 +38,16 @@ module Diameter
       @peer_table = {}
       @handlers = {}
 
-      @threadpool = pool = Concurrent::ThreadPoolExecutor.new(
-                                                              min_threads: 5,
-                                                              max_threads: 5,
-                                                              max_queue: 100,
-                                                              overflow_policy: :caller_runs
-                                                              )
+      @answer_timeout = opts.fetch(:timeout, 60)
 
-      
+      @threadpool = Concurrent::ThreadPoolExecutor.new(
+                                                       min_threads: 5,
+                                                       max_threads: 5,
+                                                       max_queue: 1,
+                                                       overflow_policy: :caller_runs
+                                                       )
+
+      @res = Dnsruby::Resolver.new
       Diameter.logger.log(Logger::INFO, 'Stack initialized')
     end
 
@@ -120,6 +126,23 @@ module Diameter
     end
     
     # @!group Peer connections and message sending
+
+    def connect_to_realm(realm)
+      possible_peers = []
+      @res.query("_diameter._tcp.#{realm}", "SRV").each_answer do |a|
+        possible_peers << {name: a.target.to_s, port: a.port, priority: a.priority, weight: a.weight}
+      end
+
+      # Prefer the lowest priority and the highest weight
+      possible_peers.sort!{ |a, b| (a[:priority] <=> b[:priority]) || (b[:weight] <=> a[:weight])}
+      Diameter.logger.debug("Sorted list of peers for realm #{realm} is #{possible_peers.inspect}")
+
+      primary = possible_peers[0]
+
+      url = "aaa://#{primary[:name]}:#{primary[:port]}"
+      Diameter.logger.info("Primary peer for realm #{realm} is #{primary[:name]}, (#{url})")
+      connect_to_peer(url, primary[:name], realm)
+    end
     
     # Creates a Peer connection to a Diameter agent at the specific
     # network location indicated by peer_uri.
@@ -165,6 +188,15 @@ module Diameter
         @tcp_helper.send(req.to_wire, peer.cxn)
         q = Queue.new
         @pending_ete[req.ete] = q
+
+        # Time this request out if no answer is received
+        Concurrent::timer(@answer_timeout) do
+          q = @pending_ete.delete(req.ete)
+          if q
+            q.push(:timeout)
+          end
+        end
+            
         p = Concurrent::Promise.execute(executor: @threadpool) {
           Diameter.logger.debug("Waiting for answer to message with EtE #{req.ete}, queue #{q}")
           val = q.pop
@@ -240,7 +272,7 @@ module Diameter
       elsif @handlers.has_key? msg.app_id
         @handlers[msg.app_id].call(msg, cxn)
       else
-        fail "Received unknown message of type #{msg.command_code}"
+        Diameter.logger.warn("Ignoring message from unrecognised application #{msg.app_id} (Command-Code #{msg.command_code})")
       end
     end
 
@@ -273,16 +305,17 @@ module Diameter
     end
 
     def shared_apps(capabilities_msg)
-      peer_apps = capabilities_msg.all_avps_by_name("Auth-Application-Id").collect(&:uint32)
-      peer_apps += capabilities_msg.all_avps_by_name("Acct-Application-Id").collect(&:uint32)
+      peer_apps = []
 
-      capabilities_msg.all_avps_by_name("Vendor-Specific-Application-Id").each do |avp|
-        if avp.inner_avp("Auth-Application-Id")
-          peer_apps << avp.inner_avp("Auth-Application-Id").uint32
-        end
+      app_avps = ["Auth-Application-Id", "Acct-Application-Id"]
+
+      app_avps.each do |name|
+        peer_apps += capabilities_msg.all_avps_by_name(name).collect(&:uint32)
 
-        if avp.inner_avp("Acct-Application-Id")
-          peer_apps << avp.inner_avp("Acct-Application-Id").uint32
+        capabilities_msg.all_avps_by_name("Vendor-Specific-Application-Id").each do |avp|
+          if avp.inner_avp(name)
+            peer_apps << avp.inner_avp(name).uint32
+          end
         end
       end
 

data/lib/diameter/stack_transport_helpers.rb

@@ -35,6 +35,15 @@ module Diameter
         @wakeup_pipe_wr.puts "wakeup"
       end
 
+      def read_from(connection, bytes)
+        msg, src = connection.recv_nonblock(bytes)
+        if msg == ''
+          Diameter.logger.warn('Received 0 bytes on read, closing connection')
+          close(connection)
+        end
+        return msg, src
+      end
+
       def main_loop
           rs, _ws, es = IO.select(@all_connections + [@wakeup_pipe_rd], [], @all_connections)
 
@@ -50,13 +59,8 @@ module Diameter
 
           existing_data = @data[r]
           if existing_data.length < 4
-            msg, _src = r.recv_nonblock(4 - existing_data.length)
-            if msg == ''
-              Diameter.logger.warn('Received 0 bytes on read, closing connection')
-              close(r)
-            else
-              existing_data += msg
-            end
+            msg, _src = read_from(r, 4 - existing_data.length)
+            existing_data += msg
           end
 
           expected_len = -1
@@ -64,13 +68,8 @@ module Diameter
             expected_len = Message.length_from_header(existing_data[0..4])
             Diameter.logger.debug("Read 4 bytes #{existing_data[0..4].inspect}, " \
                                   "reading full message of length #{expected_len}")
-            msg, _src = r.recv_nonblock(expected_len - existing_data.length)
+            msg, _src = read_from(r, expected_len - existing_data.length)
             existing_data += msg
-            if msg == ''
-              # Connection closed
-              Diameter.logger.warn('Received 0 bytes on read, closing connection')
-              close(r)
-            end
           end
 
           if existing_data.length == expected_len

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diameter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0pre1
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: dnsruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ extra_rdoc_files: []
 files:
 - lib/diameter.rb
 - lib/diameter/avp.rb
+- lib/diameter/avp_names.rb
 - lib/diameter/avp_parser.rb
 - lib/diameter/constants.rb
 - lib/diameter/diameter_logger.rb
@@ -126,9 +141,9 @@ 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.3