[Javanetsim-cvs] IceScan Makefile.am, 1.4, 1.5 icescan.cc, 1.38, 1.39 csubtarget.h, 1.54, 1.55 Make
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan Makefile.am, 1.4, 1.5 icescan.cc, 1.38, 1.39 csubtarget.h, 1.54, 1.55 Makefile.in, 1.4, 1.5 csubtarget.cc, 1.1, 1.2 udpscan.cc, 1.1, 1.2
|
From: Alexander B. <da...@us...> - 2006-12-21 16:29:41
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4099 Modified Files: Makefile.am icescan.cc csubtarget.h Makefile.in csubtarget.cc udpscan.cc Log Message: no message Index: icescan.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** icescan.cc 21 Dec 2006 15:37:23 -0000 1.38 --- icescan.cc 21 Dec 2006 16:29:36 -0000 1.39 *************** *** 155,159 **** par->forceuid = true; }else if(!strcmp(argv[i], "--list-interfaces")){ ! listdev_pcap(); std::cout << std::endl; exit(0); --- 155,159 ---- par->forceuid = true; }else if(!strcmp(argv[i], "--list-interfaces")){ ! cpcapreader::listdev_pcap(); std::cout << std::endl; exit(0); Index: csubtarget.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** csubtarget.cc 21 Dec 2006 15:37:23 -0000 1.1 --- csubtarget.cc 21 Dec 2006 16:29:36 -0000 1.2 *************** *** 298,310 **** } ! pcap_t* p; if(par->source_iface) ! p = init_pcap(par->source_iface); else ! p = init_pcap(getdev_pcap(source_iface)); ! ! if(p == NULL){ out->line("Can't open pcap: no raw tcp scan. Exitting."); return; --- 298,315 ---- } ! int iface; if(par->source_iface) ! iface = par->source_iface; else ! iface = cpcapreader::getdev_pcap(source_iface); ! char filter_exp[256]; ! ! sprintf(filter_exp, "port %d host %s tcp", MAGIC_PORT, hostname.c_str()); ! ! cpcapreader p(iface, false, filter_exp); ! ! if(!p.opened()){ out->line("Can't open pcap: no raw tcp scan. Exitting."); return; *************** *** 335,347 **** int l = scanning_ports.size()/MAX_PACKETS; if(scanning_ports.size() % MAX_PACKETS != 0) l++; ! ! char filter_exp[256]; ! ! sprintf(filter_exp, "port %d host %s tcp", MAGIC_PORT, hostname.c_str()); ! ! pcap_filter(p, filter_exp); ! ! pcap_block(p, false); ! int maxat; --- 340,344 ---- int l = scanning_ports.size()/MAX_PACKETS; if(scanning_ports.size() % MAX_PACKETS != 0) l++; ! int maxat; *************** *** 418,425 **** *out << "TCP " << scan_type << " scan finished.\n"; - close_pcap(p); } ! int csubtarget::recieve_tcp_raw(pcap_t* p, crawsocket &rawsend, icestring &source, struct sockaddr_in &saddress, std::map <int, scanning_port> &scanning_ports, int MAGIC_PORT, int timeout, int packets){ int bytes; char *response; --- 415,421 ---- *out << "TCP " << scan_type << " scan finished.\n"; } ! int csubtarget::recieve_tcp_raw(cpcapreader &p, crawsocket &rawsend, icestring &source, struct sockaddr_in &saddress, std::map <int, scanning_port> &scanning_ports, int MAGIC_PORT, int timeout, int packets){ int bytes; char *response; *************** *** 436,440 **** //while( bytes = rawrecv.recvfrom(response, 65535, 0, NULL) > 0){ while(!stop){ ! response = readip_pcap(p, &len, NULL); port = 0; //DBGOUTPUT("while"); --- 432,436 ---- //while( bytes = rawrecv.recvfrom(response, 65535, 0, NULL) > 0){ while(!stop){ ! response = p.read_packet(&len, NULL); port = 0; //DBGOUTPUT("while"); Index: csubtarget.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** csubtarget.h 21 Dec 2006 15:37:23 -0000 1.54 --- csubtarget.h 21 Dec 2006 16:29:36 -0000 1.55 *************** *** 60,63 **** --- 60,67 ---- bool discover(); + + icestring get_source_iface(){ + return source_iface; + } void scan(); *************** *** 101,105 **** void raw_tcp_scan(icestring scan_type); ! int recieve_tcp_raw(pcap_t* p, crawsocket &rawsend, icestring &source, struct sockaddr_in &saddress, std::map <int, scanning_port> &scanning_ports, int MAGIC_PORT, int timeout, int packets); void shutdown_scansocket(int j); --- 105,109 ---- void raw_tcp_scan(icestring scan_type); ! int recieve_tcp_raw(cpcapreader &p, crawsocket &rawsend, icestring &source, struct sockaddr_in &saddress, std::map <int, scanning_port> &scanning_ports, int MAGIC_PORT, int timeout, int packets); void shutdown_scansocket(int j); Index: Makefile.in =================================================================== RCS file: /cvsroot/javanetsim/IceScan/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 21 Dec 2006 15:37:23 -0000 1.4 --- Makefile.in 21 Dec 2006 16:29:36 -0000 1.5 *************** *** 57,62 **** PROGRAMS = $(bin_PROGRAMS) am_icescan_OBJECTS = sock_time.$(OBJEXT) ice_rand.$(OBJEXT) \ ! sock_win.$(OBJEXT) sock_arp.$(OBJEXT) sock_eth.$(OBJEXT) \ ! sock_pcap.$(OBJEXT) sock_name.$(OBJEXT) sock_files.$(OBJEXT) \ csubtarget.$(OBJEXT) icediscover.$(OBJEXT) udpscan.$(OBJEXT) \ icescan.$(OBJEXT) --- 57,61 ---- PROGRAMS = $(bin_PROGRAMS) am_icescan_OBJECTS = sock_time.$(OBJEXT) ice_rand.$(OBJEXT) \ ! sock_win.$(OBJEXT) sock_name.$(OBJEXT) sock_files.$(OBJEXT) \ csubtarget.$(OBJEXT) icediscover.$(OBJEXT) udpscan.$(OBJEXT) \ icescan.$(OBJEXT) *************** *** 181,186 **** icescandir = $(datadir)/icescan icescan_SOURCES = icesockets/sock_time.cc icesockets/ice_rand.cc \ ! icesockets/sock_win.cc icesockets/sock_arp.cc icesockets/sock_eth.cc \ ! icesockets/sock_pcap.cc icesockets/sock_name.cc icesockets/sock_files.cc csubtarget.cc icediscover.cc udpscan.cc icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf --- 180,185 ---- icescandir = $(datadir)/icescan icescan_SOURCES = icesockets/sock_time.cc icesockets/ice_rand.cc \ ! icesockets/sock_win.cc icesockets/sock_name.cc icesockets/sock_files.cc \ ! csubtarget.cc icediscover.cc udpscan.cc icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf *************** *** 277,285 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icediscover.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icescan.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_arp.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_eth.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_files.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_name.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_pcap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_time.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_win.Po@am__quote@ --- 276,281 ---- *************** *** 342,387 **** @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_win.obj `if test -f 'icesockets/sock_win.cc'; then $(CYGPATH_W) 'icesockets/sock_win.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_win.cc'; fi` - sock_arp.o: icesockets/sock_arp.cc - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_arp.o -MD -MP -MF "$(DEPDIR)/sock_arp.Tpo" -c -o sock_arp.o `test -f 'icesockets/sock_arp.cc' || echo '$(srcdir)/'`icesockets/sock_arp.cc; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sock_arp.Tpo" "$(DEPDIR)/sock_arp.Po"; else rm -f "$(DEPDIR)/sock_arp.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='icesockets/sock_arp.cc' object='sock_arp.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_arp.o `test -f 'icesockets/sock_arp.cc' || echo '$(srcdir)/'`icesockets/sock_arp.cc - - sock_arp.obj: icesockets/sock_arp.cc - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_arp.obj -MD -MP -MF "$(DEPDIR)/sock_arp.Tpo" -c -o sock_arp.obj `if test -f 'icesockets/sock_arp.cc'; then $(CYGPATH_W) 'icesockets/sock_arp.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_arp.cc'; fi`; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sock_arp.Tpo" "$(DEPDIR)/sock_arp.Po"; else rm -f "$(DEPDIR)/sock_arp.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='icesockets/sock_arp.cc' object='sock_arp.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_arp.obj `if test -f 'icesockets/sock_arp.cc'; then $(CYGPATH_W) 'icesockets/sock_arp.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_arp.cc'; fi` - - sock_eth.o: icesockets/sock_eth.cc - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_eth.o -MD -MP -MF "$(DEPDIR)/sock_eth.Tpo" -c -o sock_eth.o `test -f 'icesockets/sock_eth.cc' || echo '$(srcdir)/'`icesockets/sock_eth.cc; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sock_eth.Tpo" "$(DEPDIR)/sock_eth.Po"; else rm -f "$(DEPDIR)/sock_eth.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='icesockets/sock_eth.cc' object='sock_eth.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_eth.o `test -f 'icesockets/sock_eth.cc' || echo '$(srcdir)/'`icesockets/sock_eth.cc - - sock_eth.obj: icesockets/sock_eth.cc - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_eth.obj -MD -MP -MF "$(DEPDIR)/sock_eth.Tpo" -c -o sock_eth.obj `if test -f 'icesockets/sock_eth.cc'; then $(CYGPATH_W) 'icesockets/sock_eth.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_eth.cc'; fi`; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sock_eth.Tpo" "$(DEPDIR)/sock_eth.Po"; else rm -f "$(DEPDIR)/sock_eth.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='icesockets/sock_eth.cc' object='sock_eth.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_eth.obj `if test -f 'icesockets/sock_eth.cc'; then $(CYGPATH_W) 'icesockets/sock_eth.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_eth.cc'; fi` - - sock_pcap.o: icesockets/sock_pcap.cc - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_pcap.o -MD -MP -MF "$(DEPDIR)/sock_pcap.Tpo" -c -o sock_pcap.o `test -f 'icesockets/sock_pcap.cc' || echo '$(srcdir)/'`icesockets/sock_pcap.cc; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sock_pcap.Tpo" "$(DEPDIR)/sock_pcap.Po"; else rm -f "$(DEPDIR)/sock_pcap.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='icesockets/sock_pcap.cc' object='sock_pcap.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_pcap.o `test -f 'icesockets/sock_pcap.cc' || echo '$(srcdir)/'`icesockets/sock_pcap.cc - - sock_pcap.obj: icesockets/sock_pcap.cc - @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_pcap.obj -MD -MP -MF "$(DEPDIR)/sock_pcap.Tpo" -c -o sock_pcap.obj `if test -f 'icesockets/sock_pcap.cc'; then $(CYGPATH_W) 'icesockets/sock_pcap.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_pcap.cc'; fi`; \ - @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sock_pcap.Tpo" "$(DEPDIR)/sock_pcap.Po"; else rm -f "$(DEPDIR)/sock_pcap.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='icesockets/sock_pcap.cc' object='sock_pcap.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sock_pcap.obj `if test -f 'icesockets/sock_pcap.cc'; then $(CYGPATH_W) 'icesockets/sock_pcap.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_pcap.cc'; fi` - sock_name.o: icesockets/sock_name.cc @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_name.o -MD -MP -MF "$(DEPDIR)/sock_name.Tpo" -c -o sock_name.o `test -f 'icesockets/sock_name.cc' || echo '$(srcdir)/'`icesockets/sock_name.cc; \ --- 338,341 ---- Index: udpscan.cc =================================================================== RCS file: /cvsroot/javanetsim/IceScan/udpscan.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** udpscan.cc 21 Dec 2006 15:37:23 -0000 1.1 --- udpscan.cc 21 Dec 2006 16:29:36 -0000 1.2 *************** *** 74,91 **** sudp.bind(hostname, MAGIC_PORT, 0); sudp.nonblock(true); - pcap_t* p = init_pcap(par->source_iface); //check for NULL - if(p == NULL){ - out->line("Can't open pcap: no raw tcp scan. Exitting."); - 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++){ for(std::map <int, scanning_port>::iterator i = scanning_ports.begin(); i!= scanning_ports.end() && next; ++i){ --- 74,98 ---- sudp.bind(hostname, MAGIC_PORT, 0); sudp.nonblock(true); ! int iface = 0; ! ! if(par->source_iface) ! iface = par->source_iface; ! else{ ! icestring sif = subtarget->get_source_iface(); ! iface = cpcapreader::getdev_pcap(sif); ! } char filter_exp[256]; ! sprintf(filter_exp, "host %s icmp", destname.c_str()); ! ! cpcapreader p(iface, false, filter_exp); ! ! if(!p.opened()){ ! out->line("Can't open pcap: no raw tcp scan. Exitting."); ! return false; ! } ! for(repeats = 1; repeats <= UDP_SCAN_REPEATS && next; repeats++){ for(std::map <int, scanning_port>::iterator i = scanning_ports.begin(); i!= scanning_ports.end() && next; ++i){ *************** *** 114,118 **** else{ ! response = readip_pcap(p, &len, NULL); if(response){ recvbytes = len; --- 121,125 ---- else{ ! response = p.read_packet(&len, NULL); if(response){ recvbytes = len; *************** *** 149,154 **** sudp.close(); //sicmp.shutdown(); ! //sicmp.close(); ! close_pcap(p); delete[] zmsg; } --- 156,160 ---- sudp.close(); //sicmp.shutdown(); ! //sicmp.close(); delete[] zmsg; } Index: Makefile.am =================================================================== RCS file: /cvsroot/javanetsim/IceScan/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 21 Dec 2006 15:37:23 -0000 1.4 --- Makefile.am 21 Dec 2006 16:29:36 -0000 1.5 *************** *** 2,7 **** icescandir = $(datadir)/icescan icescan_SOURCES = icesockets/sock_time.cc icesockets/ice_rand.cc \ ! icesockets/sock_win.cc icesockets/sock_arp.cc icesockets/sock_eth.cc \ ! icesockets/sock_pcap.cc icesockets/sock_name.cc icesockets/sock_files.cc csubtarget.cc icediscover.cc udpscan.cc icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf CXXFLAGS=-DICESCAN_DATADIR=\"$(icescandir)\" --- 2,7 ---- icescandir = $(datadir)/icescan icescan_SOURCES = icesockets/sock_time.cc icesockets/ice_rand.cc \ ! icesockets/sock_win.cc icesockets/sock_name.cc icesockets/sock_files.cc \ ! csubtarget.cc icediscover.cc udpscan.cc icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf CXXFLAGS=-DICESCAN_DATADIR=\"$(icescandir)\" |
