/*
- * $Id: client_db.cc,v 1.26 1998/03/25 09:21:43 kostas Exp $
+ * $Id: client_db.cc,v 1.27 1998/03/25 09:23:19 kostas Exp $
*
* DEBUG: section 0 Client Database
* AUTHOR: Duane Wessels
case LOG_TCP_NEGATIVE_HIT:
case LOG_TCP_MEM_HIT:
case LOG_UDP_HIT:
- if (p==PROTO_ICP)
- kb_incr(&(c->Icp.hit_kbytes_out), size);
+ if (p == PROTO_ICP)
+ kb_incr(&(c->Icp.hit_kbytes_out), size);
else
- kb_incr(&(c->Http.hit_kbytes_out),size);
+ kb_incr(&(c->Http.hit_kbytes_out), size);
break;
default:
}
C = xcalloc(n, sizeof(ClientInfo *));
c = (ClientInfo *) hash_first(client_table);
while (c && i < n) {
- *(C + i) = c;
- i++;
- c = (ClientInfo *) hash_next(client_table);
+ *(C + i) = c;
+ i++;
+ c = (ClientInfo *) hash_next(client_table);
}
for (j = 0; j < i; j++) {
- c = *(C + j);
- memFree(MEM_CLIENT_INFO, c);
+ c = *(C + j);
+ memFree(MEM_CLIENT_INFO, c);
}
xfree(C);
hashFreeMemory(client_table);
}
#if SQUID_SNMP
-int meshCtblGetRowFn(oid *New,oid *Oid)
+int
+meshCtblGetRowFn(oid * New, oid * Oid)
{
- ClientInfo *c = NULL;
- static char key[15];
+ ClientInfo *c = NULL;
+ static char key[15];
- if (!Oid[0]&&!Oid[1]&&!Oid[2]&&!Oid[3])
- c = (ClientInfo *)hash_first(client_table);
- else {
- snprintf(key,15,"%d.%d.%d.%d", Oid[0], Oid[1],Oid[2],Oid[3]);
- c = (ClientInfo *) hash_lookup(client_table, key);
- if (!c) return 0;
- c= (ClientInfo *)hash_next(client_table);
- }
- if (!c) return 0;
- addr2oid(c->addr, New);
- return 1;
+ if (!Oid[0] && !Oid[1] && !Oid[2] && !Oid[3])
+ c = (ClientInfo *) hash_first(client_table);
+ else {
+ snprintf(key, 15, "%d.%d.%d.%d", Oid[0], Oid[1], Oid[2], Oid[3]);
+ c = (ClientInfo *) hash_lookup(client_table, key);
+ if (!c)
+ return 0;
+ c = (ClientInfo *) hash_next(client_table);
+ }
+ if (!c)
+ return 0;
+ addr2oid(c->addr, New);
+ return 1;
}
variable_list *
-snmp_meshCtblFn(variable_list * Var, snint *ErrP)
+snmp_meshCtblFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
static char key[15];
ClientInfo *c = NULL;
- int aggr=0;
+ int aggr = 0;
#if 0
int cnt;
#endif
Answer = snmp_var_new(Var->name, Var->name_length);
*ErrP = SNMP_ERR_NOERROR;
- snprintf(key,15,"%d.%d.%d.%d", Var->name[11], Var->name[12],
- Var->name[13],Var->name[14]);
+ snprintf(key, 15, "%d.%d.%d.%d", Var->name[11], Var->name[12],
+ Var->name[13], Var->name[14]);
debug(49, 5) ("snmp_meshCtblFn: [%s] requested!\n", key);
c = (ClientInfo *) hash_lookup(client_table, key);
#if 0
- c=(ClientInfo *)hash_first(client_table);
+ c = (ClientInfo *) hash_first(client_table);
cnt = Var->name[11];
debug(49, 5) ("snmp_meshCtblFn: we want .x.%d\n", Var->name[10]);
while (--cnt)
- if (!(c = (ClientInfo *) hash_next(client_table)));
+ if (!(c = (ClientInfo *) hash_next(client_table)));
#endif
if (c == NULL) {
- debug(49,5)("snmp_meshCtblFn: not found.\n");
- *ErrP = SNMP_ERR_NOSUCHNAME;
- snmp_var_free(Answer);
- return (NULL);
+ debug(49, 5) ("snmp_meshCtblFn: not found.\n");
+ *ErrP = SNMP_ERR_NOSUCHNAME;
+ snmp_var_free(Answer);
+ return (NULL);
}
switch (Var->name[10]) {
case MESH_CTBL_ADDR:
- Answer->type = SMI_IPADDRESS;
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- *(Answer->val.integer) = (snint) c->addr.s_addr;
- break;
+ Answer->type = SMI_IPADDRESS;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ *(Answer->val.integer) = (snint) c->addr.s_addr;
+ break;
case MESH_CTBL_HTBYTES:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) c->Http.kbytes_out.kb;
- break;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) c->Http.kbytes_out.kb;
+ break;
case MESH_CTBL_HTREQ:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) c->Http.n_requests;
- break;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) c->Http.n_requests;
+ break;
case MESH_CTBL_HTHITS:
- aggr= c->Http.result_hist[LOG_TCP_HIT] +
- c->Http.result_hist[LOG_TCP_REFRESH_HIT] +
- c->Http.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
- c->Http.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
- c->Http.result_hist[LOG_TCP_IMS_HIT] +
- c->Http.result_hist[LOG_TCP_NEGATIVE_HIT] +
- c->Http.result_hist[LOG_TCP_MEM_HIT] +
- c->Http.result_hist[LOG_UDP_HIT];
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) aggr;
- break;
+ aggr = c->Http.result_hist[LOG_TCP_HIT] +
+ c->Http.result_hist[LOG_TCP_REFRESH_HIT] +
+ c->Http.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
+ c->Http.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
+ c->Http.result_hist[LOG_TCP_IMS_HIT] +
+ c->Http.result_hist[LOG_TCP_NEGATIVE_HIT] +
+ c->Http.result_hist[LOG_TCP_MEM_HIT] +
+ c->Http.result_hist[LOG_UDP_HIT];
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) aggr;
+ break;
case MESH_CTBL_HTHITBYTES:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) c->Http.hit_kbytes_out.kb;
- break;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) c->Http.hit_kbytes_out.kb;
+ break;
case MESH_CTBL_ICPBYTES:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint ) c->Icp.kbytes_out.kb;
- break;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) c->Icp.kbytes_out.kb;
+ break;
case MESH_CTBL_ICPREQ:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) c->Icp.n_requests;
- break;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) c->Icp.n_requests;
+ break;
case MESH_CTBL_ICPHITS:
- aggr= c->Icp.result_hist[LOG_TCP_HIT] +
- c->Icp.result_hist[LOG_TCP_REFRESH_HIT] +
- c->Icp.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
- c->Icp.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
- c->Icp.result_hist[LOG_TCP_IMS_HIT] +
- c->Icp.result_hist[LOG_TCP_NEGATIVE_HIT] +
- c->Icp.result_hist[LOG_TCP_MEM_HIT] +
- c->Icp.result_hist[LOG_UDP_HIT];
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) aggr;
- break;
+ aggr = c->Icp.result_hist[LOG_TCP_HIT] +
+ c->Icp.result_hist[LOG_TCP_REFRESH_HIT] +
+ c->Icp.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
+ c->Icp.result_hist[LOG_TCP_REFRESH_FAIL_HIT] +
+ c->Icp.result_hist[LOG_TCP_IMS_HIT] +
+ c->Icp.result_hist[LOG_TCP_NEGATIVE_HIT] +
+ c->Icp.result_hist[LOG_TCP_MEM_HIT] +
+ c->Icp.result_hist[LOG_UDP_HIT];
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) aggr;
+ break;
case MESH_CTBL_ICPHITBYTES:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) c->Icp.hit_kbytes_out.kb;
- break;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) c->Icp.hit_kbytes_out.kb;
+ break;
default:
- *ErrP = SNMP_ERR_NOSUCHNAME;
- snmp_var_free(Answer);
- debug(49,5)("snmp_meshCtblFn: illegal column.\n");
- return (NULL);
+ *ErrP = SNMP_ERR_NOSUCHNAME;
+ snmp_var_free(Answer);
+ debug(49, 5) ("snmp_meshCtblFn: illegal column.\n");
+ return (NULL);
}
return Answer;
}
/*
- * $Id: client_side.cc,v 1.234 1998/03/25 09:21:44 kostas Exp $
+ * $Id: client_side.cc,v 1.235 1998/03/25 09:23:19 kostas Exp $
*
* DEBUG: section 33 Client-side Routines
* AUTHOR: Duane Wessels
} else {
debug(33, 5) ("Access Denied: %s\n", http->uri);
debug(33, 5) ("AclMatchedName = %s\n",
- AclMatchedName ? AclMatchedName : "<null>");
+ AclMatchedName ? AclMatchedName : "<null>");
http->log_type = LOG_TCP_DENIED;
http->entry = clientCreateStoreEntry(http, http->request->method, 0);
page_id = aclGetDenyInfoPage(&Config.denyInfoList, AclMatchedName);
}
accessLogLog(&http->al);
clientUpdateCounters(http);
- clientdbUpdate(conn->peer.sin_addr, http->log_type, PROTO_HTTP,http->out.size);
+ clientdbUpdate(conn->peer.sin_addr, http->log_type, PROTO_HTTP, http->out.size);
}
if (http->redirect_state == REDIRECT_PENDING)
redirectUnregister(http->uri, http);
memFree(MEM_4K_BUF, ybuf);
/* temporary kludge to test headers, remove it @?@ @?@ */
{
- extern void httpHeaderTestParser(const char *hstr);
- httpHeaderTestParser(hdr_out);
+ extern void httpHeaderTestParser(const char *hstr);
+ httpHeaderTestParser(hdr_out);
}
/* end of kludge */
return len;
debug(33, 5) ("parseHttpRequest: Request Header is\n%s\n", *headers_p);
/* temporary kludge to test headers, remove it @?@ @?@ */
{
- extern void httpHeaderTestParser(const char *hstr);
- httpHeaderTestParser(*headers_p);
+ extern void httpHeaderTestParser(const char *hstr);
+ httpHeaderTestParser(*headers_p);
}
/* end of kludge */
/*
- * $Id: net_db.cc,v 1.77 1998/03/25 09:21:47 kostas Exp $
+ * $Id: net_db.cc,v 1.78 1998/03/25 09:23:20 kostas Exp $
*
* DEBUG: section 37 Network Measurement Database
* AUTHOR: Duane Wessels
#if SQUID_SNMP
-int netdbGetRowFn(oid *New,oid *Oid)
+int
+netdbGetRowFn(oid * New, oid * Oid)
{
- netdbEntry *c = NULL;
- static struct in_addr maddr;
- static char key[15];
-
+ netdbEntry *c = NULL;
+ static struct in_addr maddr;
+ static char key[15];
+
#if USE_ICMP
- if (!Oid[0]&&!Oid[1]&&!Oid[2]&&!Oid[3])
- c = (netdbEntry *)hash_first(addr_table);
- else {
- snprintf(key,15,"%d.%d.%d.%d", Oid[0],Oid[1],Oid[2],Oid[3]);
- c = (netdbEntry *) hash_lookup(addr_table, key);
- if (!c) return 0;
- debug(49,8)("netdbGetRowFn: [%s] found\n",key);
- c= (netdbEntry *)hash_next(addr_table);
- if (!c) debug(49,8)("netdbGetRowFn: next does not exist!\n");
- }
+ if (!Oid[0] && !Oid[1] && !Oid[2] && !Oid[3])
+ c = (netdbEntry *) hash_first(addr_table);
+ else {
+ snprintf(key, 15, "%d.%d.%d.%d", Oid[0], Oid[1], Oid[2], Oid[3]);
+ c = (netdbEntry *) hash_lookup(addr_table, key);
+ if (!c)
+ return 0;
+ debug(49, 8) ("netdbGetRowFn: [%s] found\n", key);
+ c = (netdbEntry *) hash_next(addr_table);
+ if (!c)
+ debug(49, 8) ("netdbGetRowFn: next does not exist!\n");
+ }
#endif
- if (!c) return 0;
- debug(49,8)("netdbGetRowFn: [%s] is returned\n",c->network);
- safe_inet_addr(c->network, &maddr);
- addr2oid(maddr, New);
- return 1;
+ if (!c)
+ return 0;
+ debug(49, 8) ("netdbGetRowFn: [%s] is returned\n", c->network);
+ safe_inet_addr(c->network, &maddr);
+ addr2oid(maddr, New);
+ return 1;
}
variable_list *
-snmp_netdbFn(variable_list * Var, snint *ErrP)
+snmp_netdbFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
#if 0
#if USE_ICMP
struct in_addr addr;
#endif
- snprintf(key,15,"%d.%d.%d.%d", Var->name[11], Var->name[12],
- Var->name[13],Var->name[14]);
+ snprintf(key, 15, "%d.%d.%d.%d", Var->name[11], Var->name[12],
+ Var->name[13], Var->name[14]);
- debug(49, 5) ("snmp_netdbFn: request with %d. (%s)!\n", Var->name[10],key);
+ debug(49, 5) ("snmp_netdbFn: request with %d. (%s)!\n", Var->name[10], key);
Answer = snmp_var_new(Var->name, Var->name_length);
*ErrP = SNMP_ERR_NOERROR;
#if USE_ICMP
- n = (netdbEntry *) hash_lookup(addr_table,key);
+ n = (netdbEntry *) hash_lookup(addr_table, key);
#endif
if (n == NULL) {
Answer->errstat = SNMP_ERR_NOSUCHNAME;
debug(49, 5) ("snmp_agent_response: No such oid. ");
} else
- VarNew = (*ParseFn) (VarPtr, (snint *) &(Answer->errstat));
+ VarNew = (*ParseFn) (VarPtr, (snint *) & (Answer->errstat));
/* Was there an error? */
if ((Answer->errstat != SNMP_ERR_NOERROR) ||
VarPtr = PDU->variables;
ParseFn = oidlist_Next(VarPtr->name, VarPtr->name_length,
- &(TmpOidName), (snint *) &(TmpOidNameLen));
+ &(TmpOidName), (snint *) & (TmpOidNameLen));
if (ParseFn == NULL) {
Answer->errstat = SNMP_ERR_NOSUCHNAME;
xfree(VarPtr->name);
VarPtr->name = TmpOidName;
VarPtr->name_length = TmpOidNameLen;
- VarNew = (*ParseFn) (VarPtr, (snint *) &(Answer->errstat));
+ VarNew = (*ParseFn) (VarPtr, (snint *) & (Answer->errstat));
}
/* Was there an error? */
************************************************************************/
variable_list *
-snmp_basicFn(variable_list * Var, snint *ErrP)
+snmp_basicFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
char *pp;
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_TIMETICKS;
- *(Answer->val.integer) = (snint) ( tvSubDsec(squid_start, current_time) );
+ *(Answer->val.integer) = (snint) (tvSubDsec(squid_start, current_time));
break;
case SYSCONTACT:
Answer->type = ASN_OCTET_STR;
}
variable_list *
-snmp_sysFn(variable_list * Var, snint *ErrP)
+snmp_sysFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
static fde *f = NULL;
*(Answer->val.integer) = store_swap_size;
break;
case SYSCONNTBL:
- snprintf(addrbuf,16, "%d.%d.%d.%d", Var->name[11], Var->name[12],
- Var->name[13],Var->name[14]);
-
- debug(49, 9) ("snmp_sysFn: CONN Table, [%s]\n", addrbuf);
-
- while (cnt < Squid_MaxFD) {
- f = &fd_table[cnt++];
- if (!f->open)
- continue;
- if (f->type==FD_SOCKET && !strcmp(f->ipaddr, addrbuf ) &&
- f->remote_port==Var->name[15])
- break;
- }
- if (!f || cnt==Squid_MaxFD) {
- debug(49, 9) ("snmp_sysFn: no such name. %x\n", f);
- *ErrP = SNMP_ERR_NOSUCHNAME;
- snmp_var_free(Answer);
- return (NULL);
- }
- switch(Var->name[10]) {
- case SYS_CONN_FDNUM:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = Var->name[11];
- break;
- case SYS_CONN_PORT:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = f->remote_port;
- break;
- case SYS_CONN_READ:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) f->bytes_read;
- break;
- case SYS_CONN_WRITE:
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = (snint) f->bytes_written;
- break;
- case SYS_CONN_ADDR:
- safe_inet_addr(f->ipaddr, &addr);
- snint_return = (snint) addr.s_addr;
- Answer->val_len = sizeof(snint);
- Answer->val.integer = xmalloc(Answer->val_len);
- Answer->type = SMI_IPADDRESS;
- *(Answer->val.integer) = (snint) snint_return;
- break;
- case SYS_CONN_NAME:
- Answer->type = ASN_OCTET_STR;
- Answer->val_len = strlen(f->desc);
- Answer->val.string = (u_char *) xstrdup(f->desc);
- break;
- default:
- *ErrP = SNMP_ERR_NOSUCHNAME;
- snmp_var_free(Answer);
- return (NULL);
- }
- break; /* end SYSCONNTBL */
+ snprintf(addrbuf, 16, "%d.%d.%d.%d", Var->name[11], Var->name[12],
+ Var->name[13], Var->name[14]);
+
+ debug(49, 9) ("snmp_sysFn: CONN Table, [%s]\n", addrbuf);
+
+ while (cnt < Squid_MaxFD) {
+ f = &fd_table[cnt++];
+ if (!f->open)
+ continue;
+ if (f->type == FD_SOCKET && !strcmp(f->ipaddr, addrbuf) &&
+ f->remote_port == Var->name[15])
+ break;
+ }
+ if (!f || cnt == Squid_MaxFD) {
+ debug(49, 9) ("snmp_sysFn: no such name. %x\n", f);
+ *ErrP = SNMP_ERR_NOSUCHNAME;
+ snmp_var_free(Answer);
+ return (NULL);
+ }
+ switch (Var->name[10]) {
+ case SYS_CONN_FDNUM:
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = Var->name[11];
+ break;
+ case SYS_CONN_PORT:
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = f->remote_port;
+ break;
+ case SYS_CONN_READ:
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) f->bytes_read;
+ break;
+ case SYS_CONN_WRITE:
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = ASN_INTEGER;
+ *(Answer->val.integer) = (snint) f->bytes_written;
+ break;
+ case SYS_CONN_ADDR:
+ safe_inet_addr(f->ipaddr, &addr);
+ snint_return = (snint) addr.s_addr;
+ Answer->val_len = sizeof(snint);
+ Answer->val.integer = xmalloc(Answer->val_len);
+ Answer->type = SMI_IPADDRESS;
+ *(Answer->val.integer) = (snint) snint_return;
+ break;
+ case SYS_CONN_NAME:
+ Answer->type = ASN_OCTET_STR;
+ Answer->val_len = strlen(f->desc);
+ Answer->val.string = (u_char *) xstrdup(f->desc);
+ break;
+ default:
+ *ErrP = SNMP_ERR_NOSUCHNAME;
+ snmp_var_free(Answer);
+ return (NULL);
+ }
+ break; /* end SYSCONNTBL */
case SYSFDTBL:
num = Var->name[11];
debug(49, 9) ("snmp_sysFn: FD Table, num=%d\n", num);
f = &fd_table[cnt++];
if (!f->open)
continue;
- if (f->type!=FD_SOCKET)
- num--;
+ if (f->type != FD_SOCKET)
+ num--;
}
if (num != 0 || !f) {
debug(49, 9) ("snmp_sysFn: no such name. %x\n", f);
}
variable_list *
-snmp_confFn(variable_list * Var, snint *ErrP)
+snmp_confFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
char *cp = NULL;
*(Answer->val.integer) = tvSubDsec(squid_start, current_time);
break;
case CONF_VERSION:
- pp= "Squid";
- Answer->type = ASN_OCTET_STR;
- Answer->val_len = strlen(pp);
- Answer->val.string = (u_char *) xstrdup(pp);
- break;
+ pp = "Squid";
+ Answer->type = ASN_OCTET_STR;
+ Answer->val_len = strlen(pp);
+ Answer->val.string = (u_char *) xstrdup(pp);
+ break;
case CONF_VERSION_ID:
- pp = SQUID_VERSION;
- Answer->type = ASN_OCTET_STR;
- Answer->val_len = strlen(pp);
- Answer->val.string = (u_char *) xstrdup(pp);
- break;
+ pp = SQUID_VERSION;
+ Answer->type = ASN_OCTET_STR;
+ Answer->val_len = strlen(pp);
+ Answer->val.string = (u_char *) xstrdup(pp);
+ break;
case CONF_STORAGE:
switch (Var->name[9]) {
case CONF_ST_MMAXSZ:
}
variable_list *
-snmp_meshPtblFn(variable_list * Var, snint *ErrP)
+snmp_meshPtblFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
struct in_addr *laddr;
char *cp = NULL;
peer *p = NULL;
- int cnt=0;
+ int cnt = 0;
debug(49, 5) ("snmp_meshPtblFn: peer %d requested!\n", Var->name[11]);
Answer = snmp_var_new(Var->name, Var->name_length);
*ErrP = SNMP_ERR_NOERROR;
- laddr=oid2addr(&Var->name[11]);
-
- for (p=Config.peers;p!=NULL;p=p->next,cnt++)
- if (p->in_addr.sin_addr.s_addr == laddr->s_addr)
- break;
-
+ laddr = oid2addr(&Var->name[11]);
+
+ for (p = Config.peers; p != NULL; p = p->next, cnt++)
+ if (p->in_addr.sin_addr.s_addr == laddr->s_addr)
+ break;
+
#if SNMP_OLD_INDEX
p = Config.peers;
cnt = Var->name[11];
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_COUNTER32;
- *(Answer->val.integer) = p->stats.pings_sent;
- break;
+ *(Answer->val.integer) = p->stats.pings_sent;
+ break;
case MESH_PTBL_PACKED:
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_COUNTER32;
- *(Answer->val.integer) = p->stats.pings_acked;
- break;
+ *(Answer->val.integer) = p->stats.pings_acked;
+ break;
case MESH_PTBL_FETCHES:
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_COUNTER32;
- *(Answer->val.integer) = p->stats.fetches;
- break;
+ *(Answer->val.integer) = p->stats.fetches;
+ break;
case MESH_PTBL_RTT:
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = ASN_INTEGER;
- *(Answer->val.integer) = p->stats.rtt;
- break;
+ *(Answer->val.integer) = p->stats.rtt;
+ break;
case MESH_PTBL_IGN:
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_COUNTER32;
- *(Answer->val.integer) = p->stats.ignored_replies;
- break;
+ *(Answer->val.integer) = p->stats.ignored_replies;
+ break;
case MESH_PTBL_KEEPAL_S:
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_COUNTER32;
- *(Answer->val.integer) = p->stats.n_keepalives_sent;
- break;
+ *(Answer->val.integer) = p->stats.n_keepalives_sent;
+ break;
case MESH_PTBL_KEEPAL_R:
Answer->val_len = sizeof(snint);
Answer->val.integer = xmalloc(Answer->val_len);
Answer->type = SMI_COUNTER32;
- *(Answer->val.integer) = p->stats.n_keepalives_recv;
- break;
+ *(Answer->val.integer) = p->stats.n_keepalives_recv;
+ break;
default:
*ErrP = SNMP_ERR_NOSUCHNAME;
}
variable_list *
-snmp_prfSysFn(variable_list * Var, snint *ErrP)
+snmp_prfSysFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
static struct rusage rusage;
}
variable_list *
-snmp_prfProtoFn(variable_list * Var, snint *ErrP)
+snmp_prfProtoFn(variable_list * Var, snint * ErrP)
{
variable_list *Answer;
static StatCounters *f = NULL;
variable_list *
-snmp_dnsFn(variable_list * Var, snint *ErrP)
+snmp_dnsFn(variable_list * Var, snint * ErrP)
{
debug(49, 5) ("snmp_dnsFn: Processing request with magic %d!\n", Var->name[9]);
if (Var->name[9] == NET_DNS_IPCACHE)
}
void
-addr2oid(struct in_addr addr, oid *Dest)
+addr2oid(struct in_addr addr, oid * Dest)
{
- u_char *cp;
- cp=(u_char *)&(addr.s_addr);
- Dest[0] = *cp++;
- Dest[1] = *cp++;
- Dest[2] = *cp++;
- Dest[3] = *cp++;
+ u_char *cp;
+ cp = (u_char *) & (addr.s_addr);
+ Dest[0] = *cp++;
+ Dest[1] = *cp++;
+ Dest[2] = *cp++;
+ Dest[3] = *cp++;
}
struct in_addr *
-oid2addr(oid *id)
+oid2addr(oid * id)
{
- static struct in_addr laddr;
+ static struct in_addr laddr;
#if 0
- static u_char buf[15];
- snprintf(buf,15,"%d.%d.%d.%d", id[0],id[1],id[2],id[3]);
- safe_inet_addr(buf, &laddr);
- return &laddr;
+ static u_char buf[15];
+ snprintf(buf, 15, "%d.%d.%d.%d", id[0], id[1], id[2], id[3]);
+ safe_inet_addr(buf, &laddr);
+ return &laddr;
#endif
- u_char *cp=(u_char *)&(laddr.s_addr);
- cp[0]=id[0];
- cp[1]=id[1];
- cp[2]=id[2];
- cp[3]=id[3];
- return &laddr;
+ u_char *cp = (u_char *) & (laddr.s_addr);
+ cp[0] = id[0];
+ cp[1] = id[1];
+ cp[2] = id[2];
+ cp[3] = id[3];
+ return &laddr;
}
projects / thirdparty / squid.git / commitdiff
