From patchwork Thu Mar 21 23:58:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 12388 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 4407A448D9F for ; Fri, 22 Mar 2019 02:05:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 202B968AA4D; Fri, 22 Mar 2019 02:05:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 152EC689D39 for ; Fri, 22 Mar 2019 02:05:52 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id q206so185878pgq.4 for ; Thu, 21 Mar 2019 17:05:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=TNsf24G9odypQlzf6kOO4sGjKZZWq0irD2tDXGR3uCY=; b=Bx5xZcuSo2WEhQ+PjLlFR2JwwaiaEOO6DwLcODTbZOTp93mOSPTIj2uBOqHdjr83/G hmkZ2STHx+pZso4e+/NDEMuw/pqcYcknMy3QUPSGN2HBRek4NZow/wGYEBBPJomVthOh +QWaYFKNGqffPh64qLIer1jvfIz4vRtdKY+91Gbu4BvP1P2+OpabTyf99h5YhhUmyS/8 mrVmUviZN+n2qhg/09qdy5UagmviDgAzwu3nNZSRZ7Stj5NLA1MrKN3COhxByVOFxI2i wWHKhe0cQJgJG4u30I1Ua+Rrl4RAFNLKNaEYjb8xuppbv9rSCu1HKeG01MeUQBEHMRO+ mEew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=TNsf24G9odypQlzf6kOO4sGjKZZWq0irD2tDXGR3uCY=; b=oBXicNRB/SzvN9hQ3/ahPQCHXK7kgLEtqj8P6Y2rdXW2KIq1uEf9y8HWvjqjV0S49/ Qh56OjCNnmCKKJ0RfrxcGKwzZbYAoTwTIL5ypObHlg21C52WqPUuF+8G18+ofYdSOGC7 o33bdP9Rk1sdOxQRG0KScZgSFKiZJ4A0O7tYE1gxKvoPzTNegpVnXufwcHIKHxqrt2YB RZWUA9CapuKWr+XZL2JwsHhQTH8t1A8ECRaTQlJQusM+1HWzS+lZPziQ+ZJi6qToqLhi Me4FCdl6LVNAqdqomzaBjgea1ZK91uPXXRtXSBQ6wwNpEMeNWKU0IVxjgJzPVjRfKVwa EbhQ== X-Gm-Message-State: APjAAAW550KBncYP+v8lB1ltgZWUQGXwT1XEGiEMW36y5XDl+YSOpho1 LOM0BdGZFj4hBgQ6lbGOSJOYInFi X-Google-Smtp-Source: APXvYqyH3rAkAnQYoevoyy0/pGBHkvY6dOGP7GskDPvlq/kxL3QdYhvXRF+5hGLhALIGPZaRuvYkrw== X-Received: by 2002:a63:31ce:: with SMTP id x197mr6021291pgx.69.1553212727743; Thu, 21 Mar 2019 16:58:47 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:a:7d1e:c8d2:ccef:2569]) by smtp.googlemail.com with ESMTPSA id z128sm9586696pfz.107.2019.03.21.16.58.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 16:58:47 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Mar 2019 16:58:41 -0700 Message-Id: <20190321235841.14932-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] avformat/rtsp: Add https tunneling support 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Add https based tunneling for RTSP/RTP. Tested on Axis and Bosch cameras. Https is widely used for security consideration. --- libavformat/rtsp.c | 8 ++++++-- libavformat/rtsp.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index ae8811234a..4661654967 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -87,6 +87,7 @@ const AVOption ff_rtsp_options[] = { { "tcp", "TCP", 0, AV_OPT_TYPE_CONST, {.i64 = 1 << RTSP_LOWER_TRANSPORT_TCP}, 0, 0, DEC|ENC, "rtsp_transport" }, \ { "udp_multicast", "UDP multicast", 0, AV_OPT_TYPE_CONST, {.i64 = 1 << RTSP_LOWER_TRANSPORT_UDP_MULTICAST}, 0, 0, DEC, "rtsp_transport" }, { "http", "HTTP tunneling", 0, AV_OPT_TYPE_CONST, {.i64 = (1 << RTSP_LOWER_TRANSPORT_HTTP)}, 0, 0, DEC, "rtsp_transport" }, + { "https", "HTTPS tunneling", 0, AV_OPT_TYPE_CONST, {.i64 = (1 << RTSP_LOWER_TRANSPORT_HTTPS )}, 0, 0, DEC, "rtsp_transport" }, RTSP_FLAG_OPTS("rtsp_flags", "set RTSP flags"), { "listen", "wait for incoming connections", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_LISTEN}, 0, 0, DEC, "rtsp_flags" }, { "prefer_tcp", "try RTP via TCP first, if available", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_PREFER_TCP}, 0, 0, DEC|ENC, "rtsp_flags" }, @@ -1669,6 +1670,7 @@ int ff_rtsp_connect(AVFormatContext *s) RTSPMessageHeader reply1, *reply = &reply1; int lower_transport_mask = 0; int default_port = RTSP_DEFAULT_PORT; + int https_tunnel = 0; char real_challenge[64] = ""; struct sockaddr_storage peer; socklen_t peer_len = sizeof(peer); @@ -1687,7 +1689,9 @@ int ff_rtsp_connect(AVFormatContext *s) s->max_delay = s->iformat ? DEFAULT_REORDERING_DELAY : 0; rt->control_transport = RTSP_MODE_PLAIN; - if (rt->lower_transport_mask & (1 << RTSP_LOWER_TRANSPORT_HTTP)) { + if (rt->lower_transport_mask & ((1 << RTSP_LOWER_TRANSPORT_HTTP) | + (1 << RTSP_LOWER_TRANSPORT_HTTPS))) { + https_tunnel = !!(rt->lower_transport_mask & (1 << RTSP_LOWER_TRANSPORT_HTTPS)); rt->lower_transport_mask = 1 << RTSP_LOWER_TRANSPORT_TCP; rt->control_transport = RTSP_MODE_TUNNEL; } @@ -1741,7 +1745,7 @@ redirect: char sessioncookie[17]; char headers[1024]; - ff_url_join(httpname, sizeof(httpname), "http", auth, host, port, "%s", path); + ff_url_join(httpname, sizeof(httpname), https_tunnel ? "https" : "http", auth, host, port, "%s", path); snprintf(sessioncookie, sizeof(sessioncookie), "%08x%08x", av_get_random_seed(), av_get_random_seed()); diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 9a7f366b39..b49278fc20 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -42,6 +42,7 @@ enum RTSPLowerTransport { RTSP_LOWER_TRANSPORT_HTTP = 8, /**< HTTP tunneled - not a proper transport mode as such, only for use via AVOptions */ + RTSP_LOWER_TRANSPORT_HTTPS, /**< HTTPS tunneled */ RTSP_LOWER_TRANSPORT_CUSTOM = 16, /**< Custom IO - not a public option for lower_transport_mask, but set in the SDP demuxer based