--------------------- PatchSet 2991 Date: 2001/09/09 12:38:47 Author: serassio Branch: nt-2_3-tolsty Tag: (none) Log: Fixed indent problems Members: src/delay_pools.c:1.1.1.3.4.2.2.1.2.1->1.1.1.3.4.2.2.1.2.2 src/forward.c:1.1.1.3.4.1.2.2.2.1->1.1.1.3.4.1.2.2.2.2 src/ipcache.c:1.1.1.3.4.1.2.1.2.1->1.1.1.3.4.1.2.1.2.2 src/snmp_agent.c:1.1.1.3.4.1.2.1.2.1->1.1.1.3.4.1.2.1.2.2 Index: squid/src/delay_pools.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/delay_pools.c,v retrieving revision 1.1.1.3.4.2.2.1.2.1 retrieving revision 1.1.1.3.4.2.2.1.2.2 diff -u -r1.1.1.3.4.2.2.1.2.1 -r1.1.1.3.4.2.2.1.2.2 --- squid/src/delay_pools.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.2.2.1.2.1 +++ squid/src/delay_pools.c 9 Sep 2001 12:38:47 -0000 1.1.1.3.4.2.2.1.2.2 @@ -1,5 +1,6 @@ + /* - * $Id: delay_pools.c,v 1.1.1.3.4.2.2.1.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: delay_pools.c,v 1.1.1.3.4.2.2.1.2.2 2001/09/09 12:38:47 serassio Exp $ * * DEBUG: section 77 Delay Pools * AUTHOR: David Luyer @@ -37,16 +38,14 @@ #if DELAY_POOLS #include "squid.h" -struct _class1DelayPool -{ +struct _class1DelayPool { int class; int aggregate; }; #define IND_MAP_SZ 256 -struct _class2DelayPool -{ +struct _class2DelayPool { int class; int aggregate; /* OK: -1 is terminator. individual[255] is always host 255. */ @@ -60,8 +59,7 @@ #define NET_MAP_SZ 256 #define C3_IND_SZ (NET_MAP_SZ*IND_MAP_SZ) -struct _class3DelayPool -{ +struct _class3DelayPool { int class; int aggregate; /* OK: -1 is terminator. network[255] is always host 255. */ @@ -82,8 +80,7 @@ typedef struct _class2DelayPool class2DelayPool; typedef struct _class3DelayPool class3DelayPool; -union _delayPool -{ +union _delayPool { class1DelayPool *class1; class2DelayPool *class2; class3DelayPool *class3; @@ -307,7 +304,8 @@ return (pool << 16) | position; } -delay_id delayClient(request_t * r) +delay_id +delayClient(request_t * r) { aclCheck_t ch; int i; @@ -322,8 +320,7 @@ ch.my_port = r->my_port; ch.request = r; if (r->client_addr.s_addr == INADDR_BROADCAST) { - debug(77, 2) - ("delayClient: WARNING: Called with 'allones' address, ignoring\n"); + debug(77, 2) ("delayClient: WARNING: Called with 'allones' address, ignoring\n"); return delayId(0, 0); } for (pool = 0; pool < Config.Delay.pools; pool++) { @@ -394,10 +391,8 @@ position = i << 8; if (host == 255) { position |= 255; - if (!(delay_data[pool].class3->individual_255_used[i / 8] & (1 << (i % - 8)))) { - delay_data[pool].class3->individual_255_used[i / 8] |= - (1 << (i % 8)); + if (!(delay_data[pool].class3->individual_255_used[i / 8] & (1 << (i % 8)))) { + delay_data[pool].class3->individual_255_used[i / 8] |= (1 << (i % 8)); assert(position < C3_IND_SZ); delay_data[pool].class3->individual[position] = (Config.Delay.rates[pool]->individual.max_bytes * @@ -435,7 +430,7 @@ if (rates->aggregate.restore_bps != -1 && (class1->aggregate += rates->aggregate.restore_bps * incr) > rates->aggregate.max_bytes) - class1->aggregate = rates->aggregate.max_bytes; + class1->aggregate = rates->aggregate.max_bytes; } static void @@ -449,7 +444,7 @@ if (rates->aggregate.restore_bps != -1 && (class2->aggregate += rates->aggregate.restore_bps * incr) > rates->aggregate.max_bytes) - class2->aggregate = rates->aggregate.max_bytes; + class2->aggregate = rates->aggregate.max_bytes; if ((restore_bytes = rates->individual.restore_bps) == -1) return; restore_bytes *= incr; @@ -462,10 +457,8 @@ if (i != 255 && class2->individual_map[i] == 255) return; if (class2->individual[i] != rates->individual.max_bytes && - (class2->individual[i] += - restore_bytes) > - rates->individual.max_bytes) class2->individual[i] = - rates->individual.max_bytes; + (class2->individual[i] += restore_bytes) > rates->individual.max_bytes) + class2->individual[i] = rates->individual.max_bytes; if (++i == (IND_MAP_SZ - 1)) return; } @@ -484,7 +477,7 @@ if (rates->aggregate.restore_bps != -1 && (class3->aggregate += rates->aggregate.restore_bps * incr) > rates->aggregate.max_bytes) - class3->aggregate = rates->aggregate.max_bytes; + class3->aggregate = rates->aggregate.max_bytes; /* the following line deliberately uses &, not &&, in an if statement * to avoid conditional execution */ @@ -493,18 +486,14 @@ return; individual_restore_bytes *= incr; network_restore_bytes *= incr; - for (i = 0; i < ((class3->network_255_used) ? NET_MAP_SZ : NET_MAP_SZ - 1); - ++i) { + for (i = 0; i < ((class3->network_255_used) ? NET_MAP_SZ : NET_MAP_SZ - 1); ++i) { assert(i < NET_MAP_SZ); if (i != 255 && class3->network_map[i] == 255) return; if (individual_restore_bytes != -incr) { mpos = i << 8; - individual_255_used = - class3->individual_255_used[i / 8] & (1 << (i % 8)); - for (j = 0; - j < ((individual_255_used) ? IND_MAP_SZ : IND_MAP_SZ - 1); - ++j, ++mpos) { + individual_255_used = class3->individual_255_used[i / 8] & (1 << (i % 8)); + for (j = 0; j < ((individual_255_used) ? IND_MAP_SZ : IND_MAP_SZ - 1); ++j, ++mpos) { assert(i < NET_MAP_SZ); assert(j < IND_MAP_SZ); if (j != 255 && class3->individual_map[i][j] == 255) @@ -513,14 +502,14 @@ if (class3->individual[mpos] != rates->individual.max_bytes && (class3->individual[mpos] += individual_restore_bytes) > rates->individual.max_bytes) - class3->individual[mpos] = rates->individual.max_bytes; + class3->individual[mpos] = rates->individual.max_bytes; } } if (network_restore_bytes != -incr && class3->network[i] != rates->network.max_bytes && (class3->network[i] += network_restore_bytes) > rates->network.max_bytes) - class3->network[i] = rates->network.max_bytes; + class3->network[i] = rates->network.max_bytes; } } @@ -542,16 +531,13 @@ continue; switch (class) { case 1: - delayUpdateClass1(delay_data[i].class1, Config.Delay.rates[i], - incr); + delayUpdateClass1(delay_data[i].class1, Config.Delay.rates[i], incr); break; case 2: - delayUpdateClass2(delay_data[i].class2, Config.Delay.rates[i], - incr); + delayUpdateClass2(delay_data[i].class2, Config.Delay.rates[i], incr); break; case 3: - delayUpdateClass3(delay_data[i].class3, Config.Delay.rates[i], - incr); + delayUpdateClass3(delay_data[i].class3, Config.Delay.rates[i], incr); break; default: assert(0); @@ -584,19 +570,16 @@ if (Config.Delay.rates[pool]->aggregate.restore_bps != -1) nbytes = XMIN(nbytes, delay_data[pool].class2->aggregate); if (Config.Delay.rates[pool]->individual.restore_bps != -1) - nbytes = - XMIN(nbytes, delay_data[pool].class2->individual[position]); + nbytes = XMIN(nbytes, delay_data[pool].class2->individual[position]); break; case 3: if (Config.Delay.rates[pool]->aggregate.restore_bps != -1) nbytes = XMIN(nbytes, delay_data[pool].class3->aggregate); if (Config.Delay.rates[pool]->individual.restore_bps != -1) - nbytes = - XMIN(nbytes, delay_data[pool].class3->individual[position]); + nbytes = XMIN(nbytes, delay_data[pool].class3->individual[position]); if (Config.Delay.rates[pool]->network.restore_bps != -1) - nbytes = - XMIN(nbytes, delay_data[pool].class3->network[position >> 8]); + nbytes = XMIN(nbytes, delay_data[pool].class3->network[position >> 8]); break; default: @@ -657,7 +640,8 @@ return found ? i : max; } -delay_id delayMostBytesAllowed(const MemObject * mem) +delay_id +delayMostBytesAllowed(const MemObject * mem) { int j; int jmax = -1; @@ -790,8 +774,7 @@ for (i = 0; i < NET_MAP_SZ; i++) { if (class3->network_map[i] == 255) break; - storeAppendPrintf(sentry, "\t\tCurrent [Network %d]: ", - class3->network_map[i]); + storeAppendPrintf(sentry, "\t\tCurrent [Network %d]: ", class3->network_map[i]); shown = 1; for (j = 0; j < IND_MAP_SZ; j++) { if (class3->individual_map[i][j] == 255) @@ -800,8 +783,7 @@ class3->individual[(i << 8) | j]); } if (class3->individual_255_used[i / 8] & (1 << (i % 8))) { - storeAppendPrintf(sentry, "%d:%d ", 255, - class3->individual[(i << 8) | 255]); + storeAppendPrintf(sentry, "%d:%d ", 255, class3->individual[(i << 8) | 255]); } storeAppendPrintf(sentry, "\n"); } @@ -815,14 +797,12 @@ class3->individual[(255 << 8) | j]); } if (class3->individual_255_used[255 / 8] & (1 << (255 % 8))) { - storeAppendPrintf(sentry, "%d:%d ", 255, - class3->individual[(255 << 8) | 255]); + storeAppendPrintf(sentry, "%d:%d ", 255, class3->individual[(255 << 8) | 255]); } storeAppendPrintf(sentry, "\n"); } if (!shown) - storeAppendPrintf(sentry, - "\t\tCurrent [All networks]: Not used yet.\n"); + storeAppendPrintf(sentry, "\t\tCurrent [All networks]: Not used yet.\n"); storeAppendPrintf(sentry, "\n"); } @@ -831,8 +811,7 @@ { unsigned short i; - storeAppendPrintf(sentry, "Delay pools configured: %d\n\n", - Config.Delay.pools); + storeAppendPrintf(sentry, "Delay pools configured: %d\n\n", Config.Delay.pools); for (i = 0; i < Config.Delay.pools; i++) { switch (Config.Delay.class[i]) { case 0: Index: squid/src/forward.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/forward.c,v retrieving revision 1.1.1.3.4.1.2.2.2.1 retrieving revision 1.1.1.3.4.1.2.2.2.2 diff -u -r1.1.1.3.4.1.2.2.2.1 -r1.1.1.3.4.1.2.2.2.2 --- squid/src/forward.c 27 Aug 2001 21:48:20 -0000 1.1.1.3.4.1.2.2.2.1 +++ squid/src/forward.c 9 Sep 2001 12:38:47 -0000 1.1.1.3.4.1.2.2.2.2 @@ -1,5 +1,6 @@ + /* - * $Id: forward.c,v 1.1.1.3.4.1.2.2.2.1 2001/08/27 21:48:20 tolsty Exp $ + * $Id: forward.c,v 1.1.1.3.4.1.2.2.2.2 2001/09/09 12:38:47 serassio Exp $ * * DEBUG: section 17 Request Forwarding * AUTHOR: Duane Wessels @@ -126,7 +127,8 @@ fwdState->server_fd = -1; if (fwdCheckRetry(fwdState)) { debug(17, 3) ("fwdServerClosed: re-forwarding (%d tries, %d secs)\n", - fwdState->n_tries, (int) (squid_curtime - fwdState->start)); + fwdState->n_tries, + (int) (squid_curtime - fwdState->start)); if (fwdState->servers->next) { /* cycle */ FwdServer *fs = fwdState->servers; @@ -156,7 +158,8 @@ assert(fwdState->server_fd == server_fd); if (status == COMM_ERR_DNS) { fwdState->flags.dont_retry = 1; - debug(17, 4) ("fwdConnectDone: Unknown host: %s\n", request->host); + debug(17, 4) ("fwdConnectDone: Unknown host: %s\n", + request->host); err = errorCon(ERR_DNS_FAIL, HTTP_SERVICE_UNAVAILABLE); err->dnsserver_msg = xstrdup(dns_error_message); err->request = requestLink(request); @@ -179,8 +182,7 @@ peerCheckConnectStart(fs->peer); comm_close(server_fd); } else { - debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, - storeUrl(fwdState->entry)); + debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry)); fd_note(server_fd, storeUrl(fwdState->entry)); fd_table[server_fd].uses++; fwdDispatch(fwdState); @@ -244,8 +246,12 @@ fwdConnectDone(fd, COMM_OK, fwdState); return; } - fd = comm_open(SOCK_STREAM, 0, Config.Addrs.tcp_outgoing, 0, - COMM_NONBLOCKING, url); + fd = comm_open(SOCK_STREAM, + 0, + Config.Addrs.tcp_outgoing, + 0, + COMM_NONBLOCKING, + url); if (fd < 0) { debug(50, 4) ("fwdConnectStart: %s\n", xstrerror()); err = errorCon(ERR_SOCKET_FAILURE, HTTP_INTERNAL_SERVER_ERROR); @@ -258,7 +264,10 @@ fwdState->server_fd = fd; fwdState->n_tries++; comm_add_close_handler(fd, fwdServerClosed, fwdState); - commSetTimeout(fd, ctimeout, fwdConnectTimeout, fwdState); + commSetTimeout(fd, + ctimeout, + fwdConnectTimeout, + fwdState); commConnectStart(fd, host, port, fwdConnectDone, fwdState); } @@ -296,7 +305,8 @@ ErrorState *err; debug(17, 3) ("fwdDispatch: FD %d: Fetching '%s %s'\n", fwdState->client_fd, - RequestMethodStr[request->method], storeUrl(entry)); + RequestMethodStr[request->method], + storeUrl(entry)); /*assert(!EBIT_TEST(entry->flags, ENTRY_DISPATCHED)); */ assert(entry->ping_status != PING_WAITING); assert(entry->lock_count); @@ -505,7 +515,8 @@ assert(EBIT_TEST(fwdState->entry->flags, ENTRY_FWD_HDR_WAIT)); debug(17, 3) ("fwdFail: %s \"%s\"\n\t%s\n", err_type_str[errorState->type], - httpStatusString(errorState->http_status), storeUrl(fwdState->entry)); + httpStatusString(errorState->http_status), + storeUrl(fwdState->entry)); if (fwdState->err) errorStateFree(fwdState->err); fwdState->err = errorState; @@ -551,7 +562,8 @@ fwdLogReplyStatus(fwdState->n_tries, e->mem_obj->reply->sline.status); if (fwdReforward(fwdState)) { debug(17, 3) ("fwdComplete: re-forwarding %d %s\n", - e->mem_obj->reply->sline.status, storeUrl(e)); + e->mem_obj->reply->sline.status, + storeUrl(e)); if (fwdState->server_fd > -1) fwdUnregister(fwdState->server_fd, fwdState); storeEntryReset(e); @@ -574,7 +586,8 @@ fwdInit(void) { cachemgrRegister("forward", - "Request Forwarding Statistics", fwdStats, 0, 1); + "Request Forwarding Statistics", + fwdStats, 0, 1); } static void Index: squid/src/ipcache.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ipcache.c,v retrieving revision 1.1.1.3.4.1.2.1.2.1 retrieving revision 1.1.1.3.4.1.2.1.2.2 diff -u -r1.1.1.3.4.1.2.1.2.1 -r1.1.1.3.4.1.2.1.2.2 --- squid/src/ipcache.c 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.1.2.1.2.1 +++ squid/src/ipcache.c 9 Sep 2001 12:38:47 -0000 1.1.1.3.4.1.2.1.2.2 @@ -1,5 +1,6 @@ + /* - * $Id: ipcache.c,v 1.1.1.3.4.1.2.1.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: ipcache.c,v 1.1.1.3.4.1.2.1.2.2 2001/09/09 12:38:47 serassio Exp $ * * DEBUG: section 14 IP Cache * AUTHOR: Harvest Derived @@ -34,8 +35,7 @@ #include "squid.h" -static struct -{ +static struct { int requests; int replies; int hits; @@ -45,8 +45,7 @@ int errors; int ghbn_calls; /* # calls to blocking gethostbyname() */ int release_locked; -} -IpcacheStats; +} IpcacheStats; static dlink_list lru_list; @@ -59,8 +58,7 @@ static IPH dummy_handler; static int ipcacheExpiredEntry(ipcache_entry *); static int ipcache_testname(void); -static ipcache_entry *ipcacheAddNew(const char *, const struct hostent *, - ipcache_status_t); +static ipcache_entry *ipcacheAddNew(const char *, const struct hostent *, ipcache_status_t); #if USE_DNSSERVERS static ipcache_entry *ipcacheParse(const char *buf); #else @@ -80,7 +78,8 @@ static ipcache_addrs static_addrs; static hash_table *ip_table = NULL; -static char ipcache_status_char[] = { +static char ipcache_status_char[] = +{ 'C', 'N', 'P', @@ -115,8 +114,7 @@ { hash_link *table_entry = NULL; if ((table_entry = hash_lookup(ip_table, i->name)) == NULL) { - snprintf(tmp_error_buf, ERROR_BUF_SZ, - "ipcache_release: key '%s' not found\n", i->name); + snprintf(tmp_error_buf, ERROR_BUF_SZ, "ipcache_release: key '%s' not found\n", i->name); fatal_dump(tmp_error_buf); } assert(i == (ipcache_entry *) table_entry); @@ -217,18 +215,19 @@ i->addrs.badcount = 0; for (k = 0; k < addr_count; k++) xmemcpy(&i->addrs.in_addrs[k].s_addr, - *(hp->h_addr_list + k), hp->h_length); + *(hp->h_addr_list + k), + hp->h_length); } static ipcache_entry * -ipcacheAddNew(const char *name, const struct hostent *hp, - ipcache_status_t status) +ipcacheAddNew(const char *name, const struct hostent *hp, ipcache_status_t status) { ipcache_entry *i; if (ipcache_get(name)) fatal_dump("ipcacheAddNew: somebody adding a duplicate!"); debug(14, 10) ("ipcacheAddNew: Adding '%s', status=%c\n", - name, ipcache_status_char[status]); + name, + ipcache_status_char[status]); i = ipcache_create(name); if (hp) ipcacheAddHostent(i, hp); @@ -383,7 +382,8 @@ assert(answers[k].rdlength == 4); xmemcpy(&i.addrs.in_addrs[j++], answers[k].rdata, 4); debug(14, 3) ("ipcacheParse: #%d %s\n", - j - 1, inet_ntoa(i.addrs.in_addrs[j - 1])); + j - 1, + inet_ntoa(i.addrs.in_addrs[j - 1])); } assert(j == na); return &i; @@ -406,8 +406,7 @@ cbdataFree(c); c = NULL; n = ++IpcacheStats.replies; - statHistCount(&Counter.dns.svc_time, tvSubMsec(i->request_time, - current_time)); + statHistCount(&Counter.dns.svc_time, tvSubMsec(i->request_time, current_time)); #if USE_DNSSERVERS x = ipcacheParse(reply); #else @@ -481,12 +480,7 @@ IpcacheStats.pending_hits++; ipcacheAddPending(i, handler, handlerData); if (squid_curtime - i->expires > 600) { - debug(14, 0) - - - ("ipcache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", - name, - (int) (squid_curtime + Config.negativeDnsTtl - i->expires)); + debug(14, 0) ("ipcache_nbgethostbyname: '%s' PENDING for %d seconds, aborting\n", name, (int) (squid_curtime + Config.negativeDnsTtl - i->expires)); ipcacheChangeKey(i); ipcache_call_pending(i); } @@ -533,7 +527,8 @@ n = hashPrime(ipcache_high / 4); ip_table = hash_create((HASHCMP *) strcmp, n, hash4); cachemgrRegister("ipcache", - "IP Cache Stats and Contents", stat_ipcache_get, 0, 1); + "IP Cache Stats and Contents", + stat_ipcache_get, 0, 1); } int @@ -604,7 +599,8 @@ i->locks ? 'L' : ' ', (int) (squid_curtime - i->lastref), (int) (i->expires - squid_curtime), - (int) i->addrs.count, (int) i->addrs.badcount); + (int) i->addrs.count, + (int) i->addrs.badcount); for (k = 0; k < (int) i->addrs.count; k++) { storeAppendPrintf(sentry, " %15s-%3s", inet_ntoa(i->addrs.in_addrs[k]), i->addrs.bad_mask[k] ? "BAD" : "OK "); @@ -621,13 +617,16 @@ storeAppendPrintf(sentry, "IP Cache Statistics:\n"); storeAppendPrintf(sentry, "IPcache Entries: %d\n", memInUse(MEM_IPCACHE_ENTRY)); - storeAppendPrintf(sentry, "IPcache Requests: %d\n", IpcacheStats.requests); - storeAppendPrintf(sentry, "IPcache Hits: %d\n", IpcacheStats.hits); + storeAppendPrintf(sentry, "IPcache Requests: %d\n", + IpcacheStats.requests); + storeAppendPrintf(sentry, "IPcache Hits: %d\n", + IpcacheStats.hits); storeAppendPrintf(sentry, "IPcache Pending Hits: %d\n", IpcacheStats.pending_hits); storeAppendPrintf(sentry, "IPcache Negative Hits: %d\n", IpcacheStats.negative_hits); - storeAppendPrintf(sentry, "IPcache Misses: %d\n", IpcacheStats.misses); + storeAppendPrintf(sentry, "IPcache Misses: %d\n", + IpcacheStats.misses); storeAppendPrintf(sentry, "Blocking calls to gethostbyname(): %d\n", IpcacheStats.ghbn_calls); storeAppendPrintf(sentry, "Attempts to release locked entries: %d\n", @@ -635,7 +634,11 @@ storeAppendPrintf(sentry, "\n\n"); storeAppendPrintf(sentry, "IP Cache Contents:\n\n"); storeAppendPrintf(sentry, " %-29.29s %5s %6s %6s %1s\n", - "Hostname", "Flags", "lstref", "TTL", "N"); + "Hostname", + "Flags", + "lstref", + "TTL", + "N"); for (m = lru_list.head; m; m = m->next) ipcacheStatPrint(m->data, sentry); } @@ -731,8 +734,7 @@ } if (k == ia->count) { /* All bad, reset to All good */ - debug(14, - 3) ("ipcacheCycleAddr: Changing ALL %s addrs from BAD to OK\n", + debug(14, 3) ("ipcacheCycleAddr: Changing ALL %s addrs from BAD to OK\n", name); for (k = 0; k < ia->count; k++) ia->bad_mask[k] = 0; @@ -854,42 +856,49 @@ snmp_netIpFn(variable_list * Var, snint * ErrP) { variable_list *Answer = NULL; - debug(49, 5) ("snmp_netIpFn: Processing request:\n", - Var->name[LEN_SQ_NET + 1]); + debug(49, 5) ("snmp_netIpFn: Processing request:\n", Var->name[LEN_SQ_NET + 1]); snmpDebugOid(5, Var->name, Var->name_length); *ErrP = SNMP_ERR_NOERROR; switch (Var->name[LEN_SQ_NET + 1]) { case IP_ENT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - memInUse(MEM_IPCACHE_ENTRY), SMI_GAUGE32); + memInUse(MEM_IPCACHE_ENTRY), + SMI_GAUGE32); break; case IP_REQ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.requests, SMI_COUNTER32); + IpcacheStats.requests, + SMI_COUNTER32); break; case IP_HITS: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.hits, SMI_COUNTER32); + IpcacheStats.hits, + SMI_COUNTER32); break; case IP_PENDHIT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.pending_hits, SMI_GAUGE32); + IpcacheStats.pending_hits, + SMI_GAUGE32); break; case IP_NEGHIT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.negative_hits, SMI_COUNTER32); + IpcacheStats.negative_hits, + SMI_COUNTER32); break; case IP_MISS: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.misses, SMI_COUNTER32); + IpcacheStats.misses, + SMI_COUNTER32); break; case IP_GHBN: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.ghbn_calls, SMI_COUNTER32); + IpcacheStats.ghbn_calls, + SMI_COUNTER32); break; case IP_LOC: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IpcacheStats.release_locked, SMI_COUNTER32); + IpcacheStats.release_locked, + SMI_COUNTER32); break; default: *ErrP = SNMP_ERR_NOSUCHNAME; Index: squid/src/snmp_agent.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/snmp_agent.c,v retrieving revision 1.1.1.3.4.1.2.1.2.1 retrieving revision 1.1.1.3.4.1.2.1.2.2 diff -u -r1.1.1.3.4.1.2.1.2.1 -r1.1.1.3.4.1.2.1.2.2 --- squid/src/snmp_agent.c 27 Aug 2001 21:48:21 -0000 1.1.1.3.4.1.2.1.2.1 +++ squid/src/snmp_agent.c 9 Sep 2001 12:38:47 -0000 1.1.1.3.4.1.2.1.2.2 @@ -1,5 +1,6 @@ + /* - * $Id: snmp_agent.c,v 1.1.1.3.4.1.2.1.2.1 2001/08/27 21:48:21 tolsty Exp $ + * $Id: snmp_agent.c,v 1.1.1.3.4.1.2.1.2.2 2001/09/09 12:38:47 serassio Exp $ * * DEBUG: section 49 SNMP Interface * AUTHOR: Kostas Anagnostakis @@ -54,15 +55,18 @@ switch (Var->name[LEN_SQ_SYS]) { case SYSVMSIZ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - store_mem_size >> 10, ASN_INTEGER); + store_mem_size >> 10, + ASN_INTEGER); break; case SYSSTOR: Answer = snmp_var_new_integer(Var->name, Var->name_length, - store_swap_size, ASN_INTEGER); + store_swap_size, + ASN_INTEGER); break; case SYS_UPTIME: Answer = snmp_var_new_integer(Var->name, Var->name_length, - tvSubDsec(squid_start, current_time) * 100, SMI_TIMETICKS); + (int) tvSubDsec(squid_start, current_time) * 100, + SMI_TIMETICKS); break; default: *ErrP = SNMP_ERR_NOSUCHNAME; @@ -76,8 +80,7 @@ { variable_list *Answer = NULL; char *cp = NULL; - debug(49, 5) ("snmp_confFn: Processing request with magic %d!\n", - Var->name[8]); + debug(49, 5) ("snmp_confFn: Processing request with magic %d!\n", Var->name[8]); *ErrP = SNMP_ERR_NOERROR; switch (Var->name[LEN_SQ_CONF]) { case CONF_ADMIN: @@ -102,19 +105,23 @@ switch (Var->name[LEN_SQ_CONF + 1]) { case CONF_ST_MMAXSZ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Config.memMaxSize >> 20, ASN_INTEGER); + (snint) Config.memMaxSize >> 20, + ASN_INTEGER); break; case CONF_ST_SWMAXSZ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Config.Swap.maxSize >> 10, ASN_INTEGER); + (snint) Config.Swap.maxSize >> 10, + ASN_INTEGER); break; case CONF_ST_SWHIWM: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Config.Swap.highWaterMark, ASN_INTEGER); + (snint) Config.Swap.highWaterMark, + ASN_INTEGER); break; case CONF_ST_SWLOWM: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Config.Swap.lowWaterMark, ASN_INTEGER); + (snint) Config.Swap.lowWaterMark, + ASN_INTEGER); break; default: *ErrP = SNMP_ERR_NOSUCHNAME; @@ -144,8 +151,7 @@ char *cp = NULL; peer *p = NULL; int cnt = 0; - debug(49, 5) ("snmp_meshPtblFn: peer %d requested!\n", - Var->name[LEN_SQ_MESH + 3]); + debug(49, 5) ("snmp_meshPtblFn: peer %d requested!\n", Var->name[LEN_SQ_MESH + 3]); *ErrP = SNMP_ERR_NOERROR; laddr = oid2addr(&Var->name[LEN_SQ_MESH + 3]); for (p = Config.peers; p != NULL; p = p->next, cnt++) @@ -165,51 +171,63 @@ break; case MESH_PTBL_IP: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) p->in_addr.sin_addr.s_addr, SMI_IPADDRESS); + (snint) p->in_addr.sin_addr.s_addr, + SMI_IPADDRESS); break; case MESH_PTBL_HTTP: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) p->http_port, ASN_INTEGER); + (snint) p->http_port, + ASN_INTEGER); break; case MESH_PTBL_ICP: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) p->icp.port, ASN_INTEGER); + (snint) p->icp.port, + ASN_INTEGER); break; case MESH_PTBL_TYPE: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) p->type, ASN_INTEGER); + (snint) p->type, + ASN_INTEGER); break; case MESH_PTBL_STATE: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) neighborUp(p), ASN_INTEGER); + (snint) neighborUp(p), + ASN_INTEGER); break; case MESH_PTBL_SENT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.pings_sent, ASN_INTEGER); + p->stats.pings_sent, + ASN_INTEGER); break; case MESH_PTBL_PACKED: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.pings_acked, ASN_INTEGER); + p->stats.pings_acked, + ASN_INTEGER); break; case MESH_PTBL_FETCHES: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.fetches, SMI_COUNTER32); + p->stats.fetches, + SMI_COUNTER32); break; case MESH_PTBL_RTT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.rtt, ASN_INTEGER); + p->stats.rtt, + ASN_INTEGER); break; case MESH_PTBL_IGN: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.ignored_replies, SMI_COUNTER32); + p->stats.ignored_replies, + SMI_COUNTER32); break; case MESH_PTBL_KEEPAL_S: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.n_keepalives_sent, SMI_COUNTER32); + p->stats.n_keepalives_sent, + SMI_COUNTER32); break; case MESH_PTBL_KEEPAL_R: Answer = snmp_var_new_integer(Var->name, Var->name_length, - p->stats.n_keepalives_recv, SMI_COUNTER32); + p->stats.n_keepalives_recv, + SMI_COUNTER32); break; default: *ErrP = SNMP_ERR_NOSUCHNAME; @@ -223,38 +241,42 @@ { variable_list *Answer = NULL; static struct rusage rusage; - debug(49, 5) ("snmp_prfSysFn: Processing request with magic %d!\n", - Var->name[LEN_SQ_PRF + 1]); + debug(49, 5) ("snmp_prfSysFn: Processing request with magic %d!\n", Var->name[LEN_SQ_PRF + 1]); *ErrP = SNMP_ERR_NOERROR; switch (Var->name[LEN_SQ_PRF + 1]) { case PERF_SYS_PF: squid_getrusage(&rusage); Answer = snmp_var_new_integer(Var->name, Var->name_length, - rusage_pagefaults(&rusage), SMI_COUNTER32); + rusage_pagefaults(&rusage), + SMI_COUNTER32); break; case PERF_SYS_NUMR: Answer = snmp_var_new_integer(Var->name, Var->name_length, - IOStats.Http.reads, SMI_COUNTER32); + IOStats.Http.reads, + SMI_COUNTER32); break; case PERF_SYS_MEMUSAGE: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) memTotalAllocated() >> 10, ASN_INTEGER); + (snint) memTotalAllocated() >> 10, + ASN_INTEGER); break; case PERF_SYS_CPUTIME: squid_getrusage(&rusage); Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) rusage_cputime(&rusage), ASN_INTEGER); + (snint) rusage_cputime(&rusage), + ASN_INTEGER); break; case PERF_SYS_CPUUSAGE: squid_getrusage(&rusage); Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) dpercent(rusage_cputime(&rusage), tvSubDsec(squid_start, - current_time)), ASN_INTEGER); + (snint) dpercent(rusage_cputime(&rusage), tvSubDsec(squid_start, current_time)), + ASN_INTEGER); break; case PERF_SYS_MAXRESSZ: squid_getrusage(&rusage); Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) rusage_maxrss(&rusage), ASN_INTEGER); + (snint) rusage_maxrss(&rusage), + ASN_INTEGER); break; case PERF_SYS_CURLRUEXP: Answer = snmp_var_new_integer(Var->name, Var->name_length, @@ -267,19 +289,23 @@ break; case PERF_SYS_CURUNLREQ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.unlink.requests, SMI_COUNTER32); + (snint) Counter.unlink.requests, + SMI_COUNTER32); break; case PERF_SYS_CURUNUSED_FD: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Squid_MaxFD - Number_FD, SMI_GAUGE32); + (snint) Squid_MaxFD - Number_FD, + SMI_GAUGE32); break; case PERF_SYS_CURRESERVED_FD: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Number_FD, SMI_GAUGE32); + (snint) Number_FD, + SMI_GAUGE32); break; case PERF_SYS_NUMOBJCNT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) memInUse(MEM_STOREENTRY), SMI_COUNTER32); + (snint) memInUse(MEM_STOREENTRY), + SMI_COUNTER32); break; default: *ErrP = SNMP_ERR_NOSUCHNAME; @@ -296,71 +322,85 @@ static StatCounters *l = NULL; double x; int minutes; - debug(49, 5) ("snmp_prfProtoFn: Processing request with magic %d!\n", - Var->name[LEN_SQ_PRF]); + debug(49, 5) ("snmp_prfProtoFn: Processing request with magic %d!\n", Var->name[LEN_SQ_PRF]); *ErrP = SNMP_ERR_NOERROR; switch (Var->name[LEN_SQ_PRF + 1]) { case PERF_PROTOSTAT_AGGR: /* cacheProtoAggregateStats */ switch (Var->name[LEN_SQ_PRF + 2]) { case PERF_PROTOSTAT_AGGR_HTTP_REQ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.client_http.requests, SMI_COUNTER32); + (snint) Counter.client_http.requests, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_HTTP_HITS: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.client_http.hits, SMI_COUNTER32); + (snint) Counter.client_http.hits, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_HTTP_ERRORS: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.client_http.errors, SMI_COUNTER32); + (snint) Counter.client_http.errors, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_HTTP_KBYTES_IN: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.client_http.kbytes_in.kb, SMI_COUNTER32); + (snint) Counter.client_http.kbytes_in.kb, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_HTTP_KBYTES_OUT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.client_http.kbytes_out.kb, SMI_COUNTER32); + (snint) Counter.client_http.kbytes_out.kb, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_ICP_S: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.icp.pkts_sent, SMI_COUNTER32); + (snint) Counter.icp.pkts_sent, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_ICP_R: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.icp.pkts_recv, SMI_COUNTER32); + (snint) Counter.icp.pkts_recv, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_ICP_SKB: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.icp.kbytes_sent.kb, SMI_COUNTER32); + (snint) Counter.icp.kbytes_sent.kb, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_ICP_RKB: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.icp.kbytes_recv.kb, SMI_COUNTER32); + (snint) Counter.icp.kbytes_recv.kb, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_REQ: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.server.all.requests, SMI_INTEGER); + (snint) Counter.server.all.requests, + SMI_INTEGER); break; case PERF_PROTOSTAT_AGGR_ERRORS: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.server.all.errors, SMI_INTEGER); + (snint) Counter.server.all.errors, + SMI_INTEGER); break; case PERF_PROTOSTAT_AGGR_KBYTES_IN: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.server.all.kbytes_in.kb, SMI_COUNTER32); + (snint) Counter.server.all.kbytes_in.kb, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_KBYTES_OUT: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.server.all.kbytes_out.kb, SMI_COUNTER32); + (snint) Counter.server.all.kbytes_out.kb, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_CURSWAP: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) store_swap_size, SMI_COUNTER32); + (snint) store_swap_size, + SMI_COUNTER32); break; case PERF_PROTOSTAT_AGGR_CLIENTS: Answer = snmp_var_new_integer(Var->name, Var->name_length, - (snint) Counter.client_http.clients, SMI_COUNTER32); + (snint) Counter.client_http.clients, + SMI_COUNTER32); break; default: *ErrP = SNMP_ERR_NOSUCHNAME; @@ -400,14 +440,10 @@ &f->client_http.hit_svc_time); break; case PERF_MEDIAN_ICP_QUERY: - x = - statHistDeltaMedian(&l->icp.query_svc_time, - &f->icp.query_svc_time); + x = statHistDeltaMedian(&l->icp.query_svc_time, &f->icp.query_svc_time); break; case PERF_MEDIAN_ICP_REPLY: - x = - statHistDeltaMedian(&l->icp.reply_svc_time, - &f->icp.reply_svc_time); + x = statHistDeltaMedian(&l->icp.reply_svc_time, &f->icp.reply_svc_time); break; case PERF_MEDIAN_DNS: x = statHistDeltaMedian(&l->dns.svc_time, &f->dns.svc_time); @@ -423,7 +459,8 @@ return NULL; } return snmp_var_new_integer(Var->name, Var->name_length, - (snint) x, SMI_INTEGER); + (snint) x, + SMI_INTEGER); } *ErrP = SNMP_ERR_NOSUCHNAME; return NULL;