From 50e4845d94c6fa8ad5c6406cfe27da21225893fa Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Mon, 1 Aug 2022 23:00:26 +0200
Subject: [PATCH] improve whois parsing

---
 src/utils/whois.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/utils/whois.js b/src/utils/whois.js
index 03664f5..262d0ca 100644
--- a/src/utils/whois.js
+++ b/src/utils/whois.js
@@ -15,9 +15,13 @@ import { isIPv6, ip4InRangeToCIDR } from './ip';
  */
 function cIDRofWhois(ip, whoisData) {
   if (isIPv6(ip)) {
-    return whoisData.inet6num || 'N/A';
+    return whoisData.inet6num || whoisData.range || 'N/A';
   }
-  return ip4InRangeToCIDR(ip, whoisData.range) || 'N/A';
+  const { range } = whoisData;
+  if (range.includes('/') && !range.includes('-')) {
+    return range;
+  }
+  return ip4InRangeToCIDR(ip, range) || 'N/A';
 }
 
 /*
@@ -31,6 +35,7 @@ function orgFromWhois(whoisData) {
     || (whoisData['Contact Master']
       && whoisData['Contact Master'].address.split('\n')[0])
     || whoisData.netname
+    || whoisData.owner
     || 'N/A';
 }