system-getifaddrs 0.1.5 → 0.2.0

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    system-getifaddrs (0.1.5)
+    system-getifaddrs (0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.9.2)
-    rake-compiler (0.7.9)
+    rake (10.0.4)
+    rake-compiler (0.8.3)
       rake
     rspec (1.3.2)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Bruno Coimbra
+Copyright (c) 2010-2013 Bruno Coimbra
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,4 +1,4 @@
-# system-ifaddrs ![https://secure.travis-ci.org/bbcoimbra/system-getifaddrs.png](https://secure.travis-ci.org/bbcoimbra/system-getifaddrs.png)
+# system-ifaddrs ![https://secure.travis-ci.org/bbcoimbra/system-getifaddrs.png](https://secure.travis-ci.org/bbcoimbra/system-getifaddrs.png) [![Code Climate](https://codeclimate.com/github/bbcoimbra/system-getifaddrs.png)](https://codeclimate.com/github/bbcoimbra/system-getifaddrs)
 
 This lib is a wrapper for get\_ifaddrs C routine.
 
@@ -27,6 +27,7 @@ Consider test.rb below:
 require "pp"
 require "system/getifaddrs"
 pp System.get_ifaddrs
+pp System.get_all_ifaddrs
 ```
 
 When test.rb is executed:
@@ -39,8 +40,12 @@ Should return:
 
 ```ruby
 {:lo=>{:inet_addr=>"127.0.0.1", :netmask=>"255.0.0.0"}}
+[{:interface => "lo", :inet_addr => #<IPAddr '127.0.0.1'>,
+    :netmask   => #<IPAddr '255.0.0.0'>},
+ {:interface => "lo", :inet_addr => #<IPAddr '::1'>,
+    :netmask => #<IPAddr 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'>}]
 ```
 
 ## Copyright
 
-Copyright (c) 2010 Bruno Coimbra. See LICENSE for details.
+Copyright (c) 2010-2013 Bruno Coimbra. See LICENSE for details.

data/ext/rb_getifaddrs/rb_getifaddrs.c

@@ -14,83 +14,66 @@ int get_if_family(struct ifaddrs *ifa){
 	return 0;
 }
 
-char * get_if_name(struct ifaddrs *ifa){
-	return ifa->ifa_name;
-}
+VALUE ipaddr(struct sockaddr *ip) {
+    VALUE bytes;
 
-int get_if_host(struct ifaddrs *ifa, char *host){
-	if(getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in),
-			host, NI_MAXHOST,
-			NULL, 0, NI_NUMERICHOST))
-		return 0;
-	return 1;
-}
+    switch(ip->sa_family) {
+    case AF_INET:
+        bytes = rb_str_new(&((struct sockaddr_in *)ip)->sin_addr.s_addr, 4);
+        break;
+
+    case AF_INET6:
+        bytes = rb_str_new(&((struct sockaddr_in6 *)ip)->sin6_addr.s6_addr, 16);
+        break;
+
+    default:
+        rb_raise(rb_eSystemCallError, "Unhandled IP family.");
 
-int get_if_netmask(struct ifaddrs *ifa, char *netmask){
-	if(getnameinfo(ifa->ifa_netmask, sizeof(struct sockaddr_in),
-			netmask, NI_MAXHOST,
-			NULL, 0, NI_NUMERICHOST))
-		return 0;
-	return 1;
+    }
+
+    VALUE ipaddr = rb_const_get(rb_cObject, rb_intern("IPAddr"));
+    return rb_funcall(ipaddr, rb_intern("new_ntoh"), 1, bytes);
 }
 
-VALUE set_if_hash(VALUE rb_if_hash, char *if_name, char *if_host, char *if_netmask){
-
-	VALUE rb_if_data_hash;
-	char *str_inet_name = "inet_addr";
-	char *str_netmask_name = "netmask";
-
-	rb_if_data_hash = rb_hash_new();
-	rb_hash_aset(rb_if_hash,
-			rb_str_intern(rb_str_new2(if_name)),
-			rb_if_data_hash);
-	rb_hash_aset(rb_if_data_hash,
-			rb_str_intern(rb_str_new2(str_inet_name)),
-			rb_str_new2(if_host));
-	rb_hash_aset(rb_if_data_hash,
-			rb_str_intern(rb_str_new2(str_netmask_name)),
-			rb_str_new2(if_netmask));
-	return rb_if_data_hash;
+VALUE if_hash(struct ifaddrs *ifa)
+{
+    VALUE hash = rb_hash_new();
+
+    rb_hash_aset(hash, ID2SYM(rb_intern("interface")), rb_str_new2(ifa->ifa_name));
+    rb_hash_aset(hash, ID2SYM(rb_intern("inet_addr")), ipaddr(ifa->ifa_addr));
+    rb_hash_aset(hash, ID2SYM(rb_intern("netmask")), ipaddr(ifa->ifa_netmask));
+
+    return hash;
 }
 
-VALUE rb_get_ifaddrs(void)
+VALUE rb_get_all_ifaddrs(void)
 {
     struct ifaddrs *ifaddr, *ifa;
-    VALUE rb_if_hash;
+    VALUE rb_if_arr;
 
     if (getifaddrs(&ifaddr) == -1)
     {
         rb_raise(rb_eSystemCallError, "Can't get info about interfaces");
     }
-    rb_if_hash = rb_hash_new();
+    rb_if_arr = rb_ary_new();
     for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next)
     {
         int family;
 
         family = get_if_family(ifa);
-        if (family == AF_INET)
+        if (family == AF_INET || family == AF_INET6)
         {
-            char *if_host, *if_netmask, *if_name;
-
-            if_name = get_if_name(ifa);
-						if_host = malloc(sizeof(char) * NI_MAXHOST);
-						if (! get_if_host(ifa, if_host))
-							rb_raise(rb_eSystemCallError, "Can't get IP from %s", if_name);
-
-						if_netmask = malloc(sizeof(char) * NI_MAXHOST);
-						if (! get_if_netmask(ifa, if_netmask))
-							rb_raise(rb_eSystemCallError, "Can't get IP from %s", if_name);
-
-						set_if_hash(rb_if_hash, if_name, if_host, if_netmask);
+            rb_ary_push(rb_if_arr, if_hash(ifa));
         }
     }
+
     freeifaddrs(ifaddr);
-    return rb_if_hash;
+    return rb_if_arr;
 }
 
 VALUE mSystem;
 void Init_rb_getifaddrs(){
     mSystem = rb_define_module("System");
-    rb_define_module_function(mSystem, "get_ifaddrs", rb_get_ifaddrs, 0);
+    rb_define_module_function(mSystem, "get_all_ifaddrs", rb_get_all_ifaddrs, 0);
 }
 

data/lib/system/getifaddrs.rb

@@ -1,5 +1,16 @@
+require 'ipaddr'
 begin
   require File.join(File.dirname(__FILE__), 'rb_getifaddrs')
 rescue LoadError
   require File.join(File.dirname(__FILE__), '..', 'rb_getifaddrs')
-end
+end
+
+module System
+  def self.get_ifaddrs
+    get_all_ifaddrs.each_with_object({}) do |data, hash|
+      if data[:inet_addr].ipv4?
+        hash[data[:interface].to_sym] = {inet_addr: data[:inet_addr].to_s, netmask: data[:netmask].to_s}
+      end
+    end
+  end
+end

data/lib/system/getifaddrs/version.rb

@@ -1,5 +1,5 @@
 module System
   class Getifaddrs
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

data/spec/system-ifaddrs_spec.rb

@@ -57,4 +57,19 @@ describe System do
             end
         end
     end
+
+    context "get_all_ifaddrs" do
+      before :all do
+        @ifconfig_interfaces = get_interfaces_from_ifconfig
+        @get_ifaddrs_interfaces = System.get_all_ifaddrs
+      end
+
+      it 'should return an array' do
+        @get_ifaddrs_interfaces.should be_kind_of(Array)
+      end
+
+      it 'should have same number of interfaces than system' do
+          @get_ifaddrs_interfaces.size.should have_at_least(@ifconfig_interfaces.keys.size).elements
+      end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: system-getifaddrs
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3322810239089075693
+      hash: 322430430249784826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,10 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3322810239089075693
+      hash: 322430430249784826
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This lib is a wrapper for get_ifaddrs C routine