Merge branch 'master' into master

Author: petergjoel

src/model/Network.cpp

@@ -358,6 +358,7 @@ namespace aalwines
         for(auto& r : _routers)
         {
             if(r->is_null()) continue;
+            if(r->interfaces().empty()) continue;
             s << "    <router name=\"" << r->name() << "\">\n";
             s << "      <interfaces>\n";
             for(auto& inf : r->interfaces())

src/model/Query.h

@@ -52,7 +52,7 @@ namespace aalwines {
             uint8_t _mask = 0;
             uint64_t _value = 0;               
         public:
-            friend class ptrie::byte_iterator<label_t>;
+            friend struct ptrie::byte_iterator<label_t>;
             label_t()
             {
                 _type = NONE;