RTC: Support eip/candidate to set the eip of server

trunk/research/players/js/srs.sdk.js

@@ -33,8 +33,8 @@ function SrsRtcPublisherAsync() {
     //      webrtc://r.ossrs.net:11985/live/mystream
     // or set the api server to myapi.domain.com:
     //      webrtc://myapi.domain.com/live/livestream
-    // or set the candidate(ip) of answer:
-    //      webrtc://r.ossrs.net/live/livestream?eip=39.107.238.185
+    // or set the candidate(eip) of answer:
+    //      webrtc://r.ossrs.net/live/livestream?candidate=39.107.238.185
     // or force to access https API:
     //      webrtc://r.ossrs.net/live/livestream?schema=https
     // or use plaintext, without SRTP:
@@ -272,8 +272,8 @@ function SrsRtcPlayerAsync() {
     //      webrtc://r.ossrs.net:11985/live/mystream
     // or set the api server to myapi.domain.com:
     //      webrtc://myapi.domain.com/live/livestream
-    // or set the candidate(ip) of answer:
-    //      webrtc://r.ossrs.net/live/livestream?eip=39.107.238.185
+    // or set the candidate(eip) of answer:
+    //      webrtc://r.ossrs.net/live/livestream?candidate=39.107.238.185
     // or force to access https API:
     //      webrtc://r.ossrs.net/live/livestream?schema=https
     // or use plaintext, without SRTP:

trunk/src/app/srs_app_rtc_api.cpp

@@ -118,8 +118,11 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe
         srs_discovery_tc_url(tcUrl, schema, host, vhost, app, stream_name, port, param);
     }
 
-    // For client to specifies the EIP of server.
+    // For client to specifies the candidate(EIP) of server.
     string eip = r->query_get("eip");
+    if (eip.empty()) {
+        eip = r->query_get("candidate");
+    }
     string codec = r->query_get("codec");
     // For client to specifies whether encrypt by SRTP.
     string srtp = r->query_get("encrypt");
@@ -338,8 +341,11 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt
         srs_discovery_tc_url(tcUrl, schema, host, vhost, app, stream_name, port, param);
     }
 
-    // For client to specifies the EIP of server.
+    // For client to specifies the candidate(EIP) of server.
     string eip = r->query_get("eip");
+    if (eip.empty()) {
+        eip = r->query_get("candidate");
+    }
     string codec = r->query_get("codec");
 
     srs_trace("RTC publish %s, api=%s, tid=%s, clientip=%s, app=%s, stream=%s, offer=%dB, eip=%s, codec=%s",