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

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

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

Modified Files:
	nssnmp.c 
Log Message:
compiler warnings silence


Index: nssnmp.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nssnmp/nssnmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nssnmp.c	9 Jun 2005 21:31:30 -0000	1.3
--- nssnmp.c	12 Jun 2005 22:34:24 -0000	1.4
***************
*** 454,464 ****
  static int UdpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
  static int SnmpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv);
  static void TrapDump(Server *server,Pdu &pdu,SnmpTarget &target);
  static const char *SnmpError(SnmpSession *session,int status);
--- 454,464 ----
  static int UdpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
  static int SnmpCmd(ClientData arg, Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]);
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv);
  static void TrapDump(Server *server,Pdu &pdu,SnmpTarget &target);
  static const char *SnmpError(SnmpSession *session,int status);
***************
*** 712,716 ****
   */
  
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      TrapContext *ctx = (TrapContext *)arg;
--- 712,716 ----
   */
  
! static int TrapCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      TrapContext *ctx = (TrapContext *)arg;
***************
*** 945,949 ****
        if(now - session->access_time > server->idle_timeout) {
          SnmpSession *next = (SnmpSession*)session->next;
!         Ns_Log(Notice,"ns_snmp: GC: inactive session %d: %s",session->id,session->addr->get_printable());
          SessionUnlink(server,session,0);
          session = next;
--- 945,949 ----
        if(now - session->access_time > server->idle_timeout) {
          SnmpSession *next = (SnmpSession*)session->next;
!         Ns_Log(Notice,"ns_snmp: GC: inactive session %ld: %s",session->id,session->addr->get_printable());
          SessionUnlink(server,session,0);
          session = next;
***************
*** 1080,1084 ****
  {
      Server *server = (Server*)arg;
!     int status,id;
      SnmpSession *session;
      enum commands {
--- 1080,1084 ----
  {
      Server *server = (Server*)arg;
!     int cmd,status,id;
      SnmpSession *session;
      enum commands {
***************
*** 1086,1092 ****
          cmdConfig, cmdGet, cmdWalk, cmdSet, 
          cmdTrap, cmdInform, cmdDestroy
!     } cmd;
  
!     static char *sCmd[] = {
          "gc", "sessions", "create",
          "config", "get", "walk", "set", 
--- 1086,1092 ----
          cmdConfig, cmdGet, cmdWalk, cmdSet, 
          cmdTrap, cmdInform, cmdDestroy
!     };
  
!     static const char *sCmd[] = {
          "gc", "sessions", "create",
          "config", "get", "walk", "set", 
***************
*** 1475,1479 ****
  }
  
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      Server *server = (Server*)arg;
--- 1475,1479 ----
  }
  
! static int MibCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Server *server = (Server*)arg;
***************
*** 1488,1493 ****
  
      if(!strcmp(argv[1],"labels")) {
!       char *pattern = (argc > 2 ? argv[2] : 0);
!       char *syntax = (argc > 3 ? argv[3] : 0);
        Tcl_HashSearch search;
  
--- 1488,1493 ----
  
      if(!strcmp(argv[1],"labels")) {
!       char *pattern = (argc > 2 ? (char*)argv[2] : 0);
!       char *syntax = (argc > 3 ? (char*)argv[3] : 0);
        Tcl_HashSearch search;
  
***************
*** 1614,1618 ****
          } else
          if(mib->hint) {
!           FormatIntTC(interp,argv[3],mib->hint);
            return TCL_OK;
          }
--- 1614,1618 ----
          } else
          if(mib->hint) {
!           FormatIntTC(interp,(char*)argv[3],mib->hint);
            return TCL_OK;
          }
***************
*** 1620,1627 ****
  
        if(!strcmp(mib->syntax,"OCTET STRING") && mib->hint) {
!         FormatStringTC(interp,argv[3],mib->hint);
          return TCL_OK;
        }
!       Tcl_AppendResult(interp,argv[3],0);
      } else
  
--- 1620,1627 ----
  
        if(!strcmp(mib->syntax,"OCTET STRING") && mib->hint) {
!         FormatStringTC(interp,(char*)argv[3],mib->hint);
          return TCL_OK;
        }
!       Tcl_AppendResult(interp,(char*)argv[3],0);
      } else
  
***************
*** 1719,1723 ****
  
  // Check host availability by simulating PING
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
     Server *server = (Server*)arg;
--- 1719,1723 ----
  
  // Check host availability by simulating PING
! static int IcmpCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
     Server *server = (Server*)arg;
***************
*** 1742,1746 ****
  
  // Check host availability by simulating PING
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
     Server *server = (Server*)arg;
--- 1742,1746 ----
  
  // Check host availability by simulating PING
! static int PingCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
     Server *server = (Server*)arg;
***************
*** 1780,1784 ****
     fd_set fds;
  
!    if(Ns_GetSockAddr(&addr,argv[1],0) != NS_OK) {
       Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
       return TCL_ERROR;
--- 1780,1784 ----
     fd_set fds;
  
!    if(Ns_GetSockAddr(&addr,(char*)argv[1],0) != NS_OK) {
       Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
       return TCL_ERROR;
***************
*** 2008,2011 ****
--- 2008,2014 ----
   *
   * $Log$
+  * Revision 1.4  2005/06/12 22:34:24  seryakov
+  * compiler warnings silence
+  *
   * Revision 1.3  2005/06/09 21:31:30  seryakov
   * rewrote nssnmp's ns_udp using new Objv interface, added to nsudp's ns_udp -retries
***************
*** 2763,2767 ****
   *----------------------------------------------------------------------
   */
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      fd_set rfds;
--- 2766,2770 ----
   *----------------------------------------------------------------------
   */
! static int RadiusCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      fd_set rfds;
***************
*** 2784,2788 ****
      }
      if(!(port = atoi(argv[2]))) port = RADIUS_AUTH_PORT;
!     if(Ns_GetSockAddr((sockaddr_in*)&sa,argv[1],port) != NS_OK) {
        Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
        return TCL_ERROR;
--- 2787,2791 ----
      }
      if(!(port = atoi(argv[2]))) port = RADIUS_AUTH_PORT;
!     if(Ns_GetSockAddr((sockaddr_in*)&sa,(char*)argv[1],port) != NS_OK) {
        Tcl_AppendResult(interp,"noHost: unknown host: ",argv[1],0);
        return TCL_ERROR;
***************
*** 2792,2796 ****
        if(!strcasecmp(argv[i],"Retries")) retries = atoi(argv[i+1]); else
        if(!strcasecmp(argv[i],"Timeout")) timeout = atoi(argv[i+1]); else {
!         if((attr = RadiusAttrCreate(argv[i],0,0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&vp,attr);
          else {
--- 2795,2799 ----
        if(!strcasecmp(argv[i],"Retries")) retries = atoi(argv[i+1]); else
        if(!strcasecmp(argv[i],"Timeout")) timeout = atoi(argv[i+1]); else {
!         if((attr = RadiusAttrCreate((char*)argv[i],0,0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&vp,attr);
          else {
***************
*** 2808,2812 ****
      hdr = (RadiusHeader *)buffer;
      RadiusVectorCreate(vector);
!     RadiusHeaderPack(hdr,0,code,vector,vp,argv[3]);
      RadiusAttrFree(&vp);
      memcpy(vector,hdr->vector,RADIUS_VECTOR_LEN);
--- 2811,2815 ----
      hdr = (RadiusHeader *)buffer;
      RadiusVectorCreate(vector);
!     RadiusHeaderPack(hdr,0,code,vector,vp,(char*)argv[3]);
      RadiusAttrFree(&vp);
      memcpy(vector,hdr->vector,RADIUS_VECTOR_LEN);
***************
*** 2847,2851 ****
      }
      // Verify reply md5 digest
!     if(RadiusVectorVerify(hdr,vector,argv[3])) {
        Tcl_AppendResult(interp,"noResponse: invalid reply digest",0);
        return TCL_ERROR;
--- 2850,2854 ----
      }
      // Verify reply md5 digest
!     if(RadiusVectorVerify(hdr,vector,(char*)argv[3])) {
        Tcl_AppendResult(interp,"noResponse: invalid reply digest",0);
        return TCL_ERROR;
***************
*** 2853,2857 ****
      Ns_DStringInit(&ds);
      Ns_DStringPrintf(&ds,"code %d id %d ipaddr %s ",hdr->code,hdr->id,ns_inet_ntoa(sa.sin_addr));
!     if((vp = RadiusAttrParse(hdr,len,argv[3]))) {
        RadiusAttrPrintf(vp,&ds,1,1);
        RadiusAttrFree(&vp);
--- 2856,2860 ----
      Ns_DStringInit(&ds);
      Ns_DStringPrintf(&ds,"code %d id %d ipaddr %s ",hdr->code,hdr->id,ns_inet_ntoa(sa.sin_addr));
!     if((vp = RadiusAttrParse(hdr,len,(char*)argv[3]))) {
        RadiusAttrPrintf(vp,&ds,1,1);
        RadiusAttrFree(&vp);
***************
*** 2877,2881 ****
   *----------------------------------------------------------------------
   */
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      int n;
--- 2880,2884 ----
   *----------------------------------------------------------------------
   */
! static int RadiusDictCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      int n;
***************
*** 2904,2908 ****
        if(!strcmp(argv[5],"date")) n = RADIUS_TYPE_DATE; else n = atoi(argv[5]);
        if(!RadiusDictFind(atoi(argv[3]),atoi(argv[4]),0))
!         RadiusDictAdd(argv[2],atoi(argv[3]),atoi(argv[4]),n);
      } else
      if(!strcmp(argv[1],"get")) {
--- 2907,2911 ----
        if(!strcmp(argv[5],"date")) n = RADIUS_TYPE_DATE; else n = atoi(argv[5]);
        if(!RadiusDictFind(atoi(argv[3]),atoi(argv[4]),0))
!         RadiusDictAdd((char*)argv[2],atoi(argv[3]),atoi(argv[4]),n);
      } else
      if(!strcmp(argv[1],"get")) {
***************
*** 2914,2918 ****
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName(argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        if(dict) {
          char buffer[256];
--- 2917,2921 ----
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName((char*)argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        if(dict) {
          char buffer[256];
***************
*** 2929,2933 ****
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName(argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        ns_free(dict);
      }
--- 2932,2936 ----
          dict = RadiusDictFind(n,argc > 3 ? atoi(argv[3]): 0,1);
        else
!         dict = RadiusDictFindName((char*)argv[2],argc > 3 ? atoi(argv[3]): 0,1);
        ns_free(dict);
      }
***************
*** 2950,2954 ****
   *----------------------------------------------------------------------
   */
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      Ns_DString ds;
--- 2953,2957 ----
   *----------------------------------------------------------------------
   */
! static int RadiusClientCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Ns_DString ds;
***************
*** 2966,2970 ****
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,argv[2],0) == NS_OK && (client = RadiusClientFind(server,addr.sin_addr,0)))
          Tcl_AppendResult(interp,client->secret,0);
      } else
--- 2969,2973 ----
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,(char*)argv[2],0) == NS_OK && (client = RadiusClientFind(server,addr.sin_addr,0)))
          Tcl_AppendResult(interp,client->secret,0);
      } else
***************
*** 2975,2979 ****
          return TCL_ERROR;
        }
!       RadiusClientAdd(server,argv[2],argv[3]);
      } else
  
--- 2978,2982 ----
          return TCL_ERROR;
        }
!       RadiusClientAdd(server,(char*)argv[2],(char*)argv[3]);
      } else
  
***************
*** 2983,2987 ****
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,argv[2],0) == NS_OK) client = RadiusClientFind(server,addr.sin_addr,1);
        ns_free(client);
      } else
--- 2986,2990 ----
          return TCL_ERROR;
        }
!       if(Ns_GetSockAddr(&addr,(char*)argv[2],0) == NS_OK) client = RadiusClientFind(server,addr.sin_addr,1);
        ns_free(client);
      } else
***************
*** 3012,3016 ****
   */
  
! static int RadiusReqCmd(ClientData arg, Tcl_Interp *interp, int argc, char **argv)
  {
      Ns_DString ds;
--- 3015,3019 ----
   */
  
! static int RadiusReqCmd(ClientData arg, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Ns_DString ds;
***************
*** 3042,3046 ****
        } else
        if((atoi(argv[2]) > 0 && (attr = RadiusAttrFind(req->req,atoi(argv[2]),vendor))) ||
!          (attr = RadiusAttrFindName(req->req,argv[2],vendor))) {
          RadiusAttrPrintf(attr,&ds,0,0);
        }
--- 3045,3049 ----
        } else
        if((atoi(argv[2]) > 0 && (attr = RadiusAttrFind(req->req,atoi(argv[2]),vendor))) ||
!          (attr = RadiusAttrFindName(req->req,(char*)argv[2],vendor))) {
          RadiusAttrPrintf(attr,&ds,0,0);
        }
***************
*** 3054,3058 ****
            req->reply_code = atoi(argv[i+1]);
          else
!         if((attr = RadiusAttrCreate(argv[i],atoi(argv[i]),0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&req->reply,attr);
        }
--- 3057,3061 ----
            req->reply_code = atoi(argv[i+1]);
          else
!         if((attr = RadiusAttrCreate((char*)argv[i],atoi(argv[i]),0,(unsigned char*)argv[i+1],-1)))
            RadiusAttrLink(&req->reply,attr);
        }