From d9515330a4b25e9d6f02c7067682c5c4dbd6e619 Mon Sep 17 00:00:00 2001
From: Ethan Lai <yzlai@yahoo.com>
Date: Wed, 26 Feb 2014 16:11:41 +0000
Subject: [PATCH 1/2] TS-2585: add overridable configs support

---
 plugins/regex_remap/regex_remap.cc | 79 +++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 2 deletions(-)

diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index 111e2921051..3fcc254e35d 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -118,7 +118,8 @@ class RemapRegex
  public:
   RemapRegex(const std::string& reg, const std::string& sub, const std::string& opt) :
     _num_subs(-1), _rex(NULL), _extra(NULL), _order(-1), _simple(false), _lowercase_substitutions(false),
-    _active_timeout(-1), _no_activity_timeout(-1), _connect_timeout(-1), _dns_timeout(-1)
+    _active_timeout(-1), _no_activity_timeout(-1), _connect_timeout(-1), _dns_timeout(-1),
+    _first_item(NULL), _last_item(NULL)
   {
     TSDebug(PLUGIN_NAME, "Calling constructor");
 
@@ -180,7 +181,41 @@ class RemapRegex
         _lowercase_substitutions = atoi(opt_val.c_str());
         TSDebug(PLUGIN_NAME, "lowercasing %d", _lowercase_substitutions);
       } else {
-        TSError("Unknown options: %s", opt.c_str());
+        TSOverridableConfigKey name;
+        TSRecordDataType type;
+        std::string opt_name = opt.substr(start, pos1-start-1);
+        if (TS_SUCCESS == TSHttpTxnConfigFind(opt_name.c_str(), opt_name.length(), &name, &type)) {
+          Item *cur = (Item *) TSmalloc(sizeof(Item));
+          switch (type) {
+            case TS_RECORDDATATYPE_INT:
+              cur->data.rec_int = strtoll(opt_val.c_str(), NULL, 10);
+              break;
+            case TS_RECORDDATATYPE_STRING:
+              cur->data.rec_string = TSstrdup(opt_val.c_str());
+              cur->data_len = opt_val.size();
+              break;
+            default:
+              TSfree(cur);
+              cur = NULL;
+              TSError("%s: configuration variable '%s' is of an unsupported type", PLUGIN_NAME, opt_name.c_str());
+              break;
+          }
+          if (cur) {
+            TSDebug(PLUGIN_NAME, "%s = %s", opt_name.c_str(), opt_val.c_str());
+            cur->name = name;
+            cur->type = type;
+            cur->next = NULL;
+            if (NULL == _first_item) {
+              _first_item = cur;
+              _last_item = cur;
+            } else {
+              _last_item->next = cur;
+              _last_item = cur;
+            }
+          }
+        } else {
+          TSError("Unknown options: %s", opt.c_str());
+        }
       }
       start = opt.find_first_of("@", pos2);
     }
@@ -490,6 +525,16 @@ class RemapRegex
   inline int dns_timeout_option() const  { return _dns_timeout; };
   inline bool lowercase_substitutions_option() const  { return _lowercase_substitutions; };
 
+  struct Item {
+    TSOverridableConfigKey name;
+    TSRecordDataType type;
+    TSRecordData data;
+    int data_len; // Used when data is a string
+    Item* next;
+  };
+
+  inline Item* get_override_items() const { return _first_item; };
+
  private:
   char* _rex_string;
   char* _subst;
@@ -510,6 +555,9 @@ class RemapRegex
   int _no_activity_timeout;
   int _connect_timeout;
   int _dns_timeout;
+
+  Item* _first_item;
+  Item* _last_item;
 };
 
 struct RemapInstance
@@ -762,6 +810,15 @@ TSRemapDeleteInstance(void* ih)
 
   re = ri->first;
   while (re) {
+    RemapRegex::Item *item = re->get_override_items();
+    while (item) {
+      RemapRegex::Item *tmp = item;
+      if (TS_RECORDDATATYPE_STRING == item->type) {
+        TSfree(item->data.rec_string);
+      }
+      item = item->next;
+      TSfree(tmp);
+    }
     tmp = re;
     re = re->next();
     delete tmp;
@@ -862,6 +919,24 @@ TSRemapDoRemap(void* ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
         TSDebug(PLUGIN_NAME, "Setting lowercasing substitutions on");
         lowercase_substitutions = true;
       }
+      if (re->get_override_items() != NULL) {
+        RemapRegex::Item *item = re->get_override_items();
+        while (item) {
+          switch (item->type) {
+            case TS_RECORDDATATYPE_INT:
+              TSHttpTxnConfigIntSet(txnp, item->name, item->data.rec_int);
+              TSDebug(PLUGIN_NAME, "Setting config id %d to %" PRId64"", item->name, item->data.rec_int);
+              break;
+            case TS_RECORDDATATYPE_STRING:
+              TSHttpTxnConfigStringSet(txnp, item->name, item->data.rec_string, item->data_len);
+              TSDebug(PLUGIN_NAME, "Setting config id %d to %s", item->name, item->data.rec_string);
+              break;
+            default:
+              break; // Error ?
+          }
+          item = item->next;
+        }
+      }
 
       // Update profiling if requested
       if (ri->profile) {

From eacd35a7922a7f2ff7d4bbfffe56b13629d1b1da Mon Sep 17 00:00:00 2001
From: Ethan Lai <yzlai@yahoo.com>
Date: Wed, 26 Feb 2014 16:17:37 +0000
Subject: [PATCH 2/2] TS-2585: add doc

---
 doc/reference/plugins/regex_remap.en.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/reference/plugins/regex_remap.en.rst b/doc/reference/plugins/regex_remap.en.rst
index 0f8c897bcdf..e9093ce9751 100644
--- a/doc/reference/plugins/regex_remap.en.rst
+++ b/doc/reference/plugins/regex_remap.en.rst
@@ -123,6 +123,7 @@ remap.config. The following options are available ::
     @no_activity_timeout=<nnn>  - No activity timeout (in ms)
     @connect_timeout=<nnn>      - Connect timeouts (in ms)
     @dns_timeout=<nnn>          - Connect timeouts (in ms)
+    @overridable-config=<value> - see :ref:`ts-overridable-config`
 
 This can be useful to force a particular response for some URLs, e.g. ::