[Autosec-devel] sonar/src target.c,1.15,1.16

[red0x <re...@us...>]

Update of /cvsroot/autosec/sonar/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649/src

Modified Files:
	target.c 
Log Message:
Fixed defualt port return value in load_default_ports

Index: target.c
===================================================================
RCS file: /cvsroot/autosec/sonar/src/target.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** target.c	30 Mar 2004 22:03:22 -0000	1.15
--- target.c	8 Apr 2004 21:10:41 -0000	1.16
***************
*** 33,51 ****
  #include "sonar.h"
  #include "mem.h"
  
  extern sonar_t mthis;
  
- /*
- #ifndef HAVE_STRNDUP
- #define HAVE_STRNDUP
- char* strndup(const char* src, size_t n) {
- 	char* dst;
- 	dst = malloc(n + 1);
- 	strncpy(dst, src, n);
- 	return dst;
- }
- #endif
- */
- 
  static const char rcsid[] =
          "\100$ autosec/sonar: $Id$";
--- 33,40 ----
  #include "sonar.h"
  #include "mem.h"
+ #include "util.h"
  
  extern sonar_t mthis;
  
  static const char rcsid[] =
          "\100$ autosec/sonar: $Id$";
***************
*** 248,252 ****
--- 237,244 ----
  	sa->sin_addr.s_addr = htonl(start);
  	if(retval == 255 || retval == 256 || (start & 0x000000ff) == 0 || (start & 0x000000ff) == 255)
+ 	{
  		target->broadcast = 1;
+ 		mthis.opts.bBroadcast = 1;
+ 	}
  	return retval;
  }
***************
*** 311,320 ****
  	struct servent *se;
  	assert(*target != NULL);
  	while((se = getservent()) != NULL)
  	{
  		(*target)->ports[se->s_port] = PORT_SCAN;
  	}
  	endservent();
! 	return SONAR_OK;
  	
  }
--- 303,314 ----
  	struct servent *se;
  	assert(*target != NULL);
+ 	(*target)->num_ports = 0;
  	while((se = getservent()) != NULL)
  	{
  		(*target)->ports[se->s_port] = PORT_SCAN;
+ 		(*target)->num_ports++;
  	}
  	endservent();
! 	return (*target)->num_ports;
  	
  }