able to read from conf file, still not able to call get_onionlayout in main/schema.cc

conf/CURRENT.conf

 [onions for num]
 oDET: DETJOIN DET RND
-oOPE: OPE RND
+oOPE: OPEFOREIGN OPE RND
 oAGG: HOM
 [end]
 
 [onions for str]
-oDET: DET RND
-oOPE: OPE RND
-oSWP: SEARCH
+oDET: DETJOIN DET RND
+oOPE: OPEFOREIGN OPE RND

conf/DEFAULT.conf

+[onions for num]
+oDET: DETJOIN DET RND
+oOPE: OPE RND
+oAGG: HOM
+[end]
+
+[onions for str]
+oDET: DET RND
+oOPE: OPE RND

conf/FULL.conf

+[onions for num]
+oDET: DETJOIN DET RND
+oOPE: OPE RND
+oAGG: HOM
+[end]
+
+[onions for str]
+oDET: DET RND
+oOPE: OPE RND
+oSWP: SEARCH

debug/test_onion_conf.cc

 #include "util/onions.hh"
+#include <assert.h>
+
+static
+void is_onionlayout_equal(onionlayout &ol1,onionlayout &ol2){
+    for(auto item:ol1){
+        auto key = item.first;
+        assert(ol2.find(key)!=ol2.end());
+        assert(ol2[key]==ol1[key]);
+    }
+}
+
+
 int main(){
-    const char *di = dir;
+    const char *di = "conf/CURRENT.conf";
     onion_conf of(di);
     auto res = of.get_onionlayout_for_num();
-    auto res2 = of.get_onion_levels_str();
+    auto res2 = of.get_onionlayout_for_str();
+    is_onionlayout_equal(res,NUM_ONION_LAYOUT);
+    is_onionlayout_equal(NUM_ONION_LAYOUT,res);
+
+    is_onionlayout_equal(res2,STR_ONION_LAYOUT);
+    is_onionlayout_equal(STR_ONION_LAYOUT,res2);
     return 0;
 }
+

main/schema.cc

@@ -431,9 +431,11 @@ onionlayout FieldMeta::determineOnionLayout(const AES_KEY *const m_key,
     /*we only support sensitive rating here*/
     if (SECURITY_RATING::SENSITIVE == sec_rating) {
         if (true == isMySQLTypeNumeric(f)) {
-            return NUM_ONION_LAYOUT;
+              return CURRENT_NUM_LAYOUT;
+//            return NUM_ONION_LAYOUT;
         } else {
-            return STR_ONION_LAYOUT;
+              return CURRENT_STR_LAYOUT;
+//            return STR_ONION_LAYOUT;
         }
     } else if (SECURITY_RATING::BEST_EFFORT == sec_rating) {
         if (true == isMySQLTypeNumeric(f)) {

onionlayout.conf

-#comments
-#typedef enum onion {
-#    oDET,
-#    oOPE,
-#    oAGG,
-#    oSWP,
-#    oPLAIN,
-#    oBESTEFFORT,
-#    oASHE,
-#    oINVALID,
-#} onion;
-#
-#extern std::map<std::string,onion> string_to_onion;
-#
-#//Sec levels ordered such that
-#// if a is less secure than b.
-#// a appears before b
-#// (note, this is not "iff")
-#
-#enum class SECLEVEL {
-#    INVALID,
-#    PLAINVAL,
-#    OPEFOREIGN,
-#    OPE,
-#    DETJOIN,
-#    DET,
-#    SEARCH,
-#    HOM,
-#    ASHE,//added
-#    RND,
-#};
-
-[onions for num]
-oDET: DETJOIN DET RND
-oOPE: OPE RND
-oAGG: HOM
-oASHE: ASHE
-[end]
-
-
-[onions for str]
-oDET: DETJOIN DET RND
-oOPE: OPE RND
-oSWP: SEARCH
-[end]

util/onions.cc

@@ -141,7 +141,9 @@ onion_conf::~onion_conf(){
 }
 
 
-
+onion_conf global_onion_conf(dir);
+onionlayout CURRENT_NUM_LAYOUT = global_onion_conf.get_onionlayout_for_num();
+onionlayout CURRENT_STR_LAYOUT = global_onion_conf.get_onionlayout_for_str();
 
 
 

util/onions.hh

@@ -9,7 +9,6 @@
 #include <vector>
 #include <assert.h>
 
-extern const char *const dir;
 typedef enum onion {
     oDET,
     oOPE,
@@ -188,4 +187,5 @@ public:
 };
 
 
-
+extern onionlayout CURRENT_NUM_LAYOUT;
+extern onionlayout CURRENT_STR_LAYOUT;