diameter 0.2.0pre2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f3f9bf79194a1bf46cdeb9f5554f4d6b1e12969
-  data.tar.gz: a652abd1f5e36bb61de18851e17fc097fab8c806
+  metadata.gz: 78fdef7d94263e4950aec0b5c1dbf6e18925c817
+  data.tar.gz: 6d2d7d32b7701e73474c048cc39cb5e9c0263311
 SHA512:
-  metadata.gz: 9ba23cea6ecdb922d02f9d2bd0589054e4e098fe3b522442835f36deb59649f83baa56ab84592c5fb2ae053bd0408838eebc732de2d6f1c73501ef12436780f5
-  data.tar.gz: 1cd7b01d9b41dff2608da114711b83cad13b9fd196eff9bbc8b6eddff325bff9d3515674ed7be0157e29a591faa7c9b56b700ad320e3d1444305b9f89b8d2c20
+  metadata.gz: f1cf4fe297f2f6dfa12ccb5645282b4c59bc7f8df21f8a16ec00cfd59580ad02981000d0feac28a0e8afb46a771740917fd4a05c7753557e31f003d66400dde3
+  data.tar.gz: 75d82606e30f397720fd18bbc950cd3e7ce2f00891e79f2983d93a9a94cb93788d3e59f164012317a3d84e620a73fb310fc4e6707c548e20b660c28a7e0b3812

data/lib/diameter/avp_names.rb

@@ -10,7 +10,7 @@ module Diameter
                        'NAS-Port' => [5, Unsigned32],
                        'Service-Type' => [6, Enumerated],
                        'Framed-Protocol' => [7, Enumerated],
-                       'Framed-IP-Address' => [8, IPAddress],
+                       'Framed-IP-Address' => [8, OctetString],
                        'Framed-IP-Netmask' => [9, IPAddress],
                        'Framed-Routing' => [10, Enumerated],
                        'Filter-Id' => [11, UTF8String],

data/lib/diameter/message.rb

@@ -233,7 +233,9 @@ module Diameter
     def create_answer(result_code, opts={})
       fail "Cannot answer an answer" if answer
       
-      avps = opts.fetch(:avps, [])
+      avps = []
+      avps << avp_by_name("Session-Id") unless avp_by_name("Session-Id").nil?
+      avps += opts.fetch(:avps, [])
       avps << if opts[:experimental_result_vendor]
                 AVP.create("Experimental-Result",
                            [AVP.create("Experimental-Result-Code", result_code),

data/lib/diameter/peer.rb

@@ -25,8 +25,9 @@ module Diameter
     attr_accessor :identity, :static, :cxn, :realm, :expiry_time, :last_message_seen
     attr_reader :state
 
-    def initialize(identity)
+    def initialize(identity, realm)
       @identity = identity
+      @realm = realm
       @state = :CLOSED
       @state_change_q = Queue.new
     end

data/lib/diameter/stack.rb

@@ -8,21 +8,6 @@ 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
 
@@ -51,7 +36,6 @@ module Diameter
 
       @tcp_helper = TCPStackHelper.new(self)
       @peer_table = {}
-      @realm_table = {}
       @handlers = {}
 
       @answer_timeout = opts.fetch(:timeout, 60)
@@ -60,7 +44,7 @@ module Diameter
                                                        min_threads: 5,
                                                        max_threads: 5,
                                                        max_queue: 1,
-                                                       overflow_policy: :caller_runs
+                                                       fallback_policy: :caller_runs
                                                        )
 
       @res = Dnsruby::Resolver.new
@@ -187,9 +171,7 @@ module Diameter
       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] = Peer.new(peer_host, realm)
       @peer_table[peer_host].state = :WAITING
       # Will move to :UP when the CEA is received
       @peer_table[peer_host].cxn = cxn
@@ -205,31 +187,40 @@ module Diameter
     # those AVPs don't already exist.
     #
     # @param req [Message] The request to send.
-    def send_request(req)
+    # @param peer [Peer] (Optional) A peer to use as the first hop for the message
+    def send_request(req, options={})
       fail "Must pass a request" unless req.request
       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]
-        @tcp_helper.send(req.to_wire, peer.cxn)
+
+      peer = options[:peer]
+
+      if peer.nil?
+        peer = if req['Destination-Host']
+                 peer_identity = req['Destination-Host'].octet_string
+                 Diameter.logger.debug("Selecting peer by Destination-Host (#{peer_identity})")
+                 @peer_table[peer_identity]
+               elsif req['Destination-Realm']
+                 realm = req['Destination-Realm'].octet_string
+                 Diameter.logger.debug("Selecting peer by Destination-Realm (#{realm})")
+                 @peer_table.values.select { |p| p.realm == realm }.sample
+               else
+                 fail "Request must have Destination-Host or Destination-Realm"
+               end
+      else
+        Diameter.logger.debug("Peer selection forced to #{peer.identity}")
+      end
+
+      if peer.nil?
+        Diameter.logger.warn("No peer is available to send message - cannot route")
+        fail "No acceptable peer"
+      elsif peer.state == :UP
         q = Queue.new
         @pending_ete[req.ete] = q
+        @tcp_helper.send(req.to_wire, peer.cxn)
 
+=begin
         # 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)
@@ -247,7 +238,7 @@ module Diameter
         }
         return p
       else
-        Diameter.logger.log(Logger::WARN, "Peer #{peer_name} is in state #{state} - cannot route")
+        Diameter.logger.warn("Peer #{peer.identity} is in state #{peer.state} - cannot route")
       end
     end
 
@@ -302,7 +293,7 @@ module Diameter
       end
 
       if msg.command_code == 257 && msg.answer
-        handle_cea(msg)
+        handle_cea(msg, cxn)
       elsif msg.command_code == 257 && msg.request
         handle_cer(msg, cxn)
       elsif msg.command_code == 280 && msg.request
@@ -381,8 +372,9 @@ module Diameter
 
       if rc == 2001
         peer = cer.avp_by_name('Origin-Host').octet_string
-        Diameter.logger.debug("Creating peer table entry for peer #{peer}")
-        @peer_table[peer] = Peer.new(peer)
+        realm = cer.avp_by_name('Origin-Realm').octet_string
+        Diameter.logger.debug("Creating peer table entry for peer #{peer} in realm #{realm}")
+        @peer_table[peer] = Peer.new(peer, realm)
         @peer_table[peer].state = :UP
         @peer_table[peer].reset_timer
         @peer_table[peer].cxn = cxn
@@ -391,14 +383,26 @@ module Diameter
       end
     end
 
-    def handle_cea(cea)
-      peer = cea.avp_by_name('Origin-Host').octet_string
-      if @peer_table.has_key? peer
-        @peer_table[peer].state = :UP
-        @peer_table[peer].reset_timer
+    def handle_cea(cea, cxn)
+      host = cea.avp_by_name('Origin-Host').octet_string
+      if @peer_table.has_key? host
+        @peer_table[host].state = :UP
+        @peer_table[host].reset_timer
       else
-        Diameter.logger.warn("Ignoring CEA from unknown peer #{peer}")
-        Diameter.logger.debug("Known peers are #{@peer_table.keys}")
+        entry = @peer_table.find { |h, p| p.cxn == cxn }
+        if entry.nil?
+          Diameter.logger.warn("Ignoring CEA from unknown peer #{host}")
+          Diameter.logger.debug("Known peers are #{@peer_table.keys}")
+        else
+          old_host, peer = entry
+          Diameter.logger.warn("Peer identity changed #{old_host} => #{host}")
+
+          @peer_table.delete(old_host)
+          peer.identity = host
+          @peer_table[host] = peer
+          @peer_table[host].state = :UP
+          @peer_table[host].reset_timer
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diameter
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre2
+  version: 0.3.0
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dnsruby
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.8.0
 description: 
 email: ruby-diameter@rkd.me.uk
 executables: []
@@ -120,7 +148,6 @@ files:
 - lib/diameter/avp_parser.rb
 - lib/diameter/constants.rb
 - lib/diameter/diameter_logger.rb
-- lib/diameter/fsm.rb
 - lib/diameter/message.rb
 - lib/diameter/peer.rb
 - lib/diameter/stack.rb
@@ -141,12 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Pure-Ruby Diameter stack

data/lib/diameter/fsm.rb

@@ -1,27 +0,0 @@
-require 'micromachine'
-
-machine = MicroMachine.new(:closed) # Initial state.
-
-# Define the possible transitions for each event.
-machine.when(:closed, :start => :wait_conn_ack)
-machine.when(:closed, :r_conn_cer => :r_open)
-
-machine.when(:wait_conn_ack, :i_rcv_conn_ack => :wait_i_cea)
-machine.when(:wait_conn_ack, :i_rcv_conn_nack => :closed)
-machine.when(:wait_conn_ack, :r_conn_cer => :wait_conn_ack_elect)
-machine.when(:wait_conn_ack, :timeout => :closed)
-
- 
-machine.when(:reset, :confirmed => :new, :ignored => :new)
-
-machine.trigger(:confirm)  #=> true
-machine.state              #=> :confirmed
-
-machine.trigger(:ignore)   #=> false
-machine.state              #=> :confirmed
-
-machine.trigger(:reset)    #=> true
-machine.state              #=> :new
-
-machine.trigger(:ignore)   #=> true
-machine.state              #=> :ignored