[Javanetsim-cvs] IceScan nbt_wrapper.h, 1.2, 1.3 icescan.cc, 1.13, 1.14 csubtarget.h, 1.13, 1.14
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan nbt_wrapper.h, 1.2, 1.3 icescan.cc, 1.13, 1.14 csubtarget.h, 1.13, 1.14
|
From: Alexander B. <da...@us...> - 2006-12-13 13:22:09
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21429 Modified Files: nbt_wrapper.h icescan.cc csubtarget.h Log Message: no message Index: icescan.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** icescan.cc 13 Dec 2006 13:13:30 -0000 1.13 --- icescan.cc 13 Dec 2006 13:22:00 -0000 1.14 *************** *** 134,153 **** exit(1); }else{ - // pcrecpp::StringPiece input(argv[i+1]); - // pcrecpp::RE re("(\\d+(-\\d+)*),*"); IceRegex re("(\\d+(-\\d+)*),*"); - - //std::vector<icestring> v; string var, var2 = ""; ! re1.match(argv[i+1]); ! rel.findReset(); ! //re.Consume(&input, &var, &var2) ! while(! re1.findNext()){ ! // DBGOUTPUT(v.size()); ! // DBGOUTPUT(v[0]); ! if( rel.group(1,var) && rel.group(2,var2) ){ struct port_range pr; --- 134,147 ---- exit(1); }else{ IceRegex re("(\\d+(-\\d+)*),*"); string var, var2 = ""; ! re.match(argv[i+1]); ! re.findReset(); ! ! while(! re.findNext()){ ! if( re.group(1,var) && re.group(2,var2) ){ struct port_range pr; *************** *** 163,167 **** } } - exit(-1); i++; } --- 157,160 ---- *************** *** 185,191 **** }else{ //DBGOUTPUT("Target is: " << argv[i]); ! ! par->target.assign(argv[i]); ! //DBGOUTPUT(par->target); } --- 178,182 ---- }else{ //DBGOUTPUT("Target is: " << argv[i]); ! par->target.assign(argv[i]); } *************** *** 198,202 **** exit(0); - print_help(argv[0]); } --- 189,192 ---- Index: csubtarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** csubtarget.h 13 Dec 2006 12:59:06 -0000 1.13 --- csubtarget.h 13 Dec 2006 13:22:00 -0000 1.14 *************** *** 44,47 **** --- 44,48 ---- long time; int socket_ptr; + int attempt; }; *************** *** 155,162 **** icestring source(local_hostname); - DBGOUTPUT("!!!"); std::map <int, scanning_port> scanning_ports; ! DBGOUTPUT("!!!"); ! init_scanning_ports(hostname, par, (int) SOCK_RAW, scanning_ports); --- 156,161 ---- icestring source(local_hostname); std::map <int, scanning_port> scanning_ports; ! init_scanning_ports(hostname, par, (int) SOCK_RAW, scanning_ports); *************** *** 167,175 **** crawsocket rawsend(AF_INET, (int) SOCK_RAW, IPPROTO_RAW); ! ! DBGOUTPUT("All ready!"); ! while(done){ std::map <int, scanning_port>::iterator i; --- 166,176 ---- crawsocket rawsend(AF_INET, (int) SOCK_RAW, IPPROTO_RAW); + crawsocket rawrecv(AF_INET, (int) SOCK_RAW, IPPROTO_TCP); ! rawrecv.nonblock(true); ! int attempts = 0; ! ! while(attempts++ < 5){ std::map <int, scanning_port>::iterator i; *************** *** 177,183 **** if(! (*i).second.done ){ //DBGOUTPUT("!!!!");// ! rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 2337818902, 2337818902, TH_FIN, 0, 0, 0); //DBGOUTPUT("!!!!"); (*i).second.time = time(0); usleep(1000); --- 178,186 ---- if(! (*i).second.done ){ //DBGOUTPUT("!!!!");// ! rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, TH_FIN, 0, 0, 0); //DBGOUTPUT("!!!!"); (*i).second.time = time(0); + + (*i).second.attempt++; usleep(1000); *************** *** 185,192 **** } - //sleep(1); - - crawsocket rawrecv(AF_INET, (int) SOCK_RAW, IPPROTO_TCP); - //rawrecv.nonblock(true); int bytes; --- 188,191 ---- *************** *** 197,212 **** ! for(int k = 1; k<=27; k++){ ! while( bytes = rawrecv.recvfrom(response, 65535, 0, NULL)){ ! //if(ip->saddr = saddress.sin_addr.s_addr){ ! // tcp = (struct tcphdr *) (response + 4 * ip->ihl); ! //if (tcp->th_flags & TH_RST) { ! crawsocket::print_tcppacket(response, bytes); ! // int closed_port = ntohs(tcp->th_sport); ! //} ! //} ! bzero(response, 65534); } ! } done = false; --- 196,215 ---- ! while( bytes = rawrecv.recvfrom(response, 65535, 0, NULL) > 0){ ! if(ip->saddr = saddress.sin_addr.s_addr){ ! tcp = (struct tcphdr *) (response + 4 * ip->ihl); ! if (tcp->th_flags & TH_RST) { ! crawsocket::print_tcppacket(response, bytes); ! int closed_port = ntohs(tcp->th_sport); ! ! set_port_status(closed_port, PORT_CLOSED); ! ! //if(scanning_ports.find(closed_port)) ! scanning_ports[closed_port].done = true; ! ! } } ! bzero(response, 65534); ! } done = false; *************** *** 289,292 **** --- 292,296 ---- sp.port_number = i; scanning_ports[i] = sp; + scanning_ports[i].attempt = 0; scanning_ports[i].done = false; } Index: nbt_wrapper.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/nbt_wrapper.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nbt_wrapper.h 12 Dec 2006 20:40:19 -0000 1.2 --- nbt_wrapper.h 13 Dec 2006 13:22:00 -0000 1.3 *************** *** 4,11 **** #include <sys/types.h> - #define my_uint16_t uint16_t - #define my_uint32_t uint32_t - #define my_uint8_t uint8_t - #define NBT_MSGSIZE 1024 --- 4,7 ---- |
