tem_multi_proxy 0.1 → 0.2

data/CHANGELOG

@@ -1 +1,3 @@
+v0.2. The multi_proxy can respond to remote queries on connected TEMs.
+
 v0.1. Initial release. Standalone manager works.

data/Manifest

@@ -1,8 +1,11 @@
 bin/tem_multi_proxy
+bin/tem_multi_proxy_query
 CHANGELOG
+lib/tem_multi_proxy/client.rb
 lib/tem_multi_proxy/manager.rb
+lib/tem_multi_proxy/server.rb
 lib/tem_multi_proxy.rb
 LICENSE
+Manifest
 Rakefile
 README
-Manifest

data/bin/tem_multi_proxy

@@ -3,5 +3,5 @@
 require 'rubygems'
 require 'tem_multi_proxy'
 
-manager = Tem::MultiProxy::Manager.new
-manager.management_loop
+server = Tem::MultiProxy::Server.new(ARGV[0] && ARGV[0].to_i)
+server.serving_loop

data/bin/tem_multi_proxy_query

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'tem_multi_proxy'
+
+server_addr = ARGV[0] || 'localhost'
+print "Querying #{server_addr}...\n"
+tem_transports = Tem::MultiProxy::Client.query_tems server_addr
+print tem_transports.inspect, "\n"

data/lib/tem_multi_proxy/client.rb

@@ -0,0 +1,30 @@
+# :nodoc: namespace
+module Tem::MultiProxy
+  
+class Client
+  Protocol = Zerg::Support::Protocols::ObjectProtocol
+  Adapter = Zerg::Support::Sockets::ProtocolAdapter.adapter_module Protocol 
+  SocketFactory = Zerg::Support::SocketFactory
+  JcopRemoteTransport = Tem::Transport::JcopRemoteTransport 
+  
+  # Queries a multi_proxy for its TEMs, and returns them as transport
+  # configurations suitable for Tem::Tem#new.
+  def self.query_tems(server_addr = 'localhost')
+    @client_socket = SocketFactory.socket :out_addr => server_addr,
+                                          :out_port => Server::DEFAULT_PORT,
+                                          :no_delay => true
+    @client_socket.extend Adapter
+    @client_socket.send_object :query => 'tem_ports'
+    tem_ports = @client_socket.recv_object
+    @client_socket.close
+    
+    return nil unless tem_ports
+    server_host = SocketFactory.host_from_address server_addr
+    tem_ports.map do |port|
+      { :class => JcopRemoteTransport,
+        :opts => { :host => server_host, :port => port } }
+    end
+  end  
+end
+
+end  # namespace Tem::MultiProxy

data/lib/tem_multi_proxy/manager.rb

@@ -15,6 +15,11 @@ class Manager
     (9001...9050).each { |port| @free_ports[port] = true }
     @logger = Logger.new STDERR
   end
+  
+  # Returns an array of ports that TEMs can listen to.
+  def tem_ports
+    @proxy_ports.values.sort
+  end
 
   # Polls each smartcard reader to see if there's a card present.
   def poll_readers

data/lib/tem_multi_proxy/server.rb

@@ -0,0 +1,55 @@
+require 'logger'
+require 'rbtree'
+require 'set'
+
+
+# :nodoc: namespace
+module Tem::MultiProxy
+  
+class Server
+  DEFAULT_PORT = 9051
+
+  Protocol = Zerg::Support::Protocols::ObjectProtocol
+  Adapter = Zerg::Support::Sockets::ProtocolAdapter.adapter_module Protocol 
+  SocketFactory = Zerg::Support::SocketFactory
+  
+  def initialize(server_port = nil)
+    @manager = Manager.new
+    @socket = SocketFactory.socket :in_port => (server_port || DEFAULT_PORT),
+                                   :no_delay => true    
+  end
+  
+  # The main server loop.
+  def serving_loop
+    Thread.new { socket_loop }
+    @manager.management_loop
+  end
+  
+  # Socket-serving loop that takes in clients and spins off a thread for each
+  # client.
+  def socket_loop
+    @socket.listen
+    loop do
+      client_socket, client_addr = @socket.accept
+      Thread.new(client_socket) { |client_socket| serve_client client_socket }      
+    end
+    @manager.tem_ports
+  end
+  
+  # Handle a single client.
+  def serve_client(client)
+    client.extend Adapter
+    request = client.recv_object
+    if request
+      case request[:query]
+      when 'tem_ports'
+        client.send_object @manager.tem_ports
+      else
+        client.send_object 'Unknown request'
+      end
+    end
+    client.close rescue nil
+  end
+end
+
+end  # namespace Tem::MultiProxy

data/lib/tem_multi_proxy.rb

@@ -1,5 +1,6 @@
 # Gem requirements.
 require 'rubygems'
+require 'eventmachine'
 require 'smartcard'
 require 'tem_ruby'
 require 'zerg_support'
@@ -9,4 +10,6 @@ module Tem::MultiProxy
 end
 
 # The files making up the gem.
+require 'tem_multi_proxy/client.rb'
 require 'tem_multi_proxy/manager.rb'
+require 'tem_multi_proxy/server.rb'

data/tem_multi_proxy.gemspec

@@ -2,17 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_multi_proxy}
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2009-06-01}
-  s.default_executable = %q{tem_multi_proxy}
+  s.date = %q{2009-06-02}
   s.description = %q{Maintains TEM proxies for all the physically attached TEMs.}
   s.email = %q{victor@costan.us}
-  s.executables = ["tem_multi_proxy"]
-  s.extra_rdoc_files = ["bin/tem_multi_proxy", "CHANGELOG", "lib/tem_multi_proxy/manager.rb", "lib/tem_multi_proxy.rb", "LICENSE", "README"]
-  s.files = ["bin/tem_multi_proxy", "CHANGELOG", "lib/tem_multi_proxy/manager.rb", "lib/tem_multi_proxy.rb", "LICENSE", "Rakefile", "README", "Manifest", "tem_multi_proxy.gemspec"]
+  s.executables = ["tem_multi_proxy", "tem_multi_proxy_query"]
+  s.extra_rdoc_files = ["bin/tem_multi_proxy", "bin/tem_multi_proxy_query", "CHANGELOG", "lib/tem_multi_proxy/client.rb", "lib/tem_multi_proxy/manager.rb", "lib/tem_multi_proxy/server.rb", "lib/tem_multi_proxy.rb", "LICENSE", "README"]
+  s.files = ["bin/tem_multi_proxy", "bin/tem_multi_proxy_query", "CHANGELOG", "lib/tem_multi_proxy/client.rb", "lib/tem_multi_proxy/manager.rb", "lib/tem_multi_proxy/server.rb", "lib/tem_multi_proxy.rb", "LICENSE", "Manifest", "Rakefile", "README", "tem_multi_proxy.gemspec"]
   s.homepage = %q{http://tem.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tem_multi_proxy", "--main", "README"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_multi_proxy
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -04:00
+date: 2009-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,24 +56,31 @@ description: Maintains TEM proxies for all the physically attached TEMs.
 email: victor@costan.us
 executables: 
 - tem_multi_proxy
+- tem_multi_proxy_query
 extensions: []
 
 extra_rdoc_files: 
 - bin/tem_multi_proxy
+- bin/tem_multi_proxy_query
 - CHANGELOG
+- lib/tem_multi_proxy/client.rb
 - lib/tem_multi_proxy/manager.rb
+- lib/tem_multi_proxy/server.rb
 - lib/tem_multi_proxy.rb
 - LICENSE
 - README
 files: 
 - bin/tem_multi_proxy
+- bin/tem_multi_proxy_query
 - CHANGELOG
+- lib/tem_multi_proxy/client.rb
 - lib/tem_multi_proxy/manager.rb
+- lib/tem_multi_proxy/server.rb
 - lib/tem_multi_proxy.rb
 - LICENSE
+- Manifest
 - Rakefile
 - README
-- Manifest
 - tem_multi_proxy.gemspec
 has_rdoc: true
 homepage: http://tem.rubyforge.org