ddns 0.1.5 → 0.1.6

data/bin/ddns

@@ -10,11 +10,6 @@ require 'socket'
 LOGGER = Logger.new($stderr)
 default_gaddress = nil
 
-begin
-  default_gaddress = IPSocket.getaddress(Socket.gethostname)
-rescue SocketError
-end
-
 options = {
   :hostname => Socket.gethostname,
   :address  => '0.0.0.0',
@@ -25,19 +20,21 @@ options = {
   :resolver => Resolv::DNS.new,
   :daemon   => false,
   :logger   => LOGGER,
-  :loglevel => Logger::INFO
+  :loglevel => Logger::INFO,
+  :ttl      => 300,
 }
 
 opts = OptionParser.new
 opts.on('-H', '--hostname HOST',       "Own hostname (default #{options[:hostname]})")              {|v| options[:hostname] = v }
 opts.on('-A', '--address ADDRESS',     "Name service ip address (default #{options[:address]})")    {|v| options[:address]  = v }
 opts.on('-P', '--port PORT', Integer,  "Name service port (default #{options[:port]})")             {|v| options[:port]     = v }
-opts.on('-a', '--gaddress ADDRESS',    "Gossip service ip address (default #{options[:gaddress]})") {|v| options[:gaddress] = v }
+opts.on('-a', '--gaddress ADDRESS',    "Gossip service ip address")                                 {|v| options[:gaddress] = v }
 opts.on('-p', '--gport PORT', Integer, "Gossip service port (default #{options[:gport]})")          {|v| options[:gport]    = v }
 opts.on('-S', '--socket SOCK',         "Socket file path (default #{options[:sock]})")              {|v| options[:sock]     = v }
 opts.on('-d', '--daemon COMMAND',      "Directive of daemonize (start|stop|restart|status)")        {|v| options[:daemon]   = v }
 opts.on('-r', '--resolver CONF',       "Default resolver (default /etc/resolv.conf)")               {|v| options[:resolver] = Resolv::DNS.new(v) }
 opts.on('-N', '--no-resolver',         "Not use default resolver")                                  {|v| options[:resolver] = nil }
+opts.on('-T', '--ttl TTL',             "Time to live (#{options[:ttl]})")                           {|v| options[:ttl]      = v.to_i }
 
 opts.on('-L', '--loglevel LEVEL',
   [:fatal, :error, :warn, :info, :debug], "Log level (default info)") {|v| options[:loglevel] = Logger.const_get(v.to_s.upcase) }
@@ -57,9 +54,26 @@ rescue => e
 end
 
 unless options[:gaddress]
-  $stderr.puts 'Please pass gossip service address'
+  if ['stop', 'status'].include?(options[:daemon])
+    options[:gaddress] = '127.0.0.1'
+  else
+    begin
+      options[:gaddress] = IPSocket.getaddress(Socket.gethostname)
+    rescue SocketError
+    end
+
+    unless options[:gaddress]
+      $stderr.puts 'Please pass gossip service address'
+      exit 1
+    end
+  end
+end
+
+if options[:ttl] < 1
+  $stderr.puts "invalid TTL: #{options[:ttl]}"
   exit 1
 end
+ 
 
 #RGossip.debug = true
 RGossip.port = options[:gport]
@@ -75,7 +89,7 @@ if options[:daemon]
 else
   begin
     at_exit { FileUtils.rm_f(options[:sock]) }
-    $DDNS_GOSSIP = DRb.start_service("drbunix:#{options[:sock]}", $DDNS_ATTR.gossip)
+    $RDDNS_ATTR = DRb.start_service("drbunix:#{options[:sock]}", $DDNS_ATTR)
   rescue => e
     $stderr.puts(e.message)
   end

data/bin/ddnsctl

@@ -29,6 +29,13 @@ def clear
   $gossip.clear_dead_list
 end
 
+def ttl(time)
+  time = time.to_i
+  raise "invalid TTL: #{time}" if time < 1
+  puts "Update TTL: #{time}"
+  $DDNS_ATTR.ttl = time
+end
+
 options = {
   :sock => '/tmp/ddns.sock',
 }
@@ -38,6 +45,7 @@ opts.on('-L',         "List nodes")      {|v| options[:command] = :list }
 opts.on('-A ADDREDD', "Add node")        {|v| options[:command] = :add ; options[:arg] = v }
 opts.on('-D ADDREDD', "Delete node")     {|v| options[:command] = :delete ; options[:arg] = v }
 opts.on('-C',         "Clear dead list") {|v| options[:command] = :clear }
+opts.on('-T TTL',     "Update TTL")      {|v| options[:command] = :ttl ; options[:arg] = v }
 opts.on('-S', '--socket SOCK', "Socket file path (default #{options[:sock]})") {|v| options[:sock] = v }
 opts.on('-h', '--help', "Display this help") { $stdout.puts opts.help ; exit 1 }
 
@@ -47,7 +55,7 @@ if ARGV.empty?
 end
 
 begin
-  raise "invalid arguments: #{ARGV.join ' '}" if 1 < ARGV.select {|i| %w(-L -A -D -C).include?(i) }.length
+  raise "invalid arguments: #{ARGV.join ' '}" if 1 < ARGV.select {|i| %w(-L -A -D -C -T).include?(i) }.length
   opts.parse!(ARGV)
 rescue => e
   $stderr.puts e.message
@@ -60,14 +68,21 @@ unless File.exist?(options[:sock])
   exit 1
 end
 
-$gossip = DRbObject.new_with_uri("drbunix:#{options[:sock]}")
+$DDNS_ATTR = DRbObject.new_with_uri("drbunix:#{options[:sock]}")
+$gossip = $DDNS_ATTR.gossip
 
-case options[:command] 
-when :list   then list
-when :add    then add(options[:arg])
-when :delete then delete(options[:arg])
-when :clear  then clear
-else
-  $stdout.puts opts.help
+begin
+  case options[:command] 
+  when :list   then list
+  when :add    then add(options[:arg])
+  when :delete then delete(options[:arg])
+  when :clear  then clear
+  when :ttl    then ttl(options[:arg])
+  else
+    $stdout.puts opts.help
+    exit 1
+  end
+rescue => e
+  $stderr.puts e.message
   exit 1
 end

data/lib/ddns-server.rb

@@ -20,6 +20,7 @@ class DDNS < RExec::Daemon::Base
     attr_reader :resolver
     attr_reader :logger
     attr_reader :loglevel
+    attr_accessor :ttl
     attr_reader :gossip
 
     def initialize(options = {})
@@ -32,6 +33,7 @@ class DDNS < RExec::Daemon::Base
       @resolver      = options[:resolver]
       @logger        = options[:logger] || Logger.new($stderr)
       @loglevel      = options[:loglevel] || Logger::INFO
+      @ttl           = options[:ttl] || 300
       @logger.level  = @loglevel
 
       @gossip = RGossip::Client.new(
@@ -77,19 +79,19 @@ class DDNS < RExec::Daemon::Base
         logger.level = $DDNS_ATTR.loglevel
 
         if $DDNS_ATTR.daemon and $DDNS_ATTR.sock
-          $DDNS_GOSSIP = DRb.start_service("drbunix:#{$DDNS_ATTR.sock}", $DDNS_ATTR.gossip)
+          $RDDNS_ATTR = DRb.start_service("drbunix:#{$DDNS_ATTR.sock}", $DDNS_ATTR)
         end
       end
 
       match($DDNS_ATTR.method(:lookup_a_record).to_proc, :A) do |transaction|
         address, timestamp, data = $DDNS_ATTR.gossip.select {|a, t, d| d == transaction.name }.sort_by{ rand }.first
-        transaction.respond!(address)
+        transaction.respond!(address, :ttl => $DDNS_ATTR.ttl)
       end
 
       match($DDNS_ATTR.method(:lookup_ptr_record).to_proc, :PTR) do |transaction|
         name = transaction.name.sub(/\.in-addr\.arpa\Z/, '').split('.').reverse.join('.')
         address, timestamp, data = $DDNS_ATTR.gossip.find {|a, t, d| a == name }
-        transaction.respond!(Resolv::DNS::Name.create("#{data}."))
+        transaction.respond!(Resolv::DNS::Name.create("#{data}."), :ttl => $DDNS_ATTR.ttl)
       end
 
       if $DDNS_ATTR.resolver

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ddns
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +09:00
-default_executable: 
+date: 2011-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -61,11 +60,9 @@ extra_rdoc_files: []
 
 files: 
 - README
-- bin/ddns
-- bin/ddns.orig
 - bin/ddnsctl
+- bin/ddns
 - lib/ddns-server.rb
-has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/ddns
 licenses: []
 
@@ -95,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Distributed name server

data/bin/ddns.orig

@@ -1,80 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'fileutils'
-require 'drb/drb'
-require 'ddns-server'
-require 'optparse'
-require 'resolv'
-require 'socket'
-
-LOGGER = Logger.new($stderr)
-default_gaddress = nil
-
-begin
-  default_gaddress = IPSocket.getaddress(Socket.gethostname)
-rescue SocketError
-end
-
-options = {
-  :hostname => Socket.gethostname,
-  :address  => '0.0.0.0',
-  :port     => 10053,
-  :gaddress => default_gaddress,
-  :gport    => 10870,
-  :sock     => '/tmp/ddns.sock',
-  :resolver => Resolv::DNS.new,
-  :daemon   => false,
-  :logger   => LOGGER,
-  :loglevel => Logger::INFO
-}
-
-opts = OptionParser.new
-opts.on('-H', '--hostname HOST',       "Own hostname (default #{options[:hostname]})")              {|v| options[:hostname] = v }
-opts.on('-A', '--address ADDRESS'      "Name service ip address (default #{options[:address]})")    {|v| options[:address]  = v }
-opts.on('-P', '--port PORT', Integer,  "Name service port (default #{options[:port]})")             {|v| options[:port]     = v }
-opts.on('-a', '--gaddress ADDRESS'     "Gossip service ip address (default #{options[:gaddress]})") {|v| options[:gaddress] = v }
-opts.on('-p', '--gport PORT', Integer, "Gossip service port (default #{options[:gport]})")          {|v| options[:gport]    = v }
-opts.on('-S', '--socket SOCK',         "Socket file path (default #{options[:sock]})")              {|v| options[:sock]     = v }
-opts.on('-d', '--daemon COMMAND',      "Directive of daemonize (start|stop|restart|status)")        {|v| options[:daemon]   = v }
-opts.on('-r', '--resolver CONF',       "Default resolver (default /etc/resolv.conf)")               {|v| options[:resolver] = Resolv::DNS.new(v) }
-opts.on('-N', '--no-resolver',         "Not use default resolver")                                  {|v| options[:resolver] = nil }
-
-opts.on('-L', '--loglevel LEVEL',
-  [:fatal, :error, :warn, :info, :debug], "Log level (default info)") {|v| options[:loglevel] = Logger.const_get(v.to_s.upcase) }
-
-opts.on('-i', '--initial NODES', "Initial access node list (ex 10.0.0.1,10.0.0.2)") do |v|
-  options[:initial_nodes] = v.split(/\s*,\s*/)
-end
-
-opts.on('-h', '--help', "Display this help") { $stdout.puts opts.help ; exit 1 }
-
-begin
-  opts.parse!(ARGV)
-rescue => e
-  $stderr.puts e.message
-  $stdout.puts opts.help
-  exit 1
-end
-
-#RGossip.debug = true
-RGossip.port = options[:gport]
-DDNS::Attributes.new(options)
-
-LOGGER.info("Name service at #{options[:address]}:#{options[:port]}")
-LOGGER.info("Gossip service at #{options[:gaddress]}:#{options[:gport]}")
-LOGGER.info("Hostname: #{options[:hostname]}")
-
-if options[:daemon] 
-  ARGV.unshift options[:daemon]
-  DDNS.daemonize
-else
-  begin
-    at_exit { FileUtils.rm_f(options[:sock]) }
-    $DDNS_GOSSIP = DRb.start_service("drbunix:#{options[:sock]}", $DDNS_ATTR.gossip)
-  rescue => e
-    $stderr.puts(e.message)
-  end
-
-  DDNS.run
-end
-