SourceFormat Enforcement

[thirdparty/squid.git] / src / HttpHdrCc.cci

diff --git a/src/HttpHdrCc.cci b/src/HttpHdrCc.cci
index 20825d8fd97c7f35212906a037640fc22ef41092..cdbc1016f0d60bd90855f95cb127ca78fad160dd 100644 (file)
--- a/src/HttpHdrCc.cci
+++ b/src/HttpHdrCc.cci
@@ -1,139 +1,48 @@
 /*
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
- * DEBUG: section 65    HTTP Cache Control Header
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: section 65    HTTP Cache Control Header */
 
-void
-HttpHdrCc::setMaxAge(int max_age_)
-{
-
-    if (max_age_ >= 0) {
-        set(CC_MAX_AGE);
-        max_age = max_age_;
-    } else {
-        set(CC_MAX_AGE,false);
-        max_age=MAX_AGE_UNSET;
-    }
-}
+#include "Debug.h"
+#include "defines.h"
 
-int32_t
-HttpHdrCc::getMaxAge() const
-{
-    return max_age;
-}
-
-void
-HttpHdrCc::setSMaxAge(int32_t s_maxage)
-{
-    if (s_maxage >= 0) {
-        set(CC_S_MAXAGE);
-        this->s_maxage=s_maxage;
-    } else {
-        set(CC_S_MAXAGE,false);
-        this->s_maxage=S_MAXAGE_UNSET;
-    }
-}
-
-int32_t
-HttpHdrCc::getSMaxAge() const
-{
-    return s_maxage;
-}
-
-void
-HttpHdrCc::setMaxStale(int32_t max_stale)
-{
-    if (max_stale>=0 || max_stale==MAX_STALE_ALWAYS) {
-        set(CC_MAX_STALE);
-        this->max_stale=max_stale;
-    } else {
-        set(CC_MAX_STALE,false);
-        this->max_stale=MAX_STALE_UNSET;
-    }
-}
-int32_t
-HttpHdrCc::getMaxStale() const
+bool
+HttpHdrCc::isSet(HttpHdrCcType id) const
 {
-    return max_stale;
+    assert(id < HttpHdrCcType::CC_ENUM_END);
+    return EBIT_TEST(mask, static_cast<long>(id));
 }
 
 void
-HttpHdrCc::setStaleIfError(int32_t stale_if_error)
-{
-    if (stale_if_error >= 0) {
-        set(CC_STALE_IF_ERROR);
-        this->stale_if_error=stale_if_error;
-    } else {
-        set(CC_STALE_IF_ERROR,false);
-        this->stale_if_error=STALE_IF_ERROR_UNSET;
-    }
-}
-
-int32_t
-HttpHdrCc::getStaleIfError() const
+HttpHdrCc::setMask(HttpHdrCcType id, bool newval)
 {
-    return stale_if_error;
+    if (newval)
+        EBIT_SET(mask,static_cast<long>(id));
+    else
+        EBIT_CLR(mask, static_cast<long>(id));
 }
 
+/// set a data member to a new value, and set the corresponding mask-bit.
+/// if setting is false, then the mask-bit is cleared.
 void
-HttpHdrCc::setMinFresh(int32_t min_fresh)
-{
-    if (min_fresh >= 0) {
-        set(CC_MIN_FRESH);
-        this->min_fresh=min_fresh;
+HttpHdrCc::setValue(int32_t &value, int32_t new_value, HttpHdrCcType hdr, bool setting)
+{
+    if (setting) {
+        if (new_value < 0) {
+            debugs(65,3,HERE << "rejecting negative-value Cache-Control directive " << hdr
+                   << " value " << new_value );
+            return;
+        }
     } else {
-        set(CC_MIN_FRESH,false);
-        this->min_fresh=MIN_FRESH_UNSET;
+        new_value=-1; //rely on the convention that "unknown" is -1
     }
-}
-
-int32_t
-HttpHdrCc::getMinFresh() const
-{
-    return min_fresh;
-}
 
-bool
-HttpHdrCc::isSet(http_hdr_cc_type id) const
-{
-    assert(id>=CC_PUBLIC && id < CC_ENUM_END);
-    return EBIT_TEST(mask,id);
+    value=new_value;
+    setMask(hdr,setting);
 }
 
-void
-HttpHdrCc::set(http_hdr_cc_type id, bool newval)
-{
-    assert(id>=CC_PUBLIC && id < CC_ENUM_END);
-    if (newval)
-        EBIT_SET(mask,id);
-    else
-        EBIT_CLR(mask,id);
-}