fixing issues found during seagull testing and add single common descriptors api

src/mod/endpoints/mod_media_gateway/media_gateway.c

@@ -166,6 +166,7 @@ mg_termination_t *megaco_choose_termination(megaco_profile_t *profile, const cha
     term = switch_core_alloc(pool, sizeof *term);
     term->pool = pool;
     term->type = termtype;
+    term->active_events = NULL;
     
     if (termtype == MG_TERM_RTP) {
         /* Fill in local address and reserve an rtp port */

src/mod/endpoints/mod_media_gateway/media_gateway_stack.h

@@ -112,6 +112,15 @@ typedef enum {
    cmMemcpy((U8 *)(_tkn)->val, (CONSTANT U8 *)(_val), (_len));            \
 }
 
+#define MG_SET_TKNSTROSXL(_tkn, _len, _val, _mem)\
+{\
+   (_tkn).pres = PRSNT_NODEF;\
+   (_tkn).len = (_len);\
+   cmGetMem((Ptr)_mem, (Size)((_len)*sizeof(U8)), (Ptr*)&((_tkn).val));\
+   cmMemcpy((U8*)((_tkn).val), (U8*)(_val), _len);\
+}
+
+switch_status_t mg_prc_descriptors(megaco_profile_t* mg_profile, MgMgcoCommand *inc_cmd, mg_termination_t* term);
 void handle_sng_log(uint8_t level, char *fmt, ...);
 void handle_mgco_sta_ind(Pst *pst, SuId suId, MgMgtSta* msg);
 void handle_mgco_txn_sta_ind(Pst *pst, SuId suId, MgMgcoInd* msg);

src/mod/endpoints/mod_media_gateway/mod_media_gateway.c

@@ -438,6 +438,9 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 
     memset(&out_ctxt,0,sizeof(out_ctxt));
 
+	inc_context = &cmd->contextId;
+    memcpy(&out_ctxt, inc_context,sizeof(MgMgcoContextId));
+
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s: Received Command Type[%s] \n", __PRETTY_FUNCTION__, PRNT_MG_CMD_TYPE(cmd->cmdType.val));
 
 	/* validate Transaction Id */
@@ -506,7 +509,6 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 
 
 	/* Validate Context - if context is specified then check if its present with us */
-	inc_context = &cmd->contextId;
 	MG_ZERO(&ctxtId, sizeof(MgMgcoContextId));
 	memcpy(&ctxtId, inc_context, sizeof(MgMgcoContextId));
 
@@ -535,7 +537,6 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 		goto error1;
 	}
 
-    memcpy(&out_ctxt, inc_context,sizeof(MgMgcoContextId));
 
 	switch(cmd->cmdType.val)
 	{
@@ -557,7 +558,7 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 						{
 							/*MgMgcoAmmReq *addReq = &cmdReq->cmd.u.mod;*/
 							handle_mg_modify_cmd(mg_profile, cmd);
-							mg_send_modify_rsp(suId, cmd);
+							/*mg_send_modify_rsp(suId, cmd);*/
 							break;
 						}
 					case MGT_MOVE:
@@ -619,9 +620,10 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 			return;
 	}
 
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "cmd->cmdStatus.val[%d]\n",cmd->cmdStatus.val);
     /* END OF TXN received - means last command in txn to process. 
      * Send response to peer */
-    if(CH_CMD_STATUS_END_OF_TXN == cmd->cmdStatus.val){
+    /*if(CH_CMD_STATUS_END_OF_TXN == cmd->cmdStatus.val)*/{
         mg_send_end_of_axn(suId, &cmd->transId, &out_ctxt, &cmd->peerId);
     }
 
@@ -635,6 +637,9 @@ error:
 			mg_build_mgco_err_request(&mgErr, txn_id, &ctxtId, err_code, &errTxt)) {
 		sng_mgco_send_err(suId, mgErr);
 	}
+    if(CH_CMD_STATUS_END_OF_TXN == cmd->cmdStatus.val){
+        mg_send_end_of_axn(suId, &cmd->transId, &out_ctxt, &cmd->peerId);
+    }
 error1:
 	mg_free_cmd(cmd);
 	return;
@@ -654,7 +659,7 @@ void handle_mgco_txn_sta_ind(Pst *pst, SuId suId, MgMgcoInd* txn_sta_ind)
     switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s\n", __PRETTY_FUNCTION__);
    
     /*dump information*/
-    /*mgAccEvntPrntMgMgcoInd(txn_sta_ind, stdout);*/
+    mgAccEvntPrntMgMgcoInd(txn_sta_ind, stdout);
 }
 
 /*****************************************************************************************************************************/

src/mod/endpoints/mod_media_gateway/mod_media_gateway.h

@@ -42,7 +42,7 @@ typedef enum {
 	MEGACO_CODEC_ILBC,
     
     /* Nothing below this line */
-    MEGACO_CODEC_INVALID = 0xFFFFFFFF
+    MEGACO_CODEC_INVALID = 0xFFFFFF
 } megaco_codec_t;
 
 typedef struct mg_peer_profile_s{
@@ -90,6 +90,7 @@ typedef struct mg_termination_s {
     const char *uuid; /*!< UUID of the associated FS channel, or NULL if it's not activated */
     mg_context_t *context; /*!< Context in which this termination is connected, or NULL */
     megaco_profile_t *profile; /*!< Parent MG profile */
+    MgMgcoReqEvtDesc  *active_events;     /* !< active megaco events */
     
     union {
         struct {