kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-07 05:29:22 +00:00
Code Issues Projects Releases Wiki Activity

FS-9031: [avmd] Check session initialization

Browse Source 
Now avmd session's initialization is checked
for errors. Error reporting is improved.
This commit is contained in:
Piotr Gregor 2016-04-07 02:09:14 +01:00
parent da43cd8367
commit 8baf10d266
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mod/applications/mod_avmd/mod_avmd.c
View File

@ -656,8 +656,13 @@ SWITCH_STANDARD_API(avmd_api_main)
"\n has no read codec assigned yet. Please try again.\n\n", "\n has no read codec assigned yet. Please try again.\n\n",
switch_channel_get_name(channel), uuid); switch_channel_get_name(channel), uuid);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), SWITCH_LOG_ERROR, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), SWITCH_LOG_ERROR,
<<<<<<< HEAD
"Failed to start session. Channel [%s] has no codec assigned yet." "Failed to start session. Channel [%s] has no codec assigned yet."
" Please try again\n", switch_channel_get_name(channel)); " Please try again\n", switch_channel_get_name(channel));
=======
"Failed to start session. Channel [%s] has no codec assigned yet.\n",
switch_channel_get_name(channel));
>>>>>>> FS-9031: [avmd] Check session initialization
goto end; goto end;
} }
#endif #endif
@ -680,24 +685,35 @@ SWITCH_STANDARD_API(avmd_api_main)
" for FreeSWITCH session [%s]\n", uuid); " for FreeSWITCH session [%s]\n", uuid);
switch (res) { switch (res) {
case -1: case -1:
<<<<<<< HEAD
stream->write_function(stream, "-ERR, buffer error\n\n"); stream->write_function(stream, "-ERR, buffer error\n\n");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session),
SWITCH_LOG_ERROR, "Failed to init avmd session." SWITCH_LOG_ERROR, "Failed to init avmd session."
" Buffer error!\n"); " Buffer error!\n");
break; break;
case -2: case -2:
=======
>>>>>>> FS-9031: [avmd] Check session initialization
stream->write_function(stream, "-ERR, SMA buffer size is 0\n\n"); stream->write_function(stream, "-ERR, SMA buffer size is 0\n\n");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session),
SWITCH_LOG_ERROR, "Failed to init avmd session." SWITCH_LOG_ERROR, "Failed to init avmd session."
" SMA buffer size is 0!\n"); " SMA buffer size is 0!\n");
break; break;
<<<<<<< HEAD
case -3: case -3:
=======
case -2:
>>>>>>> FS-9031: [avmd] Check session initialization
stream->write_function(stream, "-ERR, SMA buffer error\n\n"); stream->write_function(stream, "-ERR, SMA buffer error\n\n");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session),
SWITCH_LOG_ERROR, "Failed to init avmd session." SWITCH_LOG_ERROR, "Failed to init avmd session."
" SMA buffer error\n"); " SMA buffer error\n");
break; break;
<<<<<<< HEAD
case -4: case -4:
=======
case -3:
>>>>>>> FS-9031: [avmd] Check session initialization
stream->write_function(stream, "-ERR, SMA sqa buffer error\n\n"); stream->write_function(stream, "-ERR, SMA sqa buffer error\n\n");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session),
SWITCH_LOG_ERROR, "Failed to init avmd session." SWITCH_LOG_ERROR, "Failed to init avmd session."
@ -738,11 +754,19 @@ SWITCH_STANDARD_API(avmd_api_main)
/* Set the vmd tag to detect an existing vmd media bug */ /* Set the vmd tag to detect an existing vmd media bug */
switch_channel_set_private(channel, "_avmd_", bug); switch_channel_set_private(channel, "_avmd_", bug);
<<<<<<< HEAD
/* OK */ /* OK */
=======
/* Everything went according to plan! Notify the user */
>>>>>>> FS-9031: [avmd] Check session initialization
stream->write_function(stream, "+OK\n [%s] [%s] started!\n\n", stream->write_function(stream, "+OK\n [%s] [%s] started!\n\n",
uuid, switch_channel_get_name(channel)); uuid, switch_channel_get_name(channel));
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), SWITCH_LOG_INFO, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(fs_session), SWITCH_LOG_INFO,
"Avmd on channel [%s] started!\n", switch_channel_get_name(channel)); "Avmd on channel [%s] started!\n", switch_channel_get_name(channel));
<<<<<<< HEAD
=======
>>>>>>> FS-9031: [avmd] Check session initialization
end: end: