From e39eed6519ddd673c24cdd94c8ade6f51d5c2a5b Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 27 May 2014 16:11:25 +0800 Subject: [PATCH] add SrsPid and SrsId to client response, add pid to log --- .../players/srs_bwt/release/srs_bwt.swf | Bin 4840 -> 4887 bytes trunk/research/players/srs_bwt/src/srs_bwt.as | 7 +++++ .../players/srs_player/release/srs_player.swf | Bin 5454 -> 5515 bytes .../players/srs_player/src/srs_player.as | 7 +++++ .../srs_publisher/release/srs_publisher.swf | Bin 5470 -> 5527 bytes .../srs_publisher/src/srs_publisher.as | 7 +++++ trunk/src/app/srs_app_log.cpp | 16 +++++----- trunk/src/rtmp/srs_protocol_rtmp.cpp | 29 +++++++++++++++++- 8 files changed, 57 insertions(+), 9 deletions(-) diff --git a/trunk/research/players/srs_bwt/release/srs_bwt.swf b/trunk/research/players/srs_bwt/release/srs_bwt.swf index f035aa6fff27d066a4b4d6dbd5eade9475dc4052..6a88f3a48355aa1e2ca4546fe7f9433fba573c96 100755 GIT binary patch literal 4887 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 J{~t7b#$r_>LV5rI literal 4840 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 O1)p@``2PT=mZR2wregX4 diff --git a/trunk/research/players/srs_bwt/src/srs_bwt.as b/trunk/research/players/srs_bwt/src/srs_bwt.as index 2a671faf9..8a0036df4 100755 --- a/trunk/research/players/srs_bwt/src/srs_bwt.as +++ b/trunk/research/players/srs_bwt/src/srs_bwt.as @@ -137,6 +137,7 @@ package private var srs_server:String = null; private var srs_primary_authors:String = null; private var srs_id:String = null; + private var srs_pid:String = null; private function update_context_items():void { // for context menu var customItems:Array = [new ContextMenuItem("SrsPlayer")]; @@ -146,6 +147,9 @@ package if (srs_primary_authors != null) { customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary_authors)); } + if (srs_pid != null) { + customItems.push(new ContextMenuItem("SrsPid: " + srs_pid)); + } if (srs_id != null) { customItems.push(new ContextMenuItem("SrsId: " + srs_id)); } @@ -166,6 +170,9 @@ package if (evt.info.data.hasOwnProperty("srs_id")) { srs_id = evt.info.data.srs_id; } + if (evt.info.data.hasOwnProperty("srs_pid")) { + srs_pid = evt.info.data.srs_pid; + } update_context_items(); } diff --git a/trunk/research/players/srs_player/release/srs_player.swf b/trunk/research/players/srs_player/release/srs_player.swf index 3402953c93a9d559010b731e3c90f327138057b4..a09750e17b603d38adda5190e6a388f46602a8c4 100755 GIT binary patch literal 5515 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 Em@S>Jq5uE@ diff --git a/trunk/research/players/srs_player/src/srs_player.as b/trunk/research/players/srs_player/src/srs_player.as index 781917176..55ac327a0 100755 --- a/trunk/research/players/srs_player/src/srs_player.as +++ b/trunk/research/players/srs_player/src/srs_player.as @@ -269,6 +269,7 @@ package private var srs_server:String = null; private var srs_primary_authors:String = null; private var srs_id:String = null; + private var srs_pid:String = null; private function update_context_items():void { // for context menu var customItems:Array = [new ContextMenuItem("SrsPlayer")]; @@ -278,6 +279,9 @@ package if (srs_primary_authors != null) { customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary_authors)); } + if (srs_pid != null) { + customItems.push(new ContextMenuItem("SrsPid: " + srs_pid)); + } if (srs_id != null) { customItems.push(new ContextMenuItem("SrsId: " + srs_id)); } @@ -316,6 +320,9 @@ package if (evt.info.data.hasOwnProperty("srs_id")) { srs_id = evt.info.data.srs_id; } + if (evt.info.data.hasOwnProperty("srs_pid")) { + srs_pid = evt.info.data.srs_pid; + } update_context_items(); } diff --git a/trunk/research/players/srs_publisher/release/srs_publisher.swf b/trunk/research/players/srs_publisher/release/srs_publisher.swf index 149e179c36370fce1b3b875cfb3a53186e1ea3b2..30f44ce92a819bc299e124e6f228768b5327f3f7 100755 GIT binary patch literal 5527 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 ZBIC4f%|>g*CGfWYouVBj{|_|ypiqEW!wUca literal 5470 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 UT82MeulpYx)*tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)(tv.tv_usec / 1000), - level_name, tag, context_id, errno); + level_name, tag, getpid(), context_id, errno); } else { log_header_size = snprintf(log_data, LOG_MAX_SIZE, - "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%d] ", + "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%d][%d] ", 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)(tv.tv_usec / 1000), - level_name, context_id, errno); + level_name, getpid(), context_id, errno); } } else { if (tag) { log_header_size = snprintf(log_data, LOG_MAX_SIZE, - "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%s][%d] ", + "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%s][%d][%d] ", 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)(tv.tv_usec / 1000), - level_name, tag, context_id); + level_name, tag, getpid(), context_id); } else { log_header_size = snprintf(log_data, LOG_MAX_SIZE, - "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d] ", + "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%d] ", 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)(tv.tv_usec / 1000), - level_name, context_id); + level_name, getpid(), context_id); } } diff --git a/trunk/src/rtmp/srs_protocol_rtmp.cpp b/trunk/src/rtmp/srs_protocol_rtmp.cpp index d830dbc18..e278209f6 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp.cpp @@ -492,7 +492,33 @@ int SrsRtmpClient::connect_app(string app, string tc_url) } SrsAutoFree(SrsMessage, msg); SrsAutoFree(SrsConnectAppResPacket, pkt); - srs_info("get connect app response message"); + + // server info + std::string srs_version; + std::string srs_server_ip; + int srs_id = 0; + int srs_pid = 0; + + SrsAmf0Any* data = pkt->info->get_property("data"); + if (data && data->is_ecma_array()) { + SrsAmf0EcmaArray* arr = data->to_ecma_array(); + + SrsAmf0Any* prop = NULL; + if ((prop = arr->ensure_property_string("srs_version")) != NULL) { + srs_version = prop->to_str(); + } + if ((prop = arr->ensure_property_string("srs_server_ip")) != NULL) { + srs_server_ip = prop->to_str(); + } + if ((prop = arr->ensure_property_number("srs_id")) != NULL) { + srs_id = (int)prop->to_number(); + } + if ((prop = arr->ensure_property_number("srs_pid")) != NULL) { + srs_pid = (int)prop->to_number(); + } + } + srs_trace("connected, version=%s, ip=%s, identity=[%d][%d]", + srs_version.c_str(), srs_server_ip.c_str(), srs_pid, srs_id); return ret; } @@ -867,6 +893,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) data->set("srs_server_ip", SrsAmf0Any::str(server_ip)); } // for edge to directly get the id of client. + data->set("srs_pid", SrsAmf0Any::number(getpid())); data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id())); if ((ret = protocol->send_and_free_packet(pkt, 0)) != ERROR_SUCCESS) {