address.rb in bitcoin-ruby-0.0.2

- old
+ new

@@ -1,5 +1,7 @@
+# encoding: ascii-8bit
+
 module Bitcoin
   module Protocol
 
     class Addr < Struct.new(:time, :service, :ip, :port)
 
@@ -13,11 +15,11 @@
       # attr_reader :service
 
       # create addr from raw binary +data+
       def initialize(data = nil)
         if data
-          self[:time], self[:service], self[:ip], self[:port] = data.unpack("IQx12a4n")
+          self[:time], self[:service], self[:ip], self[:port] = data.unpack("VQx12a4n")
           self[:ip] = ip.unpack("C*").join(".")
         else
           self[:time], self[:service] = Time.now.to_i, 1
           self[:ip], self[:port] = "127.0.0.1", Bitcoin.network[:default_port]
         end
@@ -28,18 +30,18 @@
         (Time.now.tv_sec-7200) <= self[:time]
       end
 
       def to_payload
         ip = self[:ip].split(".").map(&:to_i)
-        [ time, service, ("\x00"*10)+"\xff\xff", *ip, port ].pack("IQa12C4n")
+        [ time, service, ("\x00"*10)+"\xff\xff", *ip, port ].pack("VQa12C4n")
       end
 
       def string
         "#{self[:ip]}:#{self[:port]}"
       end
 
       def self.pkt(*addrs)
-        addrs = addrs.select{|i| i.is_a?(Bitcoin::Protocol::Addr) }
+        addrs = addrs.select{|i| i.is_a?(Bitcoin::Protocol::Addr) && i.ip =~ /^\d+\.\d+\.\d+\.\d+$/ }
         length = Bitcoin::Protocol.pack_var_int(addrs.size)
         Bitcoin::Protocol.pkt("addr", length + addrs.map(&:to_payload).join)
       end
     end
 