update for snmp

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 4c7e102bf09d8e6a83e0e4411d9e7123b92fd46c..cc36a02d6caddf2a5fd9be4fbbb06af6cb894b6a 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.83 1998/02/22 11:59:00 kostas Exp $
+ * $Id: fqdncache.cc,v 1.84 1998/02/23 21:07:12 kostas Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -899,81 +899,83 @@ fqdncache_restart(void)
 int
 fqdn_getMax()
 {
-       int i=0;
-       fqdncache_entry *fq=NULL;
+    int i = 0;
+    fqdncache_entry *fq = NULL;
 
-       fq=(fqdncache_entry *) hash_first(fqdn_table);
-       if (fq!=NULL) {
-               i=1;
-               while ((fq=(fqdncache_entry *)hash_next(fqdn_table))) i++;
-       }
-       return i;
-} 
+    fq = (fqdncache_entry *) hash_first(fqdn_table);
+    if (fq != NULL) {
+       i = 1;
+       while ((fq = (fqdncache_entry *) hash_next(fqdn_table)))
+           i++;
+    }
+    return i;
+}
 
-variable_list *snmp_fqdncacheFn(variable_list *Var, long *ErrP)
+variable_list *
+snmp_fqdncacheFn(variable_list * Var, long *ErrP)
 {
-  variable_list *Answer;
-  static fqdncache_entry *fq=NULL;
-  static struct in_addr fqaddr;
-  int cnt=0;
+    variable_list *Answer;
+    static fqdncache_entry *fq = NULL;
+    static struct in_addr fqaddr;
+    int cnt = 0;
 
-  debug(49,5)("snmp_fqdncacheFn: Processing request with %d.%d!\n",Var->name[11],Var->name[12]);
+    debug(49, 5) ("snmp_fqdncacheFn: Processing request with %d.%d!\n", Var->name[11], Var->name[12]);
 
-  cnt=Var->name[12];
+    cnt = Var->name[12];
 
-  fq=(fqdncache_entry *) hash_first(fqdn_table);
-  while (fq && --cnt) 
+    fq = (fqdncache_entry *) hash_first(fqdn_table);
+    while (fq && --cnt)
        fq = (fqdncache_entry *) hash_next(fqdn_table);
-  if (fq==NULL || cnt!=0) {
+    if (fq == NULL || cnt != 0) {
        *ErrP = SNMP_ERR_NOSUCHNAME;
        return NULL;
-  }    
-  Answer = snmp_var_new(Var->name, Var->name_length);
-  *ErrP = SNMP_ERR_NOERROR;
+    }
+    Answer = snmp_var_new(Var->name, Var->name_length);
+    *ErrP = SNMP_ERR_NOERROR;
 
-  switch(Var->name[11]) {
+    switch (Var->name[11]) {
     case NET_FQDN_ID:
        Answer->type = ASN_INTEGER;
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->val_len = sizeof(long);
-        *(Answer->val.integer)= Var->name[12];
+       *(Answer->val.integer) = Var->name[12];
        break;
     case NET_FQDN_NAME:
-        Answer->type = SMI_STRING;
-       Answer->val_len=strlen(fq->names[0]);
-       Answer->val.string=xstrdup((char *)fq->names[0]);
+       Answer->type = SMI_STRING;
+       Answer->val_len = strlen(fq->names[0]);
+       Answer->val.string = xstrdup((char *) fq->names[0]);
        break;
     case NET_FQDN_IP:
        Answer->type = SMI_IPADDRESS;
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->val_len = sizeof(long);
-        safe_inet_addr(fq->name, &fqaddr);
-        *(Answer->val.integer)= (long) fqaddr.s_addr;
+       safe_inet_addr(fq->name, &fqaddr);
+       *(Answer->val.integer) = (long) fqaddr.s_addr;
        break;
     case NET_FQDN_LASTREF:
        Answer->type = SMI_TIMETICKS;
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->val_len = sizeof(long);
-        *(Answer->val.integer)= fq->lastref;
+       *(Answer->val.integer) = fq->lastref;
        break;
     case NET_FQDN_EXPIRES:
        Answer->type = SMI_TIMETICKS;
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->val_len = sizeof(long);
-        *(Answer->val.integer)= fq->expires;
+       *(Answer->val.integer) = fq->expires;
        break;
     case NET_FQDN_STATE:
        Answer->type = ASN_INTEGER;
        Answer->val.integer = xmalloc(Answer->val_len);
        Answer->val_len = sizeof(long);
-        *(Answer->val.integer)= fq->status;
+       *(Answer->val.integer) = fq->status;
        break;
     default:
-        *ErrP = SNMP_ERR_NOSUCHNAME;
-        snmp_var_free(Answer);
-        xfree(Answer->val.integer);
-        return(NULL);
-  }
-  return Answer;
+       *ErrP = SNMP_ERR_NOSUCHNAME;
+       snmp_var_free(Answer);
+       xfree(Answer->val.integer);
+       return (NULL);
+    }
+    return Answer;
 }
 #endif

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 0eab4cdec18bc6dd243366475b5ca63a6a102154..21a4ac8446f930a44833b9dcc2c51a3035ff0daa 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.158 1998/02/22 11:58:35 kostas Exp $
+ * $Id: ipcache.cc,v 1.159 1998/02/23 21:07:13 kostas Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -1059,38 +1059,41 @@ ipcache_restart(void)
 
 #ifdef SQUID_SNMP
 
-int ipcache_getMax()
+int 
+ipcache_getMax()
 {
-       int i=0;
-       dlink_node *m = NULL;
-       for (m=lru_list.head; m &&m->data ; m=m->next) i++;
-       return i;
+    int i = 0;
+    dlink_node *m = NULL;
+    for (m = lru_list.head; m && m->data; m = m->next)
+       i++;
+    return i;
 }
 
-variable_list *snmp_ipcacheFn(variable_list *Var, long *ErrP)
+variable_list *
+snmp_ipcacheFn(variable_list * Var, long *ErrP)
 {
-  variable_list *Answer;
-  ipcache_entry *IPc= NULL;
-  dlink_node *m = NULL;
-  int cnt = 1;
-  debug(49,5)("snmp_ipcacheFn: Processing request with %d.%d!\n",Var->name[11],Var->name[12]);
-
-  cnt=Var->name[12];
-
-  for (m = lru_list.head; --cnt && m; m = m->next);
-  debug(49,5)("snmp_ipcacheFn: cnt now=%d m=%x, data=%x\n",cnt,m->data);
-  if (!m || !(IPc = m->data)) {
-        *ErrP = SNMP_ERR_NOSUCHNAME;
+    variable_list *Answer;
+    ipcache_entry *IPc = NULL;
+    dlink_node *m = NULL;
+    int cnt = 1;
+    debug(49, 5) ("snmp_ipcacheFn: Processing request with %d.%d!\n", Var->name[11], Var->name[12]);
+
+    cnt = Var->name[12];
+
+    for (m = lru_list.head; --cnt && m; m = m->next);
+    debug(49, 5) ("snmp_ipcacheFn: cnt now=%d m=%x, data=%x\n", cnt, m->data);
+    if (!m || !(IPc = m->data)) {
+       *ErrP = SNMP_ERR_NOSUCHNAME;
        return NULL;
-  }
-  Answer = snmp_var_new(Var->name, Var->name_length);
-  *ErrP = SNMP_ERR_NOERROR;
-  Answer->val.integer = xmalloc(Answer->val_len);
-  Answer->val_len = sizeof(long);
-  switch(Var->name[11]) {
+    }
+    Answer = snmp_var_new(Var->name, Var->name_length);
+    *ErrP = SNMP_ERR_NOERROR;
+    Answer->val.integer = xmalloc(Answer->val_len);
+    Answer->val_len = sizeof(long);
+    switch (Var->name[11]) {
     case NET_IPC_ID:
-        Answer->type = SMI_INTEGER;
-        *(Answer->val.integer)= Var->name[12];
+       Answer->type = SMI_INTEGER;
+       *(Answer->val.integer) = Var->name[12];
        break;
     case NET_IPC_NAME:
        xfree(Answer->val.integer);
@@ -1100,19 +1103,18 @@ variable_list *snmp_ipcacheFn(variable_list *Var, long *ErrP)
        break;
     case NET_IPC_IP:
        Answer->type = SMI_IPADDRESS;
-        *(Answer->val.integer)=IPc->addrs.in_addrs[0].s_addr;    /* first one only */
+       *(Answer->val.integer) = IPc->addrs.in_addrs[0].s_addr;         /* first one only */
        break;
     case NET_IPC_STATE:
-        Answer->type = SMI_INTEGER;
-        *(Answer->val.integer)= IPc->status;
+       Answer->type = SMI_INTEGER;
+       *(Answer->val.integer) = IPc->status;
        break;
     default:
-        *ErrP = SNMP_ERR_NOSUCHNAME;
-        snmp_var_free(Answer);
-        xfree(Answer->val.integer);
-        return(NULL);
-  }
-  return Answer;
+       *ErrP = SNMP_ERR_NOSUCHNAME;
+       snmp_var_free(Answer);
+       xfree(Answer->val.integer);
+       return (NULL);
+    }
+    return Answer;
 }
 #endif
-

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index fe049375ae71a1d352b9fbe8d1ef8a097bfdb54d..ecabf83182f1fe7379ecd24e51966f194232454c 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -382,7 +382,7 @@ snmp_confFn(variable_list * Var, long *ErrP)
     case CONF_UPTIME:
        Answer->val_len = sizeof(long);
        Answer->val.integer = xmalloc(Answer->val_len);
-       Answer->type = ASN_TIMETICKS;
+       Answer->type = SMI_TIMETICKS;
        *(Answer->val.integer) = tvSubDsec(squid_start, current_time);
        break;
     case CONF_STORAGE: