name broken out on a new line.
char *rn_Mask; /* netmask, if present */
struct squid_radix_node *rn_Dupedkey;
- }
-
- rn_leaf;
+ } rn_leaf;
struct { /* node only data: */
int rn_Off; /* where to start compare */
struct squid_radix_node *rn_L; /* progeny */
struct squid_radix_node *rn_R; /* progeny */
- }
-
- rn_node;
+ } rn_node;
} rn_u;
#ifdef RN_DEBUG
int code;
const char *content_type;
HttpVersion version;
- }
-
- http;
+ } http;
class ICPDetails
{
ICPDetails() : opcode(ICP_INVALID) {}
icp_opcode opcode;
- }
-
- icp;
+ } icp;
class CacheDetails
{
const char *ssluser;
#endif
- }
-
- cache;
+ } cache;
class Headers
{
char *request;
char *reply;
- }
-
- headers;
+ } headers;
class Private
{
Private() : method_str(NULL) {}
const char *method_str;
- }
-
- _private;
+ } _private;
HierarchyLogEntry hier;
HttpReply *reply;
HttpRequest *request;
int bit_on_count; /* #bits turned on */
int bseq_len_sum; /* sum of all bit seq length */
int bseq_count; /* number of bit seqs */
-}
-
-CacheDigestStats;
+} CacheDigestStats;
/* local functions */
static void cacheDigestHashKey(const CacheDigest * cd, const cache_key * key);
struct stat *statp;
squidaio_result_t *resultp;
-}
-
-squidaio_request_t;
+} squidaio_request_t;
typedef struct squidaio_request_queue_t
{
squidaio_request_t *volatile *volatile tailp;
unsigned long requests;
unsigned long blocked; /* main failed to lock the queue */
-}
-
-squidaio_request_queue_t;
+} squidaio_request_queue_t;
typedef struct squidaio_thread_t squidaio_thread_t;
struct stat *statp;
squidaio_result_t *resultp;
-}
-
-squidaio_request_t;
+} squidaio_request_t;
typedef struct squidaio_request_queue_t
{
squidaio_request_t *volatile *volatile tailp;
unsigned long requests;
unsigned long blocked; /* main failed to lock the queue */
-}
-
-squidaio_request_queue_t;
+} squidaio_request_queue_t;
typedef struct squidaio_thread_t squidaio_thread_t;
char *path;
struct squidaio_unlinkq_t *next;
-}
-
-squidaio_unlinkq_t;
+} squidaio_unlinkq_t;
dlink_list used_list;
int exceptok:1; /* likewise */
int attemptfailed:1; /* The attempt branch failed */
int exceptfailed:1; /* the except branch failed */
- }
-
- flags;
+ } flags;
void finish();
private:
ESI_EXPR_MORE,
ESI_EXPR_MOREEQ,
ESI_EXPR_EXPR /* the result of an expr PRI 1 */
-}
-evaltype;
+} evaltype;
typedef enum
{
ESI_LITERAL_INT,
ESI_LITERAL_BOOL,
ESI_LITERAL_INVALID
-}
-literalhint;
+} literalhint;
struct _stackmember
{
char *string;
double floating;
int integral;
- }
- value;
+ } value;
literalhint valuestored;
evaltype valuetype;
int precedence;
enum Sending { sendingUndecided, sendingVirgin, sendingAdapted,
sendingDone } sending;
- }
-
- state;
+ } state;
CBDATA_CLASS2(ICAPModXact);
};
u_int16_t checksum; /* IP checksum */
u_int32_t source_ip;
u_int32_t dest_ip;
-}
-iphdr;
+} iphdr;
/* ICMP header */
typedef struct icmphdr
u_int16_t icmp_id;
u_int16_t icmp_seq;
u_int32_t timestamp; /* not part of ICMP, but we need it */
-}
-icmphdr;
+} icmphdr;
#endif /* _SQUID_MSWIN_ */
{
STABH *callback;
void *data;
- }
-
- abort;
+ } abort;
char *log_url;
RemovalPolicyNode repl;
int id;
bool pending() const;
STCB *callback_handler;
void *callback_data;
- }
-
- _callback;
+ } _callback;
};
SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *);
{
STRCB *callback;
void *callback_data;
- }
-
- read;
+ } read;
struct
{
unsigned int closing:1; /* debugging aid */
- }
-
- flags;
+ } flags;
};
StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
Flags() : selected(0), read_only(0){}
unsigned int selected:1;
unsigned int read_only:1;
- }
-
- flags;
+ } flags;
virtual void init() = 0; /* Initialise the fs */
virtual void create(); /* Create a new fs */
virtual void dump(StoreEntry &)const; /* Dump fs config snippet */
struct
{
int blksize;
- }
-
- fs;
+ } fs;
};
#endif /* SQUID_SWAPDIR_H */
{
hash_link hash;
int n;
-}
-
-fvdb_entry;
+} fvdb_entry;
static hash_table *via_table = NULL;
static hash_table *forw_table = NULL;
static void fvdbInit();
char *header;
char *element;
char separator;
- }
-
- header;
+ } header;
char *timespec;
} data;
unsigned char width;
unsigned int credentials_ok:
2; /*0=unchecked,1=ok,2=failed */
- }
-
- flags;
+ } flags;
BasicAuthQueueNode *auth_queue;
private:
void *data;
AuthUserRequest *auth_user_request;
RH *handler;
-}
-authenticateStateData;
+} authenticateStateData;
#endif
/// \ingroup AuthNegotiateAPI
void *data;
AuthUserRequest *auth_user_request;
RH *handler;
-}
-
-authenticateStateData;
+} authenticateStateData;
#endif
class NTLMUser : public AuthUser
int scanned_count; /* #scanned entries */
int bad_add_count; /* #duplicate adds */
int bad_del_count; /* #dels with no prior add */
-}
-
-CacheIndex;
+} CacheIndex;
typedef struct _CacheEntry
struct _CacheEntry *next;
/* StoreSwapLogData s; */
unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH];
-}
-
-CacheEntry;
+} CacheEntry;
/* copied from url.c */
char *action;
char *user_name;
char *passwd;
-}
-cachemgrStateData;
+} cachemgrStateData;
static CacheManagerAction *cachemgrFindAction(const char *action);
static cachemgrStateData *cachemgrParseUrl(const char *url);
char *data;
struct Line *next;
-}
-
-Line;
+} Line;
typedef struct EntryAlias
{
struct EntryAlias *next;
char *name;
-}
-
-EntryAlias;
+} EntryAlias;
typedef struct Entry
{
int array_flag;
struct Entry *next;
-}
-
-Entry;
+} Entry;
typedef struct TypeDep
{
unsigned deferred: 1; /* This is a pipelined request waiting for the current object to complete */
unsigned parsed_ok: 1; /* Was this parsed correctly? */
- }
-
- flags;
+ } flags;
bool mayUseConnection() const {return mayUseConnection_;}
void mayUseConnection(bool aBool)
struct
{
bool readMoreRequests;
- }
-
- flags;
+ } flags;
http_port_list *port;
bool transparent() const;
unsigned complete: 1; /* we have read all we can from upstream */
bool headersSent;
- }
-
- flags;
+ } flags;
clientStreamNode *ourNode; /* This will go away if/when this file gets refactored some more */
private:
}
else {
debugs(78, 1, "WARNING: Reply from unknown nameserver " << from << " (retrying..." << (squid_curtime-last_warning) << "<=60)" );
- }
-
- continue;
+ } continue;
}
idnsGrokReply(rbuf, len);
{
int id;
char *page_name;
-}
-ErrorDynamicPageInfo;
+} ErrorDynamicPageInfo;
/* local constant and vars */
{
QUOTE_METHOD_SHELL = 1,
QUOTE_METHOD_URL
- }
-
- quote;
+ } quote;
IPAddress local_addr;
};
unsigned int dont_retry:1;
unsigned int ftp_pasv_failed:1;
unsigned int forward_completed:1;
- }
-
- flags;
+ } flags;
#if LINUX_NETFILTER
IPAddress src;
#endif
{
unsigned int negcached:1;
unsigned int fromhosts:1;
- }
-
- flags;
+ } flags;
};
/// \ingroup FQDNCacheInternal
int hits;
int misses;
int negative_hits;
-}
-FqdncacheStats;
+} FqdncacheStats;
/// \ingroup FQDNCacheInternal
static dlink_list lru_list;
int alloc;
int realloc;
int collisions;
- }
-
- alloc;
+ } alloc;
int disk_overflows;
int stripe_overflows;
int open_mem_hits;
storeCossRemove(rb->sd, e);
rb->counts.objcount--;
rb->counts.cancelcount++;
- }
-
- continue;
+ } continue;
} else {
x = log(static_cast<double>(++rb->counts.bad_log_op)) / log(10.0);
currentEntry()->release();
counts.objcount--;
counts.cancelcount++;
- }
-
- continue;
+ } continue;
} else {
x = ::log(static_cast<double>(++counts.bad_log_op)) / ::log(10.0);
} else {
debug_trap("commonUfsDirRebuildFromSwapLog: bad condition");
debugs(47, 1, "\tSee " << __FILE__ << ":" << __LINE__);
- }
-
- continue;
+ } continue;
} else if (used) {
/* swapfile in use, not by this URL, log entry is newer */
/* This is sorta bad: the log entry should NOT be newer at this
* try to close again in the I/O callbacks.
*/
bool try_closing;
- }
-
- flags;
+ } flags;
link_list *pending_reads;
link_list *pending_writes;
void queueRead(char *, size_t, off_t, STRCB *, void *);
char *last_command;
char *last_reply;
int replycode;
- }
-
- ctrl;
+ } ctrl;
struct
{
char *host;
u_short port;
bool read_pending;
- }
-
- data;
+ } data;
struct _ftp_flags flags;
char *name;
char *showname;
char *link;
-}
-ftpListParts;
+} ftpListParts;
/// \ingroup ServerProtocolFTPInternal
#define FTP_LOGIN_ESCAPED 1
HttpRequest *req;
FwdState::Pointer fwd;
char replybuf[BUFSIZ];
-}
-
-GopherStateData;
+} GopherStateData;
static PF gopherStateFree;
static void gopher_mime_content(MemBuf * mb, const char *name, const char *def);
int replies;
int queue_size;
int avg_svc_time;
- }
-
- stats;
+ } stats;
};
struct _helper_stateful
int replies;
int queue_size;
int avg_svc_time;
- }
-
- stats;
+ } stats;
};
struct _helper_server
double rtt;
int samp;
int hops;
- }
-
- cto;
+ } cto;
};
/// \bug redundant typedef
void *callback_data;
struct _IdentClient *next;
-}
-
-IdentClient;
+} IdentClient;
typedef struct _IdentStateData
{
IPAddress my_peer;
IdentClient *clients;
char buf[4096];
-}
-
-IdentStateData;
+} IdentStateData;
static IOCB identReadReply;
static PF identClose;
{
unsigned int negcached:1;
unsigned int fromhosts:1;
- }
-
- flags;
+ } flags;
};
/// \ingroup IPCacheInternal
int rr_cname;
int cname_only;
int invalid;
-}
-IpcacheStats;
+} IpcacheStats;
/// \ingroup IPCacheInternal
static dlink_list lru_list;
char buf[NETDB_REQBUF_SZ];
int buf_ofs;
netdb_conn_state_t connstate;
-}
-
-netdbExchangeState;
+} netdbExchangeState;
static hash_table *addr_table = NULL;
static hash_table *host_table = NULL;
static struct
{
int timeouts;
-}
-
-PeerStats;
+} PeerStats;
static const char *DirectStr[] =
{
const char *client_ident;
const char *method_s;
RH *handler;
-}
-
-redirectStateData;
+} redirectStateData;
static HLPCB redirectHandleReply;
static void redirectStateFree(redirectStateData * r);
bool min;
bool lmfactor;
bool max;
-}
-
-stale_flags;
+} stale_flags;
/*
* This enumerated list assigns specific values, ala HTTP/FTP status
int private_key;
int too_many_open_files;
int too_many_open_fds;
- }
-
- no;
+ } no;
struct
{
int Default;
- }
-
- yes;
-}
-
-store_check_cachable_hist;
+ } yes;
+} store_check_cachable_hist;
int
storeTooManyDiskFilesOpen(void)
int add_coll_count; /* #accepted entries that collided with existing ones */
int rej_count; /* #store entries not accepted to store_digest */
int rej_coll_count; /* #not accepted entries that collided with existing ones */
-}
-
-StoreDigestStats;
+} StoreDigestStats;
/* local vars */
static StoreDigestState sd_state;
int select_fail;
int create_fail;
int success;
- }
-
- create;
-}
-
-store_io_stats;
+ } create;
+} store_io_stats;
OBJH storeIOStats;
int total;
/* number of entries read so far */
int scanned;
-}
-
-store_rebuild_progress;
+} store_rebuild_progress;
static store_rebuild_progress *RebuildProgress = NULL;
int weight;
int rebuildwait;
void *info;
- }
-
- Wccp2;
+ } Wccp2;
#endif
#if USE_ICMP
customlog *accesslogs;
int rotateNumber;
- }
-
- Log;
+ } Log;
char *adminEmail;
char *EmailFrom;
char *EmailProgram;
char *ssl_password;
#endif
- }
-
- Program;
+ } Program;
#if USE_DNSSERVERS
int dnsChildren;
char *surrogate_id;
#endif
- }
-
- Accel;
+ } Accel;
char *appendDomain;
size_t appendDomainLen;
char *debugOptions;
char *file;
time_t period;
u_short port;
- }
-
- Announce;
+ } Announce;
struct
{
#endif
/* FIXME INET6 : this should really be a CIDR value */
IPAddress client_netmask;
- }
-
- Addrs;
+ } Addrs;
size_t tcpRcvBufsz;
size_t udpMaxHitObjsz;
wordlist *hierarchy_stoplist;
int size;
int low;
int high;
- }
-
- ipcache;
+ } ipcache;
struct
{
int size;
- }
-
- fqdncache;
+ } fqdncache;
int minDirectHops;
int minDirectRtt;
cachemgr_passwd *passwd_list;
int64_t maxObjectSize;
int64_t minObjectSize;
size_t maxInMemObjSize;
- }
-
- Store;
+ } Store;
struct
{
int high;
int low;
time_t period;
- }
-
- Netdb;
+ } Netdb;
struct
{
int global_internal_static;
int dns_require_A;
int debug_override_X;
- }
-
- onoff;
+ } onoff;
class ACL *aclList;
acl_access *ssl_bump;
#endif
- }
-
- accessList;
+ } accessList;
acl_deny_info_list *denyInfoList;
authConfig authConfiguration;
int epsv_all;
int sanitycheck;
int telnet;
- }
-
- Ftp;
+ } Ftp;
refresh_t *Refresh;
struct _cacheSwap
RefCount<class Store> *swapDirs;
int n_allocated;
int n_configured;
- }
-
- cacheSwap;
+ } cacheSwap;
struct
{
char *directory;
int use_short_names;
- }
-
- icons;
+ } icons;
char *errorDirectory;
struct
{
int maxtries;
int onerror;
- }
-
- retry;
+ } retry;
struct
{
size_t limit;
- }
-
- MemPools;
+ } MemPools;
#if DELAY_POOLS
DelayConfig Delay;
int icp_min_poll;
int dns_min_poll;
int http_min_poll;
- }
-
- comm_incoming;
+ } comm_incoming;
int max_open_disk_fds;
int uri_whitespace;
int64_t rangeOffsetLimit;
int ttl;
unsigned short port;
char *encode_key;
- }
-
- mcast_miss;
+ } mcast_miss;
#endif
/* one access list per header type we know of */
time_t rewrite_period;
size_t swapout_chunk_size;
int rebuild_chunk_percentage;
- }
-
- digest;
+ } digest;
#endif
#if USE_SSL
{
int unclean_shutdown;
char *ssl_engine;
- }
-
- SSL;
+ } SSL;
#endif
wordlist *ext_methods;
int high_rptm;
int high_pf;
size_t high_memory;
- }
-
- warnings;
+ } warnings;
char *store_dir_select_algorithm;
int sleep_after_fork; /* microseconds */
time_t minimum_expiry_time; /* seconds */
char *flags;
acl_access *cert_error;
SSL_CTX *sslContext;
- }
-
- ssl_client;
+ } ssl_client;
#endif
char *accept_filter;
{
int enable_purge;
int mangle_request_headers;
- }
-
- onoff;
+ } onoff;
uid_t effectiveUserID;
gid_t effectiveGroupID;
};
time_t last_connect_probe;
int logged_state; /* so we can print dead/revived msgs */
int conn_open; /* current opened connections */
- }
-
- stats;
+ } stats;
struct
{
int version;
int counts[ICP_END+1];
u_short port;
- }
-
- icp;
+ } icp;
#if USE_HTCP
struct
double version;
int counts[2];
u_short port;
- }
-
- htcp;
+ } htcp;
#endif
u_short http_port;
unsigned int hash;
double load_multiplier;
double load_factor; /* normalized weight value */
- }
-
- carp;
+ } carp;
#endif
char *login; /* Proxy authorization */
StatHist reply_svc_time;
int query_timeouts;
int times_used;
- }
-
- icp;
+ } icp;
struct
{
int true_miss_count;
int false_hit_count;
int false_miss_count;
-}
-
-CacheQueryStats;
+} CacheQueryStats;
typedef struct _Cache Cache;
struct _CacheEntry *next;
unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH];
/* storeSwapLogData s; */
-}
-
-CacheEntry;
+} CacheEntry;
/* parsed access log entry */
cache_key key[SQUID_MD5_DIGEST_LENGTH];
time_t timestamp;
short int use_icp; /* true/false */
-}
-
-RawAccessLogEntry;
+} RawAccessLogEntry;
typedef enum {
frError = -2, frMore = -1, frEof = 0, frOk = 1
{
size_t bytes;
size_t kb;
-}
-
-kb_t;
+} kb_t;
typedef struct _acl_time_data acl_time_data;
struct
{
int cached;
- }
-
- flags;
-}
-
-url_entry;
+ } flags;
+} url_entry;
static STCB urnHandleReply;
static url_entry *urnParseReply(const char *inbuf, const HttpRequestMethod&);
char *user_name;
char *passwd;
char *pub_auth;
-}
-
-cachemgr_request;
+} cachemgr_request;
/*
* Debugging macros (info goes to error_log on your web server)