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

res_pjsip: Fix empty ActiveChannels property in AMI responses.

Browse Source 
The logic appears to have been reversed since it was introduced in
05cbf8df.

Resolves: #1254
(cherry picked from commit b1065e783d)
This commit is contained in:
Sean Bright
2025-05-27 12:56:30 -04:00
committed by George Joseph
parent d9c6ab1c99
commit 7154985931
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_pjsip/pjsip_configuration.c
View File

@@ -1710,14 +1710,6 @@ int ast_sip_for_each_channel(
return ast_sip_for_each_channel_snapshot(endpoint_snapshot, on_channel_snapshot, arg); return ast_sip_for_each_channel_snapshot(endpoint_snapshot, on_channel_snapshot, arg);
} }
static int active_channels_to_str_cb(void *object, void *arg, int flags)
{
const struct ast_channel_snapshot *snapshot = object;
struct ast_str **buf = arg;
ast_str_append(buf, 0, "%s,", snapshot->base->name);
return 0;
}
static void active_channels_to_str(const struct ast_sip_endpoint *endpoint, static void active_channels_to_str(const struct ast_sip_endpoint *endpoint,
struct ast_str **str) struct ast_str **str)
{ {
@@ -1725,13 +1717,8 @@ static void active_channels_to_str(const struct ast_sip_endpoint *endpoint,
RAII_VAR(struct ast_endpoint_snapshot *, endpoint_snapshot, RAII_VAR(struct ast_endpoint_snapshot *, endpoint_snapshot,
ast_sip_get_endpoint_snapshot(endpoint), ao2_cleanup); ast_sip_get_endpoint_snapshot(endpoint), ao2_cleanup);
if (endpoint_snapshot) { ast_str_append(str, 0, "%d",
return; endpoint_snapshot ? endpoint_snapshot->num_channels : 0);
}
ast_sip_for_each_channel_snapshot(endpoint_snapshot,
active_channels_to_str_cb, str);
ast_str_truncate(*str, -1);
} }
#define AMI_DEFAULT_STR_SIZE 512 #define AMI_DEFAULT_STR_SIZE 512