diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/callerid.c | 13 | ||||
| -rw-r--r-- | main/message.c | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/main/callerid.c b/main/callerid.c index a99dafc44..a9864da40 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -1209,7 +1209,16 @@ static const struct ast_value_translation redirecting_reason_types[] = { { AST_REDIRECTING_REASON_OUT_OF_ORDER, "out_of_order", "Called DTE Out-Of-Order" }, { AST_REDIRECTING_REASON_AWAY, "away", "Callee is Away" }, { AST_REDIRECTING_REASON_CALL_FWD_DTE, "cf_dte", "Call Forwarding By The Called DTE" }, - { AST_REDIRECTING_REASON_SEND_TO_VM, "send_to_vm", "Call is being redirected to user's voicemail"}, + { AST_REDIRECTING_REASON_SEND_TO_VM, "send_to_vm", "Call is being redirected to user's voicemail" }, + + /* Convenience SIP aliases. Alias descriptions are not used. */ + { AST_REDIRECTING_REASON_USER_BUSY, "user-busy" }, + { AST_REDIRECTING_REASON_NO_ANSWER, "no-answer" }, + { AST_REDIRECTING_REASON_UNCONDITIONAL, "unconditional" }, + { AST_REDIRECTING_REASON_TIME_OF_DAY, "time-of-day" }, + { AST_REDIRECTING_REASON_DO_NOT_DISTURB, "do-not-disturb" }, + { AST_REDIRECTING_REASON_FOLLOW_ME, "follow-me" }, + { AST_REDIRECTING_REASON_OUT_OF_ORDER, "out-of-service" }, /* *INDENT-ON* */ }; @@ -1232,7 +1241,7 @@ const char *ast_redirecting_reason_describe(int data) for (index = 0; index < ARRAY_LEN(redirecting_reason_types); ++index) { if (redirecting_reason_types[index].value == data) { - return redirecting_reason_types[index].description; + return redirecting_reason_types[index].description ?: "Redirecting reason alias-bug"; } } diff --git a/main/message.c b/main/message.c index 01a1c9b1c..c15975b63 100644 --- a/main/message.c +++ b/main/message.c @@ -398,7 +398,7 @@ static void msg_destructor(void *obj) struct ast_msg *msg = obj; ast_string_field_free_memory(msg); - ao2_ref(msg->vars, -1); + ao2_cleanup(msg->vars); } struct ast_msg *ast_msg_alloc(void) |