<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/3317/">https://reviewboard.asterisk.org/r/3317/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="8" style="border: 1px gray solid;">
<tr>
<td>
<h1 style="margin-right: 0.2em; padding: 0; font-size: 10pt;">This change has been discarded.</h1>
</td>
</tr>
</table>
<br />
<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.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers, George Joseph, Joshua Colp, and Matt Jordan.</div>
<div>By Jonathan Rose.</div>
<p style="color: grey;"><i>Updated March 10, 2014, 1:02 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-23235">ASTERISK-23235</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;">Introduces new options for transports and endpoints
transport/dscp - DSCP equivalent to tos option. If input numerically, this is treated as a DSCP value and not as a TOS value.
endpoint/dscp_audio - Same for tos_audio endpoint option
endpoint/dscp_video - Same for tos_video endpoint option
Deprecates all the above TOS options. They still work and the input for them still functions the same.
If a string representation is used for either TOS or DSCP settings (e.g. AF21, CS1, etc) then it doesn't matter which option is used. Both should be interpreted correctly.
Output of these fields in sorcery object representations will only show DSCP values now. If type has a name, the name is used. If it would be 'unknown' instead, then the numerical value will be used.
Alembic scripts are updated to include the dscp fields. The equivalent tos fields are left alone.
This patch also fixes an issue where two alembic revisions were upgrades from the same revision. This was a result of merging the patch that changed the TOS field types in phase 1.</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;">Checked numerous TOS and DSCP values for equivalence and their output.
Ran upgrade and downgrade against alembic scripts from a fresh database
Created testsuite modifications for tests that are currently checking TOS values. Right now those tests will fail if this patch is applied.</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/res/res_pjsip/pjsip_configuration.c <span style="color: grey">(410043)</span></li>
<li>/trunk/res/res_pjsip/config_transport.c <span style="color: grey">(410202)</span></li>
<li>/trunk/res/res_pjsip.c <span style="color: grey">(410202)</span></li>
<li>/trunk/main/acl.c <span style="color: grey">(410202)</span></li>
<li>/trunk/include/asterisk/res_pjsip.h <span style="color: grey">(410202)</span></li>
<li>/trunk/include/asterisk/acl.h <span style="color: grey">(410202)</span></li>
<li>/trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py <span style="color: grey">(410202)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/3317/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>