summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addons/ooh323c/src/ootypes.h76
-rw-r--r--apps/app_adsiprog.c6
-rw-r--r--apps/app_sms.c2
-rw-r--r--autoconf/ast_check_pwlib.m44
-rw-r--r--bridges/bridge_softmix.c2
-rw-r--r--bridges/bridge_softmix/bridge_softmix_binaural.c3
-rw-r--r--bridges/bridge_softmix/include/bridge_softmix_internal.h3
-rw-r--r--codecs/codecs.xml1
-rw-r--r--codecs/gsm/src/short_term.c16
-rwxr-xr-xconfigure10
-rw-r--r--configure.ac6
-rw-r--r--main/editline/term.c2
-rw-r--r--main/pbx.c12
-rw-r--r--main/translate.c14
-rw-r--r--pbx/pbx_lua.c4
-rw-r--r--res/res_curl.c16
-rw-r--r--res/res_http_websocket.c3
-rw-r--r--res/res_odbc.c13
-rw-r--r--res/res_pjsip.c7
-rw-r--r--res/res_pjsip_endpoint_identifier_ip.c63
-rw-r--r--res/res_pjsip_session.c6
-rw-r--r--res/res_stasis.c5
-rw-r--r--res/stasis/app.c16
-rw-r--r--res/stasis/control.c6
24 files changed, 153 insertions, 143 deletions
diff --git a/addons/ooh323c/src/ootypes.h b/addons/ooh323c/src/ootypes.h
index cc7cd7c36..71a7219a6 100644
--- a/addons/ooh323c/src/ootypes.h
+++ b/addons/ooh323c/src/ootypes.h
@@ -154,45 +154,45 @@ typedef enum OOCallClearReason {
/**
Various message types for H225 and H245 messages
*/
-#define OO_MSGTYPE_MIN 101
-#define OOQ931MSG 101
-#define OOH245MSG 102
-#define OOSetup 103
-#define OOCallProceeding 104
-#define OOAlert 105
-#define OOConnect 106
-#define OOReleaseComplete 107
-#define OOFacility 108
-#define OOInformationMessage 109
-#define OOMasterSlaveDetermination 110
-#define OOMasterSlaveAck 111
-#define OOMasterSlaveReject 112
-#define OOMasterSlaveRelease 113
-#define OOTerminalCapabilitySet 114
-#define OOTerminalCapabilitySetAck 115
-#define OOTerminalCapabilitySetReject 116
-#define OOTerminalCapabilitySetRelease 117
-#define OOOpenLogicalChannel 118
-#define OOOpenLogicalChannelAck 119
-#define OOOpenLogicalChannelReject 120
-#define OOOpenLogicalChannelRelease 121
-#define OOOpenLogicalChannelConfirm 122
-#define OOCloseLogicalChannel 123
-#define OOCloseLogicalChannelAck 124
-#define OORequestChannelClose 125
-#define OORequestChannelCloseAck 126
-#define OORequestChannelCloseReject 127
-#define OORequestChannelCloseRelease 128
-#define OOEndSessionCommand 129
-#define OOUserInputIndication 130
-#define OORequestModeAck 131
-#define OORequestModeReject 132
-#define OORequestMode 133
-#define OORequestDelayResponse 134
-#define OORequestDelayRequest 135
-#define OOStatus 136
+#define OO_MSGTYPE_MIN 0x65
+#define OOQ931MSG 0x65
+#define OOH245MSG 0x66
+#define OOSetup 0x67
+#define OOCallProceeding 0x68
+#define OOAlert 0x69
+#define OOConnect 0x6a
+#define OOReleaseComplete 0x6b
+#define OOFacility 0x6c
+#define OOInformationMessage 0x6d
+#define OOMasterSlaveDetermination 0x6e
+#define OOMasterSlaveAck 0x6f
+#define OOMasterSlaveReject 0x70
+#define OOMasterSlaveRelease 0x71
+#define OOTerminalCapabilitySet 0x72
+#define OOTerminalCapabilitySetAck 0x73
+#define OOTerminalCapabilitySetReject 0x74
+#define OOTerminalCapabilitySetRelease 0x75
+#define OOOpenLogicalChannel 0x76
+#define OOOpenLogicalChannelAck 0x77
+#define OOOpenLogicalChannelReject 0x78
+#define OOOpenLogicalChannelRelease 0x79
+#define OOOpenLogicalChannelConfirm 0x7a
+#define OOCloseLogicalChannel 0x7b
+#define OOCloseLogicalChannelAck 0x7c
+#define OORequestChannelClose 0x7d
+#define OORequestChannelCloseAck 0x7e
+#define OORequestChannelCloseReject 0x7f
+#define OORequestChannelCloseRelease 0x80
+#define OOEndSessionCommand 0x81
+#define OOUserInputIndication 0x82
+#define OORequestModeAck 0x83
+#define OORequestModeReject 0x84
+#define OORequestMode 0x85
+#define OORequestDelayResponse 0x86
+#define OORequestDelayRequest 0x87
+#define OOStatus 0x88
-#define OO_MSGTYPE_MAX 136
+#define OO_MSGTYPE_MAX 0x88
/* Timer types */
#define OO_CALLESTB_TIMER (1<<0)
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 065902995..2dd226fbd 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1109,7 +1109,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script
tmp[7] = '\0';
}
/* Setup initial stuff */
- state->key->retstr[0] = 128;
+ state->key->retstr[0] = 0x80;
/* 1 has the length */
state->key->retstr[2] = state->key->id;
/* Put the Full name in */
@@ -1145,7 +1145,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script
break;
}
/* Setup sub */
- state->sub->data[0] = 130;
+ state->sub->data[0] = 0x82;
/* 1 is the length */
state->sub->data[2] = 0x0; /* Clear extensibility bit */
state->sub->datalen = 3;
@@ -1262,7 +1262,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script
/* Something bad happened */
break;
}
- disp->data[0] = 129;
+ disp->data[0] = 0x81;
disp->data[1] = disp->datalen - 2;
disp->data[2] = ((lrci & 0x3) << 6) | disp->id;
disp->data[3] = wi;
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 88985fbc5..c50a68627 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -807,7 +807,7 @@ static void sms_log(sms_t * h, char status)
*p++ = '\\';
*p++ = 'r';
} else if (h->ud[n] < 32 || h->ud[n] == 127) {
- *p++ = 191;
+ *p++ = 0xbf;
} else {
*p++ = h->ud[n];
}
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4
index 510881f3c..beaf8db74 100644
--- a/autoconf/ast_check_pwlib.m4
+++ b/autoconf/ast_check_pwlib.m4
@@ -103,7 +103,7 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then
else
AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, )
if test "${HAS_PWLIB:-unset}" != "unset" ; then
- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make)
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make)
PWLIB_INCDIR="/usr/local/include"
PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`
if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
@@ -121,7 +121,7 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then
else
AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, )
if test "${HAS_PWLIB:-unset}" != "unset" ; then
- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make)
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make)
PWLIB_INCDIR="/usr/include"
PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`
if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 83b1a8337..334356943 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -1404,7 +1404,7 @@ static int softmix_mixing_loop(struct ast_bridge *bridge)
}
#ifdef BINAURAL_RENDERING
- check_binaural_position_change(bridge, softmix_data, bridge_channel);
+ check_binaural_position_change(bridge, softmix_data);
#endif
/* Go through pulling audio from each factory that has it available */
diff --git a/bridges/bridge_softmix/bridge_softmix_binaural.c b/bridges/bridge_softmix/bridge_softmix_binaural.c
index 128e4640e..2a8efd766 100644
--- a/bridges/bridge_softmix/bridge_softmix_binaural.c
+++ b/bridges/bridge_softmix/bridge_softmix_binaural.c
@@ -465,9 +465,10 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc,
}
void check_binaural_position_change(struct ast_bridge *bridge,
- struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel)
+ struct softmix_bridge_data *softmix_data)
{
unsigned int pos_change;
+ struct ast_bridge_channel *bridge_channel;
/*
* We only check binaural things if binaural is activated by the config
diff --git a/bridges/bridge_softmix/include/bridge_softmix_internal.h b/bridges/bridge_softmix/include/bridge_softmix_internal.h
index 01e65aa1f..f842acb5e 100644
--- a/bridges/bridge_softmix/include/bridge_softmix_internal.h
+++ b/bridges/bridge_softmix/include/bridge_softmix_internal.h
@@ -377,10 +377,9 @@ void softmix_process_write_binaural_audio(struct softmix_channel *sc,
*
* \param bridge The conference bridge.
* \param softmix_data The data used by the softmix bridge.
- * \param bridge_channel The bridge channel.
*/
void check_binaural_position_change(struct ast_bridge *bridge,
- struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel);
+ struct softmix_bridge_data *softmix_data);
/*!
* \brief Processes audio data with the binaural synthesis and adds the result to the mixing array.
diff --git a/codecs/codecs.xml b/codecs/codecs.xml
index c3ccf00f1..0b4e2a474 100644
--- a/codecs/codecs.xml
+++ b/codecs/codecs.xml
@@ -3,7 +3,6 @@
<depend>xmlstarlet</depend>
<depend>bash</depend>
<depend>res_format_attr_opus</depend>
- <depend>curl</depend>
<defaultenabled>no</defaultenabled>
</member>
<member name="codec_silk" displayname="Download the SILK codec from Digium. See http://downloads.digium.com/pub/telephony/codec_silk/README.">
diff --git a/codecs/gsm/src/short_term.c b/codecs/gsm/src/short_term.c
index 4172d322c..d22d276ba 100644
--- a/codecs/gsm/src/short_term.c
+++ b/codecs/gsm/src/short_term.c
@@ -55,21 +55,21 @@ static void Decoding_of_the_coded_Log_Area_Ratios P2((LARc,LARpp),
*/
#undef STEP
-#define STEP( B, MIC, INVA ) \
+#define STEP( B_TIMES_TWO, MIC, INVA ) \
temp1 = GSM_ADD( *LARc++, MIC ) << 10; \
- temp1 = GSM_SUB( temp1, B << 1 ); \
+ temp1 = GSM_SUB( temp1, B_TIMES_TWO ); \
temp1 = (word)GSM_MULT_R( INVA, temp1 ); \
*LARpp++ = GSM_ADD( temp1, temp1 );
STEP( 0, -32, 13107 );
STEP( 0, -32, 13107 );
- STEP( 2048, -16, 13107 );
- STEP( -2560, -16, 13107 );
+ STEP( 4096, -16, 13107 );
+ STEP( -5120, -16, 13107 );
- STEP( 94, -8, 19223 );
- STEP( -1792, -8, 17476 );
- STEP( -341, -4, 31454 );
- STEP( -1144, -4, 29708 );
+ STEP( 188, -8, 19223 );
+ STEP( -3584, -8, 17476 );
+ STEP( -682, -4, 31454 );
+ STEP( -2288, -4, 29708 );
/* NOTE: the addition of *MIC is used to restore
* the sign of *LARc.
diff --git a/configure b/configure
index c672df971..37ac28bac 100755
--- a/configure
+++ b/configure
@@ -18690,7 +18690,7 @@ LDFLAGS="${saved_sanitize_LDFLAGS}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wdeclaration-after-statement support" >&5
$as_echo_n "checking for -Wdeclaration-after-statement support... " >&6; }
-if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if $(${CC} -Wdeclaration-after-statement -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement
@@ -18742,7 +18742,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-format-truncation" >&5
$as_echo_n "checking for -Wno-format-truncation... " >&6; }
-if $(${CC} -O2 -Wno-format-truncation -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if $(${CC} -Wno-format-truncation -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
AST_NO_FORMAT_TRUNCATION=-Wno-format-truncation
@@ -18755,7 +18755,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wshadow" >&5
$as_echo_n "checking for -Wshadow... " >&6; }
-if $(${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if $(${CC} -Wshadow -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
AST_SHADOW_WARNINGS=-Wshadow
@@ -29561,7 +29561,7 @@ else
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make
+for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -29623,7 +29623,7 @@ else
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make
+for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
diff --git a/configure.ac b/configure.ac
index 0a4fb4789..f0a978ee4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1224,7 +1224,7 @@ LDFLAGS="${saved_sanitize_LDFLAGS}"
AC_SUBST(AST_UNDEFINED_SANITIZER)
AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
-if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if $(${CC} -Wdeclaration-after-statement -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
AC_MSG_RESULT(yes)
AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement
else
@@ -1264,7 +1264,7 @@ fi
AC_SUBST(AST_NO_STRICT_OVERFLOW)
AC_MSG_CHECKING(for -Wno-format-truncation)
-if $(${CC} -O2 -Wno-format-truncation -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if $(${CC} -Wno-format-truncation -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
AC_MSG_RESULT(yes)
AST_NO_FORMAT_TRUNCATION=-Wno-format-truncation
else
@@ -1274,7 +1274,7 @@ fi
AC_SUBST(AST_NO_FORMAT_TRUNCATION)
AC_MSG_CHECKING(for -Wshadow)
-if $(${CC} -Wshadow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if $(${CC} -Wshadow -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
AC_MSG_RESULT(yes)
AST_SHADOW_WARNINGS=-Wshadow
else
diff --git a/main/editline/term.c b/main/editline/term.c
index 03623be21..6814cc4ca 100644
--- a/main/editline/term.c
+++ b/main/editline/term.c
@@ -428,7 +428,7 @@ term_alloc(EditLine *el, const struct termcapstr *t, const char *cap)
*/
tlen = 0;
for (tmp = tlist; tmp < &tlist[T_str]; tmp++)
- if (*tmp != NULL && *tmp != '\0' && *tmp != *str) {
+ if (*tmp != NULL && **tmp != '\0' && *tmp != *str) {
char *ptr;
for (ptr = *tmp; *ptr != '\0'; termbuf[tlen++] = *ptr++)
diff --git a/main/pbx.c b/main/pbx.c
index 12daa67bb..b850e8efd 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2863,7 +2863,6 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
struct ast_exten *e;
struct ast_app *app;
char *substitute = NULL;
- int res;
struct pbx_find_info q = { .stacklen = 0 }; /* the rest is reset in pbx_find_extension */
char passdata[EXT_DATA_SIZE];
int matching_action = (action == E_MATCH || action == E_CANMATCH || action == E_MATCHMORE);
@@ -2880,9 +2879,12 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
ast_unlock_contexts();
return -1; /* success, we found it */
} else if (action == E_FINDLABEL) { /* map the label to a priority */
- res = e->priority;
+ int res = e->priority;
+
ast_unlock_contexts();
- return res; /* the priority we were looking for */
+
+ /* the priority we were looking for */
+ return res;
} else { /* spawn */
if (!e->cached_app)
e->cached_app = pbx_findapp(e->app);
@@ -2932,7 +2934,7 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
} else {
if (!q.swo->exec) {
ast_log(LOG_WARNING, "No execution engine for switch %s\n", q.swo->name);
- res = -1;
+ return -1;
}
return q.swo->exec(c, q.foundcontext ? q.foundcontext : context, exten, priority, callerid, q.data);
}
@@ -8922,7 +8924,7 @@ int ast_pbx_init(void)
/* This is protected by the context_and_merge lock */
autohints = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, HASH_EXTENHINT_SIZE,
autohint_hash_cb, autohint_cmp);
- if (hintdevices) {
+ if (autohints) {
ao2_container_register("autohints", autohints, print_autohint_key);
}
statecbs = ao2_container_alloc(1, NULL, statecbs_cmp);
diff --git a/main/translate.c b/main/translate.c
index 02717c5ed..226d0985d 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -32,7 +32,6 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <math.h>
-#include <stdlib.h>
#include "asterisk/lock.h"
#include "asterisk/channel.h"
@@ -1331,6 +1330,13 @@ void ast_translator_deactivate(struct ast_translator *t)
AST_RWLIST_UNLOCK(&translators);
}
+/*! Calculate the absolute difference between sample rate of two formats. */
+#define format_sample_rate_absdiff(fmt1, fmt2) ({ \
+ unsigned int rate1 = ast_format_get_sample_rate(fmt1); \
+ unsigned int rate2 = ast_format_get_sample_rate(fmt2); \
+ (rate1 > rate2 ? rate1 - rate2 : rate2 - rate1); \
+})
+
/*! \brief Calculate our best translator source format, given costs, and a desired destination */
int ast_translator_best_choice(struct ast_format_cap *dst_cap,
struct ast_format_cap *src_cap,
@@ -1415,10 +1421,8 @@ int ast_translator_best_choice(struct ast_format_cap *dst_cap,
beststeps = matrix_get(x, y)->multistep;
} else if (matrix_get(x, y)->table_cost == besttablecost
&& matrix_get(x, y)->multistep == beststeps) {
- int gap_selected = abs(ast_format_get_sample_rate(best)
- - ast_format_get_sample_rate(bestdst));
- int gap_current = abs(ast_format_get_sample_rate(src)
- - ast_format_get_sample_rate(dst));
+ unsigned int gap_selected = format_sample_rate_absdiff(best, bestdst);
+ unsigned int gap_current = format_sample_rate_absdiff(src, dst);
if (gap_current < gap_selected) {
/* better than what we have so far */
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index fcab476cc..741e9507d 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -1648,9 +1648,6 @@ static int load_or_reload_lua_stuff(void)
}
}
- if (!res) {
- ast_log(LOG_NOTICE, "Lua PBX Switch loaded.\n");
- }
lua_close(L);
return res;
}
@@ -1660,7 +1657,6 @@ static int unload_module(void)
ast_context_destroy(NULL, registrar);
ast_unregister_switch(&lua_switch);
lua_free_extensions();
- ast_log(LOG_NOTICE, "Lua PBX Switch unloaded.\n");
return 0;
}
diff --git a/res/res_curl.c b/res/res_curl.c
index 2551efcea..e0f753cc3 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -60,7 +60,9 @@ static int unload_module(void)
/* If the dependent modules are still in memory, forbid unload */
for (i = 0; i < ARRAY_LEN(dependents); i++) {
if (ast_module_check(dependents[i])) {
- ast_log(LOG_ERROR, "%s (dependent module) is still loaded. Cannot unload res_curl.so\n", dependents[i]);
+ if (!ast_shutting_down()) {
+ ast_log(LOG_WARNING, "%s (dependent module) is still loaded. Cannot unload res_curl.so\n", dependents[i]);
+ }
res = -1;
}
}
@@ -73,19 +75,9 @@ static int unload_module(void)
return res;
}
-/*!
- * \brief Load the module
- *
- * Module loading including tests for configuration or dependencies.
- * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
- * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
- * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
- * configuration file or other non-critical problem return
- * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
- */
static int load_module(void)
{
- int res = 0;
+ int res = AST_MODULE_LOAD_SUCCESS;
if (curl_global_init(CURL_GLOBAL_ALL)) {
ast_log(LOG_ERROR, "Unable to initialize the cURL library. Cannot load res_curl.so\n");
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index baaa40fd9..86a154787 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -291,6 +291,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_remove_protocol)(struct ast_webso
/*! \brief Close function for websocket session */
int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, uint16_t reason)
{
+ enum ast_websocket_opcode opcode = AST_WEBSOCKET_OPCODE_CLOSE;
char frame[4] = { 0, }; /* The header is 2 bytes and the reason code takes up another 2 bytes */
int res;
@@ -298,7 +299,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, ui
return 0;
}
- frame[0] = AST_WEBSOCKET_OPCODE_CLOSE | 0x80;
+ frame[0] = opcode | 0x80;
frame[1] = 2; /* The reason code is always 2 bytes */
/* If no reason has been specified assume 1000 which is normal closure */
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 7aa452452..4a5411e7e 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1001,16 +1001,6 @@ static int unload_module(void)
return -1;
}
-/*!
- * \brief Load the module
- *
- * Module loading including tests for configuration or dependencies.
- * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
- * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
- * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
- * configuration file or other non-critical problem return
- * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
- */
static int load_module(void)
{
if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr)))
@@ -1018,8 +1008,7 @@ static int load_module(void)
if (load_odbc_config() == -1)
return AST_MODULE_LOAD_DECLINE;
ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
- ast_log(LOG_NOTICE, "res_odbc loaded.\n");
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource",
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index c3deb98b1..654f4ba4e 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -2680,13 +2680,13 @@ int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_ident
id_list_item = ast_calloc(1, sizeof(*id_list_item));
if (!id_list_item) {
- ast_log(LOG_ERROR, "Unabled to add endpoint identifier. Out of memory.\n");
+ ast_log(LOG_ERROR, "Unable to add endpoint identifier. Out of memory.\n");
return -1;
}
id_list_item->identifier = identifier;
id_list_item->name = name;
- ast_debug(1, "Register endpoint identifier %s (%p)\n", name, identifier);
+ ast_debug(1, "Register endpoint identifier %s(%p)\n", name ?: "", identifier);
if (ast_strlen_zero(name)) {
/* if an identifier has no name then place in front */
@@ -2709,7 +2709,8 @@ int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_ident
id_list_item->priority = 0;
while ((current = strchr(current, ','))) {
++id_list_item->priority;
- if (!strncmp(prev, name, current - prev)) {
+ if (!strncmp(prev, name, current - prev)
+ && strlen(name) == current - prev) {
break;
}
prev = ++current;
diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c
index 8b92cef27..e40f9bff4 100644
--- a/res/res_pjsip_endpoint_identifier_ip.c
+++ b/res/res_pjsip_endpoint_identifier_ip.c
@@ -105,7 +105,7 @@ struct ip_identify_match {
struct ast_ha *matches;
/*! \brief Perform SRV resolution of hostnames */
unsigned int srv_lookups;
- /*! \brief Hosts to be resolved after applying configuration */
+ /*! \brief Hosts to be resolved when applying configuration */
struct ao2_container *hosts;
};
@@ -150,8 +150,8 @@ static int header_identify_match_check(void *obj, void *arg, int flags)
c_header = ast_strdupa(identify->match_header);
c_value = strchr(c_header, ':');
if (!c_value) {
- ast_log(LOG_WARNING, "Identify '%s' has invalid header_match: No ':' separator found!\n",
- ast_sorcery_object_get_id(identify));
+ /* This should not be possible. The object cannot be created if so. */
+ ast_assert(0);
return 0;
}
*c_value = '\0';
@@ -161,17 +161,19 @@ static int header_identify_match_check(void *obj, void *arg, int flags)
pj_header_name = pj_str(c_header);
header = pjsip_msg_find_hdr_by_name(rdata->msg_info.msg, &pj_header_name, NULL);
if (!header) {
- ast_debug(3, "SIP message does not contain header '%s'\n", c_header);
+ ast_debug(3, "Identify '%s': SIP message does not have header '%s'\n",
+ ast_sorcery_object_get_id(identify),
+ c_header);
return 0;
}
pj_header_value = pj_str(c_value);
if (pj_strcmp(&pj_header_value, &header->hvalue)) {
- ast_debug(3, "SIP message contains header '%s' but value '%.*s' does not match value '%s' for endpoint '%s'\n",
+ ast_debug(3, "Identify '%s': SIP message has header '%s' but value '%.*s' does not match '%s'\n",
+ ast_sorcery_object_get_id(identify),
c_header,
(int) pj_strlen(&header->hvalue), pj_strbuf(&header->hvalue),
- c_value,
- identify->endpoint_name);
+ c_value);
return 0;
}
@@ -261,7 +263,7 @@ static int ip_identify_match_host_lookup(struct ip_identify_match *identify, con
}
for (i = 0; i < num_addrs; ++i) {
- /* Check if the address is already in the list, if so don't bother adding it again */
+ /* Check if the address is already in the list, if so don't add it again */
if (identify->matches && (ast_apply_ha(identify->matches, &addrs[i]) != AST_SENSE_ALLOW)) {
continue;
}
@@ -283,14 +285,13 @@ static int ip_identify_match_host_lookup(struct ip_identify_match *identify, con
}
/*! \brief Helper function which performs an SRV lookup and then resolves the hostname */
-static int ip_identify_match_srv_lookup(struct ip_identify_match *identify, const char *prefix, const char *host)
+static int ip_identify_match_srv_lookup(struct ip_identify_match *identify, const char *prefix, const char *host, int results)
{
char service[NI_MAXHOST];
struct srv_context *context = NULL;
int srv_ret;
const char *srvhost;
unsigned short srvport;
- int results = 0;
snprintf(service, sizeof(service), "%s.%s", prefix, host);
@@ -372,10 +373,33 @@ static int ip_identify_apply(const struct ast_sorcery *sorcery, void *obj)
char *current_string;
struct ao2_iterator i;
+ /* Validate the identify object configuration */
+ if (ast_strlen_zero(identify->endpoint_name)) {
+ ast_log(LOG_ERROR, "Identify '%s' missing required endpoint name.\n",
+ ast_sorcery_object_get_id(identify));
+ return -1;
+ }
+ if (ast_strlen_zero(identify->match_header) /* No header to match */
+ /* and no static IP addresses with a mask */
+ && !identify->matches
+ /* and no addresses to resolve */
+ && (!identify->hosts || !ao2_container_count(identify->hosts))) {
+ ast_log(LOG_ERROR, "Identify '%s' is not configured to match anything.\n",
+ ast_sorcery_object_get_id(identify));
+ return -1;
+ }
+ if (!ast_strlen_zero(identify->match_header)
+ && !strchr(identify->match_header, ':')) {
+ ast_log(LOG_ERROR, "Identify '%s' missing ':' separator in match_header '%s'.\n",
+ ast_sorcery_object_get_id(identify), identify->match_header);
+ return -1;
+ }
+
if (!identify->hosts) {
return 0;
}
+ /* Resolve the match addresses now */
i = ao2_iterator_init(identify->hosts, 0);
while ((current_string = ao2_iterator_next(&i))) {
struct ast_sockaddr address;
@@ -383,26 +407,29 @@ static int ip_identify_apply(const struct ast_sorcery *sorcery, void *obj)
/* If the provided string is not an IP address perform SRV resolution on it */
if (identify->srv_lookups && !ast_sockaddr_parse(&address, current_string, 0)) {
- results = ip_identify_match_srv_lookup(identify, "_sip._udp", current_string);
+ results = ip_identify_match_srv_lookup(identify, "_sip._udp", current_string,
+ results);
if (results != -1) {
- results += ip_identify_match_srv_lookup(identify, "_sip._tcp", current_string);
+ results = ip_identify_match_srv_lookup(identify, "_sip._tcp",
+ current_string, results);
}
if (results != -1) {
- results += ip_identify_match_srv_lookup(identify, "_sips._tcp", current_string);
+ results = ip_identify_match_srv_lookup(identify, "_sips._tcp",
+ current_string, results);
}
}
- /* If SRV falls fall back to a normal lookup on the host itself */
+ /* If SRV fails fall back to a normal lookup on the host itself */
if (!results) {
results = ip_identify_match_host_lookup(identify, current_string);
}
if (results == 0) {
- ast_log(LOG_ERROR, "Address '%s' provided on ip endpoint identifier '%s' did not resolve to any address\n",
- current_string, ast_sorcery_object_get_id(obj));
+ ast_log(LOG_WARNING, "Identify '%s' provided address '%s' did not resolve to any address\n",
+ ast_sorcery_object_get_id(identify), current_string);
} else if (results == -1) {
- ast_log(LOG_ERROR, "An error occurred when adding resolution results of '%s' on '%s'\n",
- current_string, ast_sorcery_object_get_id(obj));
+ ast_log(LOG_ERROR, "Identify '%s' failed when adding resolution results of '%s'\n",
+ ast_sorcery_object_get_id(identify), current_string);
ao2_ref(current_string, -1);
ao2_iterator_destroy(&i);
return -1;
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index c3393823e..53f60cc3b 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -456,6 +456,12 @@ struct ast_sip_session_media *ast_sip_session_media_state_add(struct ast_sip_ses
return NULL;
}
session_media->bundle_group = 0;
+
+ /* Some WebRTC clients can't handle an offer to bundle media streams. Instead they expect them to
+ * already be bundled. Every client handles this scenario though so if WebRTC is enabled just go
+ * ahead and treat the streams as having already been bundled.
+ */
+ session_media->bundled = session->endpoint->media.webrtc;
} else {
session_media->bundle_group = -1;
}
diff --git a/res/res_stasis.c b/res/res_stasis.c
index be3cb7f32..a60ec5fde 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -2053,6 +2053,9 @@ static int unload_module(void)
messaging_cleanup();
cleanup();
+
+ stasis_app_control_shutdown();
+
ao2_cleanup(apps_registry);
apps_registry = NULL;
@@ -2068,8 +2071,6 @@ static int unload_module(void)
ao2_cleanup(app_bridges_playback);
app_bridges_playback = NULL;
- stasis_app_control_shutdown();
-
STASIS_MESSAGE_TYPE_CLEANUP(end_message_type);
STASIS_MESSAGE_TYPE_CLEANUP(start_message_type);
diff --git a/res/stasis/app.c b/res/stasis/app.c
index 344f2b9eb..854e79977 100644
--- a/res/stasis/app.c
+++ b/res/stasis/app.c
@@ -1473,25 +1473,15 @@ int app_unsubscribe_bridge_id(struct stasis_app *app, const char *bridge_id)
int app_is_subscribed_bridge_id(struct stasis_app *app, const char *bridge_id)
{
struct app_forwards *forwards;
- SCOPED_AO2LOCK(lock, app->forwards);
-
- forwards = ao2_find(app->forwards, BRIDGE_ALL, OBJ_SEARCH_KEY | OBJ_NOLOCK);
- if (forwards) {
- ao2_ref(forwards, -1);
- return 1;
- }
if (ast_strlen_zero(bridge_id)) {
bridge_id = BRIDGE_ALL;
}
- forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY | OBJ_NOLOCK);
- if (forwards) {
- ao2_ref(forwards, -1);
- return 1;
- }
+ forwards = ao2_find(app->forwards, bridge_id, OBJ_SEARCH_KEY);
+ ao2_cleanup(forwards);
- return 0;
+ return forwards != NULL;
}
static void *bridge_find(const struct stasis_app *app, const char *id)
diff --git a/res/stasis/control.c b/res/stasis/control.c
index d5628770b..b4fd69fb3 100644
--- a/res/stasis/control.c
+++ b/res/stasis/control.c
@@ -1562,7 +1562,9 @@ void stasis_app_control_shutdown(void)
{
ast_mutex_lock(&dial_bridge_lock);
shutting_down = 1;
- ao2_cleanup(dial_bridge);
- dial_bridge = NULL;
+ if (dial_bridge) {
+ ast_bridge_destroy(dial_bridge, 0);
+ dial_bridge = NULL;
+ }
ast_mutex_unlock(&dial_bridge_lock);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 20:01:49 +0000