From patchwork Wed Aug 24 10:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liu jc X-Patchwork-Id: 279 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp296657vsd; Wed, 24 Aug 2016 03:47:06 -0700 (PDT) X-Received: by 10.194.42.202 with SMTP id q10mr2037215wjl.190.1472035626322; Wed, 24 Aug 2016 03:47:06 -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 lw6si7847406wjb.138.2016.08.24.03.47.04; Wed, 24 Aug 2016 03:47:06 -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 3F3C1689B00; Wed, 24 Aug 2016 13:46:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from BAY004-OMC4S18.hotmail.com (bay004-omc4s18.hotmail.com [65.54.190.220]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AB6D689AF1 for ; Wed, 24 Aug 2016 13:46:45 +0300 (EEST) Received: from APC01-HK2-obe.outbound.protection.outlook.com ([65.54.190.200]) by BAY004-OMC4S18.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Wed, 24 Aug 2016 03:46:46 -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=jCjLLimH+poN2x6Yqr7aVYVqXau/3dZPddAQWhPxTUk=; b=G5TeErBM9Z3UrmPHCTOd3r99ssoG4IZnICqij28F+d4D4deIcYWoxBhLY/Pmwsw5w/yNcE42NaAn2MJc4B47rUR1bV9Y4NCAK+HjM6kNlqVmiLje68Jg2Z25utZVmtceFTDuEX0sc4suTy7BR2yEE8WdU8vvj0Lwi7aKogS+hbiTkKOfSkJs55ILrY5j+rEGdofVScE8ndPvbEownGyougcSD81NVn2eR4ZMlRbqP4Dp7jpL0lVCmcVpB94mR+Q6BHVh6SWPZjJHnnNDZbQhg9MhhXPKKp4CMIUrZJnU3J54zLB8RwzX4XfvGx86RUtpvM2+9S/FPUlKk5FHGoetSA== Received: from PU1APC01FT024.eop-APC01.prod.protection.outlook.com (10.152.252.60) by PU1APC01HT101.eop-APC01.prod.protection.outlook.com (10.152.253.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.567.7; Wed, 24 Aug 2016 10:46:44 +0000 Received: from SG2PR0201MB0933.apcprd02.prod.outlook.com (10.152.252.59) by PU1APC01FT024.mail.protection.outlook.com (10.152.252.233) with Microsoft SMTP Server (TLS) id 15.1.539.16 via Frontend Transport; Wed, 24 Aug 2016 10:46:42 +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 10:46:41 +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/fTMOf8ipPtr1kut9gG1uy6YOQ== Date: Wed, 24 Aug 2016 10:46:41 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-slblob-mailprops: mBRmoEB1kyKueF8aZcajX3KdvoBkLHZQ6cZdN3WzorubPG/g9tJ6ya9ohfmtL95PNxB2aZcCavXCYnm3B3NSYZDjaJIvuafQnO7Qzg3I/cBhSddM2o+nc9gbyxB+t6KXaccEFuI9DZcaXQ8R5B2ttflCW4yvl3QwUvHbAwSNyTkpu+bWII8fmfFNgRFyYmtYTxGOTPwIMDF9HIKgUpiBY0wFbURGiFcdFfVc0TfNocpm2sBdK+XR7V715jxwydGz0Ih75R5jma3+sNJk9XOtWczAQ+smIzYtTYcQf0HydKbdsxyxA8E0MEvGgU7F+xX38BR0w0W1yQoFQ6GMjUcKKW1Eji+QlrzIWEJfKEXtWjjIgEimIfNgwqWcdBDRrJ8gcDjXUQdcCz2UG8GLz9DWi9/3SgEwPpkNLKiR/eQvLkA8++yv8Dwx6KUDjaiaFAdGXumN3O/qzFTKalwIPovghnNU1V7PCLmsGrItv1cAZBrRngia9c+hZpOWgrKPHg9nhXM8LkWv5ELrMa8M0jJY67kYI76PxJWU2F4PGZ8EFOMgqZMoK3Tj4cncXw+MhKRQ45ZC6/2msDOMiiiKO2elP7GnHAsrybYkEV65S7ayTZN7sOzkllxKdJrFWff/T4UAX8a4REDXkzJVAFDYh3gkyD3MlwptTUl1KCMeRB3k+GEe89wYM+n8aic4paAuf6Lg3LO2HmcIihDqhfVB8AccyDU4pOXTyog0zaGWgKoWUl6RxbPI3EEKu8x6Ycvtesos9V95mvEwjcE= authentication-results: spf=softfail (sender IP is 10.152.252.59) 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.252.59 as permitted sender) x-ms-exchange-messagesentrepresentingtype: 1 x-eopattributedmessage: 0 x-forefront-antispam-report: CIP:10.152.252.59; IPV:NLI; CTRY:; EFV:NLI; SFV:NSPM; SFS:(10019020)(98900003); DIR:OUT; SFP:1102; SCL:1; SRVR:PU1APC01HT101; H:SG2PR0201MB0933.apcprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; x-microsoft-exchange-diagnostics: 1; PU1APC01HT101; 6:m6YvXyoVXqUSYeZ2tW7zJoGZml5P7dKiibicaBJraMcKd/UJ2XhdkEWIewGV1NM1l1xyBVdAUDCjE/rBrK25dfJyzuIQqL2gH0VTPCaKnTPkvHJre8ejSsS5ozVVsOSaC7LWBJo4xjQWBL/q/LZP8PJn2CfpKRSfpuE5gHh8ui3o4THZv26awf3YobPpXl/AwdP65INkk9wPQgMixGXsmNJm/X25WBkLaMzIrauozkE/wAiopyXLMt5Q23Az2NWzNcjZ0jzlrt+hU0SKLA/HmokDTA1dKvvw1cPx+vDPkLrNeAwRMHCt+tJMGqp1kRVU; 5:LvaWBZnhyfspUPNduayXQxLU6bxB+Bwmiob1ObmydejsaLcNPusLjFKqCMbVAWtELdMdDqs9kiqUXjXTjRghmqG64F/jgP5fL5xcCWLbC+qm9I3ix5cZbjWbgGFqCEGsKQ2a76U4XUAVTG07iuUMyw==; 24:bsyv3doCKb0bI5xUSci9SL3DBz1otFUaldT33MTI3wvug50LO3xVDmIHH9LjUVKlsB1eipk2DGAXgKb8dHL9MDc32rRVRA34KOZe6irSZeI=; 7:klff4Fz/PtjS6GQPo87zHi/Xadxo5mdQwvfEgLHCMJ73/UHzAPOsbb4PWF1OstKlAAzJvE10j3qolp6ZRcnR/NDaTqflJ1yYVypETnmu/kBQs03bPEZpTtraphjZZQzk6ela5ZQwUn3neu0vgrJIivMNBBBJt7VWB6wiE+8aAp+JWd4hxz3dnk9VyexeSZlbQvbTusqLGBwOnUzS1SL2V+O6uqEqrES3vVEAr9ytbFYwPjH+pJg3k3cr4sSVZNyM x-ms-office365-filtering-correlation-id: e1619691-ca54-4509-a56c-08d3cc0beda8 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(1601124038)(1601125047); SRVR:PU1APC01HT101; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(432015012)(82015046); SRVR:PU1APC01HT101; BCL:0; PCL:0; RULEID:; SRVR:PU1APC01HT101; 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 10:46:41.6799 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT101 X-OriginalArrivalTime: 24 Aug 2016 10:46:46.0791 (UTC) FILETIME=[CFA3A170:01D1FDF4] 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 | 8 ++++++++ 1 file changed, 8 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..fd10a56 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -122,6 +122,14 @@ static int tcp_open(URLContext *h, const char *uri, int flags) cur_ai = ai; restart: + // workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number. + if (cur_ai->ai_family == AF_INET6){ + struct sockaddr_in6 * sockaddr_v6 = (struct sockaddr_in6 *)cur_ai->ai_addr; + if (!sockaddr_v6->sin6_port){ + sockaddr_v6->sin6_port = htons(port); + } + } + fd = ff_socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);