diff options
-rw-r--r-- | CHANGES | 6 | ||||
-rw-r--r-- | apps/app_dial.c | 56 | ||||
-rw-r--r-- | include/asterisk/utils.h | 4 | ||||
-rw-r--r-- | main/astobj2.c | 25 | ||||
-rw-r--r-- | main/astobj2_container.c | 36 | ||||
-rw-r--r-- | main/astobj2_hash.c | 4 | ||||
-rw-r--r-- | main/astobj2_rbtree.c | 4 | ||||
-rw-r--r-- | main/utils.c | 6 | ||||
-rw-r--r-- | res/res_rtp_asterisk.c | 17 |
9 files changed, 116 insertions, 42 deletions
@@ -83,6 +83,12 @@ Core notify systemd of its state using sd_notify. Use 'Type=notify' in asterisk.service. +app_dial +------------------ + * Added the "Q" option which sets the Q.850/Q.931 cause on unanswered channels + when another channel answers the call. The default of ANSWERED_ELSEWHERE + is unchanged. + ------------------------------------------------------------------------------ --- Functionality changes from Asterisk 13.10.0 to Asterisk 13.11.0 ---------- ------------------------------------------------------------------------------ diff --git a/apps/app_dial.c b/apps/app_dial.c index 7b7c70201..893898100 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -375,6 +375,25 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <para>Enable privacy mode. Use <replaceable>x</replaceable> as the family/key in the AstDB database if it is provided. The current extension is used if a database family/key is not specified.</para> </option> + <option name="Q"> + <argument name="cause" required="true"/> + <para>Specify the Q.850/Q.931 <replaceable>cause</replaceable> to send on + unanswered channels when another channel answers the call. + As with <literal>Hangup()</literal>, <replaceable>cause</replaceable> + can be a numeric cause code or a name such as + <literal>NO_ANSWER</literal>, + <literal>USER_BUSY</literal>, + <literal>CALL_REJECTED</literal> or + <literal>ANSWERED_ELSEWHERE</literal> (the default if Q isn't specified). + You can also specify <literal>0</literal> or <literal>NONE</literal> + to send no cause. See the <filename>causes.h</filename> file for the + full list of valid causes and names. + </para> + <note> + <para>chan_sip does not support setting the cause on a CANCEL to anything + other than ANSWERED_ELSEWHERE.</para> + </note> + </option> <option name="r"> <para>Default: Indicate ringing to the calling party, even if the called party isn't actually ringing. Pass no audio to the calling party until the called channel has answered.</para> @@ -520,6 +539,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <example title="Dial with call length limit"> same => n,Dial(PJSIP/alice,,L(60000:30000:10000)) </example> + <example title="Dial alice and bob and send NO_ANSWER to bob instead of ANSWERED_ELSEWHERE when alice answers"> + same => n,Dial(PJSIP/alice&PJSIP/bob,,Q(NO_ANSWER)) + </example> <example title="Dial with pre-dial subroutines"> [default] @@ -684,6 +706,7 @@ enum { #define OPT_PREDIAL_CALLEE (1LLU << 41) #define OPT_PREDIAL_CALLER (1LLU << 42) #define OPT_RING_WITH_EARLY_MEDIA (1LLU << 43) +#define OPT_HANGUPCAUSE (1LLU << 44) enum { OPT_ARG_ANNOUNCE = 0, @@ -705,6 +728,7 @@ enum { OPT_ARG_FORCE_CID_PRES, OPT_ARG_PREDIAL_CALLEE, OPT_ARG_PREDIAL_CALLER, + OPT_ARG_HANGUPCAUSE, /* note: this entry _MUST_ be the last one in the enum */ OPT_ARG_ARRAY_SIZE }; @@ -738,6 +762,7 @@ AST_APP_OPTIONS(dial_exec_options, BEGIN_OPTIONS AST_APP_OPTION_ARG('O', OPT_OPERMODE, OPT_ARG_OPERMODE), AST_APP_OPTION('p', OPT_SCREENING), AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY), + AST_APP_OPTION_ARG('Q', OPT_HANGUPCAUSE, OPT_ARG_HANGUPCAUSE), AST_APP_OPTION_ARG('r', OPT_RINGBACK, OPT_ARG_RINGBACK), AST_APP_OPTION('R', OPT_RING_WITH_EARLY_MEDIA), AST_APP_OPTION_ARG('S', OPT_DURATION_STOP, OPT_ARG_DURATION_STOP), @@ -796,7 +821,7 @@ static void chanlist_free(struct chanlist *outgoing) ast_free(outgoing); } -static void hanguptree(struct dial_head *out_chans, struct ast_channel *exception, int answered_elsewhere) +static void hanguptree(struct dial_head *out_chans, struct ast_channel *exception, int hangupcause) { /* Hang up a tree of stuff */ struct chanlist *outgoing; @@ -804,9 +829,9 @@ static void hanguptree(struct dial_head *out_chans, struct ast_channel *exceptio while ((outgoing = AST_LIST_REMOVE_HEAD(out_chans, node))) { /* Hangup any existing lines we have open */ if (outgoing->chan && (outgoing->chan != exception)) { - if (answered_elsewhere) { + if (hangupcause >= 0) { /* This is for the channel drivers */ - ast_channel_hangupcause_set(outgoing->chan, AST_CAUSE_ANSWERED_ELSEWHERE); + ast_channel_hangupcause_set(outgoing->chan, hangupcause); } ast_hangup(outgoing->chan); } @@ -2763,6 +2788,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast } else { const char *number; int dial_end_raised = 0; + int cause = -1; if (ast_test_flag64(&opts, OPT_CALLER_ANSWER)) ast_answer(chan); @@ -2773,7 +2799,23 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast /* Ah ha! Someone answered within the desired timeframe. Of course after this we will always return with -1 so that it is hung up properly after the conversation. */ - hanguptree(&out_chans, peer, 1); + + if (ast_test_flag64(&opts, OPT_HANGUPCAUSE) + && !ast_strlen_zero(opt_args[OPT_ARG_HANGUPCAUSE])) { + cause = ast_str2cause(opt_args[OPT_ARG_HANGUPCAUSE]); + if (cause <= 0) { + if (!strcasecmp(opt_args[OPT_ARG_HANGUPCAUSE], "NONE")) { + cause = 0; + } else if (sscanf(opt_args[OPT_ARG_HANGUPCAUSE], "%30d", &cause) != 1 + || cause < 0) { + ast_log(LOG_WARNING, "Invalid cause given to Dial(...Q(<cause>)): \"%s\"\n", + opt_args[OPT_ARG_HANGUPCAUSE]); + cause = -1; + } + } + } + hanguptree(&out_chans, peer, cause >= 0 ? cause : AST_CAUSE_ANSWERED_ELSEWHERE); + /* If appropriate, log that we have a destination channel and set the answer time */ if (ast_channel_name(peer)) pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", ast_channel_name(peer)); @@ -3177,7 +3219,11 @@ out: } ast_channel_early_bridge(chan, NULL); - hanguptree(&out_chans, NULL, ast_channel_hangupcause(chan)==AST_CAUSE_ANSWERED_ELSEWHERE || ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE) ? 1 : 0 ); /* forward 'answered elsewhere' if we received it */ + /* forward 'answered elsewhere' if we received it */ + hanguptree(&out_chans, NULL, + ast_channel_hangupcause(chan) == AST_CAUSE_ANSWERED_ELSEWHERE + || ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE) + ? AST_CAUSE_ANSWERED_ELSEWHERE : -1); pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status); ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status); diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index c3df4779f..a504a5da1 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -849,8 +849,10 @@ int ast_parse_digest(const char *digest, struct ast_http_digest *d, int request, #define DO_CRASH_NORETURN #endif +void DO_CRASH_NORETURN __ast_assert_failed(int condition, const char *condition_str, + const char *file, int line, const char *function); + #ifdef AST_DEVMODE -void DO_CRASH_NORETURN __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function); #define ast_assert(a) _ast_assert(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__) static void force_inline _ast_assert(int condition, const char *condition_str, const char *file, int line, const char *function) { diff --git a/main/astobj2.c b/main/astobj2.c index 1bb5237f1..f5175ea15 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -116,21 +116,17 @@ static struct astobj2 *INTERNAL_OBJ(void *user_data) struct astobj2 *p; if (!user_data) { - ast_log(LOG_ERROR, "user_data is NULL\n"); + __ast_assert_failed(0, "user_data is NULL", __FILE__, __LINE__, __PRETTY_FUNCTION__); return NULL; } p = (struct astobj2 *) ((char *) user_data - sizeof(*p)); if (AO2_MAGIC != p->priv_data.magic) { - if (p->priv_data.magic) { - ast_log(LOG_ERROR, "bad magic number 0x%x for object %p\n", - p->priv_data.magic, user_data); - } else { - ast_log(LOG_ERROR, - "bad magic number for object %p. Object is likely destroyed.\n", - user_data); - } - ast_assert(0); + char bad_magic[100]; + + snprintf(bad_magic, sizeof(bad_magic), "bad magic number 0x%x for object %p", + p->priv_data.magic, user_data); + __ast_assert_failed(0, bad_magic, __FILE__, __LINE__, __PRETTY_FUNCTION__); return NULL; } @@ -157,7 +153,6 @@ int __ao2_lock(void *user_data, enum ao2_lock_req lock_how, const char *file, co int res = 0; if (obj == NULL) { - ast_assert(0); return -1; } @@ -216,7 +211,6 @@ int __ao2_unlock(void *user_data, const char *file, const char *func, int line, int current_value; if (obj == NULL) { - ast_assert(0); return -1; } @@ -265,7 +259,6 @@ int __ao2_trylock(void *user_data, enum ao2_lock_req lock_how, const char *file, int res = 0; if (obj == NULL) { - ast_assert(0); return -1; } @@ -385,7 +378,6 @@ void *ao2_object_get_lockaddr(void *user_data) struct astobj2_lock *obj_mutex; if (obj == NULL) { - ast_assert(0); return NULL; } @@ -409,7 +401,6 @@ static int internal_ao2_ref(void *user_data, int delta, const char *file, int li int ret; if (obj == NULL) { - ast_assert(0); return -1; } @@ -504,10 +495,6 @@ int __ao2_ref_debug(void *user_data, int delta, const char *tag, const char *fil } } - if (obj == NULL) { - ast_assert(0); - } - return old_refcount; } diff --git a/main/astobj2_container.c b/main/astobj2_container.c index 5a27a0ae5..466c10372 100644 --- a/main/astobj2_container.c +++ b/main/astobj2_container.c @@ -103,8 +103,11 @@ static int internal_ao2_link(struct ao2_container *self, void *obj_new, int flag enum ao2_lock_req orig_lock; struct ao2_container_node *node; - if (!is_ao2_object(obj_new) || !is_ao2_object(self) - || !self->v_table || !self->v_table->new_node || !self->v_table->insert) { + if (!is_ao2_object(obj_new) || !is_ao2_object(self)) { + return 0; + } + + if (!self->v_table || !self->v_table->new_node || !self->v_table->insert) { /* Sanity checks. */ ast_assert(0); return 0; @@ -187,8 +190,6 @@ void *__ao2_unlink_debug(struct ao2_container *c, void *user_data, int flags, const char *tag, const char *file, int line, const char *func) { if (!is_ao2_object(user_data)) { - /* Sanity checks. */ - ast_assert(0); return NULL; } @@ -202,8 +203,6 @@ void *__ao2_unlink_debug(struct ao2_container *c, void *user_data, int flags, void *__ao2_unlink(struct ao2_container *c, void *user_data, int flags) { if (!is_ao2_object(user_data)) { - /* Sanity checks. */ - ast_assert(0); return NULL; } @@ -268,7 +267,11 @@ static void *internal_ao2_traverse(struct ao2_container *self, enum search_flags struct ao2_container *multi_container = NULL; struct ao2_iterator *multi_iterator = NULL; - if (!is_ao2_object(self) || !self->v_table || !self->v_table->traverse_first + if (!is_ao2_object(self)) { + return NULL; + } + + if (!self->v_table || !self->v_table->traverse_first || !self->v_table->traverse_next) { /* Sanity checks. */ ast_assert(0); @@ -512,7 +515,6 @@ void ao2_iterator_restart(struct ao2_iterator *iter) { if (!is_ao2_object(iter->c)) { ast_log(LOG_ERROR, "Iterator container is not valid.\n"); - ast_assert(0); return; } @@ -577,7 +579,11 @@ static void *internal_ao2_iterator_next(struct ao2_iterator *iter, const char *t struct ao2_container_node *node; void *ret; - if (!is_ao2_object(iter->c) || !iter->c->v_table || !iter->c->v_table->iterator_next) { + if (!is_ao2_object(iter->c)) { + return NULL; + } + + if (!iter->c->v_table || !iter->c->v_table->iterator_next) { /* Sanity checks. */ ast_assert(0); return NULL; @@ -748,7 +754,11 @@ struct ao2_container *__ao2_container_clone(struct ao2_container *orig, enum sea int failed; /* Create the clone container with the same properties as the original. */ - if (!is_ao2_object(orig) || !orig->v_table || !orig->v_table->alloc_empty_clone) { + if (!is_ao2_object(orig)) { + return NULL; + } + + if (!orig->v_table || !orig->v_table->alloc_empty_clone) { /* Sanity checks. */ ast_assert(0); return NULL; @@ -779,7 +789,11 @@ struct ao2_container *__ao2_container_clone_debug(struct ao2_container *orig, en int failed; /* Create the clone container with the same properties as the original. */ - if (!is_ao2_object(orig) || !orig->v_table || !orig->v_table->alloc_empty_clone_debug) { + if (!is_ao2_object(orig)) { + return NULL; + } + + if (!orig->v_table || !orig->v_table->alloc_empty_clone_debug) { /* Sanity checks. */ ast_assert(0); return NULL; diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c index 341ff79e0..f5c678740 100644 --- a/main/astobj2_hash.c +++ b/main/astobj2_hash.c @@ -186,7 +186,9 @@ static void hash_ao2_node_destructor(void *v_doomed) * same node. */ my_container = (struct ao2_container_hash *) doomed->common.my_container; - ast_assert(is_ao2_object(my_container)); +#if defined(AST_DEVMODE) + is_ao2_object(my_container); +#endif __adjust_lock(my_container, AO2_LOCK_REQ_WRLOCK, 1); diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c index a8d5e3ac1..4362b83cb 100644 --- a/main/astobj2_rbtree.c +++ b/main/astobj2_rbtree.c @@ -878,7 +878,9 @@ static void rb_ao2_node_destructor(void *v_doomed) * same node. */ my_container = (struct ao2_container_rbtree *) doomed->common.my_container; - ast_assert(is_ao2_object(my_container)); +#if defined(AST_DEVMODE) + is_ao2_object(my_container); +#endif __adjust_lock(my_container, AO2_LOCK_REQ_WRLOCK, 1); diff --git a/main/utils.c b/main/utils.c index 1a034c101..af0ee7f6b 100644 --- a/main/utils.c +++ b/main/utils.c @@ -2437,17 +2437,16 @@ void DO_CRASH_NORETURN ast_do_crash(void) #endif /* defined(DO_CRASH) */ } -#if defined(AST_DEVMODE) void DO_CRASH_NORETURN __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function) { /* * Attempt to put it into the logger, but hope that at least * someone saw the message on stderr ... */ - ast_log(__LOG_ERROR, file, line, function, "FRACK!, Failed assertion %s (%d)\n", - condition_str, condition); fprintf(stderr, "FRACK!, Failed assertion %s (%d) at line %d in %s of %s\n", condition_str, condition, line, function, file); + ast_log(__LOG_ERROR, file, line, function, "FRACK!, Failed assertion %s (%d)\n", + condition_str, condition); /* Generate a backtrace for the assert */ ast_log_backtrace(); @@ -2460,7 +2459,6 @@ void DO_CRASH_NORETURN __ast_assert_failed(int condition, const char *condition_ usleep(1); ast_do_crash(); } -#endif /* defined(AST_DEVMODE) */ char *ast_eid_to_str(char *s, int maxlen, struct ast_eid *eid) { diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 627f800a4..95fe6d3ea 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -4286,6 +4286,7 @@ static int bridge_p2p_rtp_write(struct ast_rtp_instance *instance, unsigned int int reconstruct = ntohl(rtpheader[0]); struct ast_sockaddr remote_address = { {0,} }; int ice; + unsigned int timestamp = ntohl(rtpheader[1]); /* Get fields from packet */ payload = (reconstruct & 0x7f0000) >> 16; @@ -4314,6 +4315,22 @@ static int bridge_p2p_rtp_write(struct ast_rtp_instance *instance, unsigned int return -1; } + /* If bridged peer is in dtmf, feed all packets to core until it finishes to avoid infinite dtmf */ + if (bridged->sending_digit) { + ast_debug(1, "Feeding packets to core until DTMF finishes\n"); + return -1; + } + + /* + * Even if we are no longer in dtmf, we could still be receiving + * re-transmissions of the last dtmf end still. Feed those to the + * core so they can be filtered accordingly. + */ + if (rtp->last_end_timestamp == timestamp) { + ast_debug(1, "Feeding packet with duplicate timestamp to core\n"); + return -1; + } + /* If the marker bit has been explicitly set turn it on */ if (ast_test_flag(rtp, FLAG_NEED_MARKER_BIT)) { mark = 1; |