From patchwork Tue Oct 18 00:09:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 1043 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp497457vsd; Mon, 17 Oct 2016 17:25:56 -0700 (PDT) X-Received: by 10.28.131.212 with SMTP id f203mr9402653wmd.113.1476750356713; Mon, 17 Oct 2016 17:25:56 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wu7si40967649wjc.78.2016.10.17.17.25.54; Mon, 17 Oct 2016 17:25:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D67668971A; Tue, 18 Oct 2016 03:25:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CCF2687EBE for ; Tue, 18 Oct 2016 03:25:43 +0300 (EEST) Received: by mail-lf0-f66.google.com with SMTP id x79so29545095lff.2 for ; Mon, 17 Oct 2016 17:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fWMrr4gB29xlsRWPPPc2GSt1bNdgwtwq1ZNDL0fkmvQ=; b=ngbcLQ3/H1zMezTHdljlKxzUjzQ7sEcsezngywNYgM7fDgoHUBTU/BJkqPUi28BppH BZ8RMpyt1TZWF33nEZK5M6XkFPl4WGijs9nmqxfQkPZeoPeIqTX9ZQXjB6QibH53FfqQ q05QT7T0u+puIG6tmm8m6uCvOqO1mA5pdLDbq7wUL5oMW7lRm9AlLfg+u85LfyOdEyRv DU091UG4z/chvTpG9lC5AoZsmbCpsvYJO6aoyn2/ofqX4gZOFah4Tg+D0fUkrXJgay0x Yjrp8FIrZKf09d4JaE5vxwj+uUhG2HgTJN5vVroNc9pWGSE7p8CQCRYDgBbaM778Nvm0 CI6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fWMrr4gB29xlsRWPPPc2GSt1bNdgwtwq1ZNDL0fkmvQ=; b=IPEzDf6/ViXtHG9nUgtLjoqJmMNerK//jqz1YLro05sXMWl2XhNZEoW2Z1gMPEXyl8 ucofWMW1iUMb0TDkDsPUhzc8JPrGnf41pruzNx5MRNY6ue5itXwhshKwvH/XFAQ7pUXD lcCPZlLUjWbJWJUmDvGXysQkoh3idMvL7ITrv0T8b6xa/j+l8aud7N/S2rh5RPYG3REJ NcPngMbVdPZrUnodlyhCnFjJj0VDteKctzymH9afGmoOMaaAfG5pY6JTaDr7TnEg7KEy frWSpNetEBY6miI6cQ46mpxbK3BGm4fo/LGHPBj8ywKrZ330wx9wlwVa506P90I6yz/5 U2yw== X-Gm-Message-State: AA6/9RlWbHz7iwS3fpHX6SFQCoqO2BudZxnXn/Yr+hL7iSVv/DyW8Km5iLNvL/HbeKKaVA== X-Received: by 10.28.95.213 with SMTP id t204mr10022932wmb.18.1476749387571; Mon, 17 Oct 2016 17:09:47 -0700 (PDT) Received: from neu.localdomain (HSI-KBW-109-192-116-204.hsi6.kabel-badenwuerttemberg.de. [109.192.116.204]) by smtp.gmail.com with ESMTPSA id v3sm57476021wjm.4.2016.10.17.17.09.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2016 17:09:46 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2016 02:09:43 +0200 Message-Id: <1476749383-28855-1-git-send-email-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.5.5 Subject: [FFmpeg-devel] [PATCH] lavf/http.c: Add listen_timeout option. 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/http.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index d48958d..3b0d6ab 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -115,6 +115,7 @@ typedef struct HTTPContext { int reconnect_delay; int reconnect_delay_max; int listen; + int listen_timeout; char *resource; int reply_code; int is_multi_client; @@ -158,6 +159,7 @@ static const AVOption options[] = { { "reconnect_streamed", "auto reconnect streamed / non seekable streams", OFFSET(reconnect_streamed), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D }, { "reconnect_delay_max", "max reconnect delay in seconds after which to give up", OFFSET(reconnect_delay_max), AV_OPT_TYPE_INT, { .i64 = 120 }, 0, UINT_MAX/1000/1000, D }, { "listen", "listen on HTTP", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, D | E }, + { "listen_timeout", "Connection awaiting timeout (in milliseconds)", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "resource", "The resource requested by a client", OFFSET(resource), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, { "reply_code", "The http status code to return to a client", OFFSET(reply_code), AV_OPT_TYPE_INT, { .i64 = 200}, INT_MIN, 599, E}, { NULL } @@ -463,6 +465,9 @@ static int http_listen(URLContext *h, const char *uri, int flags, NULL); if ((ret = av_dict_set_int(options, "listen", s->listen, 0)) < 0) goto fail; + if ((ret = av_dict_set_int(options, "listen_timeout", s->listen_timeout, 0)) < 0) + goto fail; + if ((ret = ffurl_open_whitelist(&s->hd, lower_url, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, options, h->protocol_whitelist, h->protocol_blacklist, h