diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-06-14 20:24:19 +0000 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-06-14 20:24:19 +0000 |
| commit | cf4700bc26359203ceb9e9604465e805d9e5b442 (patch) | |
| tree | 428d3459b23931dea93de4c383abe7ed1fd71b80 /netconf-service | |
| parent | 367b5439e103c0d7fe87edf971d29245206aa6f7 (diff) | |
| download | infinitytier-cf4700bc26359203ceb9e9604465e805d9e5b442.tar.gz infinitytier-cf4700bc26359203ceb9e9604465e805d9e5b442.zip | |
Simplify network briding modes -- we only need passive toggle and active bridge list, not three mode types. Also change isOpen to isPublic for terminology consistency.
Diffstat (limited to 'netconf-service')
| -rw-r--r-- | netconf-service/config.js | 4 | ||||
| -rw-r--r-- | netconf-service/index.js | 2 | ||||
| -rw-r--r-- | netconf-service/redis-schema.md | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/netconf-service/config.js b/netconf-service/config.js index 9d817c5a..b4d9733e 100644 --- a/netconf-service/config.js +++ b/netconf-service/config.js @@ -1,3 +1,3 @@ -//exports.redisDb = 0; // live -exports.redisDb = 1; // test +exports.redisDb = 0; // live +//exports.redisDb = 1; // test //exports.redisDb = 2; // dev diff --git a/netconf-service/index.js b/netconf-service/index.js index 60155500..bef40669 100644 --- a/netconf-service/index.js +++ b/netconf-service/index.js @@ -42,7 +42,7 @@ var ZT_NETWORKCONFIG_DICT_KEY_IPV4_STATIC = "v4s"; var ZT_NETWORKCONFIG_DICT_KEY_IPV6_STATIC = "v6s"; var ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATE_OF_MEMBERSHIP = "com"; var ZT_NETWORKCONFIG_DICT_KEY_ENABLE_BROADCAST = "eb"; -var ZT_NETWORKCONFIG_DICT_KEY_BRIDGING_MODE = "br"; +var ZT_NETWORKCONFIG_DICT_KEY_ALLOW_PASSIVE_BRIDGING = "pb"; var ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES = "ab"; // Path to zerotier-idtool binary, invoked to enerate certificates of membership diff --git a/netconf-service/redis-schema.md b/netconf-service/redis-schema.md index be1cce64..4d1fc2c3 100644 --- a/netconf-service/redis-schema.md +++ b/netconf-service/redis-schema.md @@ -69,7 +69,7 @@ Each network has a network record indexed by its 64-bit network ID in lower-case - M v4AssignPool :: network/bits from which to assign IPs - M v6AssignMode :: 'none' (or null/empty/etc.), 'zt', 'v6native', 'dhcp6' - M v6AssignPool :: network/bits from which to assign IPs -- M bridgingMode :: 0 == none, 1 == active only, 2 == permissive/all +- M allowPassiveBridging :: if true, allow passive bridging - M subscriptions :: comma-delimited list of subscriptions for this network - M ui :: arbitrary field that can be used by the UI to store stuff @@ -82,7 +82,7 @@ The netconf-master will automatically add any peer that even attempts to request - !R id :: must be \<address\> - !R nwid :: must be \<nwid\> - M authorized :: true if node is authorized and will be issued valid certificates and network configurations -- M bridge :: true if node is an active bridge +- M activeBridge :: true if node is an active bridge - M name :: name of system - M notes :: annotation field - R authorizedBy :: user ID of user who authorized membership |