From patchwork Wed Aug 24 09:33:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liu jc X-Patchwork-Id: 277 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp270645vsd; Wed, 24 Aug 2016 02:34:06 -0700 (PDT) X-Received: by 10.28.184.19 with SMTP id i19mr23015173wmf.43.1472031245407; Wed, 24 Aug 2016 02:34:05 -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 z207si25560946wmc.40.2016.08.24.02.34.03; Wed, 24 Aug 2016 02:34:05 -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=@outlook.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=NONE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80D91689AC9; Wed, 24 Aug 2016 12:33:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from COL004-OMC4S8.hotmail.com (col004-omc4s8.hotmail.com [65.55.34.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD10A689ACD for ; Wed, 24 Aug 2016 12:33:47 +0300 (EEST) Received: from APC01-HK2-obe.outbound.protection.outlook.com ([65.55.34.201]) by COL004-OMC4S8.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Wed, 24 Aug 2016 02:33:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=RAh31hFxq/GB/EhCbWyge+m0JcZOBYkCZEoaKV5PpAw=; b=aX53Nj14g1+c3Le/bNy6KKStbXNBWHpXD0XvvuCnqdlm+nvn4f9J6tDLOimFHaZVOumEKBp8SwqR8i8dCf4BilNITHwXar/NTJ66PRToDVlDEXJ+vwbLhNs/hmVDlCXqkeLYfk3nnEsqJd4mnw7n6/f8p6g+JFR99ixPUXTycE9D8SKZuMTtMXBnMQozzzQ10+1UlxufRTsA/OEqah2g/oPqHi1VvxkzJkHaMYPSH4/QHy8EOtJqvuZ72wTznhA/fYy5Wcc5lMF0pl1bW97TBGLi325wZ6IphpS6qFJTCi0rr3zUrB8XxSRUo9QGFuxcF8Peu+VlrG6pcwP57XNqiQ== Received: from HK2APC01FT003.eop-APC01.prod.protection.outlook.com (10.152.248.55) by HK2APC01HT187.eop-APC01.prod.protection.outlook.com (10.152.249.61) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.567.7; Wed, 24 Aug 2016 09:33:45 +0000 Received: from SG2PR0201MB0933.apcprd02.prod.outlook.com (10.152.248.57) by HK2APC01FT003.mail.protection.outlook.com (10.152.248.173) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.6 via Frontend Transport; Wed, 24 Aug 2016 09:33:44 +0000 Received: from SG2PR0201MB0933.apcprd02.prod.outlook.com ([10.162.202.141]) by SG2PR0201MB0933.apcprd02.prod.outlook.com ([10.162.202.141]) with mapi id 15.01.0599.008; Wed, 24 Aug 2016 09:33:42 +0000 From: liu jc To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number. Thread-Index: AQHR/eqaIogXUsCizE+hrGQMmoWTxQ== Date: Wed, 24 Aug 2016 09:33:42 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-slblob-mailprops: wSipExTYQ2gCmt5XjEJAvKPdpxlWaidIhLKsdM5vH4ZKyI8RvY118YRWXQnMdbBPxVeSOs9+FdEuSfOrvdueLdbXj9FEyALpENLmQRikH1h5xZ33y6nCB9+/mpcdKnX/WsX5HXWRtQtMNI6lNru0H6m0ous7Lo3X7l1pmgWwt8vFd7rl3FYvf3nmClOKaxUSOPsi2KTlLBon6olnYcic7kYIsaPTTdqRVjyvzSGFKJJCXOpVNG9QEEE/Eoe4zXmRAwLUxAH5GsHAoS2d7rQ8TDicDh5inbZmy3lt3CfE4isR9A2ZsKr8oFJe4GhlL+puw5Uj1sWqc3pxYnAmh/ySou2+SQafpStbVdLVhnbxrW7DdzxF/u8Hh6zhhgSPniyaYkh1y4hexEuwXfDPn/thZLKfAhj73YhhITc7u62JYcIX30YyreuvniyX6GarOVziUcFc68zwVdyV4xAh09YmYWhCvTlgMfktLGTNvxxif8SrvvsEY+sY1Su5eGhMy1j62Cyeb4OhKB0tUX0wZ0lF10RyqOFGNGqfvtd4p6X5GmXL9hVXoceWV0z2UyA/M75O7yxV6Gj3PxKfMDnV/+B0xJovodRP8QArzIGThCfhCCoQ9mTEN4BakErTKNJ+OSG/zm/9KNz0REeDiylSYO/gj46GveMfSpxAX6j78kwr4qk4nwkXc1yOGIIr8yhIhNfBY6a2qQzUiLLY6PGjM6lhOhjg6O4iHJqyOtp7Mpo48xK7g8Cx7WBLLg== authentication-results: spf=softfail (sender IP is 10.152.248.57) smtp.mailfrom=outlook.com; ffmpeg.org; dkim=none (message not signed) header.d=none; ffmpeg.org; dmarc=fail action=none header.from=outlook.com; received-spf: SoftFail (protection.outlook.com: domain of transitioning outlook.com discourages use of 10.152.248.57 as permitted sender) x-ms-exchange-messagesentrepresentingtype: 1 x-eopattributedmessage: 0 x-forefront-antispam-report: CIP:10.152.248.57; IPV:NLI; CTRY:; EFV:NLI; SFV:NSPM; SFS:(10019020)(98900003); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2APC01HT187; H:SG2PR0201MB0933.apcprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; x-microsoft-exchange-diagnostics: 1; HK2APC01HT187; 6:50/6zBQaohqxz/E083noT/esPo9trnEZHo5RkhEXg7csWmcA0UfF0wZiVMMTzpYpZKb12ADYx7tj1JRn6Cnf0/Kmg9RlAWUuK5qw87J6R75bOu2VQkozdKpfVYUCroLQgiWlz7EnT2Zs/8HFfBN1bJxcvyjuTfQ9jlc0EcxZF05IfMMWVUK/+WWC+RrCn2O2DxIteQcxlFSGSiCZB/h9qe24NCwcTnAUOSqWIsFRDWTAsBrARrFKtKq7JRLH42kTWRfe9ReY9EA3ohqZC/cgATyukADCRdwndH+Uw+wQi/Cah9Zd2TNgbkK6ZGvjDr6i; 5:I/wufNv57v8PYnzps583v8vNYner03CzkvYNnhw/2kLDVfMidkr7kHLqxP9DiR+HJ8l9w1aYNnbABc9PVKu/QDs11ZflioX10s67vFcZJgnZbAMbGFVbD9PgPaNbDobVKZ3eEI1UkdeAZ2g+Wr5JvA==; 24:uLV8ZciqXsWNoOurnWjLRAbWQNaiS7rIFeo/mzY/nmO7wHnVkyhp3DCmcQETJjvMjnQEPiLvF1T8+6QnPYl4yI2R77XwldPTz3ImK6TTiPk=; 7:xpbIggntc2R5Cycj/X+jWCaJAFPKTRVVojMXHj/l+JafIPsAynFZ2zRbLNq2Lq1oX5kBFZasTLZOtvIbQumOHCt8AhsOuJS2vJgkuEsUVG83snhEe02hKSmu+/iGyhyHgBMvJOTwCat711lQeJkt2AICO5mDsaJFNqbXWpM1DFf1cQ9Pw6yoyQw4gDHSLO3ROu0wLa5YCoIiLIv51MVmLQIaZrM1EVI1TxnJ7ytYuG/FhGVaq8NpZzXsbbhY/NjK x-ms-office365-filtering-correlation-id: 11a06c64-63a9-4909-160e-08d3cc01bafc x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(1601124038)(1601125047); SRVR:HK2APC01HT187; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(432015012)(82015046); SRVR:HK2APC01HT187; BCL:0; PCL:0; RULEID:; SRVR:HK2APC01HT187; x-forefront-prvs: 0044C17179 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2016 09:33:42.5944 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT187 X-OriginalArrivalTime: 24 Aug 2016 09:33:48.0479 (UTC) FILETIME=[9DF63CF0:01D1FDEA] Subject: [FFmpeg-devel] [PATCH] workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number. 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: liu jc Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: liujingchao --- libavformat/tcp.c | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100644 => 100755 libavformat/tcp.c diff --git a/libavformat/tcp.c b/libavformat/tcp.c old mode 100644 new mode 100755 index c105479..61b68ca --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -122,6 +122,16 @@ static int tcp_open(URLContext *h, const char *uri, int flags) cur_ai = ai; restart: + + if (cur_ai->ai_family == AF_INET6) + { + struct sockaddr_in6 * sockaddr_v6 = (struct sockaddr_in6 *)cur_ai->ai_addr; + if (sockaddr_v6->sin6_port == 0) + { + sockaddr_v6->sin6_port = htons(port); + } + } + fd = ff_socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);