[srvx-commits] CVS: services/src common.h,1.60.2.9,1.60.2.10 opserv.c,1.187.2.54,1.187.2.55 sockcheck.c,1.54.2.28,1.54.2.29 sockcheck.h,1.6.4.2,1.6.4.3 tools.c,1.73.2.26,1.73.2.27

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv31490/src

Modified Files:
      Tag: rel-1_0
	common.h opserv.c sockcheck.c sockcheck.h tools.c 
Log Message:
nuke second parameter to sockcheck_queue_address, and intoa() which was used for it


Index: common.h
===================================================================
RCS file: /cvsroot/srvx/services/src/common.h,v
retrieving revision 1.60.2.9
retrieving revision 1.60.2.10
diff -C2 -r1.60.2.9 -r1.60.2.10
*** common.h	2001/09/04 18:19:47	1.60.2.9
--- common.h	2001/09/10 19:11:49	1.60.2.10
***************
*** 178,182 ****
  void intervalString(char *output, time_t interval);
  int getipbyname(const char *name, unsigned long *ip);
- char *intoa(unsigned long addr);
  
  const char * preposition(char *word);
--- 178,181 ----

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.187.2.54
retrieving revision 1.187.2.55
diff -C2 -r1.187.2.54 -r1.187.2.55
*** opserv.c	2001/09/05 05:36:48	1.187.2.54
--- opserv.c	2001/09/10 19:11:49	1.187.2.55
***************
*** 1703,1707 ****
  
   	if (getipbyname(scanhost, &addr)) {
! 	    sockcheck_queue_address(addr, scanhost);
  	    opserv_notice(user, OSMSG_ADDRESS_QUEUED, scanhost);
  	} else {
--- 1703,1707 ----
  
   	if (getipbyname(scanhost, &addr)) {
! 	    sockcheck_queue_address(addr);
  	    opserv_notice(user, OSMSG_ADDRESS_QUEUED, scanhost);
  	} else {
***************
*** 1943,1947 ****
  {
      if (user->ip) {
!         sockcheck_queue_address(htonl(user->ip), intoa(htonl(user->ip)));
      }
      return 0;
--- 1943,1947 ----
  {
      if (user->ip) {
!         sockcheck_queue_address(htonl(user->ip));
      }
      return 0;
***************
*** 3065,3069 ****
  {
      (void)extra;
!     sockcheck_queue_address(match->ip, match->hostname);
      return 0;
  }
--- 3065,3069 ----
  {
      (void)extra;
!     sockcheck_queue_address(match->ip);
      return 0;
  }

Index: sockcheck.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.c,v
retrieving revision 1.54.2.28
retrieving revision 1.54.2.29
diff -C2 -r1.54.2.28 -r1.54.2.29
*** sockcheck.c	2001/09/08 18:32:08	1.54.2.28
--- sockcheck.c	2001/09/10 19:11:49	1.54.2.29
***************
*** 230,238 ****
  
  void
! sockcheck_queue_address(unsigned long addr, const char *name)
  {
      sockcheck_cache_info sci;
      if (disable_sockcheck) return;
      if (pending_ip_pipe[1] == -1) return; /* something went wrong in worker */
      if (pthread_mutex_lock(&checked_ip_mutex)) {
  	/* lock failure; this usually means coding error */
--- 230,242 ----
  
  void
! sockcheck_queue_address(unsigned long addr)
  {
      sockcheck_cache_info sci;
+     unsigned char buff[17], *name;
+ 
      if (disable_sockcheck) return;
      if (pending_ip_pipe[1] == -1) return; /* something went wrong in worker */
+     name = buff + 1;
+     snprintf(name, sizeof(buff)-1, "%ld.%ld.%ld.%ld", (addr >> 24) & 255, (addr >> 16) & 255, (addr >> 8) & 255, (addr >> 0) & 255);
      if (pthread_mutex_lock(&checked_ip_mutex)) {
  	/* lock failure; this usually means coding error */
***************
*** 246,253 ****
  	if (sci->decision == REJECT) sockcheck_issue_gline(sci);
      } else {
! 	int namelen = strlen(name) + 1;
! 	unsigned char *buff = alloca(namelen);
  	buff[0] = namelen;
- 	memcpy(buff+1, name, namelen - 1);
  	if (!sci) {
  	    sci = malloc(sizeof(*sci) + namelen);
--- 250,255 ----
  	if (sci->decision == REJECT) sockcheck_issue_gline(sci);
      } else {
!         int namelen = strlen(name) + 1;
  	buff[0] = namelen;
  	if (!sci) {
  	    sci = malloc(sizeof(*sci) + namelen);
***************
*** 258,265 ****
  	    memcpy(sci->hostname, name, namelen);
  	    dict_insert(checked_ip_dict, sci->hostname, sci);
- 	} else {
- 	    sci->addr = addr;
  	}
! 	if (write(pending_ip_pipe[1], buff, namelen) < namelen) {
  	    log(PC_LOG, LOG_ERROR, "Error: write(pending_ip_pipe[1]) returned errno %d (%s)\n", errno, strerror(errno));
  	}
--- 260,265 ----
  	    memcpy(sci->hostname, name, namelen);
  	    dict_insert(checked_ip_dict, sci->hostname, sci);
  	}
! 	if (write(pending_ip_pipe[1], name, namelen) < namelen) {
  	    log(PC_LOG, LOG_ERROR, "Error: write(pending_ip_pipe[1]) returned errno %d (%s)\n", errno, strerror(errno));
  	}

Index: sockcheck.h
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.h,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -C2 -r1.6.4.2 -r1.6.4.3
*** sockcheck.h	2001/08/18 02:24:13	1.6.4.2
--- sockcheck.h	2001/09/10 19:11:49	1.6.4.3
***************
*** 34,38 ****
  void sockcheck_init(void);
  const char *sockcheck_add_test(const char *desc);
! void sockcheck_queue_address(unsigned long addr, const char *name);
  int sockcheck_uncache_host(const char *name);
  void sockcheck_get_stats(struct sockcheck_stats *stats);
--- 34,38 ----
  void sockcheck_init(void);
  const char *sockcheck_add_test(const char *desc);
! void sockcheck_queue_address(unsigned long addr);
  int sockcheck_uncache_host(const char *name);
  void sockcheck_get_stats(struct sockcheck_stats *stats);

Index: tools.c
===================================================================
RCS file: /cvsroot/srvx/services/src/tools.c,v
retrieving revision 1.73.2.26
retrieving revision 1.73.2.27
diff -C2 -r1.73.2.26 -r1.73.2.27
*** tools.c	2001/08/16 03:15:52	1.73.2.26
--- tools.c	2001/09/10 19:11:49	1.73.2.27
***************
*** 907,915 ****
      strcpy(buf->list+from, repl);
  }
- 
- char *intoa(unsigned long addr) {
-   struct in_addr in;
- 
-   in.s_addr = addr;
-   return inet_ntoa(in);
- }
--- 907,908 ----