<table><tr><td style="">jgrulich accepted this revision.<br />jgrulich added a comment.<br />This revision is now accepted and ready to land.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D27764">View Revision</a></tr></table><br /><div><div><p>Only nitpicking, otherwise it looks good to me.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156977">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpauth.cpp:34</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#include</span> <span class="cpf">"nm-l2tp-service.h"</span><span style="color: #304a96"></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#include</span> <span class="cpf">"debug.h"</span><span style="color: #304a96"></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This include doesn't seem to be used.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156970">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:127</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_IPSEC_IKELIFETIME</span><span class="p">].</span><span class="n">isEmpty</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">totalSeconds</span> <span style="color: #aa2211">=</span> <span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_IPSEC_IKELIFETIME</span><span class="p">].</span><span class="n">toInt</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">hours</span> <span style="color: #aa2211">=</span> <span class="n">totalSeconds</span> <span style="color: #aa2211">/</span> <span style="color: #601200">3600</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const? Same for variables below.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156969">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:133</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">ikelifetime</span><span style="color: #aa2211">-></span><span class="n">setTime</span><span class="p">(</span><span class="n">lifetime</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">ikelifetime</span><span style="color: #aa2211">-></span><span class="n">setEnabled</span><span class="p">(</span><span style="color: #304a96">true</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Missing indentation.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156971">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:143</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_IPSEC_SALIFETIME</span><span class="p">].</span><span class="n">isEmpty</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">totalSeconds</span> <span style="color: #aa2211">=</span> <span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_IPSEC_SALIFETIME</span><span class="p">].</span><span class="n">toInt</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">hours</span> <span style="color: #aa2211">=</span> <span class="n">totalSeconds</span> <span style="color: #aa2211">/</span> <span style="color: #601200">3600</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const? Same for variables below.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156978">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:170</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_IPSEC_PFS</span><span class="p">]</span> <span style="color: #aa2211">==</span> <span class="n">noString</span> <span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">cbPFS</span><span style="color: #aa2211">-></span><span class="n">setChecked</span><span class="p">(</span><span style="color: #304a96">true</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This can be simplified using:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">m_ui->cbIPComp->setChecked(dataMap[NM_L2TP_KEY_IPSEC_IPCOMP] == yesString)</pre></div>
<p style="padding: 0; margin: 8px;">Same above.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156972">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:259</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">cbIkelifetime</span><span style="color: #aa2211">-></span><span class="n">isChecked</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">totalSeconds</span> <span style="color: #aa2211">=</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">ikelifetime</span><span style="color: #aa2211">-></span><span class="n">time</span><span class="p">().</span><span class="n">hour</span><span class="p">()</span> <span style="color: #aa2211">*</span> <span style="color: #601200">3600</span> <span style="color: #aa2211">+</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">ikelifetime</span><span style="color: #aa2211">-></span><span class="n">time</span><span class="p">().</span><span class="n">minute</span><span class="p">()</span> <span style="color: #aa2211">*</span> <span style="color: #601200">60</span> <span style="color: #aa2211">+</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">ikelifetime</span><span style="color: #aa2211">-></span><span class="n">time</span><span class="p">().</span><span class="n">second</span><span class="p">();</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156973">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:265</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">cbSalifetime</span><span style="color: #aa2211">-></span><span class="n">isChecked</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> <span class="n">totalSeconds</span> <span style="color: #aa2211">=</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">salifetime</span><span style="color: #aa2211">-></span><span class="n">time</span><span class="p">().</span><span class="n">hour</span><span class="p">()</span> <span style="color: #aa2211">*</span> <span style="color: #601200">3600</span> <span style="color: #aa2211">+</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">salifetime</span><span style="color: #aa2211">-></span><span class="n">time</span><span class="p">().</span><span class="n">minute</span><span class="p">()</span> <span style="color: #aa2211">*</span> <span style="color: #601200">60</span> <span style="color: #aa2211">+</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">salifetime</span><span style="color: #aa2211">-></span><span class="n">time</span><span class="p">().</span><span class="n">second</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">result</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">NM_L2TP_KEY_IPSEC_SALIFETIME</span><span class="p">,</span> <span class="n">QString</span><span style="color: #aa2211">::</span><span class="n">number</span><span class="p">(</span><span class="n">totalSeconds</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156974">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tpipsecwidget.cpp:304</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">requesters</span> <span style="color: #aa2211"><<</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">machineCA</span> <span style="color: #aa2211"><<</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">machineCert</span> <span style="color: #aa2211"><<</span> <span class="n">m_ui</span><span style="color: #aa2211">-></span><span class="n">machineKey</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">bool</span> <span class="n">isP12</span> <span style="color: #aa2211">=</span> <span class="n">url</span><span class="p">.</span><span class="n">toString</span><span class="p">().</span><span class="n">endsWith</span><span class="p">(</span><span class="n">QLatin1String</span><span class="p">(</span><span style="color: #766510">".p12"</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D27764#inline-156975">View Inline</a><span style="color: #4b4d51; font-weight: bold;">l2tppppwidget.cpp:60</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">bool</span></span><span class="bright"> </span><span class="n"><span class="bright">refuse_mschap</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">dataMap</span></span><span class="bright"></span><span class="p"><span class="bright">[</span></span><span class="bright"></span><span class="n"><span class="bright">NM_L2TP_KEY_REFUSE_MSCHAP</span></span><span class="bright"></span><span class="p"><span class="bright">]</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">==</span></span><span class="bright"> </span><span class="n"><span class="bright">yesString</span></span><span class="bright"></span><span class="p"><span class="bright">);</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">bool</span> <span class="n">refuse_<span class="bright">mschapv2</span></span> <span style="color: #aa2211">=</span> <span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_REFUSE_<span class="bright">MSCHAPV2</span></span><span class="p">]</span> <span style="color: #aa2211">==</span> <span class="n">yesString</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">bool</span> <span class="n">refuse_<span class="bright">e</span>ap</span> <span style="color: #aa2211">=</span> <span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_REFUSE_<span class="bright">E</span>AP</span><span class="p">]</span> <span style="color: #aa2211">==</span> <span class="n">yesString</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #74777d"><span class="bright">// Authentication options</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000">bool</span> <span class="n">refuse_<span class="bright">pap</span></span> <span style="color: #aa2211">=</span> <span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_REFUSE_<span class="bright">PAP</span></span><span class="p">]</span> <span style="color: #aa2211">==</span> <span class="n">yesString</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"> </span><span style="color: #aa4000">bool</span> <span class="n">refuse_<span class="bright">ch</span>ap</span> <span style="color: #aa2211">=</span> <span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_L2TP_KEY_REFUSE_<span class="bright">CH</span>AP</span><span class="p">]</span> <span style="color: #aa2211">==</span> <span class="n">yesString</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">const? Same for variables below.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R116 Plasma Network Management Applet</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D27764">https://phabricator.kde.org/D27764</a></div></div><br /><div><strong>To: </strong>dkosovic, jgrulich<br /><strong>Cc: </strong>plasma-devel, Orage, LeGast00n, The-Feren-OS-Dev, cblack, jraleigh, zachus, fbampaloukas, GB_2, ragreen, ZrenBot, ngraham, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart<br /></div>