matt code changes

diff --git a/src/mod/endpoints/mod_media_gateway/media_gateway.c b/src/mod/endpoints/mod_media_gateway/media_gateway.c
index 3590762cb5d2fbd17dff7158ec6216189a92883c..78c0d400997b7cd76b60b78a75f79b61b7fb6d9e 100644 (file)
--- a/src/mod/endpoints/mod_media_gateway/media_gateway.c
+++ b/src/mod/endpoints/mod_media_gateway/media_gateway.c
@@ -374,6 +374,7 @@ void megaco_termination_destroy(mg_termination_t *term)
         term->active_events = NULL;
     }
 
+
     switch_clear_flag(term, MGT_ALLOCATED);
     switch_clear_flag(term, MGT_ACTIVE);
     
@@ -427,7 +428,7 @@ switch_status_t megaco_context_add_termination(mg_context_t *ctx, mg_termination
         if (zstr(ctx->terminations[1]->uuid)) {
             megaco_activate_termination(ctx->terminations[1]);
         }
-        
+
         switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bridging: %s (%s) <> %s (%s)\n", 
                           ctx->terminations[0]->name, ctx->terminations[0]->uuid,
                           ctx->terminations[1]->name, ctx->terminations[1]->uuid);

diff --git a/src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c b/src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
index 4e93abbf11d405507777cec6caafef5078d31b80..5aa1abb4a2ef1638e565b6a3eb500b95e83b171f 100644 (file)
--- a/src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
+++ b/src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
@@ -2879,8 +2879,14 @@ switch_status_t  mg_send_notify(megaco_profile_t* mg_profile, const char* term_n
     request.transId.val  = get_txn_id();
 
     request.contextId.type.pres = PRSNT_NODEF;
-    request.contextId.type.val  = MGT_CXTID_NULL;
-
+    if(term->context){
+       printf("Temrination is in context, adding context-id[%d]\n",term->context->context_id);
+           request.contextId.type.val  = MGT_CXTID_OTHER;
+           request.contextId.val.pres  = PRSNT_NODEF;
+           request.contextId.val.val  = term->context->context_id;
+    } else{
+           request.contextId.type.val  = MGT_CXTID_NULL;
+    }
     request.cmdStatus.pres = PRSNT_NODEF;
     request.cmdStatus.val = CH_CMD_STATUS_END_OF_TXN;
 

diff --git a/src/mod/endpoints/mod_sofia/rtp.c b/src/mod/endpoints/mod_sofia/rtp.c
index 9f0bc0147f6baf718872e638ae295227c7975819..4eb43b146c7c62d9daf5350afb533e800e32c325 100644 (file)
--- a/src/mod/endpoints/mod_sofia/rtp.c
+++ b/src/mod/endpoints/mod_sofia/rtp.c
@@ -220,7 +220,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
                                                           rate,
                                                           ptime,
                                                           1,
-                                                          /*SWITCH_CODEC_FLAG_ENCODE |*/ SWITCH_CODEC_FLAG_DECODE,
+                                                          SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                           NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
         goto fail;
@@ -231,7 +231,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
                                                                   rate,
                                                                   ptime,
                                                                   1,
-                                                                  SWITCH_CODEC_FLAG_ENCODE /*| SWITCH_CODEC_FLAG_DECODE*/, 
+                                                                  SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, 
                                                                   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
             goto fail;