diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-13 14:39:45 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-13 14:39:45 -0700 |
| commit | c59c74dddab862ade65938e630dc0f561fcb0c2f (patch) | |
| tree | b5843f27b60d898be02fd2f2cb5607b95718b96a /service | |
| parent | abbcb0a12cbab782c1d9879391efb65e9cd92acf (diff) | |
| parent | 845955dea53035e8472059ff03feca9f47c0d5fa (diff) | |
| download | infinitytier-c59c74dddab862ade65938e630dc0f561fcb0c2f.tar.gz infinitytier-c59c74dddab862ade65938e630dc0f561fcb0c2f.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service')
| -rw-r--r-- | service/ControlPlane.cpp | 6 | ||||
| -rw-r--r-- | service/README.md | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 71b3fd3f..4158ed43 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -454,7 +454,7 @@ unsigned int ControlPlane::handleRequest( } else { #ifdef ZT_ENABLE_NETWORK_CONTROLLER if (_controller) - _controller->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); + scode = _controller->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; #else scode = 404; @@ -490,7 +490,7 @@ unsigned int ControlPlane::handleRequest( } else { #ifdef ZT_ENABLE_NETWORK_CONTROLLER if (_controller) - _controller->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); + scode = _controller->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; #else scode = 404; @@ -525,7 +525,7 @@ unsigned int ControlPlane::handleRequest( } else { #ifdef ZT_ENABLE_NETWORK_CONTROLLER if (_controller) - _controller->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); + scode = _controller->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; #else scode = 404; diff --git a/service/README.md b/service/README.md index acad97a1..2a283cbd 100644 --- a/service/README.md +++ b/service/README.md @@ -204,7 +204,7 @@ Relay objects define network-specific preferred relay nodes. Traffic to peers on * **Note**: at the moment, <u>only rules specifying allowed Ethernet types are used</u>. The database supports a richer rule set, but this is not implemented yet in the client. <u>Other types of rules will have no effect</u> (yet). -Rules are matched in order of ruleId. If no rules match, the default action is 'drop'. To allow all traffic, create a single rule with all *null* fields and an action of 'accept'. +Rules are matched in order of ruleNo. If no rules match, the default action is 'drop'. To allow all traffic, create a single rule with all *null* fields and an action of 'accept'. Rule object fields can be *null*, in which case they are omitted from the object. A null field indicates "no match on this criteria." @@ -212,7 +212,7 @@ IP related fields apply only to Ethernet frames of type IPv4 or IPV6. Otherwise <table> <tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td></tr> -<tr><td>ruleId</td><td>integer</td><td>User-defined rule ID and sort order</td></tr> +<tr><td>ruleNo</td><td>integer</td><td>User-defined rule ID and sort order</td></tr> <tr><td>nodeId</td><td>string</td><td>10-digit hex ZeroTier address of node (a.k.a. "port on switch")</td></tr> <tr><td>vlanId</td><td>integer</td><td>Ethernet VLAN ID</td></tr> <tr><td>vlanPcp</td><td>integer</td><td>Ethernet VLAN priority code point (PCP) ID</td></tr> |