soa.rb in net-dns2-0.8.3

- old
+ new

@@ -5,17 +5,18 @@
       #------------------------------------------------------------
       # RR type SOA
       #------------------------------------------------------------
       class SOA < RR
         attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
-        
+
         private
-        
+
         def build_pack
           @soa_pack = pack_name(@mname)
           @soa_pack += pack_name(@rname)
           @soa_pack += [@serial,@refresh,@retry,@expire,@minimum].pack("N5")
+          @rdlength = @soa_pack.size
         end
 
         def get_data
           @soa_pack
         end
@@ -29,50 +30,56 @@
             subclass_new_from_string(args[:rdata])
           else
             [:mname,:rname,:serial,:refresh,:retry,:expire,:minimum].each do |key|
               raise ArgumentError, "Missing field :#{key}" unless args.has_key? key
             end
-            @mname = args[:mname] if valid? args[:mname] 
-            @rname = args[:rname] if valid? args[:rname]
-            @serial = args[:serial] if number? args[:serial] 
-            @refresh = args[:refresh] if number? args[:refresh] 
-            @retry = args[:retry] if number? args[:retry] 
-            @expire = args[:expire] if number? args[:expire] 
-            @minimum = args[:minimum] if number? args[:minimum] 
+            @mname = args[:mname] if valid? args[:mname]
+            @rname = args[:rname] if rname? args[:rname]
+            @serial = args[:serial] if number? args[:serial]
+            @refresh = args[:refresh] if number? args[:refresh]
+            @retry = args[:retry] if number? args[:retry]
+            @expire = args[:expire] if number? args[:expire]
+            @minimum = args[:minimum] if number? args[:minimum]
           end
         end
-        
+
         def number?(num)
           if num.kind_of? Integer and num > 0
             true
           else
-            raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"
+            false
           end
         end
 
+        def rname?(name)
+          mailbox, domain = name.split(/(?<!\\)\./, 2)
+          return true if valid? domain
+          return false
+        end
+
         def subclass_new_from_string(str)
           mname,rname,serial,refresh,ret,expire,minimum = str.strip.split(" ")
           @mname = mname if valid? mname
-          @rname = rname if valid? rname
-          @serial,@refresh,@retry,@expire,@minimum = [serial,refresh,ret,expire,minimum].collect do |i| 
-            i.to_i if valid? i.to_i
+          @rname = rname if rname? rname
+          @serial,@refresh,@retry,@expire,@minimum = [serial,refresh,ret,expire,minimum].collect do |i|
+            i.to_i if number? i.to_i
           end
         end
 
         def subclass_new_from_binary(data,offset)
           @mname,offset = dn_expand(data,offset)
           @rname,offset = dn_expand(data,offset)
           @serial,@refresh,@retry,@expire,@minimum = data.unpack("@#{offset} N5")
           return offset + 5*Net::DNS::INT32SZ
         end
-        
+
         private
-        
+
           def set_type
             @type = Net::DNS::RR::Types.new("SOA")
           end
-        
+
       end
-      
+
     end
   end
 end