<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/3995/">https://reviewboard.asterisk.org/r/3995/</a>
</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 and Joshua Colp.</div>
<div>By Jonathan Rose.</div>
<p style="color: grey;"><i>Updated Sept. 17, 2014, 5:29 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</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;">Added comma separation support to ip_identify_match_handler.
For a test, I did the following:
[1603]
type=identify
match=10.24.18.13/16,10.26.18.13/16,www.example.com
endpoint=1603
and got:
Endpoint: 1603/1603 Unavailable 0 of inf
Aor: 1603 5
Identify: 10.24.0.0/16,10.26.0.0/16,93.184.216.119/32,2606:2800:220:6d:26bf:1447:1097:aa7/128
in my pjsip show endpoint output</pre>
</td>
</tr>
</table>
<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-24290">ASTERISK-24290</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;">Using a value such as '10.24.0.0/16' would fail to match because ast_sockaddr_resolve can only parse the following formats:
* hostname:port
* host.example.com:port
* a.b.c.d
* a.b.c.d:port
* a:b:c:...:d
* [a:b:c:...:d]
* [a:b:c:...:d]:port
When the format doesn't match one of these, the function fails and we bail.
To get around this, I simply checked for the presence of a '/' in the identify string and used ast_append_ha directly with the address if it was present.
</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;">Used CLI command 'pjsip show endpoint 1603' with an endpoint that had the following identifier:
[1603]
type=identify
match=10.24.18.13/16
endpoint=1603
Before, the address would fail to parse and the command would show no identifier
After, the address would parse correctly and show '10.24.0.0/16' for the identifier as seen in:
Endpoint: 1603/1603 Not in use 0 of inf
Aor: 1603 5
Contact: 1603/sip:1603@10.24.18.13:5060;ob Unknown nan
Identify: 10.24.0.0/16
I tried a few other things, such as not using a CIDR and using a hostname to verify that there wasn't any obvious deviation in behavior introduced by the patch.
</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> (updated)</h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/branches/12/res/res_pjsip_endpoint_identifier_ip.c <span style="color: grey">(423062)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/3995/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>