X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=idnlookup.c;h=2c49f87ba4891f70a1e713b540b62a812c05aa49;hb=ebe89a6d89d89645bdbd575489b5fcd38f62ad25;hp=27b26fdef4dbd50d60d034f724d180fcce06cc1d;hpb=bfd59ca08b91d279b7646d00c209e4bb527f32c6;p=icmp-dn.git

diff --git a/idnlookup.c b/idnlookup.c
index 27b26fd..2c49f87 100644
--- a/idnlookup.c
+++ b/idnlookup.c
@@ -136,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 ':':
@@ -159,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);
@@ -191,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);
 	    }
@@ -236,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);