[naviserver-commits] modules/nssnmp ChangeLog,1.3,1.4 nssnmp.c,1.6,1.7

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

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

Modified Files:
	ChangeLog nssnmp.c 
Log Message:
removed old compat functions


Index: nssnmp.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/nssnmp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nssnmp.c	21 Jul 2005 14:44:39 -0000	1.6
--- nssnmp.c	1 Aug 2005 19:47:45 -0000	1.7
***************
*** 515,520 ****
      if(!Ns_ConfigGetInt(path,"idle_timeout",&serverPtr->idle_timeout)) serverPtr->idle_timeout = 600;
      if(!Ns_ConfigGetInt(path,"gc_interval",&serverPtr->gc_interval)) serverPtr->gc_interval = 600;
!     if(!(serverPtr->community = Ns_ConfigGet(path,"community"))) serverPtr->community = "public";
!     if(!(serverPtr->writecommunity = Ns_ConfigGet(path,"writecommunity"))) serverPtr->writecommunity = "private";
      if(!Ns_ConfigGetInt(path,"port",&serverPtr->port)) serverPtr->port = 161;
      if(!Ns_ConfigGetInt(path,"timeout",&serverPtr->timeout)) serverPtr->timeout = 2;
--- 515,520 ----
      if(!Ns_ConfigGetInt(path,"idle_timeout",&serverPtr->idle_timeout)) serverPtr->idle_timeout = 600;
      if(!Ns_ConfigGetInt(path,"gc_interval",&serverPtr->gc_interval)) serverPtr->gc_interval = 600;
!     if(!(serverPtr->community = Ns_ConfigGetValue(path,"community"))) serverPtr->community = "public";
!     if(!(serverPtr->writecommunity = Ns_ConfigGetValue(path,"writecommunity"))) serverPtr->writecommunity = "private";
      if(!Ns_ConfigGetInt(path,"port",&serverPtr->port)) serverPtr->port = 161;
      if(!Ns_ConfigGetInt(path,"timeout",&serverPtr->timeout)) serverPtr->timeout = 2;
***************
*** 523,532 ****
      if(!Ns_ConfigGetInt(path,"bulk",&serverPtr->bulk)) serverPtr->bulk = 10;
      if(!Ns_ConfigGetInt(path,"trap_port",&serverPtr->trap.port)) serverPtr->trap.port = 162;
!     if(!(serverPtr->trap.address = Ns_ConfigGet(path,"trap_address"))) serverPtr->trap.address = "0.0.0.0";
!     serverPtr->trap.proc = Ns_ConfigGet(path,"trap_proc");
      if(!Ns_ConfigGetInt(path,"radius_auth_port",&serverPtr->radius.auth_port)) serverPtr->radius.auth_port = RADIUS_AUTH_PORT;
      if(!Ns_ConfigGetInt(path,"radius_acct_port",&serverPtr->radius.acct_port)) serverPtr->radius.acct_port = RADIUS_ACCT_PORT;
!     if(!(serverPtr->radius.address = Ns_ConfigGet(path,"radius_address"))) serverPtr->radius.address = "0.0.0.0";
!     serverPtr->radius.proc = Ns_ConfigGet(path,"radius_proc");
  
      // Initialize ICMP system
--- 523,532 ----
      if(!Ns_ConfigGetInt(path,"bulk",&serverPtr->bulk)) serverPtr->bulk = 10;
      if(!Ns_ConfigGetInt(path,"trap_port",&serverPtr->trap.port)) serverPtr->trap.port = 162;
!     if(!(serverPtr->trap.address = Ns_ConfigGetValue(path,"trap_address"))) serverPtr->trap.address = "0.0.0.0";
!     serverPtr->trap.proc = Ns_ConfigGetValue(path,"trap_proc");
      if(!Ns_ConfigGetInt(path,"radius_auth_port",&serverPtr->radius.auth_port)) serverPtr->radius.auth_port = RADIUS_AUTH_PORT;
      if(!Ns_ConfigGetInt(path,"radius_acct_port",&serverPtr->radius.acct_port)) serverPtr->radius.acct_port = RADIUS_ACCT_PORT;
!     if(!(serverPtr->radius.address = Ns_ConfigGetValue(path,"radius_address"))) serverPtr->radius.address = "0.0.0.0";
!     serverPtr->radius.proc = Ns_ConfigGetValue(path,"radius_proc");
  
      // Initialize ICMP system
***************
*** 593,598 ****
      Ns_MutexSetName2(&serverPtr->radius.clientMutex,"nssnmp","radiusClient");
      Ns_MutexSetName2(&serverPtr->radius.requestMutex,"nssnmp","radiusRequest");
! 
!     return Ns_TclInitInterps(server, SnmpInterpInit, serverPtr);
  }
  
--- 593,598 ----
      Ns_MutexSetName2(&serverPtr->radius.clientMutex,"nssnmp","radiusClient");
      Ns_MutexSetName2(&serverPtr->radius.requestMutex,"nssnmp","radiusRequest");
!     Ns_TclRegisterTrace(server, SnmpInterpInit, serverPtr, NS_TCL_TRACE_CREATE);
!     return NS_OK;
  }
  
***************
*** 2012,2015 ****
--- 2012,2018 ----
   *
   * $Log$
+  * Revision 1.7  2005/08/01 19:47:45  seryakov
+  * removed old compat functions
+  *
   * Revision 1.6  2005/07/21 14:44:39  seryakov
   * *** empty log message ***

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog	21 Jul 2005 14:40:19 -0000	1.3
--- ChangeLog	1 Aug 2005 19:47:45 -0000	1.4
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-08-01 Vlad Seryakov vl...@cr...
+ 
+ 	* removed old compat functions
+ 
  2005-07-21 Vlad Seryakov vl...@cr...