merge changes from SQUID_2_3 branch

[thirdparty/squid.git] / src / structs.h

diff --git a/src/structs.h b/src/structs.h
index e4566f61431b929938c8cc52eca6397a5f1380f3..7e23782033aa92b842d758c06ecc455a7e4d2e5a 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.307 1999/10/04 05:05:35 wessels Exp $
+ * $Id: structs.h,v 1.308 1999/12/30 17:37:00 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -144,6 +144,7 @@ struct _aclCheck_t {
     struct in_addr src_addr;
     struct in_addr dst_addr;
     struct in_addr my_addr;
+    unsigned short my_port;
     request_t *request;
 #if USE_IDENT
     ConnStateData *conn;       /* hack for ident */
@@ -191,6 +192,11 @@ struct _relist {
     relist *next;
 };
 
+struct _sockaddr_in_list {
+    struct sockaddr_in s;
+    sockaddr_in_list *next;
+};
+
 #if DELAY_POOLS
 struct _delaySpec {
     int restore_bps;
@@ -266,7 +272,6 @@ struct _SquidConfig {
     size_t maxRequestBodySize;
     size_t maxReplyBodySize;
     struct {
-       ushortlist *http;
        u_short icp;
 #if USE_HTCP
        u_short htcp;
@@ -275,6 +280,9 @@ struct _SquidConfig {
        u_short snmp;
 #endif
     } Port;
+    struct {
+       sockaddr_in_list *http;
+    } Sockaddr;
 #if SQUID_SNMP
     struct {
        char *configFile;
@@ -332,7 +340,6 @@ struct _SquidConfig {
        u_short port;
     } Announce;
     struct {
-       struct in_addr tcp_incoming;
        struct in_addr tcp_outgoing;
        struct in_addr udp_incoming;
        struct in_addr udp_outgoing;
@@ -399,6 +406,9 @@ struct _SquidConfig {
        int strip_query_terms;
        int redirector_bypass;
        int ignore_unknown_nameservers;
+#if USE_CACHE_DIGESTS
+       int digest_generation;
+#endif
     } onoff;
     acl *aclList;
     struct {
@@ -460,12 +470,22 @@ struct _SquidConfig {
 #if MULTICAST_MISS_STREAM
     struct {
        struct in_addr addr;
+       int ttl;
        unsigned short port;
        char *encode_key;
     } mcast_miss;
 #endif
     HttpHeaderMask anonymize_headers;
     char *coredump_dir;
+#if USE_CACHE_DIGESTS
+    struct {
+       int bits_per_entry;
+       int rebuild_period;
+       int rewrite_period;
+       int swapout_chunk_size;
+       int rebuild_chunk_percentage;
+    } digest;
+#endif
 };
 
 struct _SquidConfig2 {
@@ -625,6 +645,7 @@ struct _HttpHdrExtField {
 struct _HttpHdrCc {
     int mask;
     int max_age;
+    int s_maxage;
 };
 
 /* http byte-range-spec */
@@ -1067,6 +1088,7 @@ struct _peer {
     } mcast;
 #if USE_CACHE_DIGESTS
     PeerDigest *digest;
+    char *digest_url;
 #endif
     int tcp_up;                        /* 0 if a connect() fails */
     time_t last_fail_time;
@@ -1432,8 +1454,10 @@ struct _request_t {
     time_t ims;
     int imslen;
     int max_forwards;
+    /* these in_addr's could probably be sockaddr_in's */
     struct in_addr client_addr;
     struct in_addr my_addr;
+    unsigned short my_port;
     HttpHeader header;
     char *body;
     size_t body_sz;