[naviserver-commits] modules/nssnmp ChangeLog,1.2,1.3 nssnmp.c,1.4,1.5

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nssnmp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1545

Modified Files:
	ChangeLog nssnmp.c 
Log Message:
fixed bug in ns_ping


Index: nssnmp.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/nssnmp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nssnmp.c	12 Jun 2005 22:34:24 -0000	1.4
--- nssnmp.c	21 Jul 2005 14:40:19 -0000	1.5
***************
*** 1746,1750 ****
     Server *server = (Server*)arg;
     if (argc < 2) {
!      Tcl_AppendResult(interp, "wrong # args: should be \"",argv[0], " host","\"", NULL);
       return TCL_ERROR;
     }
--- 1746,1750 ----
     Server *server = (Server*)arg;
     if (argc < 2) {
!      Tcl_AppendResult(interp, "wrong # args: should be \"",argv[0], " host","\" ?-timeout n? ?-debug 0|1? ?-count n? ?-size n?", NULL);
       return TCL_ERROR;
     }
***************
*** 1766,1769 ****
--- 1766,1770 ----
     int slen = sizeof(struct sockaddr);
  #endif
+    int start_time;
     int size = 56;
     char buf[4096];
***************
*** 1799,1802 ****
--- 1800,1804 ----
     if((id = ++server->icmp.id) > 65535) id = 1;
     Ns_MutexUnlock(&server->icmp.mutex);
+    start_time = time(0);
  
     for(i = 0; i < count;i++) {
***************
*** 1820,1823 ****
--- 1822,1827 ----
       retry_count = 0;
  again:
+      // Check the total time we spent pinging
+      if(time(0) - start_time > timeout) break;
       FD_ZERO(&fds);
       FD_SET(fd,&fds);
***************
*** 2008,2011 ****
--- 2012,2018 ----
   *
   * $Log$
+  * Revision 1.5  2005/07/21 14:40:19  seryakov
+  * fixed bug in ns_ping
+  *
   * Revision 1.4  2005/06/12 22:34:24  seryakov
   * compiler warnings silence

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	9 Jun 2005 21:31:30 -0000	1.2
--- ChangeLog	21 Jul 2005 14:40:19 -0000	1.3
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-07-21 Vlad Seryakov vl...@cr...
+ 
+ 	* fixed timeout bug in ns_ping
+ 
  2005-06-09 Vlad Seryakov vl...@cr...