Message ID | 20170724093317.63683.93308.stgit@skinsbursky-vz7.qa.sw.ru |
---|---|
State | New |
Series | "criu: update second "iptables restore" helper to work in VE#0" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [209.85.233.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 24 Jul 2017 11:33:58 +0200 (CEST) Received: by 10.100.128.193 with SMTP id v1csp1746812pjd; Mon, 24 Jul 2017 02:33:53 -0700 (PDT) X-Received: by 10.99.49.137 with SMTP id x131mr15276630pgx.246.1500888833180; Mon, 24 Jul 2017 02:33:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500888833; cv=none; d=google.com; s=arc-20160816; b=TRpqjzXmcgDtDjzOo6Rw7C+xbEwABCCpnOg7gTAAbyQeOcObZoSWCR87urSfEZduOs YDPQnoAPUd3DSZab/JqNoBMT2cIHw+hoz8fnlFGoMH3mjkJ7/98hOdGTJ4eNEIYFmdTr tMLTefcWD3Gbt3qDzk908JrV4b7UNHOpzjTQcazC9bNn4dFOiK/tRwYJZLWz/iucJ8An vZgGza0g9GYVoZwwTdizCrTFgFPeFXqVscX1Oh9YGhU3aEV5q4f2Q2qCNAls9O2zw5Bq kt8xYFmcEN1OjxhsOb1TTZpqSvq3UuXSkdZUCcrE3guUn3YIgsLvcV/vgQ6RO/q0uqhj E/Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:spamdiagnosticmetadata:spamdiagnosticoutput:mime-version :user-agent:message-id:date:to:from:arc-authentication-results; bh=zT8tJliS5G2vomIZH00Ut8nn79bBRnshpxgOPTTayRs=; b=YVVVkL2JJRuoP7Pv73gffSOBmF/WGXipOHySKSqBzJiozOth69qoHDx7SfzX8hLoFt eqAIxWl5C4nRP6t7rCN8FQ7hcN2dw8qeqgcow/8YYK/BLhuFOwyqlUQtR19D+j2hRVTK svgAohjuKgalYR9KfB8phaqisq/0ULOBXPSKGZkIoWFmQN8aVjOLSI4Skz9DnYSobgwL aChEJ1kWkxTIPV14dsSLDfSSd1IZc9QNI9P/0Cbd1VUabbJcqBq/BFjgETJFDky9ZIin +SsR2iztPh+WScNu5oQtAcRuTZnXW4Vi06uELxAFIceGLg11WLBvCcpfKKkIvNmV98YD 2xKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [195.214.232.140]) by mx.google.com with ESMTPS id z73si7043923plh.202.2017.07.24.02.33.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jul 2017 02:33:53 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v6O9XTFB002704; Mon, 24 Jul 2017 12:33:29 +0300 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp0176.outbound.protection.outlook.com [213.199.154.176]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v6O9XRvu002701 for <devel@openvz.org>; Mon, 24 Jul 2017 12:33:27 +0300 Received: from DB6PR0801CA0008.eurprd08.prod.outlook.com (2603:10a6:4:2::18) by VI1PR0801MB1743.eurprd08.prod.outlook.com (2603:10a6:800:5a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1282.10; Mon, 24 Jul 2017 09:33:22 +0000 Received: from VE1EUR01FT009.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::203) by DB6PR0801CA0008.outlook.office365.com (2603:10a6:4:2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1282.10 via Frontend Transport; Mon, 24 Jul 2017 09:33:22 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.25) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 195.214.232.25 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.25; helo=relay.sw.ru; Received: from relay.sw.ru (195.214.232.25) by VE1EUR01FT009.mail.protection.outlook.com (10.152.2.141) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1240.9 via Frontend Transport; Mon, 24 Jul 2017 09:33:21 +0000 Received: from skinsbursky-vz7.qa.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v6O9XKJn030937; Mon, 24 Jul 2017 12:33:20 +0300 (MSK) From: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> To: <dsafonov@virtuozzo.com> Date: Mon, 24 Jul 2017 12:33:20 +0300 Message-ID: <20170724093317.63683.93308.stgit@skinsbursky-vz7.qa.sw.ru> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.25; IPV:CAL; SCL:-1; CTRY:RU; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR0801MB1743; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT009; 1:TohWYsZ+GhKRMSZqIbv0Gxai35M3gvgc6dauXfouE54T4srWpywi6/fn0IqwQvxCrqRXz1h6NexIzHA9Sxo79d24ndckRSNsl42yXNxXWF3F3uFz3lTBHBOLt0leCrTGbwDQbvU2VQQ2/0bghvKey8IwBYxCVeYNb08f3yWfrVNrrzUdjTC42AgLGYCtsIR8LqenKcmU+pW2XMAt/PQiXp/A/Sm8r2g9uAb3ComqBgIN/yC0tfHswWIrBxjiqx5QBDWCBmeuV7jaQjXcfY5CLfXYlQBtD2mRiQBNVqq8pMm7qs+TtRpdSBU3sSIevWcF22YB/9U5Z2AgOCyD5JTk76I5d8y36Q8qi0rknqJzHp2XSzkwbl3WnJ68BoiHQC7ZflbQ+w5Y4wYewoeIeK/DJYgYFUCrqqbuoOR6Cf0JM1M6tvVEkF/yJNqc53hIu+sTYhDhnyo/VXBpHoyVhmz6pRP9gck37wQD4bl3P56u41+3YqUT9/NhMDInrxhdiXRg6NsaYe1Ti3CtCHxKidOrWw8T/RCcp5V8mpQR3JfGK88kJmw6+k14dbnZ2bJHw/KbS6NW3Tf7sH5oJjSR0YVCAyI6neM7HsXFCwTrzTDXdUDJtFnn4h5tf3I1JS5rlblipIhjmKJxFo4kCkIlHa0pmtOgpEeRVQtCVRPvIWjDolNRS1O1SA7WAoR8BuqQsU9FxDM6+ZzjKt6Anqb5AQNA6BOSWzdRmrMlFFuGPDrXSLpmJ4PZGhLkW90gwmBpnZn/Z+QyBX518KmHt76dYCos0tDE9cvuez5zwQ6iwCzRu+0rNHiV0/3WwXSDcf6haife2LsZffNgByGEyOR/QFcvYQ== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e232185-1d8e-479d-5079-08d4d27706a0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(8251501002)(2017030254075)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VI1PR0801MB1743; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 3:/DZ1tf+bnQBAGhWI7pLSZ82y22rA9zSiCcB0AQw/Z27m6PacNkRp6LiSrELlx4QDQdu+KdQivwhMZ0a+1eUoQKSTMWY2shUfR9Ingajfm16DXHKcyTeRKTVtOj39wKHp+Yf/Z+MSnvqPXL/ycE70r4hicEVR6JTnqEmJj7Rz53t9udIS55k/ncgg8lDG/MIqezOT74PezRKAFg69Y1OPWwApb81XFW1avTq81/1VZFnaigCAJQmXQ/5TO7Tz7B5sdLcr1frXn0zVgbQCn7OqQh8uSm6U8pfGn4xp0e5ps23FVJGL9YBhTwBJdhVi2BaFJQHB3jS5KUMcPdmVSKyyFHmhreioyg4C1XHozpr+uzA4DqRi3ksqPKHAdCtIiWZ2V2vfuKmoYwNk5kkp1oRmj05tz0uI9QBgBLkIgY5E4HcQSTDcmna3iVuHzCiV+eiOG6xw0aDZ9Dp4gCgK2Wo9+xPqHxy0XRsd9sZIoaxH4Xll43SNH+vxl3DuBXdg2I5rTtIsbWlpHhb804T8BRgUHTQu4lC2ICNjJ0PYCFvEBDMgvsIXhB4QxKy+0seCDiexqkg0GEt15byw+it93GL0YpiVlgxY7wgrxa+v+irMxTuSussWbYStxTj9w1afoghqbLQcduHULkdBg0Czm851UoczaYJ/RnMLgietBxUL/43vL0y8LPTKwkLRPJdImJAVWHmgX40ugPXeUAruygllF42MOeToKViseONolwX1QSMfTJ5A9lsEMjMqgDiXEFEhmnocXRtcWxh0DCPYRfD74Slx4YzFaCD6tevLPUstRYoEV8aqCJ2wbzSkRUb1X0ltLHPOYqkC0rus8eghBL3UlPnJiz7RvOhojFoQ04R81tDFQIZC2M/saBKk8SacfWUgk2mCCTbyplDcLaNlpjhdWjWHd3I3cejuz3Ja3LuQRMY= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1743: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 25:moOy1OWLtKxfiFalqzBItLbQyfF0IcVuHUN3v+DSSiIySIfioVsU3FM0RjIXOzlX8TcoAZqKnfuOvG6sTE6pZohBYEYE2AfQuhsrzgOq8Iu95hnmtqHNEHEEarV0ZJJO1U3iJeT6kn+Lgsqbmnt9vokS6U6Ok6H56KCwf2pgFQlt6Kft0L1ng6F2A1+vY7Fl1ZL+erAbfyqyLARffir5P4kB9mWPI2aQnoQF4Sz2lX1sqGQFr1S84iBpHTciQofNETHLkfoFDc1ooFMohN3EQdHlkI4l3yHHGFVHL+2Ii09YnTtUvpetwWcwUMvrzxDJZGuTABHJskjk5X6sdJvN1Y7ZwvX5HmAzq0TrlGSwjBZ/Sbj6tiOSOItJRgaH8O/v5oWERbA6OgfiOLem5R5Of9ATfWaO4Xa20R4gabZ9qXKr2hIpINbzBC7GocGxTvUvxHOfMjR1yIdd0G0h84r0eMw53LbWRpIbLYTdesonjniyEjhSLqcLF6uT3OZrHaJQM+AIEArBEbWvvyTUp7btcd3y6fidWWdwmtfE06dErbeOhFO/CdA8VXg7XHS2BzoI/u8MhV8bLPSmVWRwcENXslbyn+LHjz9BUNT48vC/U1ZKn9nPv/P9Oh7G58WvBvSVwFg8FEjtxr8ydxgAKqzpN9a14BjQYStwtZgE563Cyort4t1nOhBHfAzyh2UWw3h7AceGvzv3gn7q9piBxxKFKj9QXgWus01m+x05LChD8fNyDJDLD2qBQw4vJN8csYiAjVifZ6XPBQKvNSZm4NXeQCba6S8uKcb5KY+IRMrQ4HrwMpk73bLRvPbtg19D6qmsWOpyuJLAj6wVaZLWwB0Imc9YrwtdzlM6x653+bxbwiMBH1SJBU/LOcFqyEcmAj1GxFkpZ0BeJDjooX8CwQYzoQy9OCC3qScw6ieOUYDNjAE= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 31:7xRRlDQIpmqy+f5qmQbPwGbnZteHR3/YAN/t0QJ/QX+OsQLdQuOBVTlm/vVTFrLaIUToftIl+p3GUYdtrZglawTnXn5jGvxn8jBMqIH2WknPj/1Dyr7gZHd3SQTBLgHOjyJTD+ZNRvS65IdPRv0dOWZymSse3YKxe0N9twj3h5NR/+R3ynfUketWFzZ8uCFPu8pShgstNCXRmGLDGOlJSAzvzO8XK8ztr4x9gWqEliDgafWnlogrNHo2R13z/pVo90Dc/jppU0+PokD6x/phtLthh1hP7vb325uierJTIPFutzXCLJtN9itXMobrg64FZqmmxWpRKai1CHInRwdBfwXqMZOALKxCyioF7CUn88vJw8zGg5YRLSrreVViTTTy764YgH/HoqTzpfIHyb/jd46TXNQVE6ot5/tJPv2pHBFiaaHNkBcY50SSw4fD30tHN555A4JjZ5Dn7p4k6mZbQFD5oXvRFfTiJQHLMgroYWrEWSTM62Bbm+pspsE1TRJkjqHxRU0bIRBj+i+LDaVxH/r7ZL3a6DyaqYKGuRYPlbFTBrHviz22O5Yh3D0k35pwFdTPl1GePDELg+B/+X1QqH7D/VItU/+/NBcN3mgfaMWqkI+XIlBJv5NdTDadaRoIJ8F9E2mcdxkKhJ5Y2wk6+9Uo6jprQKGZtHkQYV1MiIk+s7510oGpjslP/LFjnO4RonCoxGpiABD24AKYsiJ1SdlgpGjSJexRLSy+Z9rpgwaZl7hvXWo/xVNEop9K/obq X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 20:CUhctLFOfxVrUg61DWxFVv9ta8wfx5t9fhOoo2SoQNOOYA4/AXmE0d2uGc4X069ahSiZ7SyQ/j8NbWWCgnZPOjQhBIbXbm22Oc30BH05iur88tR96uy3dF69DvYe6QcN7jqNXpgdd+VCWzYKg9d322eMsthZFIGhg2DYa3vgtCmS+fAnnwyN8gxHdruYzR7SVTlgK+nDhjA+xe67AGgDVXFx+EgKSj2o+JIU88hNHkADE/UQZ/r3vBbqD2kNr/e1iT+uzxmZu4lgQRK1GqIyMjAtyBfCr3JFqxKMnvM54glqFuqX6q/GqjQpf8Xhd+7gWSLFGUK2IsGYpQuUrd3g9Ut3DVZfKhX9tZA1MTZrsLZoyNFge81ABRuEUFhNBNfqtzMds9o+igvFVbqumg5KzzaAW3XLfM1huaHr26zeMqtW1LJDfUtovG81l+h5wSVNVnotRTPo0j7z3XTvRODjjJfViE5dmfgWsUB4aADklvhUNGoL+Ug//kv8kNUS92IVaeFXZ1nh+zhojgSOidVKvA== X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(9101521199)(601004)(2401047)(13013025)(13021025)(8121501046)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3002001)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0801MB1743; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0801MB1743; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 4:rBWHFvMq3T5lUMoC5QXYGOc+AFaVvZQ2Y5SeWV4qDXaEzUNwW7fDlHyzyn4PkEEUXVCPVglws9HE21C3tyK60snPeRx3mroCf7XulofNI6vHQKWwcHP1D7oyHPhwzcGw71WMNEpjNEpXXiBaVXWC9NV9JJ65WuSKBISnM+ArbWw8/WNnpr9q3Mf/U4kS0fH4jJu7ty0Zyt8ODHxCEXsBmxO3iQKZTDwBI0lPs1AoIlHT90CBbFZ80JnnbHwSHDP0C6+l31Gfv9GWfyCAT99r3aOunFFre0xFEcyINqFEnwDHp++ruXofpVzdo3Eocai6r1zacLoallBZiSi3pDuNxh0OSb82tra7lg0J4AxVi4WNiH14ru/bV0kEVmJupPHU2xZ0uOFWwVEcCYMHawTG3UtX1Uq0ChIutkVO5YZ3ZsWg2eZnb9mShD+w3U/7x+YCgxSyw4hN8HSefwy7xQreIufNoZOJbd/2LalaIUOhrJB1tNjHoNn06QJAIf6hz/PXAvYUQ4yzUvrYScD2YH6imdHtwVMPdeIeJgI1E6Zta5fzvG9frKVaFoJRhBfFr8kfIqEG5OeCmOH5gUyV3wsMbRovazCoMghmn0HS8ui/ufcUgk19v3Y4QKK4I8Fmg5CVeJNuuPgUNG5sZ/6Ku3C7nLnTsTtGPF5SPmrenvjeAl60w14MzSfnD5EznZkBV7Fe8N66jAc5JkNQN+iJht76tnytMFOCv/jldsdvSNDblMK+k/fqU3/V5P1QdK9FfEghity8Ac8KVjOfA31LXqRbQfoIaOz1nghEqdHU4drrGWT13pUrx2v/wyTZQB0uvFpJHVP1wthCBzpZiUkesYmtNkiCnvb6o7CvHVZBrxexRD8= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 23:FpsJaZv4kkSHcmmCLqyYUUvVuZZfbTr2U1QG9l8se733OXbBHEwLx6CSCueAaaVFGGrgltdhQeREhSLOAxQZK2CigpPHiu94SY9loSeuHhG+G39AI2oa6dm1mFCNgd+IaewaErmSg4LMrY6kW4w7JFzxWAmXYNrD4TtHjAjgWNumR14fozOK2JVgOktUer1x X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 6:vAwiyeC6yj3wExm/tZ0lNnIjygpwWkX4cHXUvIOxn3vYu3uJKvLGb8VVmLKpIFqseaITurjHsWpYxo4lYaflPyUYcvNCLE8d5R/ewGtLr+P7Vwzp7K8ePWo/4POfeEJ+pStggFF2I5cIZSQ0pQ7yuRNbHEjNX8x4NLa8/wTJXXbzHGo/vcfsa9jb2hrgeFDYaUWb5qP+aSZIxrP/fwvApdH51UIsSfh62XUZS+P/OnF9B8yqowjyJV3v/qOHG8VyTEmzpESt915EdX91TaR0IbZnUwH29PnOm54vx0ghaIrYZlRVT1Ij2Et1lnE405Aw4TfbbFhjX6AiwZh2Pgq4K5Se36i4lgSQoqjDKokuloDCCKQNjViZEqT8hYK+O+34bDxQsYG4RKftH/F3QOodJuIxxUhU05hFjuQziSNtGBdVtTS7SpIbbZuNoCmokTIA70lqUk+08b3hiKKhMAm3aWbIaQnMZCEtamYkPifSjoqItz+VeKv0OuPcq+vo8EGK2YGV5mp0EiD9VwdZsQkmRNb690cUWeqlIDKXF/glGlnIdiqPU4WFeA88/6fk4V9WXlwburcOljyL1e9AEmChwKD/sZx5nXxQ9Nbv8+hciINnggPmA1wDjuAEbrgcd3mhMepE4o+2ZgYb/ogOJMcEifn7hP5yY6Ze2PLU8avLsVv69mDet8aj0jHg3qNAxOcQi1Q576DUrIBrojEBabIHHmB7zjzVs6R/kh1LWlSrJ+6uLcbhHSRPz8yICftExT32tT1uyphjtyZ14upq5ZP3yBACR/8NZ6JS0vWlIOp78KxFwJy9phs/ZB3KGjAhbPCKRjVOSWgEBp/X/NMgJQMW5rkAXGPb0HOZeKp3d/9cGnpnAP6Y/4me94Vjy5GgXO+NP6mrY9u38q+zqOjDLaWUnQ== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 5:Tm1Fx+SMRNpCwIi/h7gVJZU1caBiWj3yVzCHhxlgU+27VN3FA9ATm364p6UmV7fRPzh9Gw7LYKxZnnnqo4uF+03fLlozRSHPTxPhh/jeKljKqEjihSOIT8VfVzKFqpgsg3obxYuL/sFg1PGS4GyrSGqPQCcVvv6yyzMTvkVbQTaiji16xFhdTHOdg5QfkScqSplkZK98YzcUJnctGiRZKXOeBAnoNKVde6f+VrmS+PbFQN2C70viT3Eg0TlzZ+912GuGrutwXzXaYdMCauLisPzMWRxVv4Uj0r9JoJAPwlBM1l4UsFDNkRcIuACCNQpNAeq51az0P4IdidVRAOij/eu+gEnWfES6zpN9W9GpUcUwztkLRPELagBJsZCB3TbdFI84quOwMiWdnb1H1u5MVeAeRNXvneeE43YVvRBDceHjwxh7G+IwJVWNto9TQb5Kus2kFKMk1lpT0SRS+sCZ5+kRwGNF105iLeVBRfemU/0rlZeW7HEuA3zEJEp8Vgzm; 24:D3A6tOU0yx25M9YyfiF8bt/EoGtiq8q6ajjv950Ai0ZlvS7kIy6IPkTMP6tyHFWJa8WxHGTFNVpqpUIl6DCsu+rCcK8KZRbBmKmG09VpmrM= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 7:cqg+v36G9eZEUQKbLu/+OttJIaLn+YOiSlCMj3UpwubZiK0PiM7rWBPBGGbgh9UHOrkOQiaQAV/y/h3PPOveJjMKUtVvJW+pOZP23eybWJvroOIAOjYlJEDErbsF/hPlr0tf4LRALlIBSac1KNG/T6zyHL+Td3gRyWvmI695S6zzYyzkSAKpqtIBq6/uJd+Uchlxlj3yN3cqerX3RLrwlYsMUrNC+LlqLG1CF8RHfyBBOuRK4md4Pl8+eE2ziWgPbqvDsfWq5r1AH/n6rA9hkMQ63iSoMqhoem6z7jj6f6kVB5sil2CrXZ0RSwKwmWSTE4lFobWVYaYSNIlO6u7JkDQlWd+Lf/gMBF6/SkrliYlmau7eaijSz9FFO/V3Y8TnbLSVwFTVcKUtCPivQCmPtrIFSLnp+Z/nIn5wSojYsZZ3e5otsGHxq9uAgtWERvq9nAWIAkH03yrJKoEux59oCZcITXYsUveG/us0mBtq9s+MA6GoWF+HOfwmVvgPwdLmp7jF+Bb6kd8hQHPwjqLZbyii5O85GKp1MjrGobfIgDBVb7ZYdMprpx1NRrUvcIgeAPA23Zcbv6Vlvi2dokh5q0CJbQno3H7Jei/Ldn5QIanuyXfMjngfsK700AB5vYmtPNNI7wxvmjWKOwQi11lFOikA/I7/h6omUYbuQT8YPdKwZU4mgx80rh3l/ci4FEDZTHzztlctiJ7XrMiH2M6IfsTEfoga+BcbJauFmFeef405Yb9B12d9FSVlVnlmFAA44mZnKn/63QsbS9knBWQW1UNyjCicmBXEIwFimfA0rEZT+G3U7NzXG2uw5amSgr3RIrU+lSU1nJvkaNW726D3/A3YHYYmplK1wQqHhKxbrtA= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 20:yIHHn+VfAJYXvnqZdJAFD/bYethrECrfUMxOcY0krR4FJ1ytJCnGpnTxhbvBYw27Ern+d4N9Sli81AS5l6mcUfLDlEMPSQOWB+zUv2lpwEIDBXuplCsC/StBtaCCc++O7LhGcl7N8rjyqiZ29a134lBjNidCxTkx7cUScDr9L1E= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2017 09:33:21.5974 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.25]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1743 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT009.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR0801MB1743.eurprd08.prod.outlook.com Cc: devel@openvz.org Subject: [Devel] [PATCH] criu: update second "iptables restore" helper to work in VE#0 X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/criu/net.c b/criu/net.c index b81092c..8d6f975 100644 --- a/criu/net.c +++ b/criu/net.c @@ -1775,7 +1775,7 @@ int netns_keep_nsfd(void) * iptables-restore allows to make a few changes for one iteration, * so it works faster. */ -static int iptables_restore(bool ipv6, char *buf, int size) +static int do_iptables_restore(bool ipv6, char *buf, int size) { int pfd[2], ret = -1; char *cmd4[] = {"iptables-restore", "--noflush", NULL}; @@ -1800,6 +1800,34 @@ static int iptables_restore(bool ipv6, char *buf, int size) return ret; } +static int __iptables_restore(bool ipv6, char *buf, int size) +{ + if (join_ve(root_item->pid->real, false)) + return -1; + + return do_iptables_restore(ipv6, buf, size); +} + +static int iptables_restore(bool ipv6, char *buf, int size) +{ + int child, status; + + child = fork(); + if (child < 0) { + pr_perror("failed to fork"); + return -1; + } else if (!child) { + _exit(__iptables_restore(ipv6, buf, size)); + } + + if (waitpid(child, &status, 0) != child) { + pr_err("failed to collect child %d\n", child); + return -1; + } + + return WIFEXITED(status) ? WEXITSTATUS(status) : -1; +} + int network_lock_internal() { char conf[] = "*filter\n"
Surprisingly CRIU has 2 equal helpers for iptables restore. Initial series patched only one the them. This patch updates the second one. https://jira.sw.ru/browse/PSBM-58574 Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> --- criu/net.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)