[Javanetsim-cvs] IceScan icescan.cc, 1.8, 1.9 ctarget.h, 1.5, 1.6 csubtarget.h, 1.10, 1.11
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan icescan.cc, 1.8, 1.9 ctarget.h, 1.5, 1.6 csubtarget.h, 1.10, 1.11
|
From: Alexander B. <da...@us...> - 2006-12-13 08:34:30
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7258 Modified Files: icescan.cc ctarget.h csubtarget.h Log Message: no message Index: icescan.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** icescan.cc 12 Dec 2006 20:34:03 -0000 1.8 --- icescan.cc 13 Dec 2006 08:34:27 -0000 1.9 *************** *** 170,173 **** --- 170,174 ---- }else{ //DBGOUTPUT("Target is: " << argv[i]); + // par->target.assign(argv[i]); DBGOUTPUT(par->target); *************** *** 227,231 **** ftime(&tp1); - ts.add_subtargets(par.target); --- 228,231 ---- Index: csubtarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** csubtarget.h 13 Dec 2006 02:27:18 -0000 1.10 --- csubtarget.h 13 Dec 2006 08:34:27 -0000 1.11 *************** *** 15,19 **** #define CONNECT_TIMEOUT 7 ! #define ICE_FD_SETSIZE (128) #define MAX_CLOSED 7 --- 15,25 ---- #define CONNECT_TIMEOUT 7 ! ! #ifdef __CYGWIN__ ! #define ICE_FD_SETSIZE (128) ! #else ! #define ICE_FD_SETSIZE (1024) ! #endif ! #define MAX_CLOSED 7 *************** *** 145,151 **** ! DBGOUTPUT("!!!"); std::map <int, scanning_port> scanning_ports; ! DBGOUTPUT("!!!"); init_scanning_ports(hostname, par, (int) SOCK_STREAM, scanning_ports); --- 151,157 ---- ! //DBGOUTPUT("!!!"); std::map <int, scanning_port> scanning_ports; ! //DBGOUTPUT("!!!"); init_scanning_ports(hostname, par, (int) SOCK_STREAM, scanning_ports); *************** *** 244,248 **** //DBGOUTPUT((*i).first); if((*i).second.socket_ptr != -1){ ! DBGOUTPUT("!!!!!"); j = (*i).second.socket_ptr; csocket c(AF_INET, scan_sockets[j].domain, scan_sockets[j].sid); --- 250,254 ---- //DBGOUTPUT((*i).first); if((*i).second.socket_ptr != -1){ ! //DBGOUTPUT("!!!!!"); j = (*i).second.socket_ptr; csocket c(AF_INET, scan_sockets[j].domain, scan_sockets[j].sid); *************** *** 255,259 **** (*i).second.time = time(0); int rc = c.connect(hostname.c_str(), (*i).first, 0); ! DBGOUTPUT("!!!!!"); } } --- 261,265 ---- (*i).second.time = time(0); int rc = c.connect(hostname.c_str(), (*i).first, 0); ! //DBGOUTPUT("!!!!!"); } } *************** *** 361,366 **** tv.tv_sec = 0; tv.tv_usec = 10000; ! s = select(maxfd + 1, &fd_rtmp, &fd_wtmp, &fd_xtmp, &tv); ! //(++scanning_ports.rend())->second.c->get_socketid() err = errno; // perror("select"); DBGOUTPUT(s); --- 367,371 ---- tv.tv_sec = 0; tv.tv_usec = 10000; ! s = select(maxfd + 1, &fd_rtmp, &fd_wtmp, &fd_xtmp, &tv); err = errno; // perror("select"); DBGOUTPUT(s); *************** *** 384,388 **** FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_xtmp))){ ! // DBGOUTPUT( (*i).second.socket_ptr); csocket c(AF_INET, (int) domain, scan_sockets[(*i).second.socket_ptr].sid); --- 389,393 ---- FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_xtmp))){ ! //DBGOUTPUT( (*i).second.socket_ptr); csocket c(AF_INET, (int) domain, scan_sockets[(*i).second.socket_ptr].sid); *************** *** 390,397 **** c.getsockopt(SOL_SOCKET, SO_ERROR, (char *) &sopt, (socklen_t *) &soptlen); ! // DBGOUTPUT("!!!!"); switch(sopt){ ! case 0: #ifdef __CYGWIN__ if(false){ #else --- 395,403 ---- c.getsockopt(SOL_SOCKET, SO_ERROR, (char *) &sopt, (socklen_t *) &soptlen); ! // DBGOUTPUT("!!!!"); switch(sopt){ ! case 0: #ifdef __CYGWIN__ + case 1: if(false){ #else *************** *** 430,439 **** sp.port_number = (*i).first; ! // DBGOUTPUT("!!!!"); sp.status = status; subtarget_ports.push_back(sp); ! // DBGOUTPUT("very well"); print_port_status(sp.port_number, status); --- 436,445 ---- sp.port_number = (*i).first; ! //DBGOUTPUT("!!!!"); sp.status = status; subtarget_ports.push_back(sp); ! //DBGOUTPUT("very well"); print_port_status(sp.port_number, status); *************** *** 443,447 **** (*i).second.socket_ptr = -1; ! // DBGOUTPUT("Erasing... :" << status); //scanning_ports.erase(i++); --- 449,453 ---- (*i).second.socket_ptr = -1; ! //DBGOUTPUT("Erasing... :" << status); //scanning_ports.erase(i++); Index: ctarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/ctarget.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ctarget.h 12 Dec 2006 20:34:03 -0000 1.5 --- ctarget.h 13 Dec 2006 08:34:27 -0000 1.6 *************** *** 37,50 **** int add_subtargets(icestring hostname){ int st = get_ips_byhost(hostname.c_str(), subtargets_addresses); ! icestring rev_hostname(hostname); ! ! //if((!is_domainname(hostname)) && par->reverse_dns){ ! // get_host_byip(hostname, rev_hostname, ICEMAXHOSTNAME); ! //}else{ ! //strcpy(rev_hostname, hostname); ! //} ! ! DBGOUTPUT(rev_hostname); for(int i=0; i<st; i++){ --- 37,50 ---- int add_subtargets(icestring hostname){ int st = get_ips_byhost(hostname.c_str(), subtargets_addresses); + + icestring rev_hostname; ! if((!is_domainname(hostname)) && par->reverse_dns){ ! get_host_byip(hostname, rev_hostname, ICEMAXHOSTNAME); ! }else{ ! rev_hostname.assign(hostname); ! } ! ! //DBGOUTPUT(rev_hostname); for(int i=0; i<st; i++){ |
