diff options
| -rw-r--r-- | include/asterisk/manager.h | 2 | ||||
| -rw-r--r-- | main/asterisk.c | 4 | ||||
| -rw-r--r-- | main/bridge.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 27944add8..7b18f7b7c 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -54,7 +54,7 @@ - \ref manager.c Main manager code file */ -#define AMI_VERSION "2.10.2" +#define AMI_VERSION "2.10.3" #define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */ #define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */ diff --git a/main/asterisk.c b/main/asterisk.c index f8e31d5a0..01107e217 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -795,7 +795,9 @@ static int swapmode(int *used, int *total) static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { uint64_t physmem, freeram; +#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL) uint64_t freeswap = 0; +#endif int nprocs = 0; long uptime = 0; int totalswap = 0; @@ -885,7 +887,7 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl #if defined(HAVE_SYSINFO) ast_cli(a->fd, " Buffer RAM: %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024); #endif -#if defined(HAVE_SWAPCTL) || defined(HAVE_SYSINFO) +#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL) ast_cli(a->fd, " Total Swap Space: %d KiB\n", totalswap); ast_cli(a->fd, " Free Swap Space: %" PRIu64 " KiB\n\n", freeswap); #endif diff --git a/main/bridge.c b/main/bridge.c index 5e065fb35..8284fd3af 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -3808,7 +3808,7 @@ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct a data->average_talking_energy = talker_energy; } else if ((data->average_talking_energy < talker_energy) && is_keyframe) { if (data->chan_old_vsrc) { - ast_channel_unref(data->chan_old_vsrc); + data->chan_old_vsrc = ast_channel_unref(data->chan_old_vsrc); } if (data->chan_vsrc) { data->chan_old_vsrc = data->chan_vsrc; |