kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple revisions 420089-420090,420097

Browse Source 
........
  r420089 | mjordan | 2014-08-05 15:10:52 -0500 (Tue, 05 Aug 2014) | 72 lines
  
  ARI: Add channel technology agnostic out of call text messaging
  
  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). Messages are sent using the
  endpoints resource, and can be sent directly through that resource, or to a
  particular endpoint.
  
  For example, 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 as well. 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"
  }
  
  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.
  
  Review: https://reviewboard.asterisk.org/r/3726
  
  ASTERISK-23692 #close
  Reported by: Matt Jordan
  
  ASTERISK-23969 #close
  Reported by: Andrew Nagy
........
  r420090 | mjordan | 2014-08-05 15:16:37 -0500 (Tue, 05 Aug 2014) | 2 lines
  
  Remove automerge properties :-(
........
  r420097 | mjordan | 2014-08-05 16:36:25 -0500 (Tue, 05 Aug 2014) | 2 lines
  
  test_message: Fix strict-aliasing compilation issue
........

Merged revisions 420089-420090,420097 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-08-05 21:44:09 +00:00
parent fb2adba3ca
commit 47bf7efc4d
22 changed files with 3075 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
res/ari/ari_model_validators.c
View File

@@ -588,6 +588,140 @@ ari_validator ast_ari_validate_endpoint_fn(void)
return ast_ari_validate_endpoint;
}
int ast_ari_validate_text_message(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
int has_body = 0;
int has_from = 0;
int has_to = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
if (strcmp("body", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_body = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessage field body failed validation\n");
res = 0;
}
} else
if (strcmp("from", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_from = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessage field from failed validation\n");
res = 0;
}
} else
if (strcmp("to", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_to = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessage field to failed validation\n");
res = 0;
}
} else
if (strcmp("variables", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
prop_is_valid = ast_ari_validate_list(
ast_json_object_iter_value(iter),
ast_ari_validate_text_message_variable);
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessage field variables failed validation\n");
res = 0;
}
} else
{
ast_log(LOG_ERROR,
"ARI TextMessage has undocumented field %s\n",
ast_json_object_iter_key(iter));
res = 0;
}
}
if (!has_body) {
ast_log(LOG_ERROR, "ARI TextMessage missing required field body\n");
res = 0;
}
if (!has_from) {
ast_log(LOG_ERROR, "ARI TextMessage missing required field from\n");
res = 0;
}
if (!has_to) {
ast_log(LOG_ERROR, "ARI TextMessage missing required field to\n");
res = 0;
}
return res;
}
ari_validator ast_ari_validate_text_message_fn(void)
{
return ast_ari_validate_text_message;
}
int ast_ari_validate_text_message_variable(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
int has_key = 0;
int has_value = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
if (strcmp("key", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_key = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageVariable field key failed validation\n");
res = 0;
}
} else
if (strcmp("value", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_value = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageVariable field value failed validation\n");
res = 0;
}
} else
{
ast_log(LOG_ERROR,
"ARI TextMessageVariable has undocumented field %s\n",
ast_json_object_iter_key(iter));
res = 0;
}
}
if (!has_key) {
ast_log(LOG_ERROR, "ARI TextMessageVariable missing required field key\n");
res = 0;
}
if (!has_value) {
ast_log(LOG_ERROR, "ARI TextMessageVariable missing required field value\n");
res = 0;
}
return res;
}
ari_validator ast_ari_validate_text_message_variable_fn(void)
{
return ast_ari_validate_text_message_variable;
}
int ast_ari_validate_caller_id(struct ast_json *json)
{
int res = 1;
@@ -3890,6 +4024,9 @@ int ast_ari_validate_event(struct ast_json *json)
if (strcmp("StasisStart", discriminator) == 0) {
return ast_ari_validate_stasis_start(json);
} else
if (strcmp("TextMessageReceived", discriminator) == 0) {
return ast_ari_validate_text_message_received(json);
} else
{
ast_log(LOG_ERROR, "ARI Event has undocumented subtype %s\n",
discriminator);
@@ -4061,6 +4198,9 @@ int ast_ari_validate_message(struct ast_json *json)
if (strcmp("StasisStart", discriminator) == 0) {
return ast_ari_validate_stasis_start(json);
} else
if (strcmp("TextMessageReceived", discriminator) == 0) {
return ast_ari_validate_text_message_received(json);
} else
{
ast_log(LOG_ERROR, "ARI Message has undocumented subtype %s\n",
discriminator);
@@ -4724,6 +4864,94 @@ ari_validator ast_ari_validate_stasis_start_fn(void)
return ast_ari_validate_stasis_start;
}
int ast_ari_validate_text_message_received(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
int has_type = 0;
int has_application = 0;
int has_message = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageReceived field type failed validation\n");
res = 0;
}
} else
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageReceived field application failed validation\n");
res = 0;
}
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageReceived field timestamp failed validation\n");
res = 0;
}
} else
if (strcmp("endpoint", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
prop_is_valid = ast_ari_validate_endpoint(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageReceived field endpoint failed validation\n");
res = 0;
}
} else
if (strcmp("message", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_message = 1;
prop_is_valid = ast_ari_validate_text_message(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI TextMessageReceived field message failed validation\n");
res = 0;
}
} else
{
ast_log(LOG_ERROR,
"ARI TextMessageReceived has undocumented field %s\n",
ast_json_object_iter_key(iter));
res = 0;
}
}
if (!has_type) {
ast_log(LOG_ERROR, "ARI TextMessageReceived missing required field type\n");
res = 0;
}
if (!has_application) {
ast_log(LOG_ERROR, "ARI TextMessageReceived missing required field application\n");
res = 0;
}
if (!has_message) {
ast_log(LOG_ERROR, "ARI TextMessageReceived missing required field message\n");
res = 0;
}
return res;
}
ari_validator ast_ari_validate_text_message_received_fn(void)
{
return ast_ari_validate_text_message_received;
}
int ast_ari_validate_application(struct ast_json *json)
{
int res = 1;