From: wessels <> Date: Tue, 2 Jun 1998 10:18:12 +0000 (+0000) Subject: gindent X-Git-Tag: SQUID_3_0_PRE1~3200 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eeb423fb5bfa31ba0432eee145a4c7cacf078075;p=thirdparty%2Fsquid.git gindent --- diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index baea9e7664..969d30ab9c 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -1,6 +1,6 @@ /* - * $Id: HttpHeader.cc,v 1.37 1998/05/27 22:51:41 rousskov Exp $ + * $Id: HttpHeader.cc,v 1.38 1998/06/02 04:18:12 wessels Exp $ * * DEBUG: section 55 HTTP Header * AUTHOR: Alex Rousskov @@ -184,7 +184,7 @@ static http_hdr_type ReplyHeadersArr[] = HDR_MIME_VERSION, HDR_PUBLIC, HDR_RETRY_AFTER, HDR_SERVER, HDR_SET_COOKIE, HDR_VARY, HDR_WARNING, HDR_PROXY_CONNECTION, HDR_X_CACHE, - HDR_X_CACHE_LOOKUP, + HDR_X_CACHE_LOOKUP, HDR_X_REQUEST_URI, HDR_X_SQUID_ERROR }; @@ -336,7 +336,7 @@ httpHeaderAppend(HttpHeader * dest, const HttpHeader * src) /* use fresh entries to replace old ones */ void -httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask *denied_mask) +httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask) { const HttpHeaderEntry *e; HttpHeaderPos pos = HttpHeaderInitPos; @@ -509,7 +509,7 @@ httpHeaderDelById(HttpHeader * hdr, http_hdr_type id) debug(55, 8) ("%p del-by-id %d\n", hdr, id); assert(hdr); assert_eid(id); - assert_eid(id != HDR_OTHER); /* does not make sense */ + assert_eid(id != HDR_OTHER); /* does not make sense */ if (!CBIT_TEST(hdr->mask, id)) return 0; while ((e = httpHeaderGetEntry(hdr, &pos))) { diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index 3868e7ff9b..9547c9c43f 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -1,5 +1,5 @@ /* - * $Id: HttpHeaderTools.cc,v 1.16 1998/05/30 19:42:58 rousskov Exp $ + * $Id: HttpHeaderTools.cc,v 1.17 1998/06/02 04:18:13 wessels Exp $ * * DEBUG: section 66 HTTP Header Tools * AUTHOR: Alex Rousskov @@ -109,7 +109,7 @@ httpHeaderIdByName(const char *name, int name_len, const HttpHeaderFieldInfo * i /* same as httpHeaderPutStr, but formats the string using snprintf first */ #ifdef __STDC__ void -httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt, ...) +httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) { va_list args; va_start(args, fmt); diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 4d8ed75962..d61229ffc7 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -1,6 +1,6 @@ /* - * $Id: HttpRequest.cc,v 1.5 1998/05/27 22:51:45 rousskov Exp $ + * $Id: HttpRequest.cc,v 1.6 1998/06/02 04:18:14 wessels Exp $ * * DEBUG: section 73 HTTP Request * AUTHOR: Duane Wessels @@ -94,7 +94,7 @@ httpRequestParseHeader(request_t * req, const char *parse_start) /* swaps out request-line and headers, appends terminator */ void -httpRequestSwapOut(const request_t *req, StoreEntry *e) +httpRequestSwapOut(const request_t * req, StoreEntry * e) { assert(req && e); /* store request-line */ @@ -113,7 +113,7 @@ httpRequestSwapOut(const request_t *req, StoreEntry *e) #if UNUSED_CODE void -httpRequestSetHeaders(request_t *req, method_t method, const char *uri, const char *header_str) +httpRequestSetHeaders(request_t * req, method_t method, const char *uri, const char *header_str) { #if OLD_CODE MemBuf mb; @@ -132,16 +132,17 @@ httpRequestSetHeaders(request_t *req, method_t method, const char *uri, const ch #endif httpHeaderParse(&req->header, header_str, header_str + strlen(header_str)); } + #endif /* returns the length of request line + headers + crlf */ int -httpRequestPrefixLen(const request_t *req) +httpRequestPrefixLen(const request_t * req) { assert(req); return strlen(RequestMethodStr[req->method]) + 1 + strLen(req->urlpath) + 1 + - 4+1+3 + 2 + + 4 + 1 + 3 + 2 + req->header.len + 2; } diff --git a/src/MemBuf.cc b/src/MemBuf.cc index 6df022420c..9dd299d727 100644 --- a/src/MemBuf.cc +++ b/src/MemBuf.cc @@ -1,5 +1,5 @@ /* - * $Id: MemBuf.cc,v 1.12 1998/05/30 19:42:59 rousskov Exp $ + * $Id: MemBuf.cc,v 1.13 1998/06/02 04:18:14 wessels Exp $ * * DEBUG: section 59 auto-growing Memory Buffer with printf * AUTHOR: Alex Rousskov @@ -154,12 +154,12 @@ memBufReset(MemBuf * mb) { assert(mb); - if (!mb->buf && !mb->max_capacity && !mb->capacity && !mb->size) { + if (!mb->buf && !mb->max_capacity && !mb->capacity && !mb->size) { /* Null */ memBufDefInit(mb); } else { assert(mb->buf); - assert(mb->freefunc); /* not frozen */ + assert(mb->freefunc); /* not frozen */ /* reset */ memset(mb->buf, 0, mb->capacity); mb->size = 0; @@ -233,7 +233,7 @@ memBufVPrintf(MemBuf * mb, const char *fmt, va_list vargs) /* on Linux and FreeBSD, '\0' is not counted in return value */ /* on XXX it might be counted */ /* check that '\0' is appended and not counted */ - if (!mb->size || mb->buf[mb->size-1]) + if (!mb->size || mb->buf[mb->size - 1]) assert(!mb->buf[mb->size]); else mb->size--; @@ -281,7 +281,7 @@ memBufGrow(MemBuf * mb, mb_size_t min_cap) if (new_cap > mb->max_capacity) new_cap = mb->max_capacity; - assert(new_cap <= mb->max_capacity);/* no overflow */ + assert(new_cap <= mb->max_capacity); /* no overflow */ assert(new_cap > mb->capacity); /* progress */ old_mb = *mb; @@ -317,7 +317,7 @@ memBufGrow(MemBuf * mb, mb_size_t min_cap) /* copy and free old buffer if needed */ if (old_mb.buf && old_mb.freefunc) { memcpy(mb->buf, old_mb.buf, old_mb.size); - (*old_mb.freefunc)(old_mb.buf); + (*old_mb.freefunc) (old_mb.buf); } else { assert(!old_mb.buf && !old_mb.freefunc); } diff --git a/src/StatHist.cc b/src/StatHist.cc index a39e7e4d5e..a482d987f5 100644 --- a/src/StatHist.cc +++ b/src/StatHist.cc @@ -1,6 +1,6 @@ /* - * $Id: StatHist.cc,v 1.9 1998/05/27 20:31:31 wessels Exp $ + * $Id: StatHist.cc,v 1.10 1998/06/02 04:18:15 wessels Exp $ * * DEBUG: section 62 Generic Histogram * AUTHOR: Duane Wessels @@ -192,7 +192,7 @@ statHistBinDumper(StoreEntry * sentry, int idx, double val, double size, int cou } void -statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper *bd) +statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper * bd) { int i; double left_border = H->min; @@ -248,7 +248,7 @@ statHistEnumDumper(StoreEntry * sentry, int idx, double val, double size, int co void statHistIntInit(StatHist * H, int n) { - statHistInit(H, n, &Null, &Null, 0, n-1); + statHistInit(H, n, &Null, &Null, 0, n - 1); } void diff --git a/src/access_log.cc b/src/access_log.cc index f7f1c470f4..6f099423fd 100644 --- a/src/access_log.cc +++ b/src/access_log.cc @@ -1,7 +1,7 @@ /* - * $Id: access_log.cc,v 1.32 1998/05/30 19:43:00 rousskov Exp $ + * $Id: access_log.cc,v 1.33 1998/06/02 04:18:15 wessels Exp $ * * DEBUG: section 46 Access Log * AUTHOR: Duane Wessels @@ -35,8 +35,8 @@ static void accessLogOpen(const char *fname); static char *log_quote(const char *header); -static void accessLogSquid(AccessLogEntry * al, MemBuf *mb); -static void accessLogCommon(AccessLogEntry * al, MemBuf *mb); +static void accessLogSquid(AccessLogEntry * al, MemBuf * mb); +static void accessLogCommon(AccessLogEntry * al, MemBuf * mb); const char *log_tags[] = { @@ -154,7 +154,7 @@ log_quote(const char *header) } static void -accessLogSquid(AccessLogEntry * al, MemBuf *mb) +accessLogSquid(AccessLogEntry * al, MemBuf * mb) { const char *client = NULL; if (Config.onoff.log_fqdn) @@ -179,7 +179,7 @@ accessLogSquid(AccessLogEntry * al, MemBuf *mb) } static void -accessLogCommon(AccessLogEntry * al, MemBuf *mb) +accessLogCommon(AccessLogEntry * al, MemBuf * mb) { const char *client = NULL; if (Config.onoff.log_fqdn) diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 902ba95965..56dd6dd5ff 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -1,6 +1,6 @@ /* - * $Id: cache_cf.cc,v 1.283 1998/05/30 19:43:02 rousskov Exp $ + * $Id: cache_cf.cc,v 1.284 1998/06/02 04:18:16 wessels Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -116,7 +116,7 @@ wordlistAdd(wordlist ** list, const char *key) } void -wordlistCat(const wordlist * w, MemBuf *mb) +wordlistCat(const wordlist * w, MemBuf * mb) { while (NULL != w) { memBufPrintf(mb, "%s\n", w->key); diff --git a/src/client.cc b/src/client.cc index f8b4440ca9..2aade13291 100644 --- a/src/client.cc +++ b/src/client.cc @@ -1,7 +1,8 @@ + /* - * $Id: client.cc,v 1.70 1998/05/28 05:15:44 wessels Exp $ + * $Id: client.cc,v 1.71 1998/06/02 04:18:17 wessels Exp $ * * DEBUG: section 0 WWW Client * AUTHOR: Harvest Derived diff --git a/src/client_side.cc b/src/client_side.cc index 8e063838d9..ebd25684b4 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1,6 +1,6 @@ /* - * $Id: client_side.cc,v 1.321 1998/05/29 04:34:48 rousskov Exp $ + * $Id: client_side.cc,v 1.322 1998/06/02 04:18:18 wessels Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -56,7 +56,7 @@ static int clientCheckTransferDone(clientHttpRequest *); static void CheckQuickAbort(clientHttpRequest *); static void checkFailureRatio(err_type, hier_code); static void clientProcessMiss(clientHttpRequest *); -static void clientBuildReplyHeader(clientHttpRequest * http, HttpReply *rep); +static void clientBuildReplyHeader(clientHttpRequest * http, HttpReply * rep); static clientHttpRequest *parseHttpRequestAbort(ConnStateData * conn, const char *uri); static clientHttpRequest *parseHttpRequest(ConnStateData *, method_t *, int *, char **, size_t *); static RH clientRedirectDone; @@ -541,6 +541,7 @@ updateCDJunkStats() { /* rewrite */ } + #endif void @@ -958,7 +959,7 @@ clientAppendReplyHeader(char *hdr, const char *line, size_t * sz, size_t max) } #endif -#if OLD_CODE /* use new interfaces instead */ +#if OLD_CODE /* use new interfaces instead */ static size_t clientBuildReplyHeader(clientHttpRequest * http, char *hdr_in, @@ -1050,7 +1051,7 @@ clientBuildReplyHeader(clientHttpRequest * http, #endif static void -clientBuildReplyHeader(clientHttpRequest * http, HttpReply *rep) +clientBuildReplyHeader(clientHttpRequest * http, HttpReply * rep) { HttpHeader *hdr = &rep->header; int is_hit = isTcpHit(http->log_type); @@ -1093,7 +1094,7 @@ clientBuildReplyHeader(clientHttpRequest * http, HttpReply *rep) EBIT_CLR(http->request->flags, REQ_PROXY_KEEPALIVE); /* Signal keep-alive if needed */ if (EBIT_TEST(http->request->flags, REQ_PROXY_KEEPALIVE)) - httpHeaderPutStr(hdr, + httpHeaderPutStr(hdr, http->flags.accel ? HDR_CONNECTION : HDR_PROXY_CONNECTION, "keep-alive"); #if ADD_X_REQUEST_URI @@ -1103,16 +1104,16 @@ clientBuildReplyHeader(clientHttpRequest * http, HttpReply *rep) * but X-Request-URI is likely to be the very last header to ease use from a * debugger [hdr->entries.count-1]. */ - httpHeaderPutStr(hdr, HDR_X_REQUEST_URI, + httpHeaderPutStr(hdr, HDR_X_REQUEST_URI, http->entry->mem_obj->url ? http->entry->mem_obj->url : http->uri); #endif } -static HttpReply* +static HttpReply * clientBuildReply(clientHttpRequest * http, const char *buf, size_t size) { HttpReply *rep = httpReplyCreate(); - assert(size <= 4096); /* httpReplyParse depends on this */ + assert(size <= 4096); /* httpReplyParse depends on this */ if (httpReplyParse(rep, buf)) { /* enforce 1.0 reply version */ rep->sline.version = 1.0; @@ -1268,9 +1269,9 @@ clientSendMoreData(void *data, char *buf, ssize_t size) if (http->request->method == METHOD_HEAD) { size_t k = 0; if (rep) - body_size = 0; /* do not forward body for HEAD replies */ + body_size = 0; /* do not forward body for HEAD replies */ else - k = body_size = headersEnd(buf, size); /* unparseable reply, stop and end-of-headers */ + k = body_size = headersEnd(buf, size); /* unparseable reply, stop and end-of-headers */ if (rep || k) { /* force end */ if (entry->store_status == STORE_PENDING) @@ -2298,7 +2299,7 @@ httpAccept(int sock, void *data) commSetSelect(sock, COMM_SELECT_READ, httpAccept, NULL, 0); if ((fd = comm_accept(sock, &peer, &me)) < 0) { if (!ignoreErrno(errno)) - debug(50, 1) ("httpAccept: FD %d: accept failure: %s\n", + debug(50, 1) ("httpAccept: FD %d: accept failure: %s\n", sock, xstrerror()); break; } @@ -2507,7 +2508,7 @@ clientHttpConnectionsOpen(void) continue; comm_listen(fd); commSetSelect(fd, COMM_SELECT_READ, httpAccept, NULL, 0); - /*commSetDefer(fd, httpAcceptDefer, NULL);*/ + /*commSetDefer(fd, httpAcceptDefer, NULL); */ debug(1, 1) ("Accepting HTTP connections on port %d, FD %d.\n", (int) u->i, fd); HttpSockets[NHttpSockets++] = fd; diff --git a/src/errorpage.cc b/src/errorpage.cc index 1d7ec6c691..030d0c8680 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -1,6 +1,6 @@ /* - * $Id: errorpage.cc,v 1.135 1998/05/30 19:43:07 rousskov Exp $ + * $Id: errorpage.cc,v 1.136 1998/06/02 04:18:19 wessels Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels @@ -372,8 +372,8 @@ errorConvert(char token, ErrorState * err) { request_t *r = err->request; static MemBuf mb = MemBufNULL; - const char *p = NULL; /* takes priority over mb if set */ - + const char *p = NULL; /* takes priority over mb if set */ + memBufReset(&mb); switch (token) { case 'B': @@ -503,7 +503,7 @@ errorConvert(char token, ErrorState * err) break; } if (!p) - p = mb.buf; /* do not use mb after this assignment! */ + p = mb.buf; /* do not use mb after this assignment! */ assert(p); debug(4, 3) ("errorConvert: %%%c --> '%s'\n", token, p); return p; diff --git a/src/fqdncache.cc b/src/fqdncache.cc index 7af4322c8d..0e66525d44 100644 --- a/src/fqdncache.cc +++ b/src/fqdncache.cc @@ -1,7 +1,7 @@ /* - * $Id: fqdncache.cc,v 1.104 1998/05/24 03:41:08 wessels Exp $ + * $Id: fqdncache.cc,v 1.105 1998/06/02 04:18:20 wessels Exp $ * * DEBUG: section 35 FQDN Cache * AUTHOR: Harvest Derived @@ -881,7 +881,7 @@ snmp_fqdncacheFn(variable_list * Var, snint * ErrP) while (cnt--) { fq = (fqdncache_entry *) hash_next(fqdn_table); if (NULL == fq) - break; + break; } if (fq == NULL || cnt != 0) { *ErrP = SNMP_ERR_NOSUCHNAME; diff --git a/src/gopher.cc b/src/gopher.cc index f1e316d086..f8d30f9e6c 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -1,7 +1,7 @@ /* - * $Id: gopher.cc,v 1.126 1998/05/30 19:43:09 rousskov Exp $ + * $Id: gopher.cc,v 1.127 1998/06/02 04:18:21 wessels Exp $ * * DEBUG: section 10 Gopher * AUTHOR: Harvest Derived @@ -161,7 +161,7 @@ typedef struct gopher_ds { } GopherStateData; static PF gopherStateFree; -static void gopher_mime_content(MemBuf *mb, const char *name, const char *def); +static void gopher_mime_content(MemBuf * mb, const char *name, const char *def); static void gopherMimeCreate(GopherStateData *); static int gopher_url_parser(const char *url, char *host, @@ -199,7 +199,7 @@ gopherStateFree(int fdnotused, void *data) /* figure out content type from file extension */ static void -gopher_mime_content(MemBuf *mb, const char *name, const char *def_ctype) +gopher_mime_content(MemBuf * mb, const char *name, const char *def_ctype) { char *ctype = mimeGetContentType(name); char *cenc = mimeGetContentEncoding(name); @@ -219,7 +219,7 @@ gopherMimeCreate(GopherStateData * gopherState) memBufDefInit(&mb); - memBufPrintf(&mb, + memBufPrintf(&mb, "HTTP/1.0 200 OK Gatewaying\r\n" "Server: Squid/%s\r\n" "Date: %s\r\n" diff --git a/src/http.cc b/src/http.cc index 757a369b91..1ef9243303 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.277 1998/05/30 19:43:11 rousskov Exp $ + * $Id: http.cc,v 1.278 1998/06/02 04:18:23 wessels Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -613,7 +613,7 @@ httpBuildRequestHeader(request_t * request, debug(11, 3) ("httpBuildRequestHeader:\n%s", orig_request->prefix); #endif httpHeaderInit(hdr_out, hoRequest); - + /* append our IMS header */ if (entry && entry->lastmod > -1 && request->method == METHOD_GET) httpHeaderPutTime(hdr_out, HDR_IF_MODIFIED_SINCE, entry->lastmod); diff --git a/src/icp_v2.cc b/src/icp_v2.cc index 4b20a3aaa5..32e1ccdef6 100644 --- a/src/icp_v2.cc +++ b/src/icp_v2.cc @@ -384,10 +384,10 @@ icpConnectionsOpen(void) if (theInIcpConnection < 0) fatal("Cannot open ICP Port"); commSetSelect(theInIcpConnection, - COMM_SELECT_READ, - icpHandleUdp, - NULL, - 0); + COMM_SELECT_READ, + icpHandleUdp, + NULL, + 0); for (s = Config.mcast_group_list; s; s = s->next) ipcache_nbgethostbyname(s->key, mcastJoinGroups, NULL); debug(12, 1) ("Accepting ICP messages on port %d, FD %d.\n", diff --git a/src/peer_digest.cc b/src/peer_digest.cc index cacfd9cb18..c2177eb0d2 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -1,6 +1,6 @@ /* - * $Id: peer_digest.cc,v 1.34 1998/05/29 20:59:08 rousskov Exp $ + * $Id: peer_digest.cc,v 1.35 1998/06/02 04:18:24 wessels Exp $ * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov @@ -506,7 +506,7 @@ peerDigestFetchFinish(DigestFetchState * fetch, char *buf, const char *err_msg) const time_t expires = fetch->entry->expires; const time_t fetch_resp_time = squid_curtime - fetch->start_time; const int b_read = (fetch->entry->store_status == STORE_PENDING) ? - mem->inmem_hi : mem->object_sz; + mem->inmem_hi : mem->object_sz; const int req_len = req ? httpRequestPrefixLen(req) : 0; assert(req); /* final checks */ diff --git a/src/protos.h b/src/protos.h index 3d0bd41096..27ca830a48 100644 --- a/src/protos.h +++ b/src/protos.h @@ -60,7 +60,7 @@ extern void intlistDestroy(intlist **); extern int intlistFind(intlist * list, int i); extern void wordlistDestroy(wordlist **); extern void configFreeMemory(void); -extern void wordlistCat(const wordlist *, MemBuf *mb); +extern void wordlistCat(const wordlist *, MemBuf * mb); extern void cbdataInit(void); #if CBDATA_DEBUG @@ -314,307 +314,308 @@ extern const char *getStringPrefix(const char *str, const char *end); extern int httpHeaderParseInt(const char *start, int *val); extern int httpHeaderParseSize(const char *start, size_t * sz); #ifdef __STDC__ -extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt, ...); +extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...); #else -extern void httpHeaderPutStrf() +extern void +httpHeaderPutStrf() #endif /* Http Header */ -extern void httpHeaderInitModule(); -extern void httpHeaderCleanModule(); + extern void httpHeaderInitModule(); + extern void httpHeaderCleanModule(); /* init/clean */ -extern void httpHeaderInit(HttpHeader * hdr, http_hdr_owner_type owner); -extern void httpHeaderClean(HttpHeader * hdr); + extern void httpHeaderInit(HttpHeader * hdr, http_hdr_owner_type owner); + extern void httpHeaderClean(HttpHeader * hdr); /* append/update */ -extern void httpHeaderAppend(HttpHeader * dest, const HttpHeader * src); -extern void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask *denied_mask); + extern void httpHeaderAppend(HttpHeader * dest, const HttpHeader * src); + extern void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask); /* parse/pack */ -extern int httpHeaderParse(HttpHeader * hdr, const char *header_start, const char *header_end); -extern void httpHeaderPackInto(const HttpHeader * hdr, Packer * p); + extern int httpHeaderParse(HttpHeader * hdr, const char *header_start, const char *header_end); + extern void httpHeaderPackInto(const HttpHeader * hdr, Packer * p); /* field manipulation */ -extern int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type); -extern void httpHeaderPutInt(HttpHeader * hdr, http_hdr_type type, int number); -extern void httpHeaderPutTime(HttpHeader * hdr, http_hdr_type type, time_t time); -extern void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str); -extern void httpHeaderPutAuth(HttpHeader * hdr, const char *authScheme, const char *realm); -extern void httpHeaderPutCc(HttpHeader * hdr, const HttpHdrCc * cc); -extern void httpHeaderPutExt(HttpHeader * hdr, const char *name, const char *value); -extern int httpHeaderGetInt(const HttpHeader * hdr, http_hdr_type id); -extern time_t httpHeaderGetTime(const HttpHeader * hdr, http_hdr_type id); -extern HttpHdrCc *httpHeaderGetCc(const HttpHeader * hdr); -extern HttpHdrRange *httpHeaderGetRange(const HttpHeader * hdr); -extern HttpHdrContRange *httpHeaderGetContRange(const HttpHeader * hdr); -extern const char *httpHeaderGetStr(const HttpHeader * hdr, http_hdr_type id); -extern const char *httpHeaderGetLastStr(const HttpHeader * hdr, http_hdr_type id); -extern const char *httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *authScheme); -extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id); -extern int httpHeaderDelByName(HttpHeader * hdr, const char *name); -extern int httpHeaderDelById(HttpHeader * hdr, http_hdr_type id); -extern void httpHeaderDelAt(HttpHeader * hdr, HttpHeaderPos pos); + extern int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type); + extern void httpHeaderPutInt(HttpHeader * hdr, http_hdr_type type, int number); + extern void httpHeaderPutTime(HttpHeader * hdr, http_hdr_type type, time_t time); + extern void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str); + extern void httpHeaderPutAuth(HttpHeader * hdr, const char *authScheme, const char *realm); + extern void httpHeaderPutCc(HttpHeader * hdr, const HttpHdrCc * cc); + extern void httpHeaderPutExt(HttpHeader * hdr, const char *name, const char *value); + extern int httpHeaderGetInt(const HttpHeader * hdr, http_hdr_type id); + extern time_t httpHeaderGetTime(const HttpHeader * hdr, http_hdr_type id); + extern HttpHdrCc *httpHeaderGetCc(const HttpHeader * hdr); + extern HttpHdrRange *httpHeaderGetRange(const HttpHeader * hdr); + extern HttpHdrContRange *httpHeaderGetContRange(const HttpHeader * hdr); + extern const char *httpHeaderGetStr(const HttpHeader * hdr, http_hdr_type id); + extern const char *httpHeaderGetLastStr(const HttpHeader * hdr, http_hdr_type id); + extern const char *httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *authScheme); + extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id); + extern int httpHeaderDelByName(HttpHeader * hdr, const char *name); + extern int httpHeaderDelById(HttpHeader * hdr, http_hdr_type id); + extern void httpHeaderDelAt(HttpHeader * hdr, HttpHeaderPos pos); /* avoid using these low level routines */ -extern HttpHeaderEntry *httpHeaderGetEntry(const HttpHeader * hdr, HttpHeaderPos * pos); -extern HttpHeaderEntry *httpHeaderFindEntry(const HttpHeader * hdr, http_hdr_type id); -extern void httpHeaderAddEntry(HttpHeader * hdr, HttpHeaderEntry * e); -extern HttpHeaderEntry *httpHeaderEntryClone(const HttpHeaderEntry * e); -extern void httpHeaderEntryPackInto(const HttpHeaderEntry * e, Packer * p); + extern HttpHeaderEntry *httpHeaderGetEntry(const HttpHeader * hdr, HttpHeaderPos * pos); + extern HttpHeaderEntry *httpHeaderFindEntry(const HttpHeader * hdr, http_hdr_type id); + extern void httpHeaderAddEntry(HttpHeader * hdr, HttpHeaderEntry * e); + extern HttpHeaderEntry *httpHeaderEntryClone(const HttpHeaderEntry * e); + extern void httpHeaderEntryPackInto(const HttpHeaderEntry * e, Packer * p); /* store report about current header usage and other stats */ -extern void httpHeaderStoreReport(StoreEntry * e); + extern void httpHeaderStoreReport(StoreEntry * e); /* Http Msg (currently in HttpReply.c @?@ ) */ -extern int httpMsgIsPersistent(float http_ver, const HttpHeader * hdr); -extern int httpMsgIsolateHeaders(const char **parse_start, const char **blk_start, const char **blk_end); + extern int httpMsgIsPersistent(float http_ver, const HttpHeader * hdr); + extern int httpMsgIsolateHeaders(const char **parse_start, const char **blk_start, const char **blk_end); /* Http Reply */ -extern void httpReplyInitModule(); + extern void httpReplyInitModule(); /* create/destroy */ -extern HttpReply *httpReplyCreate(); -extern void httpReplyDestroy(HttpReply * rep); + extern HttpReply *httpReplyCreate(); + extern void httpReplyDestroy(HttpReply * rep); /* reset: clean, then init */ -extern void httpReplyReset(HttpReply * rep); + extern void httpReplyReset(HttpReply * rep); /* absorb: copy the contents of a new reply to the old one, destroy new one */ -extern void httpReplyAbsorb(HttpReply * rep, HttpReply * new_rep); + extern void httpReplyAbsorb(HttpReply * rep, HttpReply * new_rep); /* parse returns -1,0,+1 on error,need-more-data,success */ -extern int httpReplyParse(HttpReply * rep, const char *buf); /*, int atEnd); */ -extern void httpReplyPackInto(const HttpReply * rep, Packer * p); + extern int httpReplyParse(HttpReply * rep, const char *buf); /*, int atEnd); */ + extern void httpReplyPackInto(const HttpReply * rep, Packer * p); /* ez-routines */ /* mem-pack: returns a ready to use mem buffer with a packed reply */ -extern MemBuf httpReplyPack(const HttpReply * rep); + extern MemBuf httpReplyPack(const HttpReply * rep); /* swap: create swap-based packer, pack, destroy packer */ -extern void httpReplySwapOut(const HttpReply * rep, StoreEntry * e); + extern void httpReplySwapOut(const HttpReply * rep, StoreEntry * e); /* set commonly used info with one call */ -extern void httpReplySetHeaders(HttpReply * rep, double ver, http_status status, + extern void httpReplySetHeaders(HttpReply * rep, double ver, http_status status, const char *reason, const char *ctype, int clen, time_t lmt, time_t expires); /* do everything in one call: init, set, pack, clean, return MemBuf */ -extern MemBuf httpPackedReply(double ver, http_status status, const char *ctype, + extern MemBuf httpPackedReply(double ver, http_status status, const char *ctype, int clen, time_t lmt, time_t expires); /* construct 304 reply and pack it into MemBuf, return MemBuf */ -extern MemBuf httpPacked304Reply(const HttpReply * rep); + extern MemBuf httpPacked304Reply(const HttpReply * rep); /* update when 304 reply is received for a cached object */ -extern void httpReplyUpdateOnNotModified(HttpReply * rep, HttpReply * freshRep); + extern void httpReplyUpdateOnNotModified(HttpReply * rep, HttpReply * freshRep); /* header manipulation */ -extern int httpReplyContentLen(const HttpReply * rep); -extern const char *httpReplyContentType(const HttpReply * rep); -extern time_t httpReplyExpires(const HttpReply * rep); -extern int httpReplyHasCc(const HttpReply * rep, http_hdr_cc_type type); + extern int httpReplyContentLen(const HttpReply * rep); + extern const char *httpReplyContentType(const HttpReply * rep); + extern time_t httpReplyExpires(const HttpReply * rep); + extern int httpReplyHasCc(const HttpReply * rep, http_hdr_cc_type type); /* Http Request */ -extern request_t *requestCreate(method_t, protocol_t, const char *urlpath); -extern void requestDestroy(request_t *); -extern request_t *requestLink(request_t *); -extern void requestUnlink(request_t *); -extern int httpRequestParseHeader(request_t * req, const char *parse_start); -extern void httpRequestSwapOut(const request_t *req, StoreEntry *e); -extern int httpRequestPrefixLen(const request_t *req); -extern int httpRequestHdrAllowed(const HttpHeaderEntry * e, String * strConnection); - -extern void icmpOpen(void); -extern void icmpClose(void); -extern void icmpPing(struct in_addr to); -extern void icmpSourcePing(struct in_addr to, const icp_common_t *, const char *url); -extern void icmpDomainPing(struct in_addr to, const char *domain); - -extern void *icpCreateMessage(icp_opcode opcode, + extern request_t *requestCreate(method_t, protocol_t, const char *urlpath); + extern void requestDestroy(request_t *); + extern request_t *requestLink(request_t *); + extern void requestUnlink(request_t *); + extern int httpRequestParseHeader(request_t * req, const char *parse_start); + extern void httpRequestSwapOut(const request_t * req, StoreEntry * e); + extern int httpRequestPrefixLen(const request_t * req); + extern int httpRequestHdrAllowed(const HttpHeaderEntry * e, String * strConnection); + + extern void icmpOpen(void); + extern void icmpClose(void); + extern void icmpPing(struct in_addr to); + extern void icmpSourcePing(struct in_addr to, const icp_common_t *, const char *url); + extern void icmpDomainPing(struct in_addr to, const char *domain); + + extern void *icpCreateMessage(icp_opcode opcode, int flags, const char *url, int reqnum, int pad); -extern int icpUdpSend(int, const struct sockaddr_in *, icp_common_t *, log_type, int); -extern PF icpHandleUdp; -extern PF httpAccept; + extern int icpUdpSend(int, const struct sockaddr_in *, icp_common_t *, log_type, int); + extern PF icpHandleUdp; + extern PF httpAccept; #ifdef SQUID_SNMP -extern PF snmpHandleUdp; -extern void snmpInit(void); -extern int snmpInitConfig(void); -extern void snmpConnectionOpen(void); -extern void snmpConnectionShutdown(void); -extern void snmpConnectionClose(void); -extern int snmpCreateView(char **); -extern int snmpCreateUser(char **); -extern int snmpCreateCommunity(char **); -extern void snmpTokenize(char *, char **, int); -extern int snmpCompare(oid * name1, int len1, oid * name2, int len2); + extern PF snmpHandleUdp; + extern void snmpInit(void); + extern int snmpInitConfig(void); + extern void snmpConnectionOpen(void); + extern void snmpConnectionShutdown(void); + extern void snmpConnectionClose(void); + extern int snmpCreateView(char **); + extern int snmpCreateUser(char **); + extern int snmpCreateCommunity(char **); + extern void snmpTokenize(char *, char **, int); + extern int snmpCompare(oid * name1, int len1, oid * name2, int len2); #endif /* SQUID_SNMP */ -extern void icpHandleIcpV3(int, struct sockaddr_in, char *, int); -extern int icpCheckUdpHit(StoreEntry *, request_t * request); -extern void icpConnectionsOpen(void); -extern void icpConnectionShutdown(void); -extern void icpConnectionClose(void); + extern void icpHandleIcpV3(int, struct sockaddr_in, char *, int); + extern int icpCheckUdpHit(StoreEntry *, request_t * request); + extern void icpConnectionsOpen(void); + extern void icpConnectionShutdown(void); + extern void icpConnectionClose(void); -extern void ipcache_nbgethostbyname(const char *name, + extern void ipcache_nbgethostbyname(const char *name, IPH * handler, void *handlerData); -extern EVH ipcache_purgelru; -extern const ipcache_addrs *ipcache_gethostbyname(const char *, int flags); -extern void ipcacheInvalidate(const char *); -extern void ipcacheReleaseInvalid(const char *); -extern void ipcacheShutdownServers(void); -extern void ipcache_init(void); -extern void stat_ipcache_get(StoreEntry *); -extern int ipcacheQueueDrain(void); -extern void ipcacheCycleAddr(const char *name, ipcache_addrs *); -extern void ipcacheMarkBadAddr(const char *name, struct in_addr); -extern void ipcacheMarkGoodAddr(const char *name, struct in_addr); -extern void ipcacheFreeMemory(void); -extern ipcache_addrs *ipcacheCheckNumeric(const char *name); -extern void ipcache_restart(void); -extern int ipcacheUnregister(const char *name, void *data); + extern EVH ipcache_purgelru; + extern const ipcache_addrs *ipcache_gethostbyname(const char *, int flags); + extern void ipcacheInvalidate(const char *); + extern void ipcacheReleaseInvalid(const char *); + extern void ipcacheShutdownServers(void); + extern void ipcache_init(void); + extern void stat_ipcache_get(StoreEntry *); + extern int ipcacheQueueDrain(void); + extern void ipcacheCycleAddr(const char *name, ipcache_addrs *); + extern void ipcacheMarkBadAddr(const char *name, struct in_addr); + extern void ipcacheMarkGoodAddr(const char *name, struct in_addr); + extern void ipcacheFreeMemory(void); + extern ipcache_addrs *ipcacheCheckNumeric(const char *name); + extern void ipcache_restart(void); + extern int ipcacheUnregister(const char *name, void *data); /* MemBuf */ /* init with specific sizes */ -extern void memBufInit(MemBuf * mb, mb_size_t szInit, mb_size_t szMax); + extern void memBufInit(MemBuf * mb, mb_size_t szInit, mb_size_t szMax); /* init with defaults */ -extern void memBufDefInit(MemBuf * mb); + extern void memBufDefInit(MemBuf * mb); /* cleans mb; last function to call if you do not give .buf away */ -extern void memBufClean(MemBuf * mb); + extern void memBufClean(MemBuf * mb); /* resets mb preserving (or initializing if needed) memory buffer */ -extern void memBufReset(MemBuf * mb); + extern void memBufReset(MemBuf * mb); /* calls memcpy, appends exactly size bytes, extends buffer if needed */ -extern void memBufAppend(MemBuf * mb, const char *buf, mb_size_t size); + extern void memBufAppend(MemBuf * mb, const char *buf, mb_size_t size); /* calls snprintf, extends buffer if needed */ #ifdef __STDC__ -extern void memBufPrintf(MemBuf * mb, const char *fmt,...); + extern void memBufPrintf(MemBuf * mb, const char *fmt,...); #else -extern void memBufPrintf(); + extern void memBufPrintf(); #endif /* vprintf for other printf()'s to use */ -extern void memBufVPrintf(MemBuf * mb, const char *fmt, va_list ap); + extern void memBufVPrintf(MemBuf * mb, const char *fmt, va_list ap); /* returns free() function to be used, _freezes_ the object! */ -extern FREE *memBufFreeFunc(MemBuf * mb); + extern FREE *memBufFreeFunc(MemBuf * mb); /* puts report on MemBuf _module_ usage into mb */ -extern void memBufReport(MemBuf * mb); + extern void memBufReport(MemBuf * mb); -extern char *mime_get_header(const char *mime, const char *header); -extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix); + extern char *mime_get_header(const char *mime, const char *header); + extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix); #if OLD_CODE -extern char *mime_headers_end(const char *mime); + extern char *mime_headers_end(const char *mime); #endif -extern size_t headersEnd(const char *, size_t); -extern const char *mime_get_auth(const char *hdr, const char *auth_scheme, const char **auth_field); + extern size_t headersEnd(const char *, size_t); + extern const char *mime_get_auth(const char *hdr, const char *auth_scheme, const char **auth_field); -extern void mimeInit(char *filename); -extern char *mimeGetContentEncoding(const char *fn); -extern char *mimeGetContentType(const char *fn); -extern char *mimeGetIcon(const char *fn); -extern char *mimeGetIconURL(const char *fn); -extern char mimeGetTransferMode(const char *fn); + extern void mimeInit(char *filename); + extern char *mimeGetContentEncoding(const char *fn); + extern char *mimeGetContentType(const char *fn); + extern char *mimeGetIcon(const char *fn); + extern char *mimeGetIconURL(const char *fn); + extern char mimeGetTransferMode(const char *fn); -extern int mcastSetTtl(int, int); -extern IPH mcastJoinGroups; + extern int mcastSetTtl(int, int); + extern IPH mcastJoinGroups; /* Labels for hierachical log file */ /* put them all here for easier reference when writing a logfile analyzer */ -extern peer *getFirstPeer(void); -extern peer *getFirstUpParent(request_t *); -extern peer *getNextPeer(peer *); -extern peer *getSingleParent(request_t *); -extern int neighborsCount(request_t *); -extern int neighborsUdpPing(request_t *, + extern peer *getFirstPeer(void); + extern peer *getFirstUpParent(request_t *); + extern peer *getNextPeer(peer *); + extern peer *getSingleParent(request_t *); + extern int neighborsCount(request_t *); + extern int neighborsUdpPing(request_t *, StoreEntry *, IRCB * callback, void *data, int *exprep, double *exprtt); -extern void neighborAddAcl(const char *, const char *); -extern void neighborsUdpAck(const cache_key *, icp_common_t *, const struct sockaddr_in *); -extern void neighborAdd(const char *, const char *, int, int, int, int, int); -extern void neighbors_open(int); -extern peer *peerFindByName(const char *); -extern peer *getDefaultParent(request_t * request); -extern peer *getRoundRobinParent(request_t * request); -extern lookup_t peerDigestLookup(peer * p, request_t * request, StoreEntry * entry); -extern peer *neighborsDigestSelect(request_t * request, StoreEntry * entry); -extern void peerNoteDigestLookup(request_t * request, peer * p, lookup_t lookup); -extern int neighborUp(const peer * e); -extern void peerDestroy(peer * e); -extern char *neighborTypeStr(const peer * e); -extern void peerCheckConnectStart(peer *); -extern void dump_peer_options(StoreEntry *, peer *); -extern int peerHTTPOkay(const peer *, request_t *); - -extern void netdbInit(void); -extern void netdbHandlePingReply(const struct sockaddr_in *from, int hops, int rtt); -extern void netdbPingSite(const char *hostname); -extern void netdbInit(void); -extern void netdbDump(StoreEntry *); -extern int netdbHops(struct in_addr); -extern void netdbFreeMemory(void); -extern int netdbHostHops(const char *host); -extern int netdbHostRtt(const char *host); -extern int netdbHostPeerRtt(const char *host, peer * peer); -extern void netdbUpdatePeer(request_t *, peer * e, int rtt, int hops); -extern void netdbDeleteAddrNetwork(struct in_addr addr); -extern int netdbHostPeerRtt(const char *host, peer * peer); -extern void netdbBinaryExchange(StoreEntry *); -extern EVH netdbExchangeStart; -extern void netdbExchangeUpdatePeer(struct in_addr, peer *, double, double); -extern peer *netdbClosestParent(request_t *); - -extern void cachemgrStart(int fd, request_t * request, StoreEntry * entry); -extern void cachemgrRegister(const char *, const char *, OBJH *, int); -extern void cachemgrInit(void); - -extern void peerSelect(request_t *, StoreEntry *, PSC *, PSC *, void *data); -extern peer *peerGetSomeParent(request_t *, hier_code *); -extern void peerSelectInit(void); + extern void neighborAddAcl(const char *, const char *); + extern void neighborsUdpAck(const cache_key *, icp_common_t *, const struct sockaddr_in *); + extern void neighborAdd(const char *, const char *, int, int, int, int, int); + extern void neighbors_open(int); + extern peer *peerFindByName(const char *); + extern peer *getDefaultParent(request_t * request); + extern peer *getRoundRobinParent(request_t * request); + extern lookup_t peerDigestLookup(peer * p, request_t * request, StoreEntry * entry); + extern peer *neighborsDigestSelect(request_t * request, StoreEntry * entry); + extern void peerNoteDigestLookup(request_t * request, peer * p, lookup_t lookup); + extern int neighborUp(const peer * e); + extern void peerDestroy(peer * e); + extern char *neighborTypeStr(const peer * e); + extern void peerCheckConnectStart(peer *); + extern void dump_peer_options(StoreEntry *, peer *); + extern int peerHTTPOkay(const peer *, request_t *); + + extern void netdbInit(void); + extern void netdbHandlePingReply(const struct sockaddr_in *from, int hops, int rtt); + extern void netdbPingSite(const char *hostname); + extern void netdbInit(void); + extern void netdbDump(StoreEntry *); + extern int netdbHops(struct in_addr); + extern void netdbFreeMemory(void); + extern int netdbHostHops(const char *host); + extern int netdbHostRtt(const char *host); + extern int netdbHostPeerRtt(const char *host, peer * peer); + extern void netdbUpdatePeer(request_t *, peer * e, int rtt, int hops); + extern void netdbDeleteAddrNetwork(struct in_addr addr); + extern int netdbHostPeerRtt(const char *host, peer * peer); + extern void netdbBinaryExchange(StoreEntry *); + extern EVH netdbExchangeStart; + extern void netdbExchangeUpdatePeer(struct in_addr, peer *, double, double); + extern peer *netdbClosestParent(request_t *); + + extern void cachemgrStart(int fd, request_t * request, StoreEntry * entry); + extern void cachemgrRegister(const char *, const char *, OBJH *, int); + extern void cachemgrInit(void); + + extern void peerSelect(request_t *, StoreEntry *, PSC *, PSC *, void *data); + extern peer *peerGetSomeParent(request_t *, hier_code *); + extern void peerSelectInit(void); /* peer_digest.c */ -extern EVH peerDigestInit; + extern EVH peerDigestInit; -extern void protoDispatch(int, StoreEntry *, request_t *); + extern void protoDispatch(int, StoreEntry *, request_t *); -extern int protoUnregister(StoreEntry *, request_t *); -extern int protoAbortFetch(StoreEntry * entry); -extern DEFER protoCheckDeferRead; + extern int protoUnregister(StoreEntry *, request_t *); + extern int protoAbortFetch(StoreEntry * entry); + extern DEFER protoCheckDeferRead; -extern void urnStart(request_t *, StoreEntry *); + extern void urnStart(request_t *, StoreEntry *); -extern void redirectStart(clientHttpRequest *, RH *, void *); -extern void redirectOpenServers(void); -extern void redirectShutdownServers(void); -extern void redirectStats(StoreEntry *); -extern int redirectUnregister(const char *url, void *); -extern void redirectFreeMemory(void); + extern void redirectStart(clientHttpRequest *, RH *, void *); + extern void redirectOpenServers(void); + extern void redirectShutdownServers(void); + extern void redirectStats(StoreEntry *); + extern int redirectUnregister(const char *url, void *); + extern void redirectFreeMemory(void); -extern void refreshAddToList(const char *, int, time_t, int, time_t); -extern int refreshCheck(const StoreEntry *, const request_t *, time_t delta); -extern time_t refreshWhen(const StoreEntry * entry); -extern time_t getMaxAge(const char *url); + extern void refreshAddToList(const char *, int, time_t, int, time_t); + extern int refreshCheck(const StoreEntry *, const request_t *, time_t delta); + extern time_t refreshWhen(const StoreEntry * entry); + extern time_t getMaxAge(const char *url); -extern void serverConnectionsClose(void); -extern void shut_down(int); + extern void serverConnectionsClose(void); + extern void shut_down(int); -extern void start_announce(void *unused); -extern void sslStart(int fd, const char *, request_t *, size_t * sz); -extern void waisStart(request_t *, StoreEntry *); -extern void passStart(int, const char *, request_t *, size_t *); -extern void identStart(int, ConnStateData *, IDCB * callback, void *); + extern void start_announce(void *unused); + extern void sslStart(int fd, const char *, request_t *, size_t * sz); + extern void waisStart(request_t *, StoreEntry *); + extern void passStart(int, const char *, request_t *, size_t *); + extern void identStart(int, ConnStateData *, IDCB * callback, void *); -extern void statInit(void); -extern double median_svc_get(int, int); -extern void pconnHistCount(int, int); -extern int stat5minClientRequests(void); + extern void statInit(void); + extern double median_svc_get(int, int); + extern void pconnHistCount(int, int); + extern int stat5minClientRequests(void); /* StatHist */ -extern void statHistClean(StatHist * H); -extern void statHistCount(StatHist * H, double val); -extern void statHistCopy(StatHist * Dest, const StatHist * Orig); -extern void statHistSafeCopy(StatHist * Dest, const StatHist * Orig); -extern double statHistDeltaMedian(const StatHist * A, const StatHist * B); -extern void statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper bd); -extern void statHistLogInit(StatHist * H, int capacity, double min, double max); -extern void statHistEnumInit(StatHist * H, int last_enum); -extern StatHistBinDumper statHistEnumDumper; -extern StatHistBinDumper statHistIntDumper; + extern void statHistClean(StatHist * H); + extern void statHistCount(StatHist * H, double val); + extern void statHistCopy(StatHist * Dest, const StatHist * Orig); + extern void statHistSafeCopy(StatHist * Dest, const StatHist * Orig); + extern double statHistDeltaMedian(const StatHist * A, const StatHist * B); + extern void statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper bd); + extern void statHistLogInit(StatHist * H, int capacity, double min, double max); + extern void statHistEnumInit(StatHist * H, int last_enum); + extern StatHistBinDumper statHistEnumDumper; + extern StatHistBinDumper statHistIntDumper; /* MemMeter */ -extern void memMeterSyncHWater(MemMeter * m); + extern void memMeterSyncHWater(MemMeter * m); #define memMeterCheckHWater(m) { if ((m).hwater_level < (m).level) memMeterSyncHWater(&(m)); } #define memMeterInc(m) { (m).level++; memMeterCheckHWater(m); } #define memMeterDec(m) { (m).level--; } @@ -622,314 +623,314 @@ extern void memMeterSyncHWater(MemMeter * m); #define memMeterDel(m, sz) { (m).level -= (sz); } /* mem */ -extern void memInit(void); -extern void memClean(); -extern void memInitModule(); -extern void memCleanModule(); -extern void memConfigure(); -extern void *memAllocate(mem_type); -extern void *memAllocBuf(size_t net_size, size_t * gross_size); -extern void memFree(mem_type, void *); -extern void memFreeBuf(size_t size, void *); -extern void memFree2K(void *); -extern void memFree4K(void *); -extern void memFree8K(void *); -extern void memFreeDISK(void *); -extern int memInUse(mem_type); -extern size_t memTotalAllocated(); + extern void memInit(void); + extern void memClean(); + extern void memInitModule(); + extern void memCleanModule(); + extern void memConfigure(); + extern void *memAllocate(mem_type); + extern void *memAllocBuf(size_t net_size, size_t * gross_size); + extern void memFree(mem_type, void *); + extern void memFreeBuf(size_t size, void *); + extern void memFree2K(void *); + extern void memFree4K(void *); + extern void memFree8K(void *); + extern void memFreeDISK(void *); + extern int memInUse(mem_type); + extern size_t memTotalAllocated(); /* MemPool */ -extern MemPool *memPoolCreate(const char *label, size_t obj_size); -extern void memPoolDestroy(MemPool * pool); -extern void *memPoolAlloc(MemPool * pool); -extern void memPoolFree(MemPool * pool, void *obj); -extern int memPoolWasUsed(const MemPool * pool); -extern int memPoolInUseCount(const MemPool * pool); -extern size_t memPoolInUseSize(const MemPool * pool); -extern int memPoolUsedCount(const MemPool * pool); -extern void memPoolReport(const MemPool * pool, StoreEntry * e); + extern MemPool *memPoolCreate(const char *label, size_t obj_size); + extern void memPoolDestroy(MemPool * pool); + extern void *memPoolAlloc(MemPool * pool); + extern void memPoolFree(MemPool * pool, void *obj); + extern int memPoolWasUsed(const MemPool * pool); + extern int memPoolInUseCount(const MemPool * pool); + extern size_t memPoolInUseSize(const MemPool * pool); + extern int memPoolUsedCount(const MemPool * pool); + extern void memPoolReport(const MemPool * pool, StoreEntry * e); /* Mem */ -extern void memReport(StoreEntry * e); -extern size_t memTotalAllocated(void); + extern void memReport(StoreEntry * e); + extern size_t memTotalAllocated(void); -extern int stmemFreeDataUpto(mem_hdr *, int); -extern void stmemAppend(mem_hdr *, const char *, int); -extern ssize_t stmemCopy(const mem_hdr *, off_t, char *, size_t); -extern void stmemFree(mem_hdr *); -extern void stmemFreeData(mem_hdr *); + extern int stmemFreeDataUpto(mem_hdr *, int); + extern void stmemAppend(mem_hdr *, const char *, int); + extern ssize_t stmemCopy(const mem_hdr *, off_t, char *, size_t); + extern void stmemFree(mem_hdr *); + extern void stmemFreeData(mem_hdr *); /* ----------------------------------------------------------------- */ /* * store.c */ -extern StoreEntry *new_StoreEntry(int, const char *, const char *); -extern StoreEntry *storeGet(const cache_key *); -extern StoreEntry *storeCreateEntry(const char *, const char *, int, method_t); -extern void storeSetPublicKey(StoreEntry *); -extern void storeComplete(StoreEntry *); -extern void storeInit(void); -extern int storeClientWaiting(const StoreEntry *); -extern void storeAbort(StoreEntry *, int); -extern void storeAppend(StoreEntry *, const char *, int); -extern void storeLockObject(StoreEntry *); -extern void storeSwapInStart(StoreEntry *, SIH *, void *data); -extern void storeRelease(StoreEntry *); -extern int storeUnlockObject(StoreEntry *); -extern int storeUnregister(StoreEntry *, void *); -extern void storeClientCopy(StoreEntry * e, + extern StoreEntry *new_StoreEntry(int, const char *, const char *); + extern StoreEntry *storeGet(const cache_key *); + extern StoreEntry *storeCreateEntry(const char *, const char *, int, method_t); + extern void storeSetPublicKey(StoreEntry *); + extern void storeComplete(StoreEntry *); + extern void storeInit(void); + extern int storeClientWaiting(const StoreEntry *); + extern void storeAbort(StoreEntry *, int); + extern void storeAppend(StoreEntry *, const char *, int); + extern void storeLockObject(StoreEntry *); + extern void storeSwapInStart(StoreEntry *, SIH *, void *data); + extern void storeRelease(StoreEntry *); + extern int storeUnlockObject(StoreEntry *); + extern int storeUnregister(StoreEntry *, void *); + extern void storeClientCopy(StoreEntry * e, off_t seen_offset, off_t copy_offset, size_t size, char *buf, STCB * callback, void *data); -extern int storePendingNClients(const StoreEntry *); -extern HASHCMP urlcmp; -extern EVH storeMaintainSwapSpace; -extern void storeExpireNow(StoreEntry *); -extern void storeReleaseRequest(StoreEntry *); -extern off_t storeLowestMemReaderOffset(const StoreEntry *); -extern void storeConfigure(void); -extern void storeNegativeCache(StoreEntry *); -extern void storeFreeMemory(void); -extern int expiresMoreThan(time_t, time_t); -extern int storeClientCopyPending(StoreEntry *, void *); -extern void InvokeHandlers(StoreEntry *); -extern int storeEntryValidToSend(StoreEntry *); -extern void storeTimestampsSet(StoreEntry *); -extern time_t storeExpiredReferenceAge(void); -extern void storeRegisterAbort(StoreEntry * e, STABH * cb, void *); -extern void storeUnregisterAbort(StoreEntry * e); -extern void storeMemObjectDump(MemObject * mem); -extern void storeEntryDump(StoreEntry * e, int debug_lvl); -extern const char *storeUrl(const StoreEntry *); -extern void storeCreateMemObject(StoreEntry *, const char *, const char *); -extern void storeCopyNotModifiedReplyHeaders(MemObject * O, MemObject * N); -extern void storeBuffer(StoreEntry *); -extern void storeBufferFlush(StoreEntry *); -extern void storeHashInsert(StoreEntry * e, const cache_key *); -extern void storeSetMemStatus(StoreEntry * e, int); + extern int storePendingNClients(const StoreEntry *); + extern HASHCMP urlcmp; + extern EVH storeMaintainSwapSpace; + extern void storeExpireNow(StoreEntry *); + extern void storeReleaseRequest(StoreEntry *); + extern off_t storeLowestMemReaderOffset(const StoreEntry *); + extern void storeConfigure(void); + extern void storeNegativeCache(StoreEntry *); + extern void storeFreeMemory(void); + extern int expiresMoreThan(time_t, time_t); + extern int storeClientCopyPending(StoreEntry *, void *); + extern void InvokeHandlers(StoreEntry *); + extern int storeEntryValidToSend(StoreEntry *); + extern void storeTimestampsSet(StoreEntry *); + extern time_t storeExpiredReferenceAge(void); + extern void storeRegisterAbort(StoreEntry * e, STABH * cb, void *); + extern void storeUnregisterAbort(StoreEntry * e); + extern void storeMemObjectDump(MemObject * mem); + extern void storeEntryDump(StoreEntry * e, int debug_lvl); + extern const char *storeUrl(const StoreEntry *); + extern void storeCreateMemObject(StoreEntry *, const char *, const char *); + extern void storeCopyNotModifiedReplyHeaders(MemObject * O, MemObject * N); + extern void storeBuffer(StoreEntry *); + extern void storeBufferFlush(StoreEntry *); + extern void storeHashInsert(StoreEntry * e, const cache_key *); + extern void storeSetMemStatus(StoreEntry * e, int); #ifdef __STDC__ -extern void storeAppendPrintf(StoreEntry *, const char *,...); + extern void storeAppendPrintf(StoreEntry *, const char *,...); #else -extern void storeAppendPrintf(); + extern void storeAppendPrintf(); #endif -extern void storeAppendVPrintf(StoreEntry *, const char *, va_list ap); -extern int storeCheckCachable(StoreEntry * e); -extern void storeUnlinkFileno(int fileno); -extern void storeSetPrivateKey(StoreEntry *); -extern int objectLen(const StoreEntry * e); -extern int contentLen(const StoreEntry * e); -extern HttpReply *storeEntryReply(StoreEntry *); + extern void storeAppendVPrintf(StoreEntry *, const char *, va_list ap); + extern int storeCheckCachable(StoreEntry * e); + extern void storeUnlinkFileno(int fileno); + extern void storeSetPrivateKey(StoreEntry *); + extern int objectLen(const StoreEntry * e); + extern int contentLen(const StoreEntry * e); + extern HttpReply *storeEntryReply(StoreEntry *); /* * store_log.c */ -extern void storeLog(int tag, const StoreEntry * e); -extern void storeLogRotate(void); -extern void storeLogClose(void); -extern void storeLogOpen(void); + extern void storeLog(int tag, const StoreEntry * e); + extern void storeLogRotate(void); + extern void storeLogClose(void); + extern void storeLogOpen(void); /* * store_key_*.c */ -extern const cache_key *storeKeyDup(const cache_key *); -extern void storeKeyFree(const cache_key *); -extern const cache_key *storeKeyScan(const char *); -extern const char *storeKeyText(const cache_key *); -extern const cache_key *storeKeyPublic(const char *, method_t); -extern const cache_key *storeKeyPrivate(const char *, method_t, int); -extern int storeKeyHashBuckets(int); -extern int storeKeyNull(const cache_key *); -extern void storeKeyInit(void); -extern HASHHASH storeKeyHashHash; -extern HASHCMP storeKeyHashCmp; + extern const cache_key *storeKeyDup(const cache_key *); + extern void storeKeyFree(const cache_key *); + extern const cache_key *storeKeyScan(const char *); + extern const char *storeKeyText(const cache_key *); + extern const cache_key *storeKeyPublic(const char *, method_t); + extern const cache_key *storeKeyPrivate(const char *, method_t, int); + extern int storeKeyHashBuckets(int); + extern int storeKeyNull(const cache_key *); + extern void storeKeyInit(void); + extern HASHHASH storeKeyHashHash; + extern HASHCMP storeKeyHashCmp; /* * store_clean.c */ -extern EVH storeDirClean; + extern EVH storeDirClean; /* store_digest.c */ -extern void storeDigestInit(); -extern void storeDigestNoteStoreReady(); -extern void storeDigestScheduleRebuild(); -extern void storeDigestAdd(const StoreEntry * entry); -extern void storeDigestDel(const StoreEntry * entry); -extern void storeDigestReport(); + extern void storeDigestInit(); + extern void storeDigestNoteStoreReady(); + extern void storeDigestScheduleRebuild(); + extern void storeDigestAdd(const StoreEntry * entry); + extern void storeDigestDel(const StoreEntry * entry); + extern void storeDigestReport(); /* * store_dir.c */ -extern char *storeSwapFullPath(int, char *); -extern char *storeSwapSubSubDir(int, char *); -extern int storeVerifySwapDirs(void); -extern const char *storeSwapPath(int); -extern int storeDirMapBitTest(int fn); -extern void storeDirMapBitSet(int fn); -extern void storeDirMapBitReset(int fn); -extern int storeDirMapAllocate(void); -extern char *storeSwapDir(int); -extern FILE *storeDirOpenTmpSwapLog(int dirn, int *clean, int *zero); -extern void storeDirCloseTmpSwapLog(int dirn); -extern void storeDirOpenSwapLogs(void); -extern void storeDirCloseSwapLogs(void); -extern char *storeDirSwapLogFile(int, const char *); -extern void storeDirSwapLog(const StoreEntry *, int op); -extern int storeDirNumber(int fileno); -extern void storeDirUpdateSwapSize(int fn, size_t size, int sign); -extern int storeDirProperFileno(int dirn, int fn); -extern void storeCreateSwapDirectories(void); -extern int storeVerifyCacheDirs(void); -extern int storeDirWriteCleanLogs(int reopen); -extern int storeDirValidFileno(int fn); -extern int storeFilenoBelongsHere(int, int, int, int); -extern OBJH storeDirStats; -extern int storeDirMapBitsInUse(void); + extern char *storeSwapFullPath(int, char *); + extern char *storeSwapSubSubDir(int, char *); + extern int storeVerifySwapDirs(void); + extern const char *storeSwapPath(int); + extern int storeDirMapBitTest(int fn); + extern void storeDirMapBitSet(int fn); + extern void storeDirMapBitReset(int fn); + extern int storeDirMapAllocate(void); + extern char *storeSwapDir(int); + extern FILE *storeDirOpenTmpSwapLog(int dirn, int *clean, int *zero); + extern void storeDirCloseTmpSwapLog(int dirn); + extern void storeDirOpenSwapLogs(void); + extern void storeDirCloseSwapLogs(void); + extern char *storeDirSwapLogFile(int, const char *); + extern void storeDirSwapLog(const StoreEntry *, int op); + extern int storeDirNumber(int fileno); + extern void storeDirUpdateSwapSize(int fn, size_t size, int sign); + extern int storeDirProperFileno(int dirn, int fn); + extern void storeCreateSwapDirectories(void); + extern int storeVerifyCacheDirs(void); + extern int storeDirWriteCleanLogs(int reopen); + extern int storeDirValidFileno(int fn); + extern int storeFilenoBelongsHere(int, int, int, int); + extern OBJH storeDirStats; + extern int storeDirMapBitsInUse(void); /* * store_swapmeta.c */ -extern char *storeSwapMetaPack(tlv * tlv_list, int *length); -extern tlv *storeSwapMetaBuild(StoreEntry * e); -extern tlv *storeSwapMetaUnpack(const char *buf, int *hdrlen); -extern void storeSwapTLVFree(tlv * n); + extern char *storeSwapMetaPack(tlv * tlv_list, int *length); + extern tlv *storeSwapMetaBuild(StoreEntry * e); + extern tlv *storeSwapMetaUnpack(const char *buf, int *hdrlen); + extern void storeSwapTLVFree(tlv * n); /* * store_rebuild.c */ -extern void storeDoRebuildFromSwapFiles(void *data); -extern void storeValidate(StoreEntry *, STVLDCB *, void *, void *); -extern void storeValidateComplete(void *data, int retcode, int errcode); -extern void storeRebuildStart(void); + extern void storeDoRebuildFromSwapFiles(void *data); + extern void storeValidate(StoreEntry *, STVLDCB *, void *, void *); + extern void storeValidateComplete(void *data, int retcode, int errcode); + extern void storeRebuildStart(void); /* * store_swapin.c */ -extern void storeSwapInStart(StoreEntry * e, SIH * callback, void *callback_data); -extern void storeSwapInValidateComplete(void *data, int retcode, int errcode); -extern void storeSwapInFileOpened(void *data, int fd, int errcode); + extern void storeSwapInStart(StoreEntry * e, SIH * callback, void *callback_data); + extern void storeSwapInValidateComplete(void *data, int retcode, int errcode); + extern void storeSwapInFileOpened(void *data, int fd, int errcode); /* * store_swapout.c */ -extern void storeSwapOutStart(StoreEntry * e); -extern void storeSwapOutHandle(int fdnotused, int flag, size_t len, void *data); -extern void storeCheckSwapOut(StoreEntry * e); -extern void storeSwapOutFileClose(StoreEntry * e); -extern int storeSwapOutWriteQueued(MemObject * mem); + extern void storeSwapOutStart(StoreEntry * e); + extern void storeSwapOutHandle(int fdnotused, int flag, size_t len, void *data); + extern void storeCheckSwapOut(StoreEntry * e); + extern void storeSwapOutFileClose(StoreEntry * e); + extern int storeSwapOutWriteQueued(MemObject * mem); /* * store_client.c */ -extern store_client *storeClientListSearch(const MemObject * mem, void *data); -extern void storeClientListAdd(StoreEntry * e, void *data); -extern void storeClientCopy(StoreEntry *, off_t, off_t, size_t, char *, STCB *, void *); -extern int storeClientCopyPending(StoreEntry * e, void *data); -extern int storeUnregister(StoreEntry * e, void *data); -extern off_t storeLowestMemReaderOffset(const StoreEntry * entry); -extern void InvokeHandlers(StoreEntry * e); -extern int storePendingNClients(const StoreEntry * e); - - -extern const char *getMyHostname(void); -extern void safeunlink(const char *path, int quiet); -extern void death(int sig); -extern void fatal(const char *message); + extern store_client *storeClientListSearch(const MemObject * mem, void *data); + extern void storeClientListAdd(StoreEntry * e, void *data); + extern void storeClientCopy(StoreEntry *, off_t, off_t, size_t, char *, STCB *, void *); + extern int storeClientCopyPending(StoreEntry * e, void *data); + extern int storeUnregister(StoreEntry * e, void *data); + extern off_t storeLowestMemReaderOffset(const StoreEntry * entry); + extern void InvokeHandlers(StoreEntry * e); + extern int storePendingNClients(const StoreEntry * e); + + + extern const char *getMyHostname(void); + extern void safeunlink(const char *path, int quiet); + extern void death(int sig); + extern void fatal(const char *message); #ifdef __STDC__ -extern void fatalf(const char *fmt,...); + extern void fatalf(const char *fmt,...); #else -extern void fatalf(); + extern void fatalf(); #endif -extern void fatal_dump(const char *message); -extern void sigusr2_handle(int sig); -extern void sig_child(int sig); -extern void leave_suid(void); -extern void enter_suid(void); -extern void no_suid(void); -extern void writePidFile(void); -extern void setSocketShutdownLifetimes(int); -extern void setMaxFD(void); -extern time_t getCurrentTime(void); -extern int percent(int, int); -extern double dpercent(double, double); -extern void squid_signal(int sig, SIGHDLR *, int flags); -extern pid_t readPidFile(void); -extern struct in_addr inaddrFromHostent(const struct hostent *hp); -extern int intAverage(int, int, int, int); -extern double doubleAverage(double, double, int, int); -extern void debug_trap(const char *); -extern void logsFlush(void); -extern char *checkNullString(char *p); -extern void squid_getrusage(struct rusage *r); -extern double rusage_cputime(struct rusage *r); -extern int rusage_maxrss(struct rusage *r); -extern int rusage_pagefaults(struct rusage *r); -extern void releaseServerSockets(void); -extern void PrintRusage(void); -extern void dumpMallocStats(void); - -extern void pumpInit(int fd, request_t * r, char *uri); -extern void pumpStart(int, StoreEntry *, request_t *, CWCB * callback, void *); -extern int pumpMethod(method_t method); -extern int pumpRestart(request_t *); - -extern void unlinkdInit(void); -extern void unlinkdClose(void); -extern void unlinkdUnlink(const char *); - -extern char *url_convert_hex(char *org_url, int allocate); -extern char *url_escape(const char *url); -extern protocol_t urlParseProtocol(const char *); -extern method_t urlParseMethod(const char *); -extern void urlInitialize(void); -extern request_t *urlParse(method_t, char *); -extern char *urlCanonical(const request_t *, char *); -extern char *urlRInternal(const char *host, u_short port, const char *dir, const char *name); -extern char *urlInternal(const char *dir, const char *name); -extern int matchDomainName(const char *d, const char *h); -extern int urlCheckRequest(const request_t *); -extern int urlDefaultPort(protocol_t p); -extern char *urlCanonicalClean(const request_t *); -extern char *urlHostname(const char *url); - -extern void useragentOpenLog(void); -extern void useragentRotateLog(void); -extern void logUserAgent(const char *, const char *); -extern peer_t parseNeighborType(const char *s); - -extern HttpReply *errorBuildReply(ErrorState * err); -extern void errorSend(int fd, ErrorState *); -extern void errorAppendEntry(StoreEntry *, ErrorState *); -extern void errorStateFree(ErrorState * err); -extern void errorInitialize(void); -extern int errorReservePageId(const char *page_name); -extern void errorFree(void); -extern ErrorState *errorCon(int type, http_status); - -extern void pconnPush(int, const char *host, u_short port); -extern int pconnPop(const char *host, u_short port); -extern void pconnInit(void); - -extern int asnMatchIp(void *, struct in_addr); -extern void asnInit(void); -extern void asnFreeMemory(void); -extern void dlinkAdd(void *data, dlink_node *, dlink_list *); -extern void dlinkDelete(dlink_node * m, dlink_list * list); -extern void kb_incr(kb_t *, size_t); -extern double gb_to_double(const gb_t *); -extern const char *gb_to_str(const gb_t *); -extern void gb_flush(gb_t *); /* internal, do not use this */ + extern void fatal_dump(const char *message); + extern void sigusr2_handle(int sig); + extern void sig_child(int sig); + extern void leave_suid(void); + extern void enter_suid(void); + extern void no_suid(void); + extern void writePidFile(void); + extern void setSocketShutdownLifetimes(int); + extern void setMaxFD(void); + extern time_t getCurrentTime(void); + extern int percent(int, int); + extern double dpercent(double, double); + extern void squid_signal(int sig, SIGHDLR *, int flags); + extern pid_t readPidFile(void); + extern struct in_addr inaddrFromHostent(const struct hostent *hp); + extern int intAverage(int, int, int, int); + extern double doubleAverage(double, double, int, int); + extern void debug_trap(const char *); + extern void logsFlush(void); + extern char *checkNullString(char *p); + extern void squid_getrusage(struct rusage *r); + extern double rusage_cputime(struct rusage *r); + extern int rusage_maxrss(struct rusage *r); + extern int rusage_pagefaults(struct rusage *r); + extern void releaseServerSockets(void); + extern void PrintRusage(void); + extern void dumpMallocStats(void); + + extern void pumpInit(int fd, request_t * r, char *uri); + extern void pumpStart(int, StoreEntry *, request_t *, CWCB * callback, void *); + extern int pumpMethod(method_t method); + extern int pumpRestart(request_t *); + + extern void unlinkdInit(void); + extern void unlinkdClose(void); + extern void unlinkdUnlink(const char *); + + extern char *url_convert_hex(char *org_url, int allocate); + extern char *url_escape(const char *url); + extern protocol_t urlParseProtocol(const char *); + extern method_t urlParseMethod(const char *); + extern void urlInitialize(void); + extern request_t *urlParse(method_t, char *); + extern char *urlCanonical(const request_t *, char *); + extern char *urlRInternal(const char *host, u_short port, const char *dir, const char *name); + extern char *urlInternal(const char *dir, const char *name); + extern int matchDomainName(const char *d, const char *h); + extern int urlCheckRequest(const request_t *); + extern int urlDefaultPort(protocol_t p); + extern char *urlCanonicalClean(const request_t *); + extern char *urlHostname(const char *url); + + extern void useragentOpenLog(void); + extern void useragentRotateLog(void); + extern void logUserAgent(const char *, const char *); + extern peer_t parseNeighborType(const char *s); + + extern HttpReply *errorBuildReply(ErrorState * err); + extern void errorSend(int fd, ErrorState *); + extern void errorAppendEntry(StoreEntry *, ErrorState *); + extern void errorStateFree(ErrorState * err); + extern void errorInitialize(void); + extern int errorReservePageId(const char *page_name); + extern void errorFree(void); + extern ErrorState *errorCon(int type, http_status); + + extern void pconnPush(int, const char *host, u_short port); + extern int pconnPop(const char *host, u_short port); + extern void pconnInit(void); + + extern int asnMatchIp(void *, struct in_addr); + extern void asnInit(void); + extern void asnFreeMemory(void); + extern void dlinkAdd(void *data, dlink_node *, dlink_list *); + extern void dlinkDelete(dlink_node * m, dlink_list * list); + extern void kb_incr(kb_t *, size_t); + extern double gb_to_double(const gb_t *); + extern const char *gb_to_str(const gb_t *); + extern void gb_flush(gb_t *); /* internal, do not use this */ #if USE_HTCP -extern void htcpInit(void); -extern void htcpQuery(StoreEntry * e, request_t * req, peer * p); -extern void htcpSocketShutdown(void); -extern void htcpSocketClose(void); + extern void htcpInit(void); + extern void htcpQuery(StoreEntry * e, request_t * req, peer * p); + extern void htcpSocketShutdown(void); + extern void htcpSocketClose(void); #endif /* String */ @@ -945,18 +946,18 @@ extern void htcpSocketClose(void); #define strSet(s,ptr,ch) (s).buf[ptr-(s).buf] = (ch) #define strCut(s,pos) (s).buf[pos] = '\0' /* #define strCat(s,str) stringAppend(&(s), (str), strlen(str)+1) */ -extern void stringInit(String * s, const char *str); -extern void stringLimitInit(String * s, const char *str, int len); -extern String stringDup(const String * s); -extern void stringClean(String * s); -extern void stringReset(String * s, const char *str); -extern void stringAppend(String * s, const char *buf, int len); + extern void stringInit(String * s, const char *str); + extern void stringLimitInit(String * s, const char *str, int len); + extern String stringDup(const String * s); + extern void stringClean(String * s); + extern void stringReset(String * s, const char *str); + extern void stringAppend(String * s, const char *buf, int len); /* extern void stringAppendf(String *s, const char *fmt, ...); */ /* * ipc.c */ -extern int ipcCreate(int type, + extern int ipcCreate(int type, const char *prog, char *const args[], const char *name, @@ -964,32 +965,32 @@ extern int ipcCreate(int type, int *wfd); /* CacheDigest */ -extern CacheDigest *cacheDigestCreate(int capacity, int bpe); -extern void cacheDigestDestroy(CacheDigest * cd); -extern CacheDigest *cacheDigestClone(const CacheDigest * cd); -extern void cacheDigestClear(CacheDigest * cd); -extern void cacheDigestChangeCap(CacheDigest * cd, int new_cap); -extern int cacheDigestTest(const CacheDigest * cd, const cache_key * key); -extern void cacheDigestAdd(CacheDigest * cd, const cache_key * key); -extern void cacheDigestDel(CacheDigest * cd, const cache_key * key); -extern size_t cacheDigestCalcMaskSize(int cap, int bpe); -extern int cacheDigestBitUtil(const CacheDigest * cd); -extern void cacheDigestGuessStatsUpdate(cd_guess_stats * stats, int real_hit, int guess_hit); -extern void cacheDigestGuessStatsReport(const cd_guess_stats * stats, StoreEntry * sentry, const char *label); -extern void cacheDigestReport(CacheDigest * cd, const char *label, StoreEntry * e); - -extern void internalStart(request_t *, StoreEntry *); -extern int internalCheck(const char *urlpath); -extern int internalStaticCheck(const char *urlpath); -extern char *internalLocalUri(const char *dir, const char *name); -extern char *internalRemoteUri(const char *, u_short, const char *, const char *); + extern CacheDigest *cacheDigestCreate(int capacity, int bpe); + extern void cacheDigestDestroy(CacheDigest * cd); + extern CacheDigest *cacheDigestClone(const CacheDigest * cd); + extern void cacheDigestClear(CacheDigest * cd); + extern void cacheDigestChangeCap(CacheDigest * cd, int new_cap); + extern int cacheDigestTest(const CacheDigest * cd, const cache_key * key); + extern void cacheDigestAdd(CacheDigest * cd, const cache_key * key); + extern void cacheDigestDel(CacheDigest * cd, const cache_key * key); + extern size_t cacheDigestCalcMaskSize(int cap, int bpe); + extern int cacheDigestBitUtil(const CacheDigest * cd); + extern void cacheDigestGuessStatsUpdate(cd_guess_stats * stats, int real_hit, int guess_hit); + extern void cacheDigestGuessStatsReport(const cd_guess_stats * stats, StoreEntry * sentry, const char *label); + extern void cacheDigestReport(CacheDigest * cd, const char *label, StoreEntry * e); + + extern void internalStart(request_t *, StoreEntry *); + extern int internalCheck(const char *urlpath); + extern int internalStaticCheck(const char *urlpath); + extern char *internalLocalUri(const char *dir, const char *name); + extern char *internalRemoteUri(const char *, u_short, const char *, const char *); /* * prototypes for system functions missing from system includes */ #ifdef _SQUID_SOLARIS_ -extern int getrusage(int, struct rusage *); -extern int getpagesize(void); -extern int gethostname(char *, int); + extern int getrusage(int, struct rusage *); + extern int getpagesize(void); + extern int gethostname(char *, int); #endif diff --git a/src/store.cc b/src/store.cc index 63a88f8e52..743fda733d 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.421 1998/05/27 22:52:00 rousskov Exp $ + * $Id: store.cc,v 1.422 1998/06/02 04:18:27 wessels Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -991,7 +991,7 @@ storeTimestampsSet(StoreEntry * entry) served_date = squid_curtime; entry->expires = reply->expires; if (reply->last_modified > -1) - entry->lastmod = reply->last_modified; + entry->lastmod = reply->last_modified; if (entry->lastmod < 0) entry->lastmod = served_date; entry->timestamp = served_date; diff --git a/src/structs.h b/src/structs.h index 5b30544a06..e701951002 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1,6 +1,7 @@ + struct _acl_ip_data { struct in_addr addr1; /* if addr2 non-zero then its a range */ struct in_addr addr2; @@ -556,8 +557,8 @@ struct _HttpHeader { /* protected, do not use these, use interface functions instead */ Array entries; /* parsed fields in raw format */ HttpHeaderMask mask; /* bit set <=> entry present */ - http_hdr_owner_type owner; /* request or reply */ - int len; /* length when packed, not counting terminating '\0' */ + http_hdr_owner_type owner; /* request or reply */ + int len; /* length when packed, not counting terminating '\0' */ }; struct _HttpReply { @@ -669,7 +670,7 @@ struct _clientHttpRequest { off_t offset; size_t size; } out; - size_t req_sz; /* raw request size on input, not current request size */ + size_t req_sz; /* raw request size on input, not current request size */ StoreEntry *entry; StoreEntry *old_entry; log_type log_type; diff --git a/src/wais.cc b/src/wais.cc index 096b4ef04c..5d8e396a26 100644 --- a/src/wais.cc +++ b/src/wais.cc @@ -1,6 +1,6 @@ /* - * $Id: wais.cc,v 1.108 1998/05/27 22:52:04 rousskov Exp $ + * $Id: wais.cc,v 1.109 1998/06/02 04:18:29 wessels Exp $ * * DEBUG: section 24 WAIS Relay * AUTHOR: Harvest Derived @@ -265,7 +265,7 @@ static void waisSendRequest(int fd, void *data) { WaisStateData *waisState = data; -#if OLD_CODE +#if OLD_CODE int len = strlen(waisState->request) + 4; char *buf = NULL; #else