From patchwork Thu Jan 24 12:36:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Fisher X-Patchwork-Id: 11855 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 41B6C44D68A for ; Thu, 24 Jan 2019 14:44:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 651C668AD1F; Thu, 24 Jan 2019 14:44:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEB1E68AD17 for ; Thu, 24 Jan 2019 14:44:10 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id 96so6341779wrb.2 for ; Thu, 24 Jan 2019 04:44:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=61+Ac2EKBYmLNb60smma5Tl1EPkEpB0PXhpjHdj3YXo=; b=GOrPAkcNy8QrCtD8khHgetPUEr9FWq7JfhW/H8WLe6LJNstOSLAdHRO6C2ggvZFe5q eiz3VBEVlOOo6/vqFJ38NH+RupDJGwHuDLUdMLwpjaxCQEgDm2xCKzTgRlQQCa9WQNTN z2pCeRkHd/Es2xDXqv/+cgpytnid2TEyxMr5arH1Cylu7q1ssnPx2u3q1IWPTlZ20uBh x2oF6gdvCEOW1bfAS5jnU/KXBO/el7p00gXaL3OIeAKxmWA+BNvZ8S9M/LfHz81Z1A/R K4lceQ/B2M5dtIA17cRIeu2v/3cn/Esf78i4Sa0JA5Dr+C877rWJOvTPlDLi3gn+PXqT dOVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=61+Ac2EKBYmLNb60smma5Tl1EPkEpB0PXhpjHdj3YXo=; b=e4PobeP5YDcTJg9+h6RLDJkaTlDLAIKeN4V9GUnejsqAPyABkyiu8+IRLlQ/fRGIJv uRxA2K30eJolc+rNiF+gR5Jo7RE//P1iLql3PiHtIXoSJ3WTmdY1bXcR0kEisF7okONg kubrvIBHgOhx2idTCLU9elhArh6odmC9A3WYFxkSl+L3h12QPlHWKq3qAcS/vlz2+3iR 2sUqhktLJEWnfOhFRLTzjOJBV6gWP+4IUKC3BhhJMcA2EgdatUSOpTCzdGOFElfKFM8k 1NeXepMcA2LV4oZxGOFiIqIBKEG7wim8E+dAJqZYvpka0w0vF3aHR4wts4fHk6Se3fyW LZAQ== X-Gm-Message-State: AJcUukcpTucqPtZEyJfrtCA5nTzanDD54FkfrPAKIcPGBuR95jbk4xCZ igWHEeRfGQdL7f75eWP/UGt8wEsW X-Google-Smtp-Source: ALg8bN4WmbqpHeQKq/Q+vwFFchsOcmZSqTgux8K762ZP2O6J23TRH4YZbsMLryCbLtSLoZDXFaK+jg== X-Received: by 2002:adf:8b4d:: with SMTP id v13mr6784883wra.282.1548333429382; Thu, 24 Jan 2019 04:37:09 -0800 (PST) Received: from localhost.localdomain (bzq-82-80-182-10.static.bezeqint.net. [82.80.182.10]) by smtp.gmail.com with ESMTPSA id t76sm64456425wme.33.2019.01.24.04.37.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 04:37:08 -0800 (PST) From: Chen Fisher To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Jan 2019 14:36:53 +0200 Message-Id: <20190124123653.54573-1-chen.fisher@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Subject: [FFmpeg-devel] [PATCH] support rtmp_listen with rtmps X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Chen Fisher MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Chen Fisher --- libavformat/rtmpproto.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index b741e421af..82b3688658 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -129,6 +129,8 @@ typedef struct RTMPContext { char auth_params[500]; int do_reconnect; int auth_tried; + char* cert_file; + char* key_file; } RTMPContext; #define PLAYER_KEY_OPEN_PART_LEN 30 ///< length of partial key used for first client digest signing @@ -2625,7 +2627,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **o } } - if (rt->listen && strcmp(proto, "rtmp")) { + if (rt->listen && strcmp(proto, "rtmp") && strcmp(proto, "rtmps")) { av_log(s, AV_LOG_ERROR, "rtmp_listen not available for %s\n", proto); return AVERROR(EINVAL); @@ -2640,7 +2642,12 @@ static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **o /* open the tls connection */ if (port < 0) port = RTMPS_DEFAULT_PORT; - ff_url_join(buf, sizeof(buf), "tls", NULL, hostname, port, NULL); + if (rt->listen) + ff_url_join(buf, sizeof(buf), "tls", NULL, hostname, port, + "?listen&listen_timeout=%d&cert=%s&key=%s", + rt->listen_timeout * 1000, rt->cert_file, rt->key_file); + else + ff_url_join(buf, sizeof(buf), "tls", NULL, hostname, port, NULL); } else if (!strcmp(proto, "rtmpe") || (!strcmp(proto, "rtmpte"))) { if (!strcmp(proto, "rtmpte")) av_dict_set(opts, "ffrtmpcrypt_tunneling", "1", 1); @@ -3112,6 +3119,8 @@ static const AVOption rtmp_options[] = { {"rtmp_listen", "Listen for incoming rtmp connections", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" }, {"listen", "Listen for incoming rtmp connections", OFFSET(listen), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_listen" }, {"timeout", "Maximum timeout (in seconds) to wait for incoming connections. -1 is infinite. Implies -rtmp_listen 1", OFFSET(listen_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC, "rtmp_listen" }, + {"cert_file", "Certificate file", OFFSET(cert_file), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"key_file", "Key file", OFFSET(key_file), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, { NULL }, };