<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://reviewboard.asterisk.org/r/1927/">https://reviewboard.asterisk.org/r/1927/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://reviewboard.asterisk.org/r/1927/diff/2/?file=28267#file28267line6157" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/channels/sig_pri.c</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static void *pri_dchannel(void *vpri)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6145</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">c</span> <span class="o">=</span> <span class="n">sig_pri_new_ast_channel</span><span class="p">(</span><span class="n">pri</span><span class="o">-></span><span class="n">pvts</span><span class="p">[</span><span class="n">chanpos</span><span class="p">],</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6157</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">c<span class="hl">han</span></span> <span class="o">=</span> <span class="n">sig_pri_new_ast_channel</span><span class="p">(</span><span class="n">pri</span><span class="o">-></span><span class="n">pvts</span><span class="p">[</span><span class="n">chanpos</span><span class="p">],</span></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6146</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">AST_STATE_RESERVED</span><span class="p">,</span> <span class="n">law</span><span class="p">,</span> <span class="n">e</span><span class="o">-></span><span class="n">ring</span><span class="p">.</span><span class="n">ctype</span><span class="p">,</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6158</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">AST_STATE_RESERVED</span><span class="p">,</span> <span class="n">law</span><span class="p">,</span> <span class="n">e</span><span class="o">-></span><span class="n">ring</span><span class="p">.</span><span class="n">ctype</span><span class="p">,</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6147</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">pri</span><span class="o">-></span><span class="n">pvts</span><span class="p">[</span><span class="n">chanpos</span><span class="p">]</span><span class="o">-></span><span class="n">exten</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6159</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">pri</span><span class="o">-></span><span class="n">pvts</span><span class="p">[</span><span class="n">chanpos</span><span class="p">]</span><span class="o">-></span><span class="n">exten</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6148</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">ast_mutex_lock</span><span class="p">(</span><span class="o">&</span><span class="n">pri</span><span class="o">-></span><span class="n">lock</span><span class="p">);</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6160</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">ast_mutex_lock</span><span class="p">(</span><span class="o">&</span><span class="n">pri</span><span class="o">-></span><span class="n">lock</span><span class="p">);</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6149</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">sig_pri_lock_private</span><span class="p">(</span><span class="n">pri</span><span class="o">-></span><span class="n">pvts</span><span class="p">[</span><span class="n">chanpos</span><span class="p">]);</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6161</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">sig_pri_lock_private</span><span class="p">(</span><span class="n">pri</span><span class="o">-></span><span class="n">pvts</span><span class="p">[</span><span class="n">chanpos</span><span class="p">]);</span></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6150</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">c</span><span class="p">)</span> <span class="p">{</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6162</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">c<span class="hl">han</span></span><span class="p">)</span> <span class="p">{</span></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6151</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#if defined(HAVE_PRI_SUBADDR)</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6163</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cp">#if defined(HAVE_PRI_SUBADDR)</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6152</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">e</span><span class="o">-></span><span class="n">ring</span><span class="p">.</span><span class="n">calling</span><span class="p">.</span><span class="n">subaddress</span><span class="p">.</span><span class="n">valid</span><span class="p">)</span> <span class="p">{</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6164</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">e</span><span class="o">-></span><span class="n">ring</span><span class="p">.</span><span class="n">calling</span><span class="p">.</span><span class="n">subaddress</span><span class="p">.</span><span class="n">valid</span><span class="p">)</span> <span class="p">{</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6153</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="cm">/* Set Calling Subaddress */</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6165</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="cm">/* Set Calling Subaddress */</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">6154</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">sig_pri_lock_owner</span><span class="p">(</span><span class="n">pri</span><span class="p">,</span> <span class="n">chanpos</span><span class="p">);</span></pre></td>
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">6166</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">sig_pri_lock_owner</span><span class="p">(</span><span class="n">pri</span><span class="p">,</span> <span class="n">chanpos</span><span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">All of this changing c to chan stuff can go since I ended up not doing anything here.</pre>
</div>
<br />
<p>- jrose</p>
<br />
<p>On May 24th, 2012, 4:32 p.m., jrose wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers, rmudgett and Matt Jordan.</div>
<div>By jrose.</div>
<p style="color: grey;"><i>Updated May 24, 2012, 4:32 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">split from: https://reviewboard.asterisk.org/r/1886/
These changes allow channels dahdi and iax2 to set callids and bind log messages to callids.
This is the same code as in the earlier review. It was split to commit the approved parts and to hopefully encourage some review of the remaining parts since there is less in here to review now.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">see https://reviewboard.asterisk.org/r/1886/</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/trunk/channels/chan_agent.c <span style="color: grey">(367420)</span></li>
<li>/trunk/channels/chan_dahdi.c <span style="color: grey">(367420)</span></li>
<li>/trunk/channels/chan_iax2.c <span style="color: grey">(367420)</span></li>
<li>/trunk/channels/chan_local.c <span style="color: grey">(367420)</span></li>
<li>/trunk/channels/sig_analog.c <span style="color: grey">(367420)</span></li>
<li>/trunk/channels/sig_pri.c <span style="color: grey">(367420)</span></li>
<li>/trunk/main/autoservice.c <span style="color: grey">(367420)</span></li>
<li>/trunk/main/logger.c <span style="color: grey">(367420)</span></li>
<li>/trunk/main/pbx.c <span style="color: grey">(367420)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/1927/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>