[Javanetsim-cvs] IceScan Makefile.am, 1.5, 1.6 icescan.cc, 1.39, 1.40 icediscover.h, 1.35, 1.36 ice

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/javanetsim/IceScan
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6985

Modified Files:
	Makefile.am icescan.cc icediscover.h icedbs.h Makefile.in 
	csubtarget.cc 
Log Message:
no message

Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** icescan.cc	21 Dec 2006 16:29:36 -0000	1.39
--- icescan.cc	21 Dec 2006 16:36:28 -0000	1.40
***************
*** 28,32 ****
  #include "ctarget.h"
  #include "icesockets/csocket.h"
! #include "icesockets/ice_rand.h"

  void print_help(char *name){
--- 28,32 ----
  #include "ctarget.h"
  #include "icesockets/csocket.h"
! #include "icesockets/sock_utils.h"

  void print_help(char *name){

Index: csubtarget.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** csubtarget.cc	21 Dec 2006 16:29:36 -0000	1.2
--- csubtarget.cc	21 Dec 2006 16:36:28 -0000	1.3
***************
*** 51,55 ****
                          icestring mac = get_arp_from_cache(hostname);

!                         if(mac != ""){
                              char Mac[24], vmac[7];

--- 51,55 ----
                          icestring mac = get_arp_from_cache(hostname);

!                         if(mac != "" && mac != "00:00:00:00:00:00"){
                              char Mac[24], vmac[7];

Index: icedbs.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icedbs.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** icedbs.h	21 Dec 2006 15:37:23 -0000	1.10
--- icedbs.h	21 Dec 2006 16:36:28 -0000	1.11
***************
*** 2,6 ****
  #define ICEDBS_H

! #include "icesockets/sock_files.h"
  #include "icesockets/iceregex.h"

--- 2,6 ----
  #define ICEDBS_H

! #include "icesockets/sock_utils.h"
  #include "icesockets/iceregex.h"

Index: icediscover.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** icediscover.h	21 Dec 2006 15:37:23 -0000	1.35
--- icediscover.h	21 Dec 2006 16:36:28 -0000	1.36
***************
*** 2,6 ****
  #define ICEDISCOVER_H

! #include "icesockets/ice_rand.h"
  #include "icesockets/csocket.h"
  #include "icesockets/crawsocket.h"
--- 2,6 ----
  #define ICEDISCOVER_H

! #include "icesockets/sock_utils.h"
  #include "icesockets/csocket.h"
  #include "icesockets/crawsocket.h"

Index: Makefile.in
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in	21 Dec 2006 16:29:36 -0000	1.5
--- Makefile.in	21 Dec 2006 16:36:28 -0000	1.6
***************
*** 56,63 ****
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  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)
  icescan_OBJECTS = $(am_icescan_OBJECTS)
  icescan_LDADD = $(LDADD)
--- 56,62 ----
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS)
! am_icescan_OBJECTS = sock_utils.$(OBJEXT) sock_win.$(OBJEXT) \
! 	sock_name.$(OBJEXT) csubtarget.$(OBJEXT) icediscover.$(OBJEXT) \
! 	udpscan.$(OBJEXT) icescan.$(OBJEXT)
  icescan_OBJECTS = $(am_icescan_OBJECTS)
  icescan_LDADD = $(LDADD)
***************
*** 179,184 ****
  target_alias = @target_alias@
  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 

--- 178,182 ----
  target_alias = @target_alias@
  icescandir = $(datadir)/icescan
! icescan_SOURCES = icesockets/sock_utils.cc icesockets/sock_win.cc icesockets/sock_name.cc \
   csubtarget.cc icediscover.cc udpscan.cc icescan.cc 

***************
*** 273,282 ****

  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csubtarget.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ice_rand.Po@am__quote@
  @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_files.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_name.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@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udpscan.Po@am__quote@
--- 271,278 ----

  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csubtarget.Po@am__quote@
  @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_name.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_utils.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock_win.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udpscan.Po@am__quote@
***************
*** 296,326 ****
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

! sock_time.o: icesockets/sock_time.cc
! @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_time.o -MD -MP -MF "$(DEPDIR)/sock_time.Tpo" -c -o sock_time.o `test -f 'icesockets/sock_time.cc' || echo '$(srcdir)/'`icesockets/sock_time.cc; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sock_time.Tpo" "$(DEPDIR)/sock_time.Po"; else rm -f "$(DEPDIR)/sock_time.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/sock_time.cc' object='sock_time.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_time.o `test -f 'icesockets/sock_time.cc' || echo '$(srcdir)/'`icesockets/sock_time.cc
! 
! sock_time.obj: icesockets/sock_time.cc
! @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_time.obj -MD -MP -MF "$(DEPDIR)/sock_time.Tpo" -c -o sock_time.obj `if test -f 'icesockets/sock_time.cc'; then $(CYGPATH_W) 'icesockets/sock_time.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_time.cc'; fi`; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sock_time.Tpo" "$(DEPDIR)/sock_time.Po"; else rm -f "$(DEPDIR)/sock_time.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/sock_time.cc' object='sock_time.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_time.obj `if test -f 'icesockets/sock_time.cc'; then $(CYGPATH_W) 'icesockets/sock_time.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_time.cc'; fi`
! 
! ice_rand.o: icesockets/ice_rand.cc
! @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ice_rand.o -MD -MP -MF "$(DEPDIR)/ice_rand.Tpo" -c -o ice_rand.o `test -f 'icesockets/ice_rand.cc' || echo '$(srcdir)/'`icesockets/ice_rand.cc; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ice_rand.Tpo" "$(DEPDIR)/ice_rand.Po"; else rm -f "$(DEPDIR)/ice_rand.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/ice_rand.cc' object='ice_rand.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 ice_rand.o `test -f 'icesockets/ice_rand.cc' || echo '$(srcdir)/'`icesockets/ice_rand.cc

! ice_rand.obj: icesockets/ice_rand.cc
! @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ice_rand.obj -MD -MP -MF "$(DEPDIR)/ice_rand.Tpo" -c -o ice_rand.obj `if test -f 'icesockets/ice_rand.cc'; then $(CYGPATH_W) 'icesockets/ice_rand.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/ice_rand.cc'; fi`; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ice_rand.Tpo" "$(DEPDIR)/ice_rand.Po"; else rm -f "$(DEPDIR)/ice_rand.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/ice_rand.cc' object='ice_rand.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 ice_rand.obj `if test -f 'icesockets/ice_rand.cc'; then $(CYGPATH_W) 'icesockets/ice_rand.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/ice_rand.cc'; fi`

  sock_win.o: icesockets/sock_win.cc
--- 292,308 ----
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

! sock_utils.o: icesockets/sock_utils.cc
! @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_utils.o -MD -MP -MF "$(DEPDIR)/sock_utils.Tpo" -c -o sock_utils.o `test -f 'icesockets/sock_utils.cc' || echo '$(srcdir)/'`icesockets/sock_utils.cc; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sock_utils.Tpo" "$(DEPDIR)/sock_utils.Po"; else rm -f "$(DEPDIR)/sock_utils.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/sock_utils.cc' object='sock_utils.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_utils.o `test -f 'icesockets/sock_utils.cc' || echo '$(srcdir)/'`icesockets/sock_utils.cc

! sock_utils.obj: icesockets/sock_utils.cc
! @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_utils.obj -MD -MP -MF "$(DEPDIR)/sock_utils.Tpo" -c -o sock_utils.obj `if test -f 'icesockets/sock_utils.cc'; then $(CYGPATH_W) 'icesockets/sock_utils.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_utils.cc'; fi`; \
! @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sock_utils.Tpo" "$(DEPDIR)/sock_utils.Po"; else rm -f "$(DEPDIR)/sock_utils.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/sock_utils.cc' object='sock_utils.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_utils.obj `if test -f 'icesockets/sock_utils.cc'; then $(CYGPATH_W) 'icesockets/sock_utils.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_utils.cc'; fi`

  sock_win.o: icesockets/sock_win.cc
***************
*** 351,368 ****
  @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_name.obj `if test -f 'icesockets/sock_name.cc'; then $(CYGPATH_W) 'icesockets/sock_name.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_name.cc'; fi`
- 
- sock_files.o: icesockets/sock_files.cc
- @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_files.o -MD -MP -MF "$(DEPDIR)/sock_files.Tpo" -c -o sock_files.o `test -f 'icesockets/sock_files.cc' || echo '$(srcdir)/'`icesockets/sock_files.cc; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sock_files.Tpo" "$(DEPDIR)/sock_files.Po"; else rm -f "$(DEPDIR)/sock_files.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/sock_files.cc' object='sock_files.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_files.o `test -f 'icesockets/sock_files.cc' || echo '$(srcdir)/'`icesockets/sock_files.cc
- 
- sock_files.obj: icesockets/sock_files.cc
- @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sock_files.obj -MD -MP -MF "$(DEPDIR)/sock_files.Tpo" -c -o sock_files.obj `if test -f 'icesockets/sock_files.cc'; then $(CYGPATH_W) 'icesockets/sock_files.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_files.cc'; fi`; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/sock_files.Tpo" "$(DEPDIR)/sock_files.Po"; else rm -f "$(DEPDIR)/sock_files.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='icesockets/sock_files.cc' object='sock_files.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_files.obj `if test -f 'icesockets/sock_files.cc'; then $(CYGPATH_W) 'icesockets/sock_files.cc'; else $(CYGPATH_W) '$(srcdir)/icesockets/sock_files.cc'; fi`
  uninstall-info-am:
  install-icescanDATA: $(icescan_DATA)
--- 333,336 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	21 Dec 2006 16:29:36 -0000	1.5
--- Makefile.am	21 Dec 2006 16:36:28 -0000	1.6
***************
*** 1,6 ****
  bin_PROGRAMS = icescan
  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
--- 1,5 ----
  bin_PROGRAMS = icescan
  icescandir = $(datadir)/icescan
! icescan_SOURCES = icesockets/sock_utils.cc icesockets/sock_win.cc icesockets/sock_name.cc \
   csubtarget.cc icediscover.cc udpscan.cc icescan.cc 
  icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf

[Javanetsim-cvs] IceScan Makefile.am, 1.5, 1.6 icescan.cc, 1.39, 1.40 icediscover.h, 1.35, 1.36 ice

[Javanetsim-cvs] IceScan Makefile.am, 1.5, 1.6 icescan.cc, 1.39, 1.40 icediscover.h, 1.35, 1.36 icedbs.h, 1.10, 1.11 Makefile.in, 1.5, 1.6 csubtarget.cc, 1.2, 1.3