PERFORCE change 100478 for review

[Clément Lecigne]

http://perforce.freebsd.org/chv.cgi?CH=100478

Change 100478 by clem1 at clem1_ipv6vulns on 2006/07/03 09:42:25

	ISIC port to IPv6... almost done, icmpsicng needs more improvements.	

Affected files ...

.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/ChangeLog#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/Makefile.in#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/TODO#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/configure#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/configure.in#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/icmpsicng.c#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/isicng.c#3 edit
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/tcpsicng.c#1 add
.. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/udpsicng.c#1 add

Differences ...

==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/isicng/isicng.c#3 (text+ko) ====

@@ -214,7 +214,7 @@
 	}
 
 	printf("Compiled against Libnet %s\n", LIBNET_VERSION);
-	puts("Installing Signal Handlers.\n");
+	puts("Installing Signal Handlers.");
 	if (signal(SIGTERM, &sighandler) == SIG_ERR)
         puts("Failed to install signal handler for SIGTERM");
 	if (signal(SIGINT, &sighandler) == SIG_ERR)
@@ -425,25 +425,15 @@
 				(u_int16_t) payload[cx] = rand() & 0xffff;
         
 		(u_int16_t) payload[payload_s] = rand() & 0xffff;
-		
-        /*
-		if (printout) {
-			printf("%s ->",
-				inet_ntoa(*((struct in_addr*) &src_ip )));
-			printf(" %s tos[%i] id[%i] ver[%i] frag[%i]\n",
-				inet_ntoa(*((struct in_addr*) &dst_ip )), tos,
-				id, ver, frag_off);
-		}
-		*/
         
 		if (skip <= acx) 
         {
             for (cx = 0; cx < repeat; cx++) 
             {
 #ifdef LIBNET_BSDISH_OS
-                c = libnet_write_link(l, buf, 0xe + 0x28 + payload_s);
+                c = libnet_write_link(l, buf, off + payload_s);
 #else /* !BSD */
-                c = libnet_write_raw_ipv6(l, buf, 0xe + 0x28 + payload_s);
+                c = libnet_write_raw_ipv6(l, buf, off + payload_s);
 #endif
                 if (c != -1)
                     datapushed += c;
@@ -490,9 +480,9 @@
    fprintf(stderr,
 	"usage: %s [-v] -s <source ip> -d <destination ip> " 
 #ifdef LIBNET_BSDISH_OS
-   "-D <destination mac>\n       [-S <source mac>]"
+   "-i <iface> -D <destination mac>\n       [-S <source mac>]"
 #else /* !BSD */
-   "\n       "
+   "\n[-i <iface>]       "
 #endif   
 	"[-p <pkts to generate>] [-k <skip packets>]\n"
     "       [-x <send packet X times>] [-r <random seed>]\n"
@@ -505,9 +495,9 @@
 	"	[-v] causes packet info to be printed out -- DEBUGGING\n\n"
 	"       ex: -s a.b.c.d -d a.b.c.d -D a:b:c:d:e:f -F100\n"
 	"        100%% of the packets will have fragments header\n"
-	"       ex: -s a.b.c.d -d a.b.c.d -D a:b:c:d:e:f -p 100 -r 103334\n"
+	"       ex: -s a:b:c::d -d b:d:c::d -D a:b:c:d:e:f -p 100 -r 103334\n"
 	"       ex: -s rand -d rand -D a:b:c:d:e:f -r 23342\n"
-	"              ^^^^ causes random source addr\n"
+	"              ^^^^ causes random source addr and dst addr\n"
 	"       ex: -s rand -d rand -D a:b:c:d:e:f -k 10000 -p 10001 -r 666\n"
 	"               Will only send the 10001 packet with random seed 666\n"
 	"               this is especially useful if you suspect that packet is\n"