[Javanetsim-cvs] IceScan icescan.cc, 1.33, 1.34 udpscan.h, 1.12, 1.13 icediscover.h, 1.26, 1.27 csu
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan icescan.cc, 1.33, 1.34 udpscan.h, 1.12, 1.13 icediscover.h, 1.26, 1.27 csubtarget.h, 1.38, 1.39
|
From: Alexander B. <da...@us...> - 2006-12-17 11:00:24
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14929 Modified Files: icescan.cc udpscan.h icediscover.h csubtarget.h Log Message: no message Index: icescan.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** icescan.cc 17 Dec 2006 09:59:39 -0000 1.33 --- icescan.cc 17 Dec 2006 11:00:20 -0000 1.34 *************** *** 315,320 **** int main(int argc, char *argv[]){ - //listdev_pcap(); - ice_service_name_database isnd("services"); ice_mac_name_database ismd("ieee-oui.txt"); --- 315,318 ---- Index: csubtarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** csubtarget.h 17 Dec 2006 09:59:39 -0000 1.38 --- csubtarget.h 17 Dec 2006 11:00:20 -0000 1.39 *************** *** 365,369 **** if(par->verbose > 0) ! *out << "Starting TCP " << scan_type << " scan against " << hostname.c_str() << "...\n"; #if (__CYGWIN__ || WIN32) //UGLY!!! --- 365,369 ---- if(par->verbose > 0) ! *out << "Starting TCP " << scan_type << " scan against " << hostname.c_str() << "...\n"; #if (__CYGWIN__ || WIN32) //UGLY!!! *************** *** 673,678 **** struct timeval tv; int s, err; - int sopt, soptlen; int res; bool done = true; --- 673,679 ---- struct timeval tv; int s, err; int res; + int sopt; + int soptlen; bool done = true; *************** *** 711,727 **** if(s >= 0 && (FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_rtmp) || FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_wtmp) || ! 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); ! ! c.getsockopt(SOL_SOCKET, SO_ERROR, (char *) &sopt, (socklen_t *) &soptlen); ! ! // DBGOUTPUT("!!!!"); switch(sopt){ case 0: #ifdef __CYGWIN__ ! if(false){ #else if(FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_r)){ --- 712,725 ---- if(s >= 0 && (FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_rtmp) || FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_wtmp) || ! FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_xtmp))){ csocket c(AF_INET, (int) domain, scan_sockets[(*i).second.socket_ptr].sid); ! ! c.getsockopt(SOL_SOCKET, SO_ERROR, (char *) &sopt, (socklen_t*) &soptlen); ! switch(sopt){ case 0: #ifdef __CYGWIN__ ! if(false){ #else if(FD_ISSET(scan_sockets[(*i).second.socket_ptr].sid, &fd_r)){ *************** *** 729,736 **** #endif }else{ ! //DBGOUTPUT("WRITE"); iceusleep(20000); res = c.write("", 0, 0); ! //DBGOUTPUT("/WRITE" << res); if(res < 0){ status = PORT_CLOSED; --- 727,734 ---- #endif }else{ ! DBGOUTPUT("WRITE"); iceusleep(20000); res = c.write("", 0, 0); ! DBGOUTPUT("/WRITE" << res); if(res < 0){ status = PORT_CLOSED; Index: icediscover.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** icediscover.h 17 Dec 2006 09:59:39 -0000 1.26 --- icediscover.h 17 Dec 2006 11:00:20 -0000 1.27 *************** *** 94,104 **** } ! char hostname[ICEMAXHOSTNAME]; char buf[1500]; //1500 == standart IP Packet size ! sockaddr_in source; ! int fromlen = sizeof(source); ! int len = recvfrom(r.get_socketid(), buf, sizeof(buf), 0, (sockaddr*)&source, &fromlen); if(len > 0){ --- 94,104 ---- } ! char hostname[ICEMAXHOSTNAME]; char buf[1500]; //1500 == standart IP Packet size ! sockaddr_in source; ! int fromlen = sizeof(source); ! int len = recvfrom(r.get_socketid(), buf, sizeof(buf), 0, (sockaddr*)&source, (socklen_t*) &fromlen); if(len > 0){ Index: udpscan.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/udpscan.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** udpscan.h 16 Dec 2006 20:44:18 -0000 1.12 --- udpscan.h 17 Dec 2006 11:00:20 -0000 1.13 *************** *** 82,86 **** if(gethostname(hostname,79)) exit(-1); ! int pppp = sudp.getMagicPort(SOCK_DGRAM, 100); sudp.bind(hostname, pppp, 0); sudp.nonblock(true); --- 82,87 ---- if(gethostname(hostname,79)) exit(-1); ! //int pppp = sudp.getMagicPort(SOCK_DGRAM, 100); ! int pppp = sudp.getMagicPort(); sudp.bind(hostname, pppp, 0); sudp.nonblock(true); |
