<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/2496/">https://reviewboard.asterisk.org/r/2496/</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/2496/diff/3/?file=37356#file37356line402" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/include/asterisk/acl.h</a>
    <span style="font-weight: normal;">

     (Diff revision 3)

    </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; ">int ast_named_acl_init(void);</pre></td>

  </tr>
 </tbody>



 
 

 <tbody>

  <tr>
    <th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">402</font></th>
    <td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cm"> * \retval a pointer to the ACL change message type</span></pre></td>
    <th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">396</font></th>
    <td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cm"> 8       \ref ast_security_topic \ref stasis_topic</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;">You have a &#39;8&#39; here in place of a &#39;*&#39;.</pre>
</div>
<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/2496/diff/3/?file=37358#file37358line4268" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/main/asterisk.c</a>
    <span style="font-weight: normal;">

     (Diff revision 3)

    </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; ">int main(int argc, char *argv[])</pre></td>

  </tr>
 </tbody>



 
 

 <tbody>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">4268</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb">        </span><span class="k">if</span> <span class="p">(</span><span class="n">ast_security_stasis_init</span><span class="p">())</span> <span class="p">{</span><span class="tb">        </span><span class="tb">        </span><span class="cm">/* Initialize Security Stasis Topic and Events */</span></pre></td>
  </tr>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">4269</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb">        </span><span class="tb">        </span><span class="n">ast_security_stasis_cleanup</span><span class="p">();</span></pre></td>
  </tr>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">4270</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb">        </span><span class="tb">        </span><span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">);</span></pre></td>
  </tr>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">4271</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb">        </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;">I&#39;m pretty sure this needs a:
printf(&quot;%s&quot;, term_quit());</pre>
</div>
<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/2496/diff/3/?file=37361#file37361line57" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/main/security_events.c</a>
    <span style="font-weight: normal;">

     (Diff revision 3)

    </span>
   </th>
  </tr>
 </thead>



 
 

 <tbody>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">57</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="k">struct</span> <span class="n">stasis_message_type</span> <span class="o">*</span><span class="nf">ast_security_event_type</span><span class="p">(</span><span class="kt">void</span><span class="p">)</span></pre></td>
  </tr>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">58</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="p">{</span></pre></td>
  </tr>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">59</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb">        </span><span class="k">return</span> <span class="n">security_event_type</span><span class="p">;</span></pre></td>
  </tr>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">60</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><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;">For the type accessor implementation, the init, and the cleanup, there are now handy dandy macros to reduce boilerplate:
STASIS_MESSAGE_TYPE_DEFN
STASIS_MESSAGE_TYPE_INIT
STASIS_MESSAGE_TYPE_CLEANUP</pre>
</div>
<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/2496/diff/3/?file=37361#file37361line521" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/main/security_events.c</a>
    <span style="font-weight: normal;">

     (Diff revision 3)

    </span>
   </th>
  </tr>
 </thead>

 <tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
  <tr>

   <td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static struct ast_event *alloc_event(const struct ast_security_event_common *sec)</pre></td>
   <td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>

  </tr>
 </tbody>



 
 

 <tbody>

  <tr>
    <th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">474</font></th>
    <td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="k">static</span> <span class="k">struct</span> <span class="n">ast_event</span> <span class="o">*</span><span class="nf">alloc_event</span><span class="p">(</span><span class="k">const</span> <span class="k">struct</span> <span class="n">ast_security_event_common</span> <span class="o">*</span><span class="n">sec</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">521</font></th>
    <td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="k">static</span> <span class="kt">int</span> <span class="nf">add_timeval_json_object</span><span class="p">(</span><span class="k">struct</span> <span class="n">ast_json</span> <span class="o">*</span><span class="n">json</span><span class="p">,</span> <span class="k">enum</span> <span class="n">ast_event_ie_type</span> <span class="n">ie_type</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;">You should be using ast_json_timeval.</pre>
</div>
<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/2496/diff/3/?file=37361#file37361line563" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/main/security_events.c</a>
    <span style="font-weight: normal;">

     (Diff revision 3)

    </span>
   </th>
  </tr>
 </thead>

 <tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
  <tr>

   <td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static struct ast_event *alloc_event(const struct ast_security_event_common *sec)</pre></td>
   <td colspan="2"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>

  </tr>
 </tbody>



 
 

 <tbody>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
    <th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">537</font></th>
    <td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="k">static</span> <span class="kt">int</span> <span class="nf">add_ip_json_object</span><span class="p">(</span><span class="k">struct</span> <span class="n">ast_json</span> <span class="o">*</span><span class="n">json</span><span class="p">,</span> <span class="k">enum</span> <span class="n">ast_event_ie_type</span> <span class="n">ie_type</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;">A function like this should probably go into json.h along with the timeval, name/number, and CEP packaging functions.</pre>
</div>
<br />



<p>- opticron</p>


<br />
<p>On May 7th, 2013, 4:32 p.m. CDT, jrose wrote:</p>








<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/static/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, David Lee, kmoore, and Matt Jordan.</div>
<div>By jrose.</div>


<p style="color: grey;"><i>Updated May 7, 2013, 4:32 p.m.</i></p>







<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>


 <a href="https://issues.asterisk.org/jira/browse/ASTERISK-21103">ASTERISK-21103</a>


</div>



<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt;">Repository: </b>
Asterisk
</div>


<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;">Stage 3/3 of ASTERISK-21103. In order to convert this set of messages I had to change all of the event blob stuff into JSON strings inside of a JSON blob loaded onto a JSON payload and sent out over stasis to the security topic where it is then consumed by stasis and read into a log message in the appropriate fashion with the fields in the right order to catch the bird to catch the spider to catch the fly.</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;">Made sure that the security messages were being generated in the same way as they were prior to the stasis change by using the following CLI command:

securityevents test generation



Examples Before:
[May  3 14:40:28] SECURITY[1305]: res_security_log.c:134 security_event_cb: SecurityEvent=&quot;FailedACL&quot;,EventTV=&quot;1367610028-869814&quot;,Severity=&quot;Error&quot;,Service=&quot;TEST&quot;,EventVersion=&quot;1&quot;,AccountID=&quot;Username&quot;,SessionID=&quot;Session123&quot;,LocalAddress=&quot;IPV4/UDP/192.168.1.1/12121&quot;,RemoteAddress=&quot;IPV4/UDP/192.168.1.2/12345&quot;,Module=&quot;test_security_events&quot;,ACLName=&quot;TEST_ACL&quot;,SessionTV=&quot;1367610028-869754&quot;
[May  3 14:40:28] SECURITY[1305]: res_security_log.c:134 security_event_cb: SecurityEvent=&quot;InvalidAccountID&quot;,EventTV=&quot;1367610028-869895&quot;,Severity=&quot;Error&quot;,Service=&quot;TEST&quot;,EventVersion=&quot;1&quot;,AccountID=&quot;FakeUser&quot;,SessionID=&quot;Session456&quot;,LocalAddress=&quot;IPV4/TCP/10.1.2.3/4321&quot;,RemoteAddress=&quot;IPV4/TCP/10.1.2.4/123&quot;,Module=&quot;test_security_events&quot;,SessionTV=&quot;1367610028-869854&quot;
[May  3 14:40:28] SECURITY[1305]: res_security_log.c:134 security_event_cb: SecurityEvent=&quot;SessionLimit&quot;,EventTV=&quot;1367610028-869960&quot;,Severity=&quot;Error&quot;,Service=&quot;TEST&quot;,EventVersion=&quot;1&quot;,AccountID=&quot;Jenny&quot;,SessionID=&quot;8675309&quot;,LocalAddress=&quot;IPV4/TLS/10.5.4.3/4444&quot;,RemoteAddress=&quot;IPV4/TLS/10.5.4.2/3333&quot;,Module=&quot;test_security_events&quot;,SessionTV=&quot;1367610028-869923&quot;


Examples After:
[May  3 14:33:35] SECURITY[31607]: res_security_log.c:122 security_event_stasis_cb: SecurityEvent=&quot;FailedACL&quot;,EventTV=&quot;1367609615-957822&quot;,Severity=&quot;Error&quot;,Service=&quot;TEST&quot;,EventVersion=&quot;1&quot;,AccountID=&quot;Username&quot;,SessionID=&quot;Session123&quot;,LocalAddress=&quot;IPV4/UDP/192.168.1.1/12121&quot;,RemoteAddress=&quot;IPV4/UDP/192.168.1.2/12345&quot;,Module=&quot;test_security_events&quot;,ACLName=&quot;TEST_ACL&quot;,SessionTV=&quot;1367609615-957750&quot;
[May  3 14:33:35] SECURITY[31608]: res_security_log.c:122 security_event_stasis_cb: SecurityEvent=&quot;InvalidAccountID&quot;,EventTV=&quot;1367609615-958101&quot;,Severity=&quot;Error&quot;,Service=&quot;TEST&quot;,EventVersion=&quot;1&quot;,AccountID=&quot;FakeUser&quot;,SessionID=&quot;Session456&quot;,LocalAddress=&quot;IPV4/TCP/10.1.2.3/4321&quot;,RemoteAddress=&quot;IPV4/TCP/10.1.2.4/123&quot;,Module=&quot;test_security_events&quot;,SessionTV=&quot;1367609615-957969&quot;
[May  3 14:33:35] SECURITY[31608]: res_security_log.c:122 security_event_stasis_cb: SecurityEvent=&quot;SessionLimit&quot;,EventTV=&quot;1367609615-958404&quot;,Severity=&quot;Error&quot;,Service=&quot;TEST&quot;,EventVersion=&quot;1&quot;,AccountID=&quot;Jenny&quot;,SessionID=&quot;8675309&quot;,LocalAddress=&quot;IPV4/TLS/10.5.4.3/4444&quot;,RemoteAddress=&quot;IPV4/TLS/10.5.4.2/3333&quot;,Module=&quot;test_security_events&quot;,SessionTV=&quot;1367609615-958360&quot;


As you can see it&#39;s basically identical aside from things that are expected to change between runs and the name of the function generating the messages.</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/include/asterisk/acl.h <span style="color: grey">(387858)</span></li>

 <li>/trunk/include/asterisk/security_events.h <span style="color: grey">(387858)</span></li>

 <li>/trunk/channels/chan_sip.c <span style="color: grey">(387858)</span></li>

 <li>/trunk/channels/chan_iax2.c <span style="color: grey">(387858)</span></li>

 <li>/trunk/main/asterisk.c <span style="color: grey">(387858)</span></li>

 <li>/trunk/main/manager.c <span style="color: grey">(387858)</span></li>

 <li>/trunk/main/named_acl.c <span style="color: grey">(387858)</span></li>

 <li>/trunk/main/security_events.c <span style="color: grey">(387858)</span></li>

 <li>/trunk/res/res_security_log.c <span style="color: grey">(387858)</span></li>

</ul>

<p><a href="https://reviewboard.asterisk.org/r/2496/diff/" style="margin-left: 3em;">View Diff</a></p>







  </td>
 </tr>
</table>








  </div>
 </body>
</html>