From patchwork Wed Aug 24 09:17:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liu jc X-Patchwork-Id: 276 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp265198vsd; Wed, 24 Aug 2016 02:17:35 -0700 (PDT) X-Received: by 10.28.173.205 with SMTP id w196mr2221248wme.86.1472030255550; Wed, 24 Aug 2016 02:17:35 -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 yv8si7542585wjc.147.2016.08.24.02.17.32; Wed, 24 Aug 2016 02:17:35 -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 A1EB8689AD0; Wed, 24 Aug 2016 12:17:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from SNT004-OMC2S14.hotmail.com (snt004-omc2s14.hotmail.com [65.55.90.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14BCB689AAA for ; Wed, 24 Aug 2016 12:17:20 +0300 (EEST) Received: from APC01-SG2-obe.outbound.protection.outlook.com ([65.55.90.73]) by SNT004-OMC2S14.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Wed, 24 Aug 2016 02:17:22 -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=ItaCPD1szREPQqbv1R7I9k2BiQhP4rI7jwNmgHMgAGw=; b=SKyVfzKsMWXuJbSr1FFlBckidKqXRt8ffWU4tVuJuIDqcMaLM23uIbqtL6ren37r/dubuToKgw1m683O/X3HhLCZuMa+Hw0PT+UF0Gc5FGhbEXNahafPzARZqwRY/wHoD0CP0sM1K7A/weCYbxqeuvZ1XKasmAaMxjpMeTQHwxh9p4GlIPgeR4TGmehW4swJDmmtpLcFAraGXeafVZsdROuMxIA2xgjj65u7QNO2QTbazBKaK+ogISzbfS/DJN2MQypq3/MvhYNEg34YWkmdBmIh4XLG/KJLBRFo8ZPgbtoRGo0ZdMAAx+chaSR8z6sK+P3VKn+WSl6dLP1kq5AOgQ== Received: from PU1APC01FT013.eop-APC01.prod.protection.outlook.com (10.152.252.57) by PU1APC01HT182.eop-APC01.prod.protection.outlook.com (10.152.252.252) 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:17:09 +0000 Received: from SG2PR0201MB0933.apcprd02.prod.outlook.com (10.152.252.58) by PU1APC01FT013.mail.protection.outlook.com (10.152.252.78) 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:17:07 +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:17:05 +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/ehIVJzdE6DB20ubwDiI/esb2w== Date: Wed, 24 Aug 2016 09:17:05 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-slblob-mailprops: UVhqIX3n4JqfQcMnudUfIh2d+jrpE6aRq0+TYhmCUgspQ6oMfR7xTKdehHBcLhsZgws8//PSktUCnkwct08tRz6kks/SdWnKBTbxOQIubcYEEF7R/hO+SPe4M73DcYAJYpI0EA3Rg5Z/j2n3SUFuNtOWhvuWh7b1GF08Bp1Wdut7XNE+2lQl/V5BiiV6UnxVkey/ATPUNvELA86mUv61QSzwihUJx8S/cz8rUa56psr3nptcTNpQeqFCiRypBjbwrdrC85ol4dGCp1IbcBGkjnKEEQ60u1+X4fMXM+PnsEJUVRjvblSy1zi32QpFW09iJLO9QaHaTaHHTHs41T4EDPzP09wUuuhAqwSXeUdjzdLzBp4yF3L5y6KSCwtiLe+ArlaZcnjWpAv7Egz2O4+SpcMRY8Eg4/Jyk31mpHb2tFKdYeinCwJylcS/ASgThYrsR1x/7y0DwEW48VFfurSawh/siMH/+8tzhUt77ZoxD7qSnfM6Et4TPmf9s1X+YPt/z5clhCzdjgCJUkMW1xtNH3UCSbHY/baGZ+0l6W3TxdZPX830SIqsYpkkYg9CkInaLt2X2hZuk6KUgFbqfqHPQZ3iCBwUAuXxkpd6pVxrH6+MUYhrJ6IaLTOm2XGWkTQSMGMnXK/2MNbZIEuGmc5uptDUcZaDy1H07tFh4KTlmRzFjcuUI2HtdnqhQlOr8D5iKOmeKtBwWHhK2hzwAFn30qpYprPUgEuQqfsCWo1H7Wtmb8Mh9Lswnui+j791es9/Nb/zVXko4xh1zviLrU5NzQ== authentication-results: spf=softfail (sender IP is 10.152.252.58) 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.58 as permitted sender) x-ms-exchange-messagesentrepresentingtype: 1 x-eopattributedmessage: 0 x-forefront-antispam-report: CIP:10.152.252.58; IPV:NLI; CTRY:; EFV:NLI; SFV:NSPM; SFS:(10019020)(98900003); DIR:OUT; SFP:1102; SCL:1; SRVR:PU1APC01HT182; H:SG2PR0201MB0933.apcprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; x-microsoft-exchange-diagnostics: 1; PU1APC01HT182; 6:Vj6RXv/0PgBlsSIcJ7uDfauLqhuUv6jSqp1zB8fqNA6jHsjVoFlKzsKt7v+6vnvwbCu1JAQkLDktNVrsoOixrAw+AfVtDU0OUJvoFMPe+bWmWsBFt9d7qHDoGHDuo5KEeGY9CjiNmrKVc0WwB4lhBi1rJy3TbI230sPHomeEBP6HgAF8El1Hnc2hT8tfB2TcK8XZ+gEYylgvndwWjHUw2R/SykctvXyDe144Mg4s3SinjUlwJacH3xmXuUIff9xPiJhmWo7dQLChFf3Utx6Im+XoDIT7JH4kUOD04xxTdw+eFcxBtJShQcPXBy8WUrPU; 5:WxYyQ29bhxAsZtePdC+iVFtaQgA0GzRn2/87rZOJOdXzvXf3OpTdNv2k0XBqAUra/Tl9ugBlY4LhhohLIGcC+uhrbcs5DVdDNfYbu3Cd61EeqB9ayK3ceVX8UlR1EwdodjUnIyv3WhwSTe/zo9FvBA==; 24:rFTEUPsMiujJzCbpt7zNfaaYMG33TL3nT3r01mxjeBXC54qU6fCWOcggv1DhkgKzcO9zOA3QjKCkM69k0bIjY8fp7C2tol/bCiXoWXTznEA=; 7:ZN0Sl/CMtslQefLSjWezHxkxQGHZ1eJM2p1Cwnk/o6x1Xpo2raTuwsUdTxdoRroQPMDBps3faRfT5+4jgGGIhd99hEp/9lFKJYUSeBXTFK2Xbg8bkTDZXryeTCa/rV5fV8/h3Rm3NjuZtSWl0XFodHBAuYkf4c5NB/sY8Oj5Cjna/fZ6bIu/Y1OeaW0uq7L7vr4j2VGsYaNngcrfn4779CcBwYQz4h8ZGqOPwX68W8RBl26WBIQHGmF9KJ6KmHdC x-ms-office365-filtering-correlation-id: 64141eeb-63f0-43d0-d847-08d3cbff6963 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(1601124038)(1601125047); SRVR:PU1APC01HT182; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(432015012)(82015046); SRVR:PU1APC01HT182; BCL:0; PCL:0; RULEID:; SRVR:PU1APC01HT182; 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:17:05.9461 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT182 X-OriginalArrivalTime: 24 Aug 2016 09:17:22.0424 (UTC) FILETIME=[523A2F80:01D1FDE8] 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 | 11 +++++++++++ 1 file changed, 11 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..289bcd8 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -122,6 +122,17 @@ 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);