diameter 0.2.0pre1 → 0.2.0pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6abc6042bb8a5998edf863242bf158597742cd34
-  data.tar.gz: 98272882c82f789b0a3ae62c5e4e6ebe05516490
+  metadata.gz: 5f3f9bf79194a1bf46cdeb9f5554f4d6b1e12969
+  data.tar.gz: a652abd1f5e36bb61de18851e17fc097fab8c806
 SHA512:
-  metadata.gz: 223aa9169ba4cf1d6bfb0512c86ce33e4dbf4926d1d3227a29fc01bca1e920d1efd832808482cdff995174a84ad2e3228a1e3169b8a6a87836a03a949c37cb2f
-  data.tar.gz: 01eae609616ab4ade22e09f63053d396ba3fc7c3d1c1d680fc098b6475865b6a3c42c6465d0fe3487ab0c250526acf41743f0c2655d62e7895627c618d9a7ada
+  metadata.gz: 9ba23cea6ecdb922d02f9d2bd0589054e4e098fe3b522442835f36deb59649f83baa56ab84592c5fb2ae053bd0408838eebc732de2d6f1c73501ef12436780f5
+  data.tar.gz: 1cd7b01d9b41dff2608da114711b83cad13b9fd196eff9bbc8b6eddff325bff9d3515674ed7be0157e29a591faa7c9b56b700ad320e3d1444305b9f89b8d2c20

data/lib/diameter/stack.rb

@@ -8,6 +8,21 @@ require 'concurrent'
 require 'dnsruby'
 
 module Diameter
+  class Realm
+    def initialize(peer_name)
+      @peers = []
+      add_peer(peer_name)
+    end
+
+    def add_peer(name)
+      @peers << name
+    end
+
+    def best_peer
+      @peers[0]
+    end
+  end
+  
   class Stack
     include Internals
 
@@ -36,6 +51,7 @@ module Diameter
 
       @tcp_helper = TCPStackHelper.new(self)
       @peer_table = {}
+      @realm_table = {}
       @handlers = {}
 
       @answer_timeout = opts.fetch(:timeout, 60)
@@ -127,6 +143,11 @@ module Diameter
     
     # @!group Peer connections and message sending
 
+    # Looks up the given Diameter realm with DNS-SRV, and establishes
+    # a connection to one peer in that realm.
+    #
+    # @param realm [String] The Diameter realm to connect to.    
+    # @return [Peer] The Diameter peer chosen.
     def connect_to_realm(realm)
       possible_peers = []
       @res.query("_diameter._tcp.#{realm}", "SRV").each_answer do |a|
@@ -152,6 +173,7 @@ module Diameter
     # @param peer_host [String] The DiameterIdentity of this peer, which
     #   will uniquely identify it in the peer table.
     # @param realm [String] The Diameter realm of this peer.
+    # @return [Peer] The Diameter peer chosen.
     def connect_to_peer(peer_uri, peer_host, realm)
       uri = URI(peer_uri)
       cxn = @tcp_helper.setup_new_connection(uri.host, uri.port)
@@ -164,15 +186,20 @@ module Diameter
       avps += app_avps
       cer_bytes = Message.new(version: 1, command_code: 257, app_id: 0, request: true, proxyable: false, retransmitted: false, error: false, avps: avps).to_wire
       @tcp_helper.send(cer_bytes, cxn)
+
+      @realm_table[realm] = Realm.new(peer_host)
+
       @peer_table[peer_host] = Peer.new(peer_host)
       @peer_table[peer_host].state = :WAITING
+      # Will move to :UP when the CEA is received
       @peer_table[peer_host].cxn = cxn
+
       @peer_table[peer_host]
-      # Will move to :UP when the CEA is received
     end
 
     # Sends a Diameter request. This is routed to an appropriate peer
-    # based on the Destination-Host AVP.
+    # based on the Destination-Host AVP (or, if that is absent, on the
+    # Destination-Realm AVP).
     #
     # This adds this stack's Origin-Host and Origin-Realm AVPs, if
     # those AVPs don't already exist.
@@ -180,8 +207,19 @@ module Diameter
     # @param req [Message] The request to send.
     def send_request(req)
       fail "Must pass a request" unless req.request
-      req.add_origin_host_and_realm(@local_host, @local_realm) 
-      peer_name = req.avp_by_name('Destination-Host').octet_string
+      req.add_origin_host_and_realm(@local_host, @local_realm)
+      peer_name = if req['Destination-Host']
+                    req['Destination-Host'].octet_string
+                  elsif req['Destination-Realm']
+                    realm = req['Destination-Realm'].octet_string
+                    if @realm_table.has_key? realm
+                      @realm_table[realm].best_peer
+                    else
+                      fail "No connection to realm #{realm}"
+                    end
+                  else
+                    fail "Request must have Destination-Host or Destination-Realm"
+                  end
       state = peer_state(peer_name)
       if state == :UP
         peer = @peer_table[peer_name]
@@ -190,13 +228,17 @@ module Diameter
         @pending_ete[req.ete] = q
 
         # Time this request out if no answer is received
+        Diameter.logger.debug("Scheduling timeout for #{@answer_timeout}s time")
+=begin
         Concurrent::timer(@answer_timeout) do
+          Diameter.logger.debug("Timing out message with EtE #{req.ete}")
           q = @pending_ete.delete(req.ete)
           if q
             q.push(:timeout)
           end
         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

data/lib/diameter/stack_transport_helpers.rb

@@ -48,7 +48,9 @@ module Diameter
           rs, _ws, es = IO.select(@all_connections + [@wakeup_pipe_rd], [], @all_connections)
 
         es.each do |e|
+          # :nocov:
           Diameter.logger.log(Logger::WARN, "Exception on connection #{e}")
+          # :nocov:
         end
 
         rs.each do |r|
@@ -134,7 +136,9 @@ module Diameter
       def accept_loop
         rs, _ws, es = IO.select(@listen_connections, [], @listen_connections)
         es.each do |e|
+          # :nocov:
           Diameter.logger.log(Logger::WARN, "Exception on connection #{e}")
+          # :nocov:
         end
 
         rs.each do |r|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diameter
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre1
+  version: 0.2.0pre2
 platform: ruby
 authors:
 - Rob Day