Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv13653
Modified Files:
Tag: rel-1_0
opserv.c sockcheck.c
Log Message:
byte order on IP's was confused between hostscan and automatic scans and such. fixed now
Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.187.2.55
retrieving revision 1.187.2.56
diff -C2 -r1.187.2.55 -r1.187.2.56
*** opserv.c 2001/09/10 19:11:49 1.187.2.55
--- opserv.c 2001/09/30 04:00:38 1.187.2.56
***************
*** 3065,3069 ****
{
(void)extra;
! sockcheck_queue_address(match->ip);
return 0;
}
--- 3065,3069 ----
{
(void)extra;
! sockcheck_queue_address(htonl(match->ip));
return 0;
}
Index: sockcheck.c
===================================================================
RCS file: /cvsroot/srvx/services/src/sockcheck.c,v
retrieving revision 1.54.2.30
retrieving revision 1.54.2.31
diff -C2 -r1.54.2.30 -r1.54.2.31
*** sockcheck.c 2001/09/28 02:40:38 1.54.2.30
--- sockcheck.c 2001/09/30 04:00:38 1.54.2.31
***************
*** 236,242 ****
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 */
--- 236,246 ----
if (disable_sockcheck) return;
+
+ printf("%d\n", pending_ip_pipe[1]);
+
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 >> 0) & 255, (addr >> 8) & 255, (addr >> 16) & 255, (addr >> 24) & 255);
! printf("Name: %s\n", name);
if (pthread_mutex_lock(&checked_ip_mutex)) {
/* lock failure; this usually means coding error */
***************
*** 259,262 ****
--- 263,267 ----
sci->addr = addr;
memcpy(sci->hostname, name, namelen);
+ printf("Added: %s\n", sci->hostname);
dict_insert(checked_ip_dict, sci->hostname, sci);
}
|
