<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/3726/">https://reviewboard.asterisk.org/r/3726/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On July 30th, 2014, 10:31 a.m. CDT, <b>opticron</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<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/3726/diff/2/?file=65032#file65032line883" style="color: black; font-weight: bold; text-decoration: underline;">/branches/12/main/message.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; ">AST_THREADSTORAGE_CUSTOM(msg_q_chan, NULL, destroy_msg_q_chan);</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">820</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="n">ao2_ref</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="o">+</span><span class="mi">1</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">822</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="n">ao2_ref</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="o">+</span><span class="mi">1</span><span class="p">);</span></pre></td>
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">821</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="n">ds</span><span class="o">-></span><span class="n">data</span> <span class="o">=</span> <span class="n">msg</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">823</font></th>
<td bgcolor="#ffffff" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="n">ds</span><span class="o">-></span><span class="n">data</span> <span class="o">=</span> <span class="n">msg</span><span class="p">;</span></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This can be changed to ao2_bump for clarity. It may actually need to be ao2_replace depending on whether the value in the datastore can be set already.</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The datastore value is purged each time a message is routed on the channel.
ao2_bump is not needed here; ao2_bump is generally useful when you don't know if the object being bumped is NULL. At this point, msg is guaranteed to be non-NULL; switching this to ao2_bump merely adds an additional if check that isn't needed.
I don't think adding ao2_bump here helps in clarifying what is occurring: we are incrementing the reference count for the datastore.</pre>
<br />
<p>- Matt</p>
<br />
<p>On July 27th, 2014, 9:20 p.m. CDT, Matt Jordan 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.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers.</div>
<div>By Matt Jordan.</div>
<p style="color: grey;"><i>Updated July 27, 2014, 9:20 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-23692">ASTERISK-23692</a>,
<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23969">ASTERISK-23969</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;">This patch adds the ability to send and receive text messages from various technology stacks in Asterisk through ARI. This includes chan_sip (sip), res_pjsip_messaging (pjsip), and res_xmpp (xmpp).
The following would send the message "Hello there" to PJSIP endpoint alice with a display URI of sip:asterisk@mycooldomain.org:
ari/endpoints/sendMessage?to=pjsip:alice&from=sip:asterisk@mycooldomain.org&body=Hello+There
This is equivalent to the following as well:
ari/endpoints/PJSIP/alice/sendMessage?from=sip:asterisk@mycooldomain.org&body=Hello+There
Both forms are available for message technologies that allow for arbitrary destinations, such as chan_sip.
Inbound messages can now be received over ARI. An ARI application that subscribes to endpoints will receive messages from those endpoints:
{
"type": "TextMessageReceived",
"timestamp": "2014-07-12T22:53:13.494-0500",
"endpoint": {
"technology": "PJSIP",
"resource": "alice",
"state": "online",
"channel_ids": []
},
"message": {
"from": "\"alice\" <sip:alice@127.0.0.1>",
"to": "pjsip:asterisk@127.0.0.1",
"body": "Watson, come here.",
"variables": []
},
"application": "testsuite"
}
A few interesting things you could do with this:
(1) Build your own XMPP to SIP gateway (without ever touching dialplan)
(2) Make a conferencing application with built-in text messaging (speech to text would be fun with this... probably should write that too)
(3) WebRTC! SIP stacks in the browser can send MESSAGE requests. Why limit yourself to just making calls when you can send arbitrary messages to a communications application? (Note: if you can't mention WebRTC in a release, you're not trying very hard)
The above was made possible due to some rather major changes in the message core. This includes (but is not limited to):
- Users of the message API can now register message handlers. A handler has two callbacks: one to determine if the handler has a destination for the message, and another to handle it.
- All dialplan functionality of handling a message was moved into a message handler provided by the message API.
- Messages can now have the technology/endpoint associated with them. Various other properties are also now more easily accessible.
- A number of ao2 containers that weren't really needed were replaced with vectors. Iteration over ao2_containers is expensive and pointless when the lifetime of things is well defined and the number of things is very small.
res_stasis now has a new file that makes up its structure, messaging. The messaging functionality implements a message handler, and passes received messages that match an interested endpoint over to the app for processing.
Note that inadvertently while testing this, I reproduced ASTERISK-23969. res_pjsip_messaging was incorrectly parsing out the 'to' field, such that arbitrary SIP URIs mangled the endpoint lookup. This patch includes the fix for that as well.</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;">Unit tests were added for the message core to make sure dialplan still worked.
Basic nominal tests have been added for the Asterisk Test Suite, and are up for review at https://reviewboard.asterisk.org/r/3864/</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>/branches/12/tests/test_message.c <span style="color: grey">(PRE-CREATION)</span></li>
<li>/branches/12/rest-api/api-docs/events.json <span style="color: grey">(419205)</span></li>
<li>/branches/12/rest-api/api-docs/endpoints.json <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/stasis/app.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/res_xmpp.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/res_stasis.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/res_pjsip_messaging.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/res_ari_endpoints.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/ari/resource_endpoints.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/ari/resource_endpoints.h <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/ari/resource_channels.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/ari/ari_model_validators.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/res/ari/ari_model_validators.h <span style="color: grey">(419205)</span></li>
<li>/branches/12/main/message.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/main/json.c <span style="color: grey">(419205)</span></li>
<li>/branches/12/include/asterisk/vector.h <span style="color: grey">(419205)</span></li>
<li>/branches/12/include/asterisk/message.h <span style="color: grey">(419205)</span></li>
<li>/branches/12/include/asterisk/manager.h <span style="color: grey">(419205)</span></li>
<li>/branches/12/include/asterisk/json.h <span style="color: grey">(419205)</span></li>
<li>/branches/12/channels/chan_sip.c <span style="color: grey">(419205)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/3726/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>