Do IPv6 as well -- should be alright in idnlookup as it is.

[icmp-dn.git] / idnlookup.c

diff --git a/idnlookup.c b/idnlookup.c
index 43518ef..2c49f87 100644 (file)
--- a/idnlookup.c
+++ b/idnlookup.c
@@ -73,11 +73,13 @@ void printdn(FILE *f, unsigned char *dnbuf, size_t size)
                fprintf(stderr, "domain name decompression not implemented, aborting\n");
                exit(1);
            }
-           printf("%.*s.", (int)*p, p + 1);
+           fprintf(f, "%.*s", (int)*p, p + 1);
            p += 1 + (int)*p;
+           if(*p != 0)
+               fprintf(f, ".");
        }
        p++;
-       printf("\n");
+       fprintf(f, "\n");
     }
 }
 
@@ -134,14 +136,19 @@ int main(int argc, char **argv)
     struct pollfd pfd;
     struct timeval tvb, tvc;
     struct sockaddr_storage name;
-    int timeout, elapsed;
+    int timeout, dispttl;
+    int elapsed;
     
     timeout = 3000;
-    while((c = getopt(argc, argv, "ht:")) != -1) {
+    dispttl = 0;
+    while((c = getopt(argc, argv, "hTt:")) != -1) {
        switch(c) {
        case 't':
            timeout = atoi(optarg);
            break;
+       case 'T':
+           dispttl = 1;
+           break;
        case 'h':
        case '?':
        case ':':
@@ -157,7 +164,6 @@ int main(int argc, char **argv)
     }
     
     memset(&aihint, 0, sizeof(aihint));
-    aihint.ai_family = PF_INET; /* Only IPv4 for now. */
     aihint.ai_socktype = SOCK_RAW;
     aihint.ai_protocol = IPPROTO_ICMP;
     ret = getaddrinfo(argv[optind], NULL, &aihint, &ai);
@@ -189,7 +195,7 @@ int main(int argc, char **argv)
            pfd.events = POLLIN;
            gettimeofday(&tvc, NULL);
            elapsed = ((tvc.tv_sec - tvb.tv_sec) * 1000) + ((tvc.tv_usec - tvb.tv_usec) / 1000);
-           if(elapsed > timeout) {
+           if(elapsed >= timeout) {
                fprintf(stderr, "idnlookup: timeout\n");
                exit(1);
            }
@@ -234,6 +240,8 @@ int main(int argc, char **argv)
            }
        }
        
+       if(dispttl)
+           printf("%i\n", ntohl(rep.ttl));
        printdn(stdout, buf + sizeof(iphdr) + sizeof(rep), ret - sizeof(iphdr) - sizeof(rep));
        
        close(s);