kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

debug prints modification

This commit is contained in:
root 2012-08-08 10:17:42 -04:00
parent 16692837c1
commit 99e04bf1d8
4 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/endpoints/mod_media_gateway/media_gateway.c
View File

@ -222,7 +222,6 @@ mg_termination_t *megaco_choose_termination(megaco_profile_t *profile, const cha
term->pool = pool; term->pool = pool;
term->type = termtype; term->type = termtype;
term->active_events = NULL; term->active_events = NULL;
term->mg_ctxt = NULL;
term->profile = profile; term->profile = profile;
switch_set_flag(term, MGT_ALLOCATED); switch_set_flag(term, MGT_ALLOCATED);
@ -335,8 +334,6 @@ void megaco_termination_destroy(mg_termination_t *term)
term->active_events = NULL; term->active_events = NULL;
} }
term->mg_ctxt = NULL;
switch_clear_flag(term, MGT_ALLOCATED); switch_clear_flag(term, MGT_ALLOCATED);
switch_clear_flag(term, MGT_ACTIVE); switch_clear_flag(term, MGT_ACTIVE);

54
src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
View File

@ -347,7 +347,7 @@ switch_status_t mg_prc_descriptors(megaco_profile_t* mg_profile, MgMgcoCommand *
for(fmtCnt = 0; fmtCnt < fmt_list->num.val; fmtCnt++){ for(fmtCnt = 0; fmtCnt < fmt_list->num.val; fmtCnt++){
fmt = &fmt_list->fmts[i]->val; fmt = &fmt_list->fmts[i]->val;
if(fmt->pres == NOTPRSNT) continue; if(fmt->pres == NOTPRSNT) continue;
printf("Format [%d]\n", fmt->val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Format [%d]\n", fmt->val);
} }
} }
} }
@ -381,30 +381,30 @@ switch_status_t mg_prc_descriptors(megaco_profile_t* mg_profile, MgMgcoCommand *
case MGT_LCLCTL_MODE: case MGT_LCLCTL_MODE:
{ {
/* Mode Property */ /* Mode Property */
printf("MGT_LCLCTL_MODE - Mode value [%d]\n", lclParm->u.mode.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"MGT_LCLCTL_MODE - Mode value [%d]\n", lclParm->u.mode.val);
break; break;
} }
case MGT_LCLCTL_RESVAL: case MGT_LCLCTL_RESVAL:
{ {
/* Reserve Value */ /* Reserve Value */
printf("MGT_LCLCTL_RESVAL: Reserve Value[%d] \n", lclParm->u.resVal.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"MGT_LCLCTL_RESVAL: Reserve Value[%d] \n", lclParm->u.resVal.val);
break; break;
} }
case MGT_LCLCTL_RESGRP: case MGT_LCLCTL_RESGRP:
{ {
/* Reserve group */ /* Reserve group */
printf("MGT_LCLCTL_RESGRP: Reserve Group[%d]\n", lclParm->u.resGrp.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"MGT_LCLCTL_RESGRP: Reserve Group[%d]\n", lclParm->u.resGrp.val);
break; break;
} }
case MGT_LCLCTL_PROPPARM: case MGT_LCLCTL_PROPPARM:
{ {
/* Properties (of a termination) */ /* Properties (of a termination) */
/* Matt - See how we can apply this to a termination */ /* Matt - See how we can apply this to a termination */
printf("MGT_LCLCTL_PROPPARM: \n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"MGT_LCLCTL_PROPPARM: \n");
break; break;
} }
default: default:
printf("Invalid local control descriptor type[%d]\n",lclParm->type.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Invalid local control descriptor type[%d]\n",lclParm->type.val);
break; break;
} }
} }
@ -429,23 +429,23 @@ switch_status_t mg_prc_descriptors(megaco_profile_t* mg_profile, MgMgcoCommand *
{ {
/* Matt to see how to apply properties to a termination */ /* Matt to see how to apply properties to a termination */
/* Properties of a termination */ /* Properties of a termination */
printf("MGT_TERMST_PROPLST:\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"MGT_TERMST_PROPLST:\n");
break; break;
} }
case MGT_TERMST_EVTBUFCTL: case MGT_TERMST_EVTBUFCTL:
{ {
/* Event /buffer Control Properties */ /* Event /buffer Control Properties */
printf(" MGT_TERMST_EVTBUFCTL: value[%d]\n", tsp->u.evtBufCtl.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE," MGT_TERMST_EVTBUFCTL: value[%d]\n", tsp->u.evtBufCtl.val);
break; break;
} }
case MGT_TERMST_SVCST: case MGT_TERMST_SVCST:
{ {
/* Service State Properties */ /* Service State Properties */
printf(" MGT_TERMST_SVCST: value[%d]\n", tsp->u.svcState.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE," MGT_TERMST_SVCST: value[%d]\n", tsp->u.svcState.val);
break; break;
} }
default: default:
printf("Invalid termination state descriptor type[%d]\n",tsp->type.val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Invalid termination state descriptor type[%d]\n",tsp->type.val);
break; break;
} }
} }
@ -630,6 +630,7 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
mg_ctxt = megaco_choose_context(mg_profile); mg_ctxt = megaco_choose_context(mg_profile);
if(NULL == mg_ctxt){ if(NULL == mg_ctxt){
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," megaco_choose_context failed \n");
mg_util_set_err_string(&errTxt, " Resource Failure "); mg_util_set_err_string(&errTxt, " Resource Failure ");
err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR; err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR;
goto error; goto error;
@ -646,6 +647,13 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
memcpy(new_ctxtId, &inc_cmd->contextId,sizeof(MgMgcoContextId)); memcpy(new_ctxtId, &inc_cmd->contextId,sizeof(MgMgcoContextId));
mg_ctxt = megaco_get_context(mg_profile, inc_cmd->contextId.val.val); mg_ctxt = megaco_get_context(mg_profile, inc_cmd->contextId.val.val);
if(NULL == mg_ctxt){ if(NULL == mg_ctxt){
#ifdef BIT_64
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,
" megaco_get_context failed for context-id[%d]\n", inc_cmd->contextId.val.val);
#else
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,
" megaco_get_context failed for context-id[%ld]\n", inc_cmd->contextId.val.val);
#endif
mg_util_set_err_string(&errTxt, " Resource Failure "); mg_util_set_err_string(&errTxt, " Resource Failure ");
err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR; err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR;
goto error; goto error;
@ -660,15 +668,12 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
term = megaco_choose_termination(mg_profile, mg_profile->rtp_termination_id_prefix); term = megaco_choose_termination(mg_profile, mg_profile->rtp_termination_id_prefix);
if(NULL == term){ if(NULL == term){
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," megaco_choose_termination failed \n");
mg_util_set_err_string(&errTxt, " Resource Failure "); mg_util_set_err_string(&errTxt, " Resource Failure ");
err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR; err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR;
goto error; goto error;
} }
if(!term->mg_ctxt){
term->mg_ctxt = mg_ctxt;
}
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Allocated Termination[%p] with term name[%s]\n", (void*)term, term->name); switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Allocated Termination[%p] with term name[%s]\n", (void*)term, term->name);
is_rtp = 0x01; is_rtp = 0x01;
@ -678,26 +683,33 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
term = megaco_find_termination(mg_profile, (char*)termId->name.lcl.val); term = megaco_find_termination(mg_profile, (char*)termId->name.lcl.val);
if(NULL == term){ if(NULL == term){
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,
" megaco_find_termination failed for term-id[%s] \n",(char*)termId->name.lcl.val);
mg_util_set_err_string(&errTxt, " Resource Failure "); mg_util_set_err_string(&errTxt, " Resource Failure ");
err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR; err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR;
goto error; goto error;
} }
if(!term->mg_ctxt){
term->mg_ctxt = mg_ctxt; switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Allocated Termination[%p] with term name[%s]\n", (void*)term, term->name);
} else { }
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Termination[%s] already in context..rejecting ADD \n", term->name);
/********************************************************************/
/* check if termination already is in call */
if(term->context){
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Termination[%p : %s] "
"already in context[%p -%d]..rejecting ADD \n",
(void*)term, term->name, (void*)term->context,term->context->context_id);
mg_util_set_err_string(&errTxt, " Term already is in call "); mg_util_set_err_string(&errTxt, " Term already is in call ");
err_code = MGT_MGCO_RSP_CODE_DUP_TERM_CTXT; err_code = MGT_MGCO_RSP_CODE_DUP_TERM_CTXT;
goto error; goto error;
} }
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Allocated Termination[%p] with term name[%s]\n", (void*)term, term->name);
}
/********************************************************************/ /********************************************************************/
/* associate physical termination to context */ /* associate physical termination to context */
if(SWITCH_STATUS_FALSE == megaco_context_add_termination(mg_ctxt, term)){ if(SWITCH_STATUS_FALSE == megaco_context_add_termination(mg_ctxt, term)){
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"megaco_context_add_termination failed \n");
mg_util_set_err_string(&errTxt, " Resource Failure "); mg_util_set_err_string(&errTxt, " Resource Failure ");
err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR; err_code = MGT_MGCO_RSP_CODE_RSRC_ERROR;
goto error; goto error;

1
src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
View File

@ -210,7 +210,6 @@ void mg_create_tdm_term(megaco_profile_t *profile, const char *tech, const char
term->pool = pool; term->pool = pool;
term->type = MG_TERM_TDM; term->type = MG_TERM_TDM;
term->profile = profile; term->profile = profile;
term->mg_ctxt = NULL;
term->tech = switch_core_strdup(pool, tech); term->tech = switch_core_strdup(pool, tech);
term->active_events = NULL; term->active_events = NULL;
term->name = switch_core_sprintf(pool, "%s%d", prefix, chan_num); term->name = switch_core_sprintf(pool, "%s%d", prefix, chan_num);

1
src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
View File

@ -113,7 +113,6 @@ struct mg_termination_s {
megaco_profile_t *profile; /*!< Parent MG profile */ megaco_profile_t *profile; /*!< Parent MG profile */
MgMgcoReqEvtDesc *active_events; /* !< active megaco events */ MgMgcoReqEvtDesc *active_events; /* !< active megaco events */
mg_termination_t *next; /*!< List for physical terminations */ mg_termination_t *next; /*!< List for physical terminations */
mg_context_t* mg_ctxt;
int *mg_error_code; /* MEGACO error code */ int *mg_error_code; /* MEGACO error code */
uint32_t flags; uint32_t flags;
const char *tech; /* Endpoint controlling the TDM interface - only FreeTDM tested so far */ const char *tech; /* Endpoint controlling the TDM interface - only FreeTDM tested so far */