[Javanetsim-cvs] IceScan CHANGELOG, 1.3, 1.4 TODO, 1.14, 1.15 udpscan.h, 1.18, 1.19 csubtarget.h, 1
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan CHANGELOG, 1.3, 1.4 TODO, 1.14, 1.15 udpscan.h, 1.18, 1.19 csubtarget.h, 1.50, 1.51
|
From: Alexander B. <da...@us...> - 2006-12-19 18:59:19
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31614 Modified Files: CHANGELOG TODO udpscan.h csubtarget.h Log Message: no message Index: csubtarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** csubtarget.h 19 Dec 2006 09:04:49 -0000 1.50 --- csubtarget.h 19 Dec 2006 18:59:16 -0000 1.51 *************** *** 55,59 **** // *****scan parameters***** - bool raw; int domain; --- 55,58 ---- *************** *** 71,94 **** csubtarget(icestring hostname, icestring reverse_hostname, iceparams *par, iceoutput *out){ ! struct scanned_port sp; ! ! subtarget_ports.push_back(sp); ! ! this->hostname.assign(hostname); ! this->reversed_hostname.assign(reverse_hostname); this->par = par; this->out = out; discovered = false; ! init_scan_sockets(); } bool discover(){ ! struct timeb tp1, tp2; ! ! ftime(&tp1); discovered = host_discover(hostname.c_str(), par, out); ! ftime(&tp2); ! ! if(par->verbose) *out << "Discovery taken " << timeb_diff(tp1, tp2) << " seconds.\n"; return discovered; --- 70,93 ---- csubtarget(icestring hostname, icestring reverse_hostname, iceparams *par, iceoutput *out){ ! struct scanned_port sp; ! ! subtarget_ports.push_back(sp); ! ! this->hostname.assign(hostname); ! this->reversed_hostname.assign(reverse_hostname); this->par = par; this->out = out; discovered = false; ! init_scan_sockets(); } bool discover(){ ! struct timeb tp1, tp2; ! ! ftime(&tp1); discovered = host_discover(hostname.c_str(), par, out); ! ftime(&tp2); ! ! if(par->verbose) *out << "Discovery taken " << timeb_diff(tp1, tp2) << " seconds.\n"; return discovered; *************** *** 129,145 **** } ! int prot_scan(){ ! ! cprotocol_scan cps(par, out); ! // cps.test(hostname.c_str()); ! return 0; } int nbt_scan(){ // NetBIOS scan, -SB ! char output_buf[255]; ! ! if(par->verbose>0){ sprintf(output_buf, "Starting NetBIOS scan against %s...", hostname.c_str()); out->line(output_buf); --- 128,143 ---- } ! int prot_scan(){ ! // cprotocol_scan cps(par, out); ! // cps.test(hostname.c_str()); ! return 0; } int nbt_scan(){ // NetBIOS scan, -SB ! char output_buf[255]; ! ! if(par->verbose>0){ sprintf(output_buf, "Starting NetBIOS scan against %s...", hostname.c_str()); out->line(output_buf); *************** *** 148,152 **** cnbtwrapper wrap(par); ! wrap.test(hostname.c_str(), 137); if(par->verbose>0){ --- 146,150 ---- cnbtwrapper wrap(par); ! wrap.test(hostname.c_str(), 137); if(par->verbose>0){ *************** *** 159,163 **** } ! int udp_scan(){ //udp scan, -SU --- 157,161 ---- } ! int udp_scan(){ //udp scan, -SU *************** *** 175,179 **** udpscan(hostname, scanning_ports, par, out, this, true); - // udpscan2(local_hn, hostname, scanning_ports,hostname.c_str(), par, out); show_ports(); --- 173,176 ---- *************** *** 192,203 **** char output_buf[255]; - raw = false; domain = (int) SOCK_STREAM; ! ! ! //DBGOUTPUT("!!!"); ! std::map <int, scanning_port> scanning_ports; ! //DBGOUTPUT("!!!"); ! init_scanning_ports(hostname, par, (int) SOCK_STREAM, scanning_ports); if(par->verbose>0){ --- 189,196 ---- char output_buf[255]; domain = (int) SOCK_STREAM; ! ! std::map <int, scanning_port> scanning_ports; ! init_scanning_ports(hostname, par, (int) SOCK_STREAM, scanning_ports); if(par->verbose>0){ *************** *** 206,214 **** } int j = initiate_connect(scanning_ports); ! //DBGOUTPUT(j); while( ! do_select_round_connect(scanning_ports, subtarget_ports) ) iceusleep(1000); - // DBGOUTPUT("end do_select_round"); - show_ports(); --- 199,205 ---- } int j = initiate_connect(scanning_ports); ! while( ! do_select_round_connect(scanning_ports, subtarget_ports) ) iceusleep(1000); show_ports(); *************** *** 359,363 **** struct sockaddr_in saddress; int len; ! int MAGIC_PORT = 54678; //ugly, need to check char local_hostname[80]; --- 350,354 ---- struct sockaddr_in saddress; int len; ! int MAGIC_PORT = csocket::getMagicPort(SOCK_DGRAM, 100); char local_hostname[80]; *************** *** 381,388 **** } - raw = true; - domain = (int) SOCK_RAW; ! len = make_sockname(saddress, hostname.c_str(), 0, domain); if(gethostname(local_hostname, 80)) exit(-1); --- 372,377 ---- } ! len = make_sockname(saddress, hostname.c_str(), 0, domain); if(gethostname(local_hostname, 80)) exit(-1); *************** *** 393,398 **** crawsocket rawsend(AF_INET, (int) SOCK_RAW, IPPROTO_RAW); ! //crawsocket rawrecv(AF_INET, (int) SOCK_RAW, IPPROTO_TCP); ! //rawrecv.nonblock(true); int one = 1; --- 382,386 ---- crawsocket rawsend(AF_INET, (int) SOCK_RAW, IPPROTO_RAW); ! int one = 1; *************** *** 417,420 **** --- 405,410 ---- pcap_filter(p, filter_exp); + pcap_block(p, false); + int maxat; *************** *** 427,431 **** std::map <int, scanning_port>::iterator i = scanning_ports.begin(); - //DBGOUTPUT(attempts); maxat = 0; --- 417,420 ---- *************** *** 460,465 **** gettimeofday(&((*i).second.tv), 0); - //DBGOUTPUT("Sending:" << (*i).second.attempt); - (*i).second.attempt++; --- 449,452 ---- Index: TODO =================================================================== RCS file: /cvsroot/javanetsim/IceScan/TODO,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TODO 16 Dec 2006 14:42:43 -0000 1.14 --- TODO 19 Dec 2006 18:59:16 -0000 1.15 *************** *** 6,15 **** + add multiple targets handling; ! * fix reading port range for ack/udp/syn pings; ! -- Discovering -- ! + UDP Ping (-PU [portlist]) [QweR] ! + TCP SYN Ping (-PS [portlist]) [Key] + ARP/RAW Discovery --- 6,13 ---- + add multiple targets handling; ! -- Discovering -- ! + TCP SYN/FIN Ping (-PS [portlist]) + ARP/RAW Discovery *************** *** 17,30 **** + Mainmon scan (-SM, FIN/ACK) ! + UDP Scan (-SU) [QweR] ! + IP Protocol Scan (-SI) [Key] (??) * do setting random window/seq(ack and seg) for raw scanning + --ttl option and ttl random generation + --badchksum option ! + ARP Scan + Fingerprint (??) -- Misc -- ! + select right interface to scan ! ! -- Bugs -- --- 15,28 ---- + Mainmon scan (-SM, FIN/ACK) ! * Fix udp scan timeouts ! * Fix Raw TCP scan timeouts ! * Rewrite raw_tcp_scan to mak support ping. ! + IP Protocol Scan (-SI) * do setting random window/seq(ack and seg) for raw scanning + --ttl option and ttl random generation + --badchksum option ! + ARP Scan + Fingerprint -- Misc -- ! + automatically select right interface to scan \ No newline at end of file Index: udpscan.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/udpscan.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** udpscan.h 19 Dec 2006 09:04:49 -0000 1.18 --- udpscan.h 19 Dec 2006 18:59:16 -0000 1.19 *************** *** 86,92 **** } ! //int pppp = sudp.getMagicPort(SOCK_DGRAM, 100); ! int pppp = sudp.getMagicPort(); ! sudp.bind(hostname, pppp, 0); sudp.nonblock(true); pcap_t* p = init_pcap(par->source_iface); //check for NULL --- 86,91 ---- } ! int MAGIC_PORT = csocket::getMagicPort(SOCK_DGRAM, 100); ! sudp.bind(hostname, MAGIC_PORT, 0); sudp.nonblock(true); pcap_t* p = init_pcap(par->source_iface); //check for NULL *************** *** 95,98 **** --- 94,105 ---- return false; } + + pcap_block(p, false); + + char filter_exp[256]; + + sprintf(filter_exp, "host %s icmp", destname.c_str()); + + pcap_filter(p, filter_exp); for(repeats = 1; repeats <= UDP_SCAN_REPEATS && next; repeats++){ Index: CHANGELOG =================================================================== RCS file: /cvsroot/javanetsim/IceScan/CHANGELOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG 30 Nov 2006 06:43:50 -0000 1.3 --- CHANGELOG 19 Dec 2006 18:59:16 -0000 1.4 *************** *** 3,8 **** (+ -- new feature, * -- bugfix) ! *** IceScan v. 0.0.3, 12 Dec 2006 *** + added printing time at startup. * fixed icmp echo discovery (icmplen). --- 3,16 ---- (+ -- new feature, * -- bugfix) ! *** IceScan v. 0.0.6, 19 Dec 2006 *** ! ! * fixed blocking pcap calls. ! ! *** IceScan v. 0.0.3, 18 Dec 2006 *** + + TCP Raw scan. + + ICMP Timestamp/Netmask discovery. + + UDP Discovery/Scan. + + Windows NT/2000/XP support. + added printing time at startup. * fixed icmp echo discovery (icmplen). |
