ruby-core

I'd like to contribute the following extensions to ipaddr.rb 

They allow the following constructs: 

 puts IPAddr.new("192.168.0.0") + 1          # => 192.168.0.1
 puts IPAddr.new("192.168.0.0") - 1          # => 192.167.255.255
 puts IPAddr.new("192.168.0.0/24").netmask   # => 255.255.255.0
 puts IPAddr.new("192.168.0.0/24").prefixlen # => 24
 puts IPAddr.new("192.168.0.0/24").size      # => 256 

Regards, 

Brian Candler.

Attachments (1)

ipaddr.rb.diff (3.96 KB, text/x-diff)

--- /usr/lib/ruby/1.8/ipaddr.rb	2006-08-04 23:00:21.000000000 +0100
+++ ipaddr.rb	2007-03-21 10:11:55.000000000 +0000
@@ -125,6 +125,16 @@
     return self.clone.set(addr_mask(@addr << num))
   end
 
+  # Returns a new ipaddr built by addition.
+  def +(other)
+    return self.clone.set(@addr + other.to_i)
+  end
+
+  # Returns a new ipaddr built by subtraction.
+  def -(other)
+    return self.clone.set(@addr - other.to_i)
+  end
+
   # Returns a new ipaddr built by bitwise negation.
   def ~
     return self.clone.set(addr_mask(~@addr))
@@ -331,6 +341,37 @@
 		   af, _to_string(@addr), _to_string(@mask_addr))
   end
 
+  # Return just the netmask.
+  def netmask
+    _to_string(@mask_addr)
+  end
+
+  # Return just the prefix length.
+  def prefixlen
+    m = case @family
+    when Socket::AF_INET
+      IN4MASK
+    when Socket::AF_INET6
+      IN6MASK
+    else
+      raise "unsupported address family"
+    end
+    return $1.length if /\A(1*)(0*)\z/ =~ (@mask_addr & m).to_s(2)
+    raise "bad addr_mask format"
+  end
+
+  # Return the number of IP addresses in the block.
+  def size
+    case @family
+    when Socket::AF_INET
+      ((~@mask_addr) & IN4MASK) + 1
+    when Socket::AF_INET6
+      ((~@mask_addr) & IN6MASK) + 1
+    else
+      raise "unsupported address family"
+    end
+  end
+
   protected
 
   def set(addr, *family)
@@ -547,6 +588,9 @@
     a = IPAddr.new("0123:4567:89ab:cdef:0ABC:DEF0:1234:5678")
     assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678", a.to_s)
     assert_equal("0123:4567:89ab:cdef:0abc:def0:1234:5678", a.to_string)
+    assert_equal("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", a.netmask)
+    assert_equal(128, a.prefixlen)
+    assert_equal(1, a.size)
     assert_equal(Socket::AF_INET6, a.family)
 
     a = IPAddr.new("3ffe:505:2::/48")
@@ -556,6 +600,9 @@
     assert_equal(false, a.ipv4?)
     assert_equal(true, a.ipv6?)
     assert_equal("#<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>", a.inspect)
+    assert_equal("ffff:ffff:ffff:0000:0000:0000:0000:0000", a.netmask)
+    assert_equal(48, a.prefixlen)
+    assert_equal(1 << 80, a.size)
 
     a = IPAddr.new("3ffe:505:2::/ffff:ffff:ffff::")
     assert_equal("3ffe:505:2::", a.to_s)
@@ -566,6 +613,16 @@
     assert_equal("0.0.0.0", a.to_s)
     assert_equal("0.0.0.0", a.to_string)
     assert_equal(Socket::AF_INET, a.family)
+    assert_equal("#<IPAddr: IPv4:0.0.0.0/255.255.255.255>", a.inspect)
+    assert_equal("255.255.255.255", a.netmask)
+    assert_equal(32, a.prefixlen)
+    assert_equal(1, a.size)
+
+    a = IPAddr.new("0.0.0.0/0")
+    assert_equal("#<IPAddr: IPv4:0.0.0.0/0.0.0.0>", a.inspect)
+    assert_equal("0.0.0.0", a.netmask)
+    assert_equal(0, a.prefixlen)
+    assert_equal(1 << 32, a.size)
 
     a = IPAddr.new("192.168.1.2")
     assert_equal("192.168.1.2", a.to_s)
@@ -579,11 +636,17 @@
     assert_equal("192.168.1.0", a.to_string)
     assert_equal(Socket::AF_INET, a.family)
     assert_equal("#<IPAddr: IPv4:192.168.1.0/255.255.255.0>", a.inspect)
+    assert_equal("255.255.255.0", a.netmask)
+    assert_equal(24, a.prefixlen)
+    assert_equal(256, a.size)
 
     a = IPAddr.new("192.168.1.2/255.255.255.0")
     assert_equal("192.168.1.0", a.to_s)
     assert_equal("192.168.1.0", a.to_string)
     assert_equal(Socket::AF_INET, a.family)
+    assert_equal("255.255.255.0", a.netmask)
+    assert_equal(24, a.prefixlen)
+    assert_equal(256, a.size)
 
     assert_equal("0:0:0:1::", IPAddr.new("0:0:0:1::").to_s)
     assert_equal("2001:200:300::", IPAddr.new("2001:200:300::/48").to_s)
@@ -728,6 +791,16 @@
     assert_equal("3ffe:505:2::", @a.to_s)
   end
 
+  def test_add
+    a = IPAddr.new("3ffe:505:2:1:ffff:ffff:ffff:fffd")
+    assert_equal("3ffe:505:2:1:ffff:ffff:ffff:fffe", (a + 1).to_s)
+    assert_equal("3ffe:505:2:2::", (a + 3).to_s)
+  end
+
+  def test_sub
+    assert_equal("3ffe:505:1:ffff:ffff:ffff:ffff:ffff", (@a - 1).to_s)
+  end
+
   def test_carrot
     a = ~@in6_addr_any
     assert_equal(IN6MASK128, a.to_s)

Thread

Prev Next

In This Thread

Prev Next

[#10458] CVS services will be permanently unavailable — Shugo Maeda <shugo@...>

[#10460] XML-RPC enhanced NilClass handling — <noreply@...>

[#10461] Ruby one-click installer wiped out system PATH environment variable. — <noreply@...>

[#10462] Inconsistent Behaviour of \Z in Oniguruma — <noreply@...>

[#10463] [PATCH/Cygwin] Build shared libs with --enable-auto-image-base — <noreply@...>

[#10464] CSV parse problem — <noreply@...>

[#10467] Module re-inclusion in 1.9 vs 1.8 — "Rick DeNatale" <rick.denatale@...>

[#10468] Floats that are NaN have strange behavior — Jonas Kongslund <jonas@...>

[#10469] rdoc for Object#instance_variable_get - suggestion — Brian Candler <B.Candler@...>

[#10478] Plan to add ext/digest/lib/digest/hmac.rb to 1.8.6 or 1.8.7? — "Zev Blut" <rubyzbibd@...>

[#10479] File.size and IO.stat.size sometimes give different results — <noreply@...>

[#10480] Ruby 1.8.6 delayed for seven days — "Akinori MUSHA" <knu@...>

[#10490] Join with block — "Farrel Lifson" <farrel.lifson@...>

[#10491] [PATCH] Emacs debugging support for ruby-debug (rdebug) — <noreply@...>

[#10492] Ruby 1.8.6 preview3 has been released — "Akinori MUSHA" <knu@...>

[#10494] make check for 1.8.6-preview3: TestDBM: DBMError: dbm_store failed — <noreply@...>

[#10503] YAML.load(file) cannot be used to load documents in sequence. — <noreply@...>

[#10507] Dynamic Array#join with block — <noreply@...>

[#10512] Windows Vista: recvfrom causes exception — <noreply@...>

[#10536] DRb freezes YARV? — "Meinrad Recheis" <meinrad.recheis@...>

[#10543] code-cleanup: kr -> ansi — Stefan Huehner <stefan@...>

[#10545] optparse.rb patch to fix and enhance the separator handling — <noreply@...>

[#10550] Ruby 1.8.6 will be released in 24 hours — "Akinori MUSHA" <knu@...>

[#10552] ruby 1.8.5p12: default IO object for gets() ? — Unknown <borg@...3.net>

[#10553] Problem with long regular expressions — <noreply@...>

[#10554] An array in a Hahs — <noreply@...>

[#10560] Ruby Gem installer not playing nice on Ubuntu — <noreply@...>

[#10563] Ruby 1.8.6 has been released — "Akinori MUSHA" <knu@...>

[#10564] Time conversion from UTC to local appears to apply 2007 rules to 2006 dates — <noreply@...>

[#10570] "each" function failed to detect element delete then jump a valid element when next yield. — <noreply@...>

[#10573] BigDecimal initialisation bug — <noreply@...>

[#10574] 1.8.6 timeut.rb segfault — Hugh Sasse <hgs@...>

[#10575] 'rescue' with non-exception class — Brian Candler <B.Candler@...>

[#10578] [PATCH] Rdoc omitting docs for Module due to :stopdoc: directive in lib/yaml/tab.rb — <noreply@...>

[#10580] Kernel#exec on OSX — "Kent Sibilev" <ksruby@...>

[#10585] Bugfix: Extension Compile Error with 1.8.6 — Lothar Scholz <mailinglists@...>

[#10590] Re: Kernel#exec on OSX — "H.Holon" <holon@...>

[#10593] Digest'ifying OpenSSL::Digest — <noreply@...>

[#10594] grave bug in 1.8.6's thread implementation — Sylvain Joyeux <sylvain.joyeux@...4x.org>

[#10607] Thread are inheriting the priority of the starting thread — <noreply@...>

[#10609] sub-process with Test::Unit does not exit error code as expected — <noreply@...>

[#10611] unsubscribe — rdaubarede@...

[#10614] Re: Welcome to our (ruby-core ML) You are added automatically — "Tyler Pedersen" <agileanalysis@...>

[#10615] Multiton in standard library — TRANS <transfire@...>

[#10616] Is there interest in this? : get object from its object-specific class? — "Rick DeNatale" <rick.denatale@...>

[#10632] xmlrpc keepalive connection bug — <noreply@...>

[#10633] Set.freeze not behaving as expected — <noreply@...>

[#10634] Matrix inverse problem — <noreply@...>

[#10636] Matrix inverse problem — <noreply@...>

[#10637] Matrix inverse problem — <noreply@...>

[#10638] Matrix inverse problem — <noreply@...>

[#10639] Matrix inverse problem — <noreply@...>

[#10640] Matrix inverse problem — <noreply@...>

[#10641] Matrix inverse problem — <noreply@...>

[#10642] Matrix inverse problem — <noreply@...>

[#10643] Matrix inverse problem — <noreply@...>

[#10645] re_set_syntax in libruby — "Michal Suchanek" <hramrach@...>

[#10646] Marshal.dump shouldn't complain about singletons if the _dump method is defined — <noreply@...>

[#10649] sub-process with Test::Unit does not exit error code as expected — <noreply@...>

[#10650] Buffer error installing gems using Zlib 1.2.1 on Windows — <noreply@...>

[#10652] rdoc documents C module methods as instance methods (patch) — <noreply@...>

[#10653] rdoc --fmt=html throws Segmentation faults — <noreply@...>

[#10654] RDoc for Kernel#select same as IO.select — <noreply@...>

[#10655] [PATCH] rdoc for String#=~ — <noreply@...>

[#10656] RDOC doesn't show string "#" or "\#" — <noreply@...>

[#10657] ri for specific method returns suggestion to refine search if there are similarly named methods — <noreply@...>

[#10658] rdoc/usage uses an uninitalized constant — <noreply@...>

[#10659] "ri Array.new" doesn't show assignment values — <noreply@...>

[#10660] RDoc looks for doc headers at function prototypes — <noreply@...>

[#10661] [PATCH] rdoc for String#=~ — <noreply@...>

[#10662] Set.freeze not behaving as expected — <noreply@...>

[#10663] Array#initialize: Better error reporting — Bertram Scharpf <lists@...>

[#10669] Matrix inverse problem — <noreply@...>

[#10670] Matrix inverse problem — <noreply@...>

[#10671] __method__ and __callee__ — Gary Wright <gwtmp01@...>

[#10672] Re: How to get the name of the executing method? — Gary Wright <gwtmp01@...>

[#10673] remove_one must preserve List invariants — <noreply@...>

[#10677] exec fails when ruby is built with pthreads enabled — <noreply@...>

[#10681] exec fails when ruby is built with pthreads enabled — <noreply@...>

[#10683] Rubyforge access — "Nathaniel Talbott" <ntalbott@...>

[#10671] method and callee — Gary Wright <gwtmp01@...>