winlin

for #319, refine the error code for RAW APi.

@@ -930,7 +930,7 @@ int SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) @@ -930,7 +930,7 @@ int SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
930 std::string scope = r->query_get("scope"); 930 std::string scope = r->query_get("scope");
931 std::string vhost = r->query_get("vhost"); 931 std::string vhost = r->query_get("vhost");
932 if (scope.empty() || (scope != "global" && scope != "vhost")) { 932 if (scope.empty() || (scope != "global" && scope != "vhost")) {
933 - ret = ERROR_SYSTEM_CONFIG_RAW_PARAMS; 933 + ret = ERROR_SYSTEM_CONFIG_RAW_NOT_ALLOWED;
934 srs_error("raw api query invalid scope=%s. ret=%d", scope.c_str(), ret); 934 srs_error("raw api query invalid scope=%s. ret=%d", scope.c_str(), ret);
935 return srs_api_response_code(w, r, ret); 935 return srs_api_response_code(w, r, ret);
936 } 936 }
@@ -988,7 +988,7 @@ int SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) @@ -988,7 +988,7 @@ int SrsGoApiRaw::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
988 std::string scope = r->query_get("scope"); 988 std::string scope = r->query_get("scope");
989 std::string value = r->query_get("value"); 989 std::string value = r->query_get("value");
990 if (scope.empty() || (scope != "global.listen" && scope != "global.pid")) { 990 if (scope.empty() || (scope != "global.listen" && scope != "global.pid")) {
991 - ret = ERROR_SYSTEM_CONFIG_RAW_PARAMS; 991 + ret = ERROR_SYSTEM_CONFIG_RAW_NOT_ALLOWED;
992 srs_error("raw api query invalid scope=%s. ret=%d", scope.c_str(), ret); 992 srs_error("raw api query invalid scope=%s. ret=%d", scope.c_str(), ret);
993 return srs_api_response_code(w, r, ret); 993 return srs_api_response_code(w, r, ret);
994 } 994 }
@@ -100,7 +100,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -100,7 +100,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
100 #define ERROR_SYSTEM_CONFIG_PERSISTENCE 1059 100 #define ERROR_SYSTEM_CONFIG_PERSISTENCE 1059
101 #define ERROR_SYSTEM_CONFIG_RAW 1060 101 #define ERROR_SYSTEM_CONFIG_RAW 1060
102 #define ERROR_SYSTEM_CONFIG_RAW_DISABLED 1061 102 #define ERROR_SYSTEM_CONFIG_RAW_DISABLED 1061
103 -#define ERROR_SYSTEM_CONFIG_RAW_PARAMS 1062 103 +#define ERROR_SYSTEM_CONFIG_RAW_NOT_ALLOWED 1062
  104 +#define ERROR_SYSTEM_CONFIG_RAW_PARAMS 1063
104 105
105 /////////////////////////////////////////////////////// 106 ///////////////////////////////////////////////////////
106 // RTMP protocol error. 107 // RTMP protocol error.