Skip to content
Browse files

Expanded matching support for whois output formats

  • Loading branch information...
1 parent 70bbe1e commit 422d75be76ea690b51d9fe81ccad18fd12c68ba5 @Ratler committed Nov 16, 2010
Showing with 7 additions and 7 deletions.
  1. +7 −7 ripecheck.tcl
View
14 ripecheck.tcl
@@ -939,23 +939,23 @@ namespace eval ::ripecheck {
dict set whoisData Owner $data
} elseif {[dict get $whoisData MntBy] == "" && [regexp -line -nocase {(?:ownerid|mnt-by):\s*(.*)} $row -> data]} {
dict set whoisData MntBy $data
- } elseif {[regexp -line -nocase {(?:Auth-Area|inetnum):\s*(.*)} $row -> data]} {
+ } elseif {[regexp -line -nocase {(?:Auth-Area|inetnum|NetRange):\s*(.*)} $row -> data]} {
dict set whoisData InetNum $data
} elseif {[regexp -line -nocase {origin:\s*(.*)} $row -> data]} {
dict set whoisData Asn $data
- } elseif {[regexp -line -nocase {Org-Name:\s*(.*)} $row -> data]} {
+ } elseif {[regexp -line -nocase {(?:Org-Name|OrgName):\s*(.*)} $row -> data]} {
dict set whoisData OrgName $data
- } elseif {[regexp -line -nocase {Street-Address:\s*(.*)} $row -> data]} {
+ } elseif {[regexp -line -nocase {(?:Street-Address|Address):\s*(.*)} $row -> data]} {
dict set whoisData StreetAddress $data
} elseif {[regexp -line -nocase {City:\s*(.*)} $row -> data]} {
dict set whoisData City $data
- } elseif {[regexp -line -nocase {Postal-Code:\s*(.*)} $row -> data]} {
+ } elseif {[regexp -line -nocase {(?:Postal-Code|PostalCode):\s*(.*)} $row -> data]} {
dict set whoisData PostalCode $data
- } elseif {[regexp -line -nocase {State-Prov:\s*(.*)} $row -> data]} {
+ } elseif {[regexp -line -nocase {(?:State-Prov|StateProv):\s*(.*)} $row -> data]} {
dict set whoisData StateProv $data
- } elseif {[regexp -line -nocase {Abuse-Phone:\s*(.*)} $row -> data]} {
+ } elseif {[regexp -line -nocase {(?:Abuse-Phone|OrgAbusePhone):\s*(.*)} $row -> data]} {
dict set whoisData AbusePhone $data
- } elseif {[dict get $whoisData AbuseMail] == "" && [regexp -line -nocase {(?:Abuse-Email|abuse-mailbox|e-mail):\s*(.*)} $row -> data]} {
+ } elseif {[dict get $whoisData AbuseMail] == "" && [regexp -line -nocase {(?:Abuse-Email|abuse-mailbox|e-mail|OrgAbuseEmail):\s*(.*)} $row -> data]} {
dict set whoisData AbuseMail [string tolower $data]
}

0 comments on commit 422d75b

Please sign in to comment.
Something went wrong with that request. Please try again.