Merge pull request #756 from ZappoMan/multiple_voxel_servers

command line options for jurisdictions

libraries/voxels/src/JurisdictionMap.cpp

@@ -44,12 +44,28 @@ JurisdictionMap::JurisdictionMap(const char* filename) : _rootOctalCode(NULL) {
     readFromFile(filename);
 }
 
-
 JurisdictionMap::JurisdictionMap(unsigned char* rootOctalCode, const std::vector<unsigned char*>& endNodes)  
     : _rootOctalCode(NULL) {
     init(rootOctalCode, endNodes);
 }
 
+JurisdictionMap::JurisdictionMap(const char* rootHexCode, const char* endNodesHexCodes) {
+    _rootOctalCode = hexStringToOctalCode(QString(rootHexCode));
+    
+    QString endNodesHexStrings(endNodesHexCodes);
+    QString delimiterPattern(",");
+    QStringList endNodeList = endNodesHexStrings.split(delimiterPattern);
+
+    for (int i = 0; i < endNodeList.size(); i++) {
+        QString endNodeHexString = endNodeList.at(i);
+
+        unsigned char* endNodeOctcode = hexStringToOctalCode(endNodeHexString);
+        //printOctalCode(endNodeOctcode);
+        _endNodes.push_back(endNodeOctcode);
+    }    
+}
+
+
 void JurisdictionMap::init(unsigned char* rootOctalCode, const std::vector<unsigned char*>& endNodes) {
     clear(); // clean up our own memory
     _rootOctalCode = rootOctalCode;

libraries/voxels/src/JurisdictionMap.h

@@ -23,6 +23,7 @@ public:
     JurisdictionMap();
     JurisdictionMap(const char* filename);
     JurisdictionMap(unsigned char* rootOctalCode, const std::vector<unsigned char*>& endNodes);
+    JurisdictionMap(const char* rootHextString, const char* endNodesHextString);
     ~JurisdictionMap();
 
     Area isMyJurisdiction(unsigned char* nodeOctalCode, int childIndex) const;

voxel-server/src/README

@@ -15,6 +15,12 @@ OPTIONS
   --local 
         This will run the voxel server in "local domain mode" and will look for a domain-server running on the same IP
         address as the voxel server
+
+  --jurisdictionRoot [hex string of root octcode]
+        Tells the server to honor jurisdiction from the specified root node and below
+
+  --jurisdictionEndNodes [<octcode>(<,octcode>...)]
+        Tells the server to honor jurisdiction from the root down to the octcodes included in the comma separated list
               
   --jurisdictionFile [filename]
         Tells the server to load it's jurisdiction from the specified file. When a voxel server is running with a limited

voxel-server/src/main.cpp

@@ -456,11 +456,22 @@ int main(int argc, const char * argv[]) {
         printf("about to readFromFile().... jurisdictionFile=%s\n", jurisdictionFile);
         jurisdiction = new JurisdictionMap(jurisdictionFile);
         printf("after readFromFile().... jurisdictionFile=%s\n", jurisdictionFile);
+    } else {
+        const char* JURISDICTION_ROOT = "--jurisdictionRoot";
+        const char* jurisdictionRoot = getCmdOption(argc, argv, JURISDICTION_ROOT);
+        if (jurisdictionRoot) {
+            printf("jurisdictionRoot=%s\n", jurisdictionRoot);
+        }
 
-        // test writing the file...
-        printf("about to writeToFile().... jurisdictionFile=%s\n", jurisdictionFile);
-        jurisdiction->writeToFile(jurisdictionFile);
-        printf("after writeToFile().... jurisdictionFile=%s\n", jurisdictionFile);
+        const char* JURISDICTION_ENDNODES = "--jurisdictionEndNodes";
+        const char* jurisdictionEndNodes = getCmdOption(argc, argv, JURISDICTION_ENDNODES);
+        if (jurisdictionEndNodes) {
+            printf("jurisdictionEndNodes=%s\n", jurisdictionEndNodes);
+        }
+
+        if (jurisdictionRoot || jurisdictionEndNodes) {
+            jurisdiction = new JurisdictionMap(jurisdictionRoot, jurisdictionEndNodes);
+        }
     }
     
     NodeList* nodeList = NodeList::createInstance(NODE_TYPE_VOXEL_SERVER, listenPort);