Update of /cvsroot/javanetsim/IceScan
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22575
Modified Files:
csubtarget.h icediscover.h udpscan.h
Log Message:
Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** csubtarget.h 17 Dec 2006 11:00:20 -0000 1.39
--- csubtarget.h 17 Dec 2006 11:14:00 -0000 1.40
***************
*** 400,404 ****
int one = 1;
const int *val = &one;
! if (rawsend.setsockopt (IPPROTO_IP, IP_HDRINCL, val, sizeof (one)) < 0)
perror("Setsockopt HDRINCL:");
--- 400,404 ----
int one = 1;
const int *val = &one;
! if (rawsend.setsockopt (IPPROTO_IP, IP_HDRINCL, (sockbuf_type *) val, sizeof (one)) < 0)
perror("Setsockopt HDRINCL:");
***************
*** 686,692 ****
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);
}while(s = -1 && err == EINTR);
--- 686,696 ----
tv.tv_sec = 0; tv.tv_usec = 10000;
! #ifndef WIN32
! s = select(maxfd + 1, &fd_rtmp, &fd_wtmp, &fd_xtmp, &tv);
! #else
! s = select(0, &fd_rtmp, &fd_wtmp, &fd_xtmp, &tv);
! #endif
err = errno;
! //perror("select"); DBGOUTPUT(s);
}while(s = -1 && err == EINTR);
***************
*** 694,702 ****
int curtime = time(0);
- // DBGOUTPUT(" 509 ");
-
for(i = scanning_ports.begin(); i!= scanning_ports.end(); ++i){
! // DBGOUTPUT(" 512 ");
!
if((*i).second.done) continue;
if( (*i).second.socket_ptr == -1){
--- 698,703 ----
int curtime = time(0);
for(i = scanning_ports.begin(); i!= scanning_ports.end(); ++i){
!
if((*i).second.done) continue;
if( (*i).second.socket_ptr == -1){
***************
*** 706,711 ****
}
- // DBGOUTPUT( (*i).second.socket_ptr);
- // DBGOUTPUT(" 522 ");
enum port_status status = PORT_UNKNOWN;
--- 707,710 ----
***************
*** 715,721 ****
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:
--- 714,723 ----
csocket c(AF_INET, (int) domain, scan_sockets[(*i).second.socket_ptr].sid);
!
! DBGOUTPUT(c.getsockopt(SOL_SOCKET, SO_ERROR, (char *) &sopt, (socklen_t*) &soptlen));
! perror("setsockopt");
+ DBGOUTPUT(sopt);
+
switch(sopt){
case 0:
Index: icediscover.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** icediscover.h 17 Dec 2006 11:00:20 -0000 1.27
--- icediscover.h 17 Dec 2006 11:14:00 -0000 1.28
***************
*** 65,69 ****
int attempts = 0;
! r.setsockopt(SOL_SOCKET, SO_RCVBUF, &size, sizeof(size));
r.nonblock(true);
--- 65,69 ----
int attempts = 0;
! r.setsockopt(SOL_SOCKET, SO_RCVBUF, (sockbuf_type *) &size, sizeof(size));
r.nonblock(true);
Index: udpscan.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/udpscan.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** udpscan.h 17 Dec 2006 11:00:20 -0000 1.13
--- udpscan.h 17 Dec 2006 11:14:00 -0000 1.14
***************
*** 89,93 ****
int size = 60 * 1024;
! sicmp.setsockopt(SOL_SOCKET, SO_RCVBUF, &size, sizeof(size));
for(repeats = 1; repeats <= UDP_SCAN_REPEATS && next; repeats++){
--- 89,93 ----
int size = 60 * 1024;
! sicmp.setsockopt(SOL_SOCKET, SO_RCVBUF, (sockbuf_type *) &size, sizeof(size));
for(repeats = 1; repeats <= UDP_SCAN_REPEATS && next; repeats++){
|
