[Javanetsim-cvs] IceScan CHANGELOG, NONE, 1.1 iceversion.h, 1.1, 1.2 icescan.cc, 1.3, 1.4 TODO, 1.3
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan CHANGELOG, NONE, 1.1 iceversion.h, 1.1, 1.2 icescan.cc, 1.3, 1.4 TODO, 1.3, 1.4 icediscover.h, 1.2, 1.3 csubtarget.h, 1.2, 1.3
|
From: Alexander B. <da...@us...> - 2006-11-29 12:51:05
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10368 Modified Files: iceversion.h icescan.cc TODO icediscover.h csubtarget.h Added Files: CHANGELOG Log Message: + added printing time at startup. * fixed icmp echo discovery (icmplen). * fixed selecting discovery type from command line. Index: icescan.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** icescan.cc 28 Nov 2006 21:01:33 -0000 1.3 --- icescan.cc 29 Nov 2006 12:51:01 -0000 1.4 *************** *** 14,18 **** "\t-P0: skip host discovery\n" "\t-PA: ACK Ping host discovery\n" ! "\t-PE: ICMP Echo (aka standart ping) host discovery)\n" "SCAN TYPES:\n" "\t-ST: tcp connect() scan\n" --- 14,18 ---- "\t-P0: skip host discovery\n" "\t-PA: ACK Ping host discovery\n" ! "\t-PE: ICMP Echo (aka standart ping) host discovery\n" "SCAN TYPES:\n" "\t-ST: tcp connect() scan\n" *************** *** 105,109 **** break; ! case 'I': par->icmp_echo_ping_discovery = true; break; --- 105,109 ---- break; ! case 'E': par->icmp_echo_ping_discovery = true; break; *************** *** 195,199 **** char version_string[255]; ! sprintf(version_string, "%s v %s %s, %s", ICENAME, ICEVERSION, ICEWEBSITE, ICEDATE); std::cout << version_string << std::endl; --- 195,203 ---- char version_string[255]; ! time_t rawtime; ! ! time(&rawtime); ! ! sprintf(version_string, "%s v %s (%s) started at %s", ICENAME, ICEVERSION, ICEWEBSITE, ctime(&rawtime)); std::cout << version_string << std::endl; Index: csubtarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** csubtarget.h 28 Nov 2006 21:01:33 -0000 1.2 --- csubtarget.h 29 Nov 2006 12:51:01 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- #include <map> #include <errno.h> + #include <sys/timeb.h> #include <pthread.h> #include "iceoutput.h" *************** *** 77,81 **** --- 78,99 ---- bool discover(){ + struct timeb tp1, tp2; + + ftime(&tp1); discovered = host_discover(hostname, par, out); + ftime(&tp2); + + int secs = tp2.time - tp1.time; + int msecs = tp2.millitm - tp1.millitm; + + if(msecs < 0){ + secs--; + msecs = 1000 + msecs; + } + + float dt = secs + 0.001*msecs; + + if(par->verbose) *out << "Discovery taken " << dt << " seconds.\n"; + return discovered; } --- NEW FILE: CHANGELOG --- IceScan CHANGELOG (+ -- new feature, * -- bugfix) *** IceScan v. 0.0.3, 12 Dec 2006 *** + added printing time at startup. * fixed icmp echo discovery (icmplen). * fixed selecting discovery type from command line. Index: icediscover.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** icediscover.h 28 Nov 2006 18:59:18 -0000 1.2 --- icediscover.h 29 Nov 2006 12:51:01 -0000 1.3 *************** *** 107,113 **** char buf[1500]; //1500 == standart IP Packet size ! int len = r.recvfrom(buf, sizeof(buf), 0, hostname); ! ! //DBGOUTPUT(hostname); struct ip *ip = (struct ip *) buf; --- 107,111 ---- char buf[1500]; //1500 == standart IP Packet size ! int len = recvfrom(r.get_socketid(), buf, sizeof(buf), 0, NULL, NULL); struct ip *ip = (struct ip *) buf; *************** *** 117,122 **** int icmplen = len - hdrlen; ! ! if(icmp -> icmp_type == ICMP_ECHOREPLY && icmp->icmp_id == getpid() && icmplen < 16){ if(par->verbose>0) out->line("Recieved icmp ping host discovery reply (echo_reply)..."); --- 115,120 ---- int icmplen = len - hdrlen; ! ! if(icmp -> icmp_type == ICMP_ECHOREPLY && icmp->icmp_id == getpid() && icmplen > 16){ if(par->verbose>0) out->line("Recieved icmp ping host discovery reply (echo_reply)..."); *************** *** 141,147 **** *out << "Starting discovery of host " << hostname << "...\n"; ! if( tcp_ack_ping(hostname, par, out) ) return true; ! if( icmp_echo_ping(hostname, par, out) ) return true; return false; --- 139,145 ---- *out << "Starting discovery of host " << hostname << "...\n"; ! if(par->ack_ping_discovery) if( tcp_ack_ping(hostname, par, out) ) return true; ! if(par->icmp_echo_ping_discovery) if( icmp_echo_ping(hostname, par, out) ) return true; return false; Index: iceversion.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/iceversion.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iceversion.h 28 Nov 2006 17:57:54 -0000 1.1 --- iceversion.h 29 Nov 2006 12:51:01 -0000 1.2 *************** *** 4,8 **** #define ICENAME "IceScan" #define ICEVERSION "0.0.2" ! #define ICEWEBSITE "" // (http://sf.net/projects/...) #define ICEDATE "28 November 2006" --- 4,8 ---- #define ICENAME "IceScan" #define ICEVERSION "0.0.2" ! #define ICEWEBSITE "http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/" // (...) #define ICEDATE "28 November 2006" Index: TODO =================================================================== RCS file: /cvsroot/javanetsim/IceScan/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 28 Nov 2006 21:01:33 -0000 1.3 --- TODO 29 Nov 2006 12:51:01 -0000 1.4 *************** *** 20,24 **** + Window Scan (-SW) [QweR] + Xmas Tree Scan (-SX) [QweR] ! + IP Protocol Scan (-SI) [Key] + Null Scan (-SN) [Key] + TCP SYN Scan (-SS) [Key] --- 20,24 ---- + Window Scan (-SW) [QweR] + Xmas Tree Scan (-SX) [QweR] ! + IP Protocol Scan (-SI) [Key] (??) + Null Scan (-SN) [Key] + TCP SYN Scan (-SS) [Key] |
