<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta http-equiv=Content-Type content="text/html; charset=us-ascii"><meta name=ProgId content=Word.Document><meta name=Generator content="Microsoft Word 14"><meta name=Originator content="Microsoft Word 14"><link rel=File-List href="cid:filelist.xml@01D0C8A1.2C0D1890"><!--[if gte mso 9]><xml>
<o:OfficeDocumentSettings>
<o:AllowPNG/>
</o:OfficeDocumentSettings>
</xml><![endif]--><!--[if gte mso 9]><xml>
<w:WordDocument>
<w:SpellingState>Clean</w:SpellingState>
<w:TrackMoves/>
<w:TrackFormatting/>
<w:EnvelopeVis/>
<w:PunctuationKerning/>
<w:ValidateAgainstSchemas/>
<w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
<w:IgnoreMixedContent>false</w:IgnoreMixedContent>
<w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
<w:DoNotPromoteQF/>
<w:LidThemeOther>EN-US</w:LidThemeOther>
<w:LidThemeAsian>X-NONE</w:LidThemeAsian>
<w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
<w:Compatibility>
<w:BreakWrappedTables/>
<w:SnapToGridInCell/>
<w:WrapTextWithPunct/>
<w:UseAsianBreakRules/>
<w:DontGrowAutofit/>
<w:SplitPgBreakAndParaMark/>
<w:EnableOpenTypeKerning/>
<w:DontFlipMirrorIndents/>
<w:OverrideTableStyleHps/>
</w:Compatibility>
<m:mathPr>
<m:mathFont m:val="Cambria Math"/>
<m:brkBin m:val="before"/>
<m:brkBinSub m:val="--"/>
<m:smallFrac m:val="off"/>
<m:dispDef/>
<m:lMargin m:val="0"/>
<m:rMargin m:val="0"/>
<m:defJc m:val="centerGroup"/>
<m:wrapIndent m:val="1440"/>
<m:intLim m:val="subSup"/>
<m:naryLim m:val="undOvr"/>
</m:mathPr></w:WordDocument>
</xml><![endif]--><!--[if gte mso 9]><xml>
<w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true" DefSemiHidden="true" DefQFormat="false" DefPriority="99" LatentStyleCount="267">
<w:LsdException Locked="false" Priority="0" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
<w:LsdException Locked="false" Priority="9" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
<w:LsdException Locked="false" Priority="39" Name="toc 1"/>
<w:LsdException Locked="false" Priority="39" Name="toc 2"/>
<w:LsdException Locked="false" Priority="39" Name="toc 3"/>
<w:LsdException Locked="false" Priority="39" Name="toc 4"/>
<w:LsdException Locked="false" Priority="39" Name="toc 5"/>
<w:LsdException Locked="false" Priority="39" Name="toc 6"/>
<w:LsdException Locked="false" Priority="39" Name="toc 7"/>
<w:LsdException Locked="false" Priority="39" Name="toc 8"/>
<w:LsdException Locked="false" Priority="39" Name="toc 9"/>
<w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
<w:LsdException Locked="false" Priority="10" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Title"/>
<w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
<w:LsdException Locked="false" Priority="11" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
<w:LsdException Locked="false" Priority="22" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
<w:LsdException Locked="false" Priority="20" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
<w:LsdException Locked="false" Priority="59" SemiHidden="false" UnhideWhenUsed="false" Name="Table Grid"/>
<w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
<w:LsdException Locked="false" Priority="1" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List Accent 1"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
<w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
<w:LsdException Locked="false" Priority="34" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
<w:LsdException Locked="false" Priority="29" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
<w:LsdException Locked="false" Priority="30" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List Accent 1"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List Accent 2"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List Accent 2"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List Accent 3"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List Accent 3"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List Accent 4"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List Accent 4"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List Accent 5"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List Accent 5"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
<w:LsdException Locked="false" Priority="60" SemiHidden="false" UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
<w:LsdException Locked="false" Priority="61" SemiHidden="false" UnhideWhenUsed="false" Name="Light List Accent 6"/>
<w:LsdException Locked="false" Priority="62" SemiHidden="false" UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
<w:LsdException Locked="false" Priority="63" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
<w:LsdException Locked="false" Priority="64" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
<w:LsdException Locked="false" Priority="65" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
<w:LsdException Locked="false" Priority="66" SemiHidden="false" UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
<w:LsdException Locked="false" Priority="67" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
<w:LsdException Locked="false" Priority="68" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
<w:LsdException Locked="false" Priority="69" SemiHidden="false" UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
<w:LsdException Locked="false" Priority="70" SemiHidden="false" UnhideWhenUsed="false" Name="Dark List Accent 6"/>
<w:LsdException Locked="false" Priority="71" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
<w:LsdException Locked="false" Priority="72" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
<w:LsdException Locked="false" Priority="73" SemiHidden="false" UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
<w:LsdException Locked="false" Priority="19" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
<w:LsdException Locked="false" Priority="21" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
<w:LsdException Locked="false" Priority="31" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
<w:LsdException Locked="false" Priority="32" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
<w:LsdException Locked="false" Priority="33" SemiHidden="false" UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
<w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
<w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
</w:LatentStyles>
</xml><![endif]--><style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;
mso-font-charset:0;
mso-generic-font-family:swiss;
mso-font-pitch:variable;
mso-font-signature:-536870145 1073786111 1 0 415 0;}
@font-face
{font-family:Verdana;
panose-1:2 11 6 4 3 5 4 4 2 4;
mso-font-charset:0;
mso-generic-font-family:swiss;
mso-font-pitch:variable;
mso-font-signature:-1593833729 1073750107 16 0 415 0;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{mso-style-unhide:no;
mso-style-qformat:yes;
mso-style-parent:"";
margin:0cm;
margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-ascii-font-family:Calibri;
mso-fareast-font-family:Calibri;
mso-hansi-font-family:Calibri;
mso-bidi-font-family:"Times New Roman";}
a:link, span.MsoHyperlink
{mso-style-noshow:yes;
mso-style-priority:99;
color:blue;
text-decoration:underline;
text-underline:single;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-noshow:yes;
mso-style-priority:99;
color:purple;
text-decoration:underline;
text-underline:single;}
span.EmailStyle17
{mso-style-type:personal-compose;
mso-style-noshow:yes;
mso-style-unhide:no;
mso-ansi-font-size:11.0pt;
mso-bidi-font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-ascii-font-family:Calibri;
mso-fareast-font-family:Calibri;
mso-hansi-font-family:Calibri;
mso-bidi-font-family:"Times New Roman";
color:windowtext;}
span.SpellE
{mso-style-name:"";
mso-spl-e:yes;}
.MsoChpDefault
{mso-style-type:export-only;
mso-default-props:yes;
font-family:"Calibri","sans-serif";
mso-ascii-font-family:Calibri;
mso-fareast-font-family:Calibri;
mso-hansi-font-family:Calibri;
mso-bidi-font-family:"Times New Roman";}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;
mso-header-margin:36.0pt;
mso-footer-margin:36.0pt;
mso-paper-source:0;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 10]><style>/* Style Definitions */
table.MsoNormalTable
{mso-style-name:"Table Normal";
mso-tstyle-rowband-size:0;
mso-tstyle-colband-size:0;
mso-style-noshow:yes;
mso-style-priority:99;
mso-style-parent:"";
mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
mso-para-margin:0cm;
mso-para-margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-ascii-font-family:Calibri;
mso-hansi-font-family:Calibri;}
</style><![endif]--><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=EN-US link=blue vlink=purple style='tab-interval:36.0pt'><div class=WordSection1><p class=MsoNormal>From: <span class=SpellE>Artem</span> Kuzmitskiy <artem.kuzmitskiy@lge.com><o:p></o:p></p><p class=MsoNormal>Subject: [PATCH 1/3] Add dump for unnamed <span class=SpellE>unix</span> sockets<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>Added functionality for dumping unnamed <span class=SpellE>unix</span> sockets.<o:p></o:p></p><p class=MsoNormal>when we call CRIU with dump option, for unnamed socket we should pass it<o:p></o:p></p><p class=MsoNormal><span class=SpellE>inode</span> <span style='mso-tab-count:1'> </span>into --<span class=SpellE>ext</span>-<span class=SpellE>unix</span>-sk. Details about this problem described in<o:p></o:p></p><p class=MsoNormal>http://criu.org/External_UNIX_socket#What_to_do_with_socketpair.28.29-s.3F.<o:p></o:p></p><p class=MsoNormal>Usage example:<o:p></o:p></p><p class=MsoNormal><span style='mso-tab-count:1'> </span><span class=SpellE>criu</span> dump -D images -o dump.log -v4 --<span class=SpellE>ext-unix-sk</span>=4529709 -t 13506<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>Signed-off-by: <span class=SpellE>Artem</span> Kuzmitskiy <artem.kuzmitskiy@lge.com><o:p></o:p></p><p class=MsoNormal>---<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>cr-service.c</span><span style='mso-spacerun:yes'> </span>|<span style='mso-spacerun:yes'> </span>8 ++++-<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>crtools.c</span><span style='mso-spacerun:yes'> </span>|<span style='mso-spacerun:yes'> </span>9 ++++--<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>files.c</span><span style='mso-spacerun:yes'> </span>|<span style='mso-spacerun:yes'> </span>4 ++-<o:p></o:p></p><p class=MsoNormal> include/<span class=SpellE>cr_options.h</span> |<span style='mso-spacerun:yes'> </span>1 +<o:p></o:p></p><p class=MsoNormal> include/<span class=SpellE>sockets.h</span><span style='mso-spacerun:yes'> </span>|<span style='mso-spacerun:yes'> </span>3 ++<o:p></o:p></p><p class=MsoNormal> lib/<span class=SpellE>criu.c</span><span style='mso-spacerun:yes'> </span>| 47 +++++++++++++++++++++++++++<o:p></o:p></p><p class=MsoNormal> lib/<span class=SpellE>criu.h</span><span style='mso-spacerun:yes'> </span>|<span style='mso-spacerun:yes'> </span>4 +--<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>protobuf</span>/<span class=SpellE>rpc.proto</span><span style='mso-spacerun:yes'> </span>| 61 ++++++++++++++++++-----------------<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>sk-unix.c</span><span style='mso-spacerun:yes'> </span>| 89 ++++++++++++++++++++++++++++++++++++++++++++++------<o:p></o:p></p><p class=MsoNormal> 9 files changed, 182 insertions(+), 44 deletions(-)<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/<span class=SpellE>cr-service.c</span> b/<span class=SpellE>cr-service.c</span><o:p></o:p></p><p class=MsoNormal>index 9c40989..105787e 100644<o:p></o:p></p><p class=MsoNormal>--- a/<span class=SpellE>cr-service.c</span><o:p></o:p></p><p class=MsoNormal>+++ b/<span class=SpellE>cr-service.c</span><o:p></o:p></p><p class=MsoNormal>@@ -30,6 +30,7 @@<o:p></o:p></p><p class=MsoNormal> #include "<span class=SpellE>cgroup.h</span>"<o:p></o:p></p><p class=MsoNormal> #include "action-<span class=SpellE>scripts.h</span>"<o:p></o:p></p><p class=MsoNormal> #include "<span class=SpellE>security.h</span>"<o:p></o:p></p><p class=MsoNormal>+#include "<span class=SpellE>sockets.h</span>"<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> #include "<span class=SpellE>setproctitle.h</span>"<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>@@ -285,8 +286,13 @@ static <span class=SpellE>int</span> <span class=SpellE>setup_opts_from_req</span>(<span class=SpellE>int</span> <span class=SpellE>sk</span>, <span class=SpellE>CriuOpts</span> *<span class=SpellE>req</span>)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span><span class=SpellE>req</span>-><span class=SpellE>pid</span> = <span class=SpellE>ids.pid</span>;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>if (<span class=SpellE>req</span>-><span class=SpellE>has_ext_unix_sk</span>)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (<span class=SpellE>req</span>-><span class=SpellE>has_ext_unix_sk</span>) {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span><span class=SpellE>opts.ext_unix_sk</span> = <span class=SpellE>req</span>-><span class=SpellE>ext_unix_sk</span>;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>for (<span class=SpellE>i</span> = 0; <span class=SpellE>i</span> < <span class=SpellE>req</span>-><span class=SpellE>n_unix_sk_ino</span>; <span class=SpellE>i</span>++) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>if (<span class=SpellE>unix_sk_id_add</span>(<span class=SpellE>req</span>-><span class=SpellE>unix_sk_ino</span>[<span class=SpellE>i</span>]-><span class=SpellE>inode</span>) < 0)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span><span class=SpellE>goto</span> err;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>if (<span class=SpellE>req</span>->root)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span><span class=SpellE>opts.root</span> = <span class=SpellE>req</span>->root;<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/<span class=SpellE>crtools.c</span> b/<span class=SpellE>crtools.c</span><o:p></o:p></p><p class=MsoNormal>index b085d33..6af6080 100644<o:p></o:p></p><p class=MsoNormal>--- a/<span class=SpellE>crtools.c</span><o:p></o:p></p><p class=MsoNormal>+++ b/<span class=SpellE>crtools.c</span><o:p></o:p></p><p class=MsoNormal>@@ -50,6 +50,7 @@ void <span class=SpellE>init_opts</span>(void)<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>/* Default options */<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>opts.final_state</span> = TASK_DEAD;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>INIT_LIST_HEAD(&<span class=SpellE>opts.ext_unixsk_ids</span>);<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>INIT_LIST_HEAD(&<span class=SpellE>opts.veth_pairs</span>);<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>INIT_LIST_HEAD(&<span class=SpellE>opts.scripts</span>);<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>INIT_LIST_HEAD(&<span class=SpellE>opts.ext_mounts</span>);<o:p></o:p></p><p class=MsoNormal>@@ -184,7 +185,7 @@ <span class=SpellE>int</span> main(<span class=SpellE>int</span> <span class=SpellE>argc</span>, char *<span class=SpellE>argv</span>[], char *<span class=SpellE>envp</span>[])<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>int</span> <span class=SpellE>log_level</span> = LOG_UNSET;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>char *<span class=SpellE>imgs_dir</span> = ".";<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>char *<span class=SpellE>work_dir</span> = NULL;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>static <span class=SpellE>const</span> char <span class=SpellE>short_opts</span>[] = "<span class=SpellE>dSsRf:F:t:p:hcD:o:n:v</span>::<span class=SpellE>xVr:jlW:L:M</span>:";<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>static <span class=SpellE>const</span> char <span class=SpellE>short_opts</span>[] = "<span class=SpellE>dSsRf:F:t:p:hcD:o:n:v</span>::x::<span class=SpellE>Vr:jlW:L:M</span>:";<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>static <span class=SpellE>struct</span> option <span class=SpellE>long_opts</span>[] = {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "tree",<span style='mso-tab-count:3'> </span><span class=SpellE>required_argument</span>,<span style='mso-tab-count:1'> </span>0, 't'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "<span class=SpellE>pid</span>",<span style='mso-tab-count:3'> </span><span class=SpellE>required_argument</span>,<span style='mso-tab-count:1'> </span>0, 'p'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal>@@ -201,7 +202,7 @@ <span class=SpellE>int</span> main(<span class=SpellE>int</span> <span class=SpellE>argc</span>, char *<span class=SpellE>argv</span>[], char *<span class=SpellE>envp</span>[])<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "log-file",<span style='mso-tab-count:3'> </span><span class=SpellE>required_argument</span>,<span style='mso-tab-count:1'> </span>0, 'o'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "namespaces",<span style='mso-tab-count:3'> </span><span class=SpellE>required_argument</span>,<span style='mso-tab-count:1'> </span>0, 'n'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "root",<span style='mso-tab-count:3'> </span><span class=SpellE>required_argument</span>,<span style='mso-tab-count:1'> </span>0, 'r'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:2'> </span>{ USK_EXT_PARAM,<span style='mso-tab-count:2'> </span><span class=SpellE>no_argument</span>,<span style='mso-tab-count:2'> </span>0, 'x'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>{ USK_EXT_PARAM,<span style='mso-tab-count:2'> </span><span class=SpellE>optional_argument</span>,<span style='mso-tab-count:1'> </span>0, 'x'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "help",<span style='mso-tab-count:3'> </span><span class=SpellE>no_argument</span>,<span style='mso-tab-count:2'> </span>0, 'h'<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ SK_EST_PARAM,<span style='mso-tab-count:3'> </span><span class=SpellE>no_argument</span>,<span style='mso-tab-count:2'> </span>0, 1042<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>{ "close",<span style='mso-tab-count:3'> </span><span class=SpellE>required_argument</span>,<span style='mso-tab-count:1'> </span>0, 1043<span style='mso-tab-count:1'> </span>},<o:p></o:p></p><p class=MsoNormal>@@ -278,6 +279,8 @@ <span class=SpellE>int</span> main(<span class=SpellE>int</span> <span class=SpellE>argc</span>, char *<span class=SpellE>argv</span>[], char *<span class=SpellE>envp</span>[])<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span><span class=SpellE>opts.final_state</span> = TASK_ALIVE;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span>break;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>case 'x':<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>if (<span class=SpellE>optarg</span> && <span class=SpellE>unix_sk_ids_parse</span>(<span class=SpellE>optarg</span>) < 0)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>return 1;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span><span class=SpellE>opts.ext_unix_sk</span> = true;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span>break;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>case 'p':<o:p></o:p></p><p class=MsoNormal>@@ -675,7 +678,7 @@ usage:<o:p></o:p></p><p class=MsoNormal> "<span style='mso-spacerun:yes'> </span><span style='mso-spacerun:yes'> </span>restore making it the parent of the restored process\n"<o:p></o:p></p><p class=MsoNormal> "\n"<o:p></o:p></p><p class=MsoNormal> "* Special resources support:\n"<o:p></o:p></p><p class=MsoNormal>-"<span style='mso-spacerun:yes'> </span>-x|--" USK_EXT_PARAM "<span style='mso-spacerun:yes'> </span>allow external <span class=SpellE>unix</span> connections\n"<o:p></o:p></p><p class=MsoNormal>+"<span style='mso-spacerun:yes'> </span>-x|--" USK_EXT_PARAM "<span class=SpellE>inode</span>,.." "<span style='mso-spacerun:yes'> </span>allow external <span class=SpellE>unix</span> connections (optionally can be assign socket's <span class=SpellE>inode</span> that allows one-sided dump)\n"<o:p></o:p></p><p class=MsoNormal> "<span style='mso-spacerun:yes'> </span>--" SK_EST_PARAM "<span style='mso-spacerun:yes'> </span>checkpoint/restore established TCP connections\n"<o:p></o:p></p><p class=MsoNormal> "<span style='mso-spacerun:yes'> </span>-r|--root PATH<span style='mso-spacerun:yes'> </span>change the root <span class=SpellE>filesystem</span> (when run in mount namespace)\n"<o:p></o:p></p><p class=MsoNormal> "<span style='mso-spacerun:yes'> </span>--evasive-devices<span style='mso-spacerun:yes'> </span>use any path to a device file if the original one\n"<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/<span class=SpellE>files.c</span> b/<span class=SpellE>files.c</span><o:p></o:p></p><p class=MsoNormal>index 071fa69..613289a 100644<o:p></o:p></p><p class=MsoNormal>--- a/<span class=SpellE>files.c</span><o:p></o:p></p><p class=MsoNormal>+++ b/<span class=SpellE>files.c</span><o:p></o:p></p><p class=MsoNormal>@@ -1421,8 +1421,10 @@ <span class=SpellE>bool</span> <span class=SpellE>inherited_fd</span>(<span class=SpellE>struct</span> <span class=SpellE>file_desc</span> *d, <span class=SpellE>int</span> *<span class=SpellE>fd_p</span>)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>return true;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>*<span class=SpellE>fd_p</span> = dup(<span class=SpellE>i_fd</span>);<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>if (*<span class=SpellE>fd_p</span> < 0)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (*<span class=SpellE>fd_p</span> < 0) {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span><span class=SpellE>pr_perror</span>("Inherit <span class=SpellE>fd</span> DUP failed");<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>return false;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>else<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span><span class=SpellE>pr_info</span>("File %s will be restored from <span class=SpellE>fd</span> %d duped "<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:4'> </span>"from inherit <span class=SpellE>fd</span> %d\n", <span class=SpellE>id_str</span>, *<span class=SpellE>fd_p</span>, <span class=SpellE>i_fd</span>);<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/include/<span class=SpellE>cr_options.h</span> b/include/<span class=SpellE>cr_options.h</span><o:p></o:p></p><p class=MsoNormal>index bf57ef9..19c2f77 100644<o:p></o:p></p><p class=MsoNormal>--- a/include/<span class=SpellE>cr_options.h</span><o:p></o:p></p><p class=MsoNormal>+++ b/include/<span class=SpellE>cr_options.h</span><o:p></o:p></p><p class=MsoNormal>@@ -45,6 +45,7 @@ <span class=SpellE>struct</span> <span class=SpellE>cr_options</span> {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>};<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>restore_sibling</span>;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>ext_unix_sk</span>;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>struct</span> <span class=SpellE>list_head</span><span style='mso-spacerun:yes'> </span><span class=SpellE>ext_unixsk_ids</span>;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>shell_job</span>;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>bool</span><span style='mso-tab-count:2'> </span><span style='mso-tab-count:1'> </span><span class=SpellE>handle_file_locks</span>;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>tcp_established_ok</span>;<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/include/<span class=SpellE>sockets.h</span> b/include/<span class=SpellE>sockets.h</span><o:p></o:p></p><p class=MsoNormal>index a3010e1..39c22fd 100644<o:p></o:p></p><p class=MsoNormal>--- a/include/<span class=SpellE>sockets.h</span><o:p></o:p></p><p class=MsoNormal>+++ b/include/<span class=SpellE>sockets.h</span><o:p></o:p></p><p class=MsoNormal>@@ -60,6 +60,9 @@ extern <span class=SpellE>int</span> <span class=SpellE>inet_collect_one</span>(<span class=SpellE>struct</span> <span class=SpellE>nlmsghdr</span> *h, <span class=SpellE>int</span> family, <span class=SpellE>int</span> type);<o:p></o:p></p><p class=MsoNormal> extern <span class=SpellE>int</span> <span class=SpellE>unix_receive_one</span>(<span class=SpellE>struct</span> <span class=SpellE>nlmsghdr</span> *h, void *);<o:p></o:p></p><p class=MsoNormal> extern <span class=SpellE>int</span> <span class=SpellE>netlink_receive_one</span>(<span class=SpellE>struct</span> <span class=SpellE>nlmsghdr</span> *<span class=SpellE>hdr</span>, void *<span class=SpellE>arg</span>);<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>+extern <span class=SpellE>int</span> <span class=SpellE>unix_sk_id_add</span>(<span class=SpellE>ino_t</span> <span class=SpellE>ino</span>);<o:p></o:p></p><p class=MsoNormal>+extern <span class=SpellE>int</span> <span class=SpellE>unix_sk_ids_parse</span>(char *<span class=SpellE>optarg</span>);<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal> extern <span class=SpellE>int</span> <span class=SpellE>do_dump_opt</span>(<span class=SpellE>int</span> <span class=SpellE>sk</span>, <span class=SpellE>int</span> level, <span class=SpellE>int</span> name, void *<span class=SpellE>val</span>, <span class=SpellE>int</span> <span class=SpellE>len</span>);<o:p></o:p></p><p class=MsoNormal> #define <span class=SpellE>dump_opt</span>(s, l, n, f)<span style='mso-tab-count:1'> </span><span class=SpellE>do_dump_opt</span>(s, l, n, f, <span class=SpellE>sizeof</span>(*f))<o:p></o:p></p><p class=MsoNormal> extern <span class=SpellE>int</span> <span class=SpellE>do_restore_opt</span>(<span class=SpellE>int</span> <span class=SpellE>sk</span>, <span class=SpellE>int</span> level, <span class=SpellE>int</span> name, void *<span class=SpellE>val</span>, <span class=SpellE>int</span> <span class=SpellE>len</span>);<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/lib/<span class=SpellE>criu.c</span> b/lib/<span class=SpellE>criu.c</span><o:p></o:p></p><p class=MsoNormal>index be848bb..95bc2f6 100644<o:p></o:p></p><p class=MsoNormal>--- a/lib/<span class=SpellE>criu.c</span><o:p></o:p></p><p class=MsoNormal>+++ b/lib/<span class=SpellE>criu.c</span><o:p></o:p></p><p class=MsoNormal>@@ -225,6 +225,53 @@ void <span class=SpellE>criu_set_ext_unix_sk</span>(<span class=SpellE>bool</span> <span class=SpellE>ext_unix_sk</span>)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>criu_local_set_ext_unix_sk</span>(<span class=SpellE>global_opts</span>, <span class=SpellE>ext_unix_sk</span>);<o:p></o:p></p><p class=MsoNormal> }<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>+<span class=SpellE>int</span> <span class=SpellE>criu_local_add_unix_sk</span>(<span class=SpellE>criu_opts</span> *opts, unsigned <span class=SpellE>int</span> <span class=SpellE>inode</span>)<o:p></o:p></p><p class=MsoNormal>+{<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>int</span> nr;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>UnixSk</span> **a, *u;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>/*if caller forgot enable <span class=SpellE>ext_unix_sk</span> option we do it*/<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (!opts-><span class=SpellE>rpc</span>-><span class=SpellE>has_ext_unix_sk</span>) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span><span class=SpellE>criu_local_set_ext_unix_sk</span>(opts, true);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>/*if user disabled <span class=SpellE>ext_unix_sk</span> and try to add <span class=SpellE>unixsk</span> <span class=SpellE>inode</span> after that*/<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (opts-><span class=SpellE>rpc</span>-><span class=SpellE>has_ext_unix_sk</span> && !opts-><span class=SpellE>rpc</span>-><span class=SpellE>ext_unix_sk</span>) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>if (opts-><span class=SpellE>rpc</span>-><span class=SpellE>n_unix_sk_ino</span> > 0) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>free(opts-><span class=SpellE>rpc</span>-><span class=SpellE>unix_sk_ino</span>);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>opts-><span class=SpellE>rpc</span>-><span class=SpellE>n_unix_sk_ino</span> = 0;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>u = <span class=SpellE>malloc</span>(<span class=SpellE>sizeof</span>(*u));<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (!u)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span><span class=SpellE>goto</span> <span class=SpellE>er</span>;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>unix_<span class=SpellE>sk</span>__<span class=SpellE>init</span>(u);<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>u-><span class=SpellE>inode</span> = <span class=SpellE>inode</span>;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>nr = opts-><span class=SpellE>rpc</span>-><span class=SpellE>n_unix_sk_ino</span> + 1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>a = <span class=SpellE>realloc</span>(opts-><span class=SpellE>rpc</span>-><span class=SpellE>unix_sk_ino</span>, nr * <span class=SpellE>sizeof</span>(u));<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (!a)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span><span class=SpellE>goto</span> <span class=SpellE>er_u</span>;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>a[nr - 1] = u;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>opts-><span class=SpellE>rpc</span>-><span class=SpellE>unix_sk_ino</span> = a;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>opts-><span class=SpellE>rpc</span>-><span class=SpellE>n_unix_sk_ino</span> = nr;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>return 0;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span class=SpellE>er_u</span>:<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>free(u);<o:p></o:p></p><p class=MsoNormal>+<span class=SpellE>er</span>:<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>return -ENOMEM;<o:p></o:p></p><p class=MsoNormal>+}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span class=SpellE>int</span> <span class=SpellE>criu_add_unix_sk</span>(unsigned <span class=SpellE>int</span> <span class=SpellE>inode</span>)<o:p></o:p></p><p class=MsoNormal>+{<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>return <span class=SpellE>criu_local_add_unix_sk</span>(<span class=SpellE>global_opts</span>, <span class=SpellE>inode</span>);<o:p></o:p></p><p class=MsoNormal>+}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_tcp_established</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>bool</span> <span class=SpellE>tcp_established</span>)<o:p></o:p></p><p class=MsoNormal> {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>opts-><span class=SpellE>rpc</span>-><span class=SpellE>has_tcp_established</span><span style='mso-tab-count:1'> </span>= true;<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/lib/<span class=SpellE>criu.h</span> b/lib/<span class=SpellE>criu.h</span><o:p></o:p></p><p class=MsoNormal>index 1655c02..eab42f6 100644<o:p></o:p></p><p class=MsoNormal>--- a/lib/<span class=SpellE>criu.h</span><o:p></o:p></p><p class=MsoNormal>+++ b/lib/<span class=SpellE>criu.h</span><o:p></o:p></p><p class=MsoNormal>@@ -48,6 +48,7 @@ void <span class=SpellE>criu_set_parent_images</span>(char *path);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_set_work_dir_fd</span>(<span class=SpellE>int</span> <span class=SpellE>fd</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_set_leave_running</span>(<span class=SpellE>bool</span> <span class=SpellE>leave_running</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_set_ext_unix_sk</span>(<span class=SpellE>bool</span> <span class=SpellE>ext_unix_sk</span>);<o:p></o:p></p><p class=MsoNormal>+<span class=SpellE>int</span> <span class=SpellE>criu_add_unix_sk</span>(unsigned <span class=SpellE>int</span> <span class=SpellE>inode</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_set_tcp_established</span>(<span class=SpellE>bool</span> <span class=SpellE>tcp_established</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_set_evasive_devices</span>(<span class=SpellE>bool</span> <span class=SpellE>evasive_devices</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_set_shell_job</span>(<span class=SpellE>bool</span> <span class=SpellE>shell_job</span>);<o:p></o:p></p><p class=MsoNormal>@@ -71,8 +72,6 @@ <span class=SpellE>int</span> <span class=SpellE>criu_add_cg_root</span>(char *ctrl, char *path);<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>int</span> <span class=SpellE>criu_add_enable_fs</span>(char *fs);<o:p></o:p></p><p class=MsoNormal> <span class=SpellE>int</span> <span class=SpellE>criu_add_skip_mnt</span>(char *<span class=SpellE>mnt</span>);<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<o:p></o:p></p><p class=MsoNormal>-<o:p></o:p></p><p class=MsoNormal> /*<o:p></o:p></p><p class=MsoNormal><span style='mso-spacerun:yes'> </span>* The <span class=SpellE>criu_notify_arg_t</span> <span class=SpellE>na</span> argument is an opaque<o:p></o:p></p><p class=MsoNormal><span style='mso-spacerun:yes'> </span>* value that callbacks (<span class=SpellE>cb</span>-s) should pass into<o:p></o:p></p><p class=MsoNormal>@@ -157,6 +156,7 @@ void <span class=SpellE>criu_local_set_parent_images</span>(<span class=SpellE>criu_opts</span> *opts, char *path);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_work_dir_fd</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>int</span> <span class=SpellE>fd</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_leave_running</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>bool</span> <span class=SpellE>leave_running</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_ext_unix_sk</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>bool</span> <span class=SpellE>ext_unix_sk</span>);<o:p></o:p></p><p class=MsoNormal>+<span class=SpellE>int</span> <span class=SpellE>criu_local_add_unix_sk</span>(<span class=SpellE>criu_opts</span> *opts, unsigned <span class=SpellE>int</span> <span class=SpellE>inode</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_tcp_established</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>bool</span> <span class=SpellE>tcp_established</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_evasive_devices</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>bool</span> <span class=SpellE>evasive_devices</span>);<o:p></o:p></p><p class=MsoNormal> void <span class=SpellE>criu_local_set_shell_job</span>(<span class=SpellE>criu_opts</span> *opts, <span class=SpellE>bool</span> <span class=SpellE>shell_job</span>);<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/<span class=SpellE>protobuf</span>/<span class=SpellE>rpc.proto</span> b/<span class=SpellE>protobuf</span>/<span class=SpellE>rpc.proto</span><o:p></o:p></p><p class=MsoNormal>index c1969c6..e434dbb 100644<o:p></o:p></p><p class=MsoNormal>--- a/<span class=SpellE>protobuf</span>/<span class=SpellE>rpc.proto</span><o:p></o:p></p><p class=MsoNormal>+++ b/<span class=SpellE>protobuf</span>/<span class=SpellE>rpc.proto</span><o:p></o:p></p><p class=MsoNormal>@@ -25,49 +25,54 @@ message <span class=SpellE>cgroup_root</span> {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>required string<span style='mso-tab-count:2'> </span>path<span style='mso-tab-count:1'> </span>= 2;<o:p></o:p></p><p class=MsoNormal> };<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>+message <span class=SpellE>unix_sk</span> {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>required uint32<span style='mso-tab-count:2'> </span><span class=SpellE>inode</span> <span style='mso-tab-count:1'> </span>= 1;<o:p></o:p></p><p class=MsoNormal>+};<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal> message <span class=SpellE>criu_opts</span> {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>required int32<span style='mso-tab-count:3'> </span><span class=SpellE>images_dir_fd</span><span style='mso-tab-count:1'> </span>= 1;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>optional int32<span style='mso-tab-count:3'> </span><span class=SpellE>pid</span><span style='mso-tab-count:2'> </span>= 2; /* if not set on dump, will dump requesting process */<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>leave_running</span><span style='mso-tab-count:1'> </span>= 3;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>ext_unix_sk</span><span style='mso-tab-count:1'> </span>= 4;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>tcp_established</span><span style='mso-tab-count:1'> </span>= 5;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>evasive_devices</span><span style='mso-tab-count:1'> </span>= 6;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>shell_job</span><span style='mso-tab-count:1'> </span>= 7;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>file_locks</span><span style='mso-tab-count:1'> </span>= 8;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional int32<span style='mso-tab-count:3'> </span><span class=SpellE>log_level</span><span style='mso-tab-count:1'> </span>= 9 [default = 2];<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional string<span style='mso-tab-count:3'> </span><span class=SpellE>log_file</span><span style='mso-tab-count:1'> </span>= 10; /* No <span class=SpellE>subdirs</span> are allowed. Consider using work-<span class=SpellE>dir</span> */<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>unix_sk</span><span style='mso-spacerun:yes'> </span><span class=SpellE>unix_sk_ino</span><span style='mso-spacerun:yes'> </span>= 5;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>tcp_established</span><span style='mso-tab-count:1'> </span>= 6;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>evasive_devices</span><span style='mso-tab-count:1'> </span>= 7;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>shell_job</span><span style='mso-tab-count:1'> </span>= 8;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>file_locks</span><span style='mso-tab-count:1'> </span>= 9;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional int32<span style='mso-tab-count:3'> </span><span class=SpellE>log_level</span><span style='mso-tab-count:1'> </span>= 10 [default = 2];<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional string<span style='mso-tab-count:3'> </span><span class=SpellE>log_file</span><span style='mso-tab-count:1'> </span>= 11; /* No <span class=SpellE>subdirs</span> are allowed. Consider using work-<span class=SpellE>dir</span> */<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>criu_page_server_info</span><span style='mso-tab-count:1'> </span><span class=SpellE>ps</span><span style='mso-tab-count:2'> </span>= 11;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>criu_page_server_info</span><span style='mso-tab-count:1'> </span><span class=SpellE>ps</span><span style='mso-tab-count:2'> </span>= 12;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>notify_scripts</span><span style='mso-tab-count:1'> </span>= 12;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>notify_scripts</span><span style='mso-tab-count:1'> </span>= 13;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional string<span style='mso-tab-count:3'> </span>root<span style='mso-tab-count:2'> </span>= 13;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional string<span style='mso-tab-count:3'> </span><span class=SpellE>parent_img</span><span style='mso-tab-count:1'> </span>= 14;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>track_mem</span><span style='mso-tab-count:1'> </span>= 15;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>auto_dedup</span><span style='mso-tab-count:1'> </span>= 16;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional string<span style='mso-tab-count:3'> </span>root<span style='mso-tab-count:2'> </span>= 14;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional string<span style='mso-tab-count:3'> </span><span class=SpellE>parent_img</span><span style='mso-tab-count:1'> </span>= 15;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>track_mem</span><span style='mso-tab-count:1'> </span>= 16;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>auto_dedup</span><span style='mso-tab-count:1'> </span>= 17;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional int32<span style='mso-tab-count:3'> </span><span class=SpellE>work_dir_fd</span><span style='mso-tab-count:1'> </span>= 17;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>link_remap</span><span style='mso-tab-count:1'> </span>= 18;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>criu_veth_pair</span><span style='mso-tab-count:2'> </span><span class=SpellE>veths</span><span style='mso-tab-count:2'> </span>= 19;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional int32<span style='mso-tab-count:3'> </span><span class=SpellE>work_dir_fd</span><span style='mso-tab-count:1'> </span>= 18;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>link_remap</span><span style='mso-tab-count:1'> </span>= 19;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>criu_veth_pair</span><span style='mso-tab-count:2'> </span><span class=SpellE>veths</span><span style='mso-tab-count:2'> </span>= 20;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional uint32<span style='mso-tab-count:3'> </span><span class=SpellE>cpu_cap</span><span style='mso-tab-count:2'> </span>= 20 [default = 0xffffffff];<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>force_irmap</span><span style='mso-tab-count:1'> </span>= 21;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated string<span style='mso-tab-count:3'> </span><span class=SpellE>exec_cmd</span><span style='mso-tab-count:1'> </span>= 22;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional uint32<span style='mso-tab-count:3'> </span><span class=SpellE>cpu_cap</span><span style='mso-tab-count:2'> </span>= 21 [default = 0xffffffff];<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>force_irmap</span><span style='mso-tab-count:1'> </span>= 22;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated string<span style='mso-tab-count:3'> </span><span class=SpellE>exec_cmd</span><span style='mso-tab-count:1'> </span>= 23;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>ext_mount_map</span><span style='mso-tab-count:2'> </span><span class=SpellE>ext_mnt</span><span style='mso-tab-count:2'> </span>= 23;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>manage_cgroups</span><span style='mso-tab-count:1'> </span>= 24;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>cgroup_root</span><span style='mso-tab-count:2'> </span><span class=SpellE>cg_root</span><span style='mso-tab-count:2'> </span>= 25;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>ext_mount_map</span><span style='mso-tab-count:2'> </span><span class=SpellE>ext_mnt</span><span style='mso-tab-count:2'> </span>= 24;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>manage_cgroups</span><span style='mso-tab-count:1'> </span>= 25;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>cgroup_root</span><span style='mso-tab-count:2'> </span><span class=SpellE>cg_root</span><span style='mso-tab-count:2'> </span>= 26;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>rst_sibling</span><span style='mso-tab-count:1'> </span>= 26; /* <span class=SpellE>swrk</span> only */<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>inherit_fd</span><span style='mso-tab-count:2'> </span><span class=SpellE>inherit_fd</span><span style='mso-tab-count:1'> </span>= 27; /* <span class=SpellE>swrk</span> only */<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>rst_sibling</span><span style='mso-tab-count:1'> </span>= 27; /* <span class=SpellE>swrk</span> only */<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated <span class=SpellE>inherit_fd</span><span style='mso-tab-count:2'> </span><span class=SpellE>inherit_fd</span><span style='mso-tab-count:1'> </span>= 28; /* <span class=SpellE>swrk</span> only */<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>auto_ext_mnt</span><span style='mso-tab-count:1'> </span>= 28;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>ext_sharing</span> <span style='mso-tab-count:1'> </span>= 29;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>ext_masters</span><span style='mso-tab-count:1'> </span>= 30;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>auto_ext_mnt</span><span style='mso-tab-count:1'> </span>= 29;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>ext_sharing</span> <span style='mso-tab-count:1'> </span>= 30;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>optional <span class=SpellE>bool</span><span style='mso-tab-count:3'> </span><span class=SpellE>ext_masters</span><span style='mso-tab-count:1'> </span>= 31;<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated string<span style='mso-tab-count:3'> </span><span class=SpellE>skip_mnt</span><span style='mso-tab-count:1'> </span>= 31;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:1'> </span>repeated string<span style='mso-tab-count:3'> </span><span class=SpellE>enable_fs</span><span style='mso-tab-count:1'> </span>= 32;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated string<span style='mso-tab-count:3'> </span><span class=SpellE>skip_mnt</span><span style='mso-tab-count:1'> </span>= 32;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>repeated string<span style='mso-tab-count:3'> </span><span class=SpellE>enable_fs</span><span style='mso-tab-count:1'> </span>= 33;<o:p></o:p></p><p class=MsoNormal> }<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> message <span class=SpellE>criu_dump_resp</span> {<o:p></o:p></p><p class=MsoNormal>diff --<span class=SpellE>git</span> a/<span class=SpellE>sk-unix.c</span> b/<span class=SpellE>sk-unix.c</span><o:p></o:p></p><p class=MsoNormal>index 6c9ec25..33d83e6 100644<o:p></o:p></p><p class=MsoNormal>--- a/<span class=SpellE>sk-unix.c</span><o:p></o:p></p><p class=MsoNormal>+++ b/<span class=SpellE>sk-unix.c</span><o:p></o:p></p><p class=MsoNormal>@@ -65,6 +65,11 @@ <span class=SpellE>struct</span> <span class=SpellE>unix_sk_listen_icon</span> {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>struct</span> <span class=SpellE>unix_sk_listen_icon</span><span style='mso-tab-count:1'> </span>*next;<o:p></o:p></p><p class=MsoNormal> };<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>+<span class=SpellE>struct</span><span style='mso-spacerun:yes'> </span><span class=SpellE>unix_sk_exception</span> {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>struct</span> <span class=SpellE>list_head</span> <span class=SpellE>unix_sk_list</span>;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>ino_t</span> <span class=SpellE>unix_sk_ino</span>;<o:p></o:p></p><p class=MsoNormal>+};<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal> #define SK_HASH_SIZE<span style='mso-tab-count:2'> </span>32<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal> static <span class=SpellE>struct</span> <span class=SpellE>unix_sk_listen_icon</span> *<span class=SpellE>unix_listen_icons</span>[SK_HASH_SIZE];<o:p></o:p></p><p class=MsoNormal>@@ -129,6 +134,23 @@ static <span class=SpellE>int</span> <span class=SpellE>can_dump_unix_sk</span>(<span class=SpellE>const</span> <span class=SpellE>struct</span> <span class=SpellE>unix_sk_desc</span> *<span class=SpellE>sk</span>)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>return 1;<o:p></o:p></p><p class=MsoNormal> }<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>+static <span class=SpellE>bool</span> <span class=SpellE>unix_sk_exception_lookup_id</span>(<span class=SpellE>ino_t</span> <span class=SpellE>ino</span>)<o:p></o:p></p><p class=MsoNormal>+{<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>bool</span> ret = false;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>struct</span> <span class=SpellE>unix_sk_exception</span> *<span class=SpellE>sk</span>;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>list_for_each_entry</span>(<span class=SpellE>sk</span>, &<span class=SpellE>opts.ext_unixsk_ids</span>, <span class=SpellE>unix_sk_list</span>) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>if (<span class=SpellE>sk</span>-><span class=SpellE>unix_sk_ino</span> == <span class=SpellE>ino</span>) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span><span class=SpellE>pr_debug</span>("Found <span class=SpellE>ino</span> %u in exception <span class=SpellE>unix</span> <span class=SpellE>sk</span> list\n", (unsigned <span class=SpellE>int</span>)<span class=SpellE>ino</span>);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>ret = true;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>break;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>return ret;<o:p></o:p></p><p class=MsoNormal>+}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal> static <span class=SpellE>int</span> <span class=SpellE>write_unix_entry</span>(<span class=SpellE>struct</span> <span class=SpellE>unix_sk_desc</span> *<span class=SpellE>sk</span>)<o:p></o:p></p><p class=MsoNormal> {<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span><span class=SpellE>int</span> ret;<o:p></o:p></p><p class=MsoNormal>@@ -559,16 +581,21 @@ static <span class=SpellE>int</span> <span class=SpellE>dump_external_sockets</span>(<span class=SpellE>struct</span> <span class=SpellE>unix_sk_desc</span> *peer)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:4'> </span>return -1;<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span>}<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:3'> </span>if (peer->type != SOCK_DGRAM) {<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:4'> </span><span class=SpellE>show_one_unix</span>("Ext stream not supported", peer);<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:4'> </span><span class=SpellE>pr_err</span>("Can't dump half of stream <span class=SpellE>unix</span> connection.\n");<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:4'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:3'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>if (<span class=SpellE>unix_sk_exception_lookup_id</span>(<span class=SpellE>sk</span>-><span class=SpellE>sd.ino</span>)) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span><span class=SpellE>pr_debug</span>("found exception for <span class=SpellE>unix</span> name-less external socket.\n");<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>} else {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>if (peer->type != SOCK_DGRAM) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span><span class=SpellE>show_one_unix</span>("Ext stream not supported", peer);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span><span class=SpellE>pr_err</span>("Can't dump half of stream <span class=SpellE>unix</span> connection.\n");<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>}<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>-<span style='mso-tab-count:3'> </span>if (!peer->name) {<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:4'> </span><span class=SpellE>show_one_unix</span>("Ext <span class=SpellE>dgram</span> w/o name", peer);<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:4'> </span><span class=SpellE>pr_err</span>("Can't dump name-less external socket.\n");<o:p></o:p></p><p class=MsoNormal>-<span style='mso-tab-count:4'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>if (!peer->name) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span><span class=SpellE>show_one_unix</span>("Ext <span class=SpellE>dgram</span> w/o name", peer);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span><span class=SpellE>pr_err</span>("Can't dump name-less external socket.\n");<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span><span class=SpellE>pr_err</span>("%d\n", <span class=SpellE>sk</span>-><span class=SpellE>fd</span>);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:5'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>}<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span>}<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:2'> </span>} else if (ret < 0)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:3'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>@@ -1105,3 +1132,47 @@ <span class=SpellE>int</span> <span class=SpellE>resolve_unix_peers</span>(void)<o:p></o:p></p><p class=MsoNormal> <span style='mso-tab-count:1'> </span>return 0;<o:p></o:p></p><p class=MsoNormal> }<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal>+<span class=SpellE>int</span> <span class=SpellE>unix_sk_id_add</span>(<span class=SpellE>ino_t</span> <span class=SpellE>ino</span>)<o:p></o:p></p><p class=MsoNormal>+{<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>struct</span> <span class=SpellE>unix_sk_exception</span> *<span class=SpellE>unix_sk</span>;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>/* TODO: validate <span class=SpellE>inode</span> here? */<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>unix_sk</span> = <span class=SpellE>xmalloc</span>(<span class=SpellE>sizeof</span> *<span class=SpellE>unix_sk</span>);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>if (<span class=SpellE>unix_sk</span> == NULL)<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>unix_sk</span>-><span class=SpellE>unix_sk_ino</span> = <span class=SpellE>ino</span>;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span><span class=SpellE>list_add_tail</span>(&<span class=SpellE>unix_sk</span>-><span class=SpellE>unix_sk_list</span>, &<span class=SpellE>opts.ext_unixsk_ids</span>);<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>return 0;<o:p></o:p></p><p class=MsoNormal>+}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span class=SpellE>int</span> <span class=SpellE>unix_sk_ids_parse</span>(char *<span class=SpellE>optarg</span>)<o:p></o:p></p><p class=MsoNormal>+{<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>/*<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span> * parsing option of the following form: --<span class=SpellE>ext-unix-sk</span>=<<span class=SpellE>inode</span> value>,<<span class=SpellE>inode</span><o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span> * value>... or short form -x<<span class=SpellE>inode</span>>,<<span class=SpellE>inode</span>>...<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span> */<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>char *<span class=SpellE>iter</span> = <span class=SpellE>optarg</span>;<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>while (*<span class=SpellE>iter</span> != '\0') {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>if (*<span class=SpellE>iter</span> == ',')<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span><span class=SpellE>iter</span>++;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>else {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span><span class=SpellE>ino_t</span> <span class=SpellE>ino</span> = (<span class=SpellE>ino_t</span>)<span class=SpellE>strtoul</span>(<span class=SpellE>iter</span>, &<span class=SpellE>iter</span>, 10);<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>if (0 == <span class=SpellE>ino</span>) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span><span class=SpellE>pr_err</span>("Can't parse <span class=SpellE>unix</span> socket <span class=SpellE>inode</span> from <span class=SpellE>optarg</span>: %s\n", <span class=SpellE>optarg</span>);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>if (<span class=SpellE>unix_sk_id_add</span>(<span class=SpellE>ino</span>) < 0) {<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span><span class=SpellE>pr_err</span>("Can't add <span class=SpellE>unix</span> socket <span class=SpellE>inode</span> in list: %s\n", <span class=SpellE>optarg</span>);<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:4'> </span>return -1;<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:3'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:2'> </span>}<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>+<span style='mso-tab-count:1'> </span>return 0;<o:p></o:p></p><p class=MsoNormal>+}<o:p></o:p></p><p class=MsoNormal>+<o:p></o:p></p><p class=MsoNormal>--<o:p></o:p></p><p class=MsoNormal>2.1.4<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal><span style='font-size:8.0pt;font-family:"Verdana","sans-serif";mso-fareast-font-family:"Times New Roman";color:#595959;mso-no-proof:yes'>Best regards,<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:8.0pt;font-family:"Verdana","sans-serif";mso-fareast-font-family:"Times New Roman";color:#595959;mso-no-proof:yes'>Artem Kuzmitskiy<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:8.0pt;font-family:"Verdana","sans-serif";mso-fareast-font-family:"Times New Roman";color:#595959;mso-no-proof:yes'>LG Russia R&D Lab, St.-Petersburg<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:8.0pt;font-family:"Verdana","sans-serif";mso-fareast-font-family:"Times New Roman";color:#595959;mso-no-proof:yes'>Web Team Web 3 Part<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:8.0pt;font-family:"Verdana","sans-serif";mso-fareast-font-family:"Times New Roman";color:#595959;mso-no-proof:yes'>Local phone 128<o:p></o:p></span></p><p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman";mso-no-proof:yes'><o:p> </o:p></span></p><p class=MsoNormal><o:p> </o:p></p></div></body></html>