fixed #2 and updated command name.

Author: ip2location-com

ip2trace.py

@@ -42,12 +42,17 @@
             os.mkdir(default_path)
         copyfile(os.path.dirname(os.path.realpath(__file__)) + os.sep + "data" + os.sep + "IP2LOCATION-LITE-DB1.IPV6.BIN", default_path + "IP2LOCATION-LITE-DB1.IPV6.BIN")
     except PermissionError as e:
-        sys.exit("Root permission is required. Please rerun it as 'sudo ip2trace'.")
+        sys.exit("Root permission is required. Please rerun it as 'sudo ip2tracepy' in Linux, or obtain administrator permission in Windows.")
 
 if sys.platform.startswith('win32'):
-    timer = time.clock
+    # timer = time.clock
+    if sys.version_info > (3,2):
+        timer = time.perf_counter
+    else:
+        timer = time.clock
 else:
     timer = time.time
+# timer = time.time
 
 def calculate_checksum(packet):
     countTo = (len(packet) // 2) * 2
@@ -94,8 +99,14 @@ def to_ip(hostname):
 
 def ip_to_domain_name(hostname):
     if is_valid_ip(hostname):
-        return socket.gethostbyaddr(hostname)
-    return hostname
+        # return socket.gethostbyaddr(hostname)
+        try:
+            return socket.gethostbyaddr(hostname)
+        except socket.herror:
+            # return hostname
+            return None
+    # return hostname
+    return None
 
 
 def create_parser():
@@ -113,8 +124,8 @@ def create_parser():
 
 def print_usage():
     print(
-"Usage: ip2trace -p [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]\n"
-"   or: ip2trace [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]\n\n"
+"Usage: ip2tracepy -p [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]\n"
+"   or: ip2tracepy [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]\n\n"
 "  -p, --ip\n"
 "  Specify an IP address or hostname.\n"
 "  The -p/--ip can be omitted if the IP address or hostname is defined in the first parameter.\n"
@@ -140,7 +151,7 @@ def print_usage():
 
 def print_version():
     print(
-"IP2Location Geolocation Traceroute (ip2trace) Version 2.1.7\n"
+"IP2Location Geolocation Traceroute (ip2trace) Version 3.0.0\n"
 "Copyright (c) 2021 IP2Location.com [MIT License]\n"
 "https://www.ip2location.com/free/traceroute-application\n")
 
@@ -204,7 +215,7 @@ def __init__(self, destination_server, database, max_hops, output, all):
             if (os.path.isfile(default_path + "IP2LOCATION-LITE-DB1.IPV6.BIN") != False):
                 self.obj = IP2Location.IP2Location(default_path + "IP2LOCATION-LITE-DB1.IPV6.BIN")
             else:
-                print("Missing IP2Location BIN database. Please enter ‘ip2trace -h’ for more information.")
+                print("Missing IP2Location BIN database. Please enter 'ip2trace -h' for more information.")
                 sys.exit()
 
         # check the output list
@@ -215,12 +226,14 @@ def __init__(self, destination_server, database, max_hops, output, all):
                     sys.exit()
 
     def print_start(self):
-        print("IP2Location Geolocation Traceroute (ip2trace) Version 2.1.7\n"
+        print("IP2Location Geolocation Traceroute (ip2trace) Version 3.0.0\n"
 "Copyright (c) 2021 IP2Location.com [MIT License]\n"
 "https://www.ip2location.com/free/traceroute-application\n\n")
-# "Traceroute to", self.destination_domain_name, "(", self.destination_ip, ")\n\n")
-# "Traceroute to", self.destination_domain_name[0], "(", self.destination_ip, ")\n\n")
-        print("Traceroute to", self.destination_domain_name[0], "(", self.destination_ip, ")\n\n", end="")
+        # print("Traceroute to", self.destination_domain_name[0], "(", self.destination_ip, ")\n\n", end="")
+        if self.destination_domain_name is not None:
+            print("Traceroute to", self.destination_domain_name[0], "(", self.destination_ip, ")\n\n", end="")
+        else:
+            print("Traceroute to", self.destination_ip, "\n\n", end="")
 
     def print_unknownhost(self):
         print("traceroute: unknown host {}".format(self.destination_server))
@@ -481,4 +494,4 @@ def main():
             # sys.exit()
             traceroute(destination_server, database, max_hops, output, all)
     else:
-        print("Missing parameters. Please enter 'ip2trace -h' for more information.")
+        print("Missing parameters. Please enter 'ip2trace -h' for more information.")

readme.md

@@ -13,8 +13,8 @@ You can install this tool by using pip in Windows or Linux. To install this tool
 ## Usage
 
 ```
-Usage: ip2trace -p [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]
-   or: ip2trace [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]
+Usage: ip2tracepy -p [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]
+   or: ip2tracepy [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS]
 
   -p, --ip
   Specify an IP address or hostname.
@@ -45,7 +45,7 @@ Usage: ip2trace -p [IP ADDRESS/HOSTNAME] -d [IP2LOCATION BIN DATA PATH] [OPTIONS
 Traceroute an IP address.
 
 ```bash
-ip2trace 8.8.8.8 -d /usr/share/ip2location/DB3.BIN -a
+ip2tracepy 8.8.8.8 -d /usr/share/ip2location/DB3.BIN -a
 ```
 
 Example output:
@@ -71,7 +71,7 @@ Traceroute to dns.google ( 8.8.8.8 )
 Traceroute by hostname
 
 ```bash
-ip2trace google.com -d /usr/share/ip2location/DB3.BIN -a
+ip2tracepy google.com -d /usr/share/ip2location/DB3.BIN -a
 ```
 
 Example output:

setup.py

@@ -6,13 +6,13 @@
 
 setuptools.setup(
     name="IP2Trace",
-    version="2.1.7",
+    version="3.0.0",
     description="A Python tool to display geolocation information in the traceroute.",
     long_description_content_type="text/markdown",
     long_description=long_description,
     entry_points={
         'console_scripts': [
-            'ip2trace=ip2trace:main'
+            'ip2tracepy=ip2trace:main'
         ]
     },
     py_modules=['ip2trace'],