正在显示
3 个修改的文件
包含
17 行增加
和
2 行删除
| @@ -75,8 +75,13 @@ int SrsClient::do_cycle() | @@ -75,8 +75,13 @@ int SrsClient::do_cycle() | ||
| 75 | srs_warn("rtmp connect vhost/app failed. ret=%d", ret); | 75 | srs_warn("rtmp connect vhost/app failed. ret=%d", ret); |
| 76 | return ret; | 76 | return ret; |
| 77 | } | 77 | } |
| 78 | - srs_info("rtmp connect success. tcUrl=%s, schema=%s, vhost=%s, port=%s, app=%s", | ||
| 79 | - req->tcUrl.c_str(), req->schema.c_str(), req->vhost.c_str(), req->port.c_str(), | 78 | + srs_info("rtmp connect success. tcUrl=%s, pageUrl=%s, swfUrl=%s", |
| 79 | + req->tcUrl.c_str(), req->pageUrl.c_str(), req->swfUrl.c_str()); | ||
| 80 | + | ||
| 81 | + srs_trace("rtmp connect success. " | ||
| 82 | + "tcUrl=%s, pageUrl=%s, swfUrl=%s, schema=%s, vhost=%s, port=%s, app=%s", | ||
| 83 | + req->tcUrl.c_str(), req->pageUrl.c_str(), req->swfUrl.c_str(), | ||
| 84 | + req->schema.c_str(), req->vhost.c_str(), req->port.c_str(), | ||
| 80 | req->app.c_str()); | 85 | req->app.c_str()); |
| 81 | 86 | ||
| 82 | return ret; | 87 | return ret; |
| @@ -112,6 +112,14 @@ int SrsRtmp::connect_app(SrsRequest* req) | @@ -112,6 +112,14 @@ int SrsRtmp::connect_app(SrsRequest* req) | ||
| 112 | } | 112 | } |
| 113 | req->tcUrl = srs_amf0_convert<SrsAmf0String>(prop)->value; | 113 | req->tcUrl = srs_amf0_convert<SrsAmf0String>(prop)->value; |
| 114 | 114 | ||
| 115 | + if ((prop = pkt->command_object->ensure_property_string("pageUrl")) != NULL) { | ||
| 116 | + req->pageUrl = srs_amf0_convert<SrsAmf0String>(prop)->value; | ||
| 117 | + } | ||
| 118 | + | ||
| 119 | + if ((prop = pkt->command_object->ensure_property_string("swfUrl")) != NULL) { | ||
| 120 | + req->swfUrl = srs_amf0_convert<SrsAmf0String>(prop)->value; | ||
| 121 | + } | ||
| 122 | + | ||
| 115 | return ret; | 123 | return ret; |
| 116 | } | 124 | } |
| 117 | 125 |
| @@ -42,6 +42,8 @@ class SrsProtocol; | @@ -42,6 +42,8 @@ class SrsProtocol; | ||
| 42 | struct SrsRequest | 42 | struct SrsRequest |
| 43 | { | 43 | { |
| 44 | std::string tcUrl; | 44 | std::string tcUrl; |
| 45 | + std::string pageUrl; | ||
| 46 | + std::string swfUrl; | ||
| 45 | 47 | ||
| 46 | std::string schema; | 48 | std::string schema; |
| 47 | std::string vhost; | 49 | std::string vhost; |
-
请 注册 或 登录 后发表评论