正在显示
5 个修改的文件
包含
8 行增加
和
6 行删除
| @@ -222,7 +222,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port) | @@ -222,7 +222,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port) | ||
| 222 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 | 222 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 |
| 223 | SrsAmf0Object* data = req->args; | 223 | SrsAmf0Object* data = req->args; |
| 224 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); | 224 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); |
| 225 | - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); | 225 | + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); |
| 226 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); | 226 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); |
| 227 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); | 227 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); |
| 228 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); | 228 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); |
| @@ -654,7 +654,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port) | @@ -654,7 +654,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port) | ||
| 654 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 | 654 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 |
| 655 | SrsAmf0Object* data = req->args; | 655 | SrsAmf0Object* data = req->args; |
| 656 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); | 656 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); |
| 657 | - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); | 657 | + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); |
| 658 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); | 658 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); |
| 659 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); | 659 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); |
| 660 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); | 660 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); |
| @@ -336,7 +336,7 @@ int SrsForwarder::connect_app(string ep_server, string ep_port) | @@ -336,7 +336,7 @@ int SrsForwarder::connect_app(string ep_server, string ep_port) | ||
| 336 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 | 336 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/147 |
| 337 | SrsAmf0Object* data = req->args; | 337 | SrsAmf0Object* data = req->args; |
| 338 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); | 338 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); |
| 339 | - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); | 339 | + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); |
| 340 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); | 340 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); |
| 341 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); | 341 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); |
| 342 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); | 342 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); |
| @@ -956,7 +956,7 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata) | @@ -956,7 +956,7 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata) | ||
| 956 | } | 956 | } |
| 957 | 957 | ||
| 958 | // add server info to metadata | 958 | // add server info to metadata |
| 959 | - metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); | 959 | + metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); |
| 960 | metadata->metadata->set("primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY)); | 960 | metadata->metadata->set("primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY)); |
| 961 | metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS)); | 961 | metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS)); |
| 962 | 962 |
| @@ -31,10 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,10 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 1 | 32 | #define VERSION_MAJOR 1 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 26 | 34 | +#define VERSION_REVISION 27 |
| 35 | 35 | ||
| 36 | // server info. | 36 | // server info. |
| 37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
| 38 | +#define RTMP_SIG_SRS_CODE "HuKaiqun" | ||
| 38 | #define RTMP_SIG_SRS_ROLE "origin/edge server" | 39 | #define RTMP_SIG_SRS_ROLE "origin/edge server" |
| 39 | #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" | 40 | #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" |
| 40 | #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server" | 41 | #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server" |
| @@ -50,6 +51,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -50,6 +51,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 50 | #define RTMP_SIG_SRS_RELEASE "https://github.com/winlinvip/simple-rtmp-server/tree/1.0release" | 51 | #define RTMP_SIG_SRS_RELEASE "https://github.com/winlinvip/simple-rtmp-server/tree/1.0release" |
| 51 | #define RTMP_SIG_SRS_HTTP_SERVER "https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer#feature" | 52 | #define RTMP_SIG_SRS_HTTP_SERVER "https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer#feature" |
| 52 | #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) | 53 | #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) |
| 54 | +#define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")" | ||
| 53 | 55 | ||
| 54 | // internal macros, covert macro values to str, | 56 | // internal macros, covert macro values to str, |
| 55 | // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification | 57 | // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification |
| @@ -905,7 +905,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) | @@ -905,7 +905,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) | ||
| 905 | 905 | ||
| 906 | data->set("version", SrsAmf0Any::str(RTMP_SIG_FMS_VER)); | 906 | data->set("version", SrsAmf0Any::str(RTMP_SIG_FMS_VER)); |
| 907 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); | 907 | data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); |
| 908 | - data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); | 908 | + data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); |
| 909 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); | 909 | data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); |
| 910 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); | 910 | data->set("srs_role", SrsAmf0Any::str(RTMP_SIG_SRS_ROLE)); |
| 911 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); | 911 | data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); |
-
请 注册 或 登录 后发表评论