CEDGE-604 Add --ipinfo-spec-ip option

Author: weiyixuan

man/mtr.8.in

@@ -412,6 +412,9 @@ You can combine this option with other --ipinfo- or -y options.
 .B -\-ipinfo\-dns \fIDOMAIN_NAME
 Specify special DOMAIN_NAME to query the DNS data. The default value for this parameter is origin6.asn.cymru.com .
 .TP
+.B -\-ipinfo\-spec\-ip \fIIP\fR/\fISUBNET-MASK\fR[,\fIIP\fR/\fISUBNET-MASK\fR,...]
+Reserved for Netpas. Specify a part of the private address that still sends a DNS request when encounters such an address.
+.TP
 .B \-z\fR, \fB\-\-aslookup
 Displays the Autonomous System (AS) number alongside each hop.  Equivalent to \fB\-\-ipinfo 0\fR.
 .IP

ui/asn.c

@@ -65,10 +65,11 @@
 #define ITEMSMAX        15
 #define ITEMSEP         '|'
 #define NAMELEN         127
+#define SPECIP_MAX      10
 #define UNKN            "???"
 #define EMPTY           "--"
 #define SEMPATH         "sem"
-#define NETPAS_DOMAIN  "ip.xelerate.ai"
+#define NETPAS_DOMAIN   "ip.xelerate.ai"
 
 typedef char *items_t[ITEMSMAX + 1];
 struct comparm {
@@ -89,6 +90,10 @@ static const int iiwidth[] = {9, 18, 6, 7, 13, 8, 10, 15};   /* item len + space
 static int prefix_arr[4] = {8, 12, 16, 16};
 static unsigned int mask_ip_scope[4];
 static unsigned int private_ip_scope[4];
+/* used for specific ip segment in private ip */
+static int spec_prefix_arr[SPECIP_MAX];
+static unsigned int spec_mask_ip_scope[SPECIP_MAX];
+static unsigned int spec_ip_scope[SPECIP_MAX];
 
 #ifdef ENABLE_IPV6
 char ipinfo_domain6[128] = "origin6.asn.cymru.com";
@@ -255,6 +260,41 @@ static void reverse_host6(
 }
 #endif
 
+void process_ip_prefix(char *ipprefix)
+{
+    char *p = NULL;
+    static int index = 0;
+
+    if (index >= (sizeof(spec_prefix_arr)/sizeof(spec_prefix_arr[0])))
+        return;
+
+    p = strrchr(ipprefix, '/');
+    if (p == NULL) {
+        error(EXIT_FAILURE, 0, "invalid argument:%s", ipprefix);
+    }
+    *p++ = '\0';
+
+    spec_prefix_arr[index] = strtonum_or_err(p, "invalid argument", STRTO_INT);
+    if (spec_prefix_arr[index] <= 0 || spec_prefix_arr[index] >= 32) {
+        *(--p) = '/';
+        error(EXIT_FAILURE, 0, "invalid argument:%s", ipprefix);
+    }
+
+    spec_mask_ip_scope[index] = 0xffffffff;
+    spec_mask_ip_scope[index] <<= (32 - spec_prefix_arr[index]);
+    spec_mask_ip_scope[index] &= 0xffffffff;
+
+    spec_ip_scope[index] = inet_addr(ipprefix);
+    if (spec_ip_scope[index] == INADDR_NONE) {
+        *(--p) = '/';
+        error(EXIT_FAILURE, 0, "invalid argument:%s", ipprefix);
+    }
+    spec_ip_scope[index] = htonl(spec_ip_scope[index]);
+    spec_ip_scope[index] &= spec_mask_ip_scope[index];
+
+    index++;
+}
+
 static void init_private_ip(void)
 {
     int i;
@@ -282,6 +322,15 @@ static int is_private_ip(ip_t *addr)
 
     ipaddr = htonl((*(struct in_addr *)addr).s_addr);
 
+    if (strcmp(ipinfo_domain, NETPAS_DOMAIN) == 0) {
+        i = 0;
+        while (spec_prefix_arr[i] != 0) {
+            if ((ipaddr & spec_mask_ip_scope[i]) == spec_ip_scope[i])
+                return 0;
+            i++;
+        }
+    }
+
 	for (i = 0; i < 4; i++) {
 		if ((ipaddr & mask_ip_scope[i]) == private_ip_scope[i])
 			return 1;

ui/asn.h

@@ -58,3 +58,5 @@ extern int get_ipinfo_compose(
     char *buf,
     int buflen,
     int hops);
+extern void process_ip_prefix(
+    char *ipprefix);

ui/mtr.c

@@ -240,6 +240,8 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
     fputs("     --ipinfo-carrier           display carrier, equal to -y 6\n", out);
     fputs("     --ipinfo-geo               display geo, equal to -y 7\n", out);
     fputs("     --ipinfo-dns DOMAIN_NAME   Specify DOMAIN_NAME to query DNS data\n", out);
+    fputs("     --ipinfo-spec-ip IP/SUBNET-MASK[,IP/SUBNET-MASK,...]\n"
+          "                                reserved for Netpas\n", out);
     fputs(" -z, --aslookup                 display AS number\n", out);
 #endif
     fputs(" -h, --help                     display this help and exit\n", out);
@@ -397,6 +399,21 @@ static void process_ipinfo_arr(struct mtr_ctl *ctl, char *optarg)
 	}
 }
 
+static void process_specific_ip_segment(char *optarg)
+{
+    char *t;
+
+	if (optarg == NULL)
+		return;
+
+	t = strtok(optarg, ",");
+	while (t != NULL) {
+        process_ip_prefix(t);
+
+		t = strtok(NULL, ",");
+	}
+}
+
 static void parse_arg(
     struct mtr_ctl *ctl,
     names_t ** names,
@@ -421,7 +438,8 @@ static void parse_arg(
         OPT_CITY,
         OPT_CARRIER,
         OPT_GEO,
-        OPT_DNS
+        OPT_DNS,
+        OPT_SPECIP
     };
     static const struct option long_options[] = {
         /* option name, has argument, NULL, short name */
@@ -465,6 +483,7 @@ static void parse_arg(
         {"ipinfo-carrier", 0, NULL, OPT_CARRIER},
         {"ipinfo-geo", 0, NULL, OPT_GEO},
         {"ipinfo-dns", 1, NULL, OPT_DNS},
+        {"ipinfo-spec-ip", 1, NULL, OPT_SPECIP},
 #endif
 
         {"interval", 1, NULL, 'i'},
@@ -762,6 +781,11 @@ static void parse_arg(
                 strncpy(ipinfo_domain, optarg, sizeof(ipinfo_domain) - 1);
             }
             break;
+        case OPT_SPECIP:
+            if (optarg) {
+                process_specific_ip_segment(optarg);
+            }
+            break;
 #endif
 #ifdef SO_MARK
         case 'M':