fix for bug 4658. Move enable-source-based-routing to per rule basis from global setting.

Conflicts:

	src/lbdecision.cc

1 files changed, 9 insertions, 9 deletions

diff --git a/src/lbdatafactory.cc b/src/lbdatafactory.cc
index 17b4260..a6c117c 100644
--- a/src/lbdatafactory.cc
+++ b/src/lbdatafactory.cc
@@ -123,9 +123,6 @@ LBDataFactory::process(const vector<string> &path, int depth, const string &key,
   if (path[0] == "disable-source-nat") {
     process_disablesourcenat(l_key,l_value);
   }
-  else if (path[0] == "enable-source-based-routing") {
-    process_enablesourcebasedrouting(l_key,l_value);
-  }
   else if (path[0] == "flush-conntrack") {
     process_flushconntrack(l_key,l_value);
   }
@@ -159,6 +156,9 @@ LBDataFactory::process(const vector<string> &path, int depth, const string &key,
     else if (depth > 0 && path[1] == "failover") {
       process_rule_failover(l_key,l_value);
     }
+    else if (depth > 0 && path[1] == "enable-source-based-routing") {
+      process_rule_enablesourcebasedrouting(l_key,l_value);
+    }
     else {
       process_rule(l_key,l_value);
     }
@@ -177,12 +177,6 @@ LBDataFactory::process_flushconntrack(const string &key, const string &value)
   _lb_data._flush_conntrack = true;
 }
 
-void
-LBDataFactory::process_enablesourcebasedrouting(const string &key, const string &value)
-{
-  _lb_data._enable_source_based_routing = true;
-}
-						
 
 void
 LBDataFactory::process_health(const string &key, const string &value) 
@@ -315,6 +309,12 @@ LBDataFactory::process_rule_failover(const string &key, const string &value)
 }
 
 void
+LBDataFactory::process_rule_enablesourcebasedrouting(const string &key, const string &value)
+{
+  _rule_iter->second._enable_source_based_routing = true;
+}
+
+void
 LBDataFactory::process_rule_source(const string &key, const string &value)
 {
   if (key == "address") {