adding add/mod/sub api and alloc context during add and release context while processing subtract code

src/mod/endpoints/mod_media_gateway/media_gateway.c

@@ -140,6 +140,8 @@ done:
         switch_core_session_rwunlock(session);
     }
     switch_event_destroy(&var_event);
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 mg_termination_t *megaco_choose_termination(megaco_profile_t *profile, const char *prefix)
@@ -154,7 +156,7 @@ mg_termination_t *megaco_choose_termination(megaco_profile_t *profile, const cha
         return NULL;
     }
     
-    
+    return SWITCH_STATUS_SUCCESS;
 }
 
 mg_termination_t *megaco_find_termination(megaco_profile_t *profile, const char *name)
@@ -210,6 +212,8 @@ switch_status_t megaco_context_add_termination(mg_context_t *ctx, mg_termination
         
         switch_ivr_uuid_bridge(ctx->terminations[0]->uuid, ctx->terminations[1]->uuid);
     }
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 
@@ -226,17 +230,19 @@ switch_status_t megaco_context_sub_termination(mg_context_t *ctx, mg_termination
     }
     
     megaco_termination_destroy(term);
+
+    return SWITCH_STATUS_SUCCESS;
 }
 
 
 switch_status_t megaco_context_move_termination(mg_context_t *dst, mg_termination_t *term) 
 {
 
+        return SWITCH_STATUS_SUCCESS;
 }
 
 mg_context_t *megaco_find_context_by_suid(SuId suId, uint32_t context_id)
 {
-    mg_context_t *result = NULL;
     megaco_profile_t*    profile = NULL;
     
     if(NULL == (profile = megaco_get_profile_by_suId(suId))){

src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c

@@ -29,7 +29,7 @@ const char *mg_service_change_reason[] = {
 *
 *
 */
-switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *inc_cmd)
+switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *inc_cmd, MgMgcoContextId* new_ctxtId)
 {
     MgMgcoContextId  *ctxtId;
     int 		  descId;
@@ -40,6 +40,8 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
     int 		  err_code;
     int 		  i;
     int 		  j;
+    int 		  is_rtp = 0x00;
+    char 		  rtp_term_name[32];
     int 		  fmtCnt;
     MgMgcoAmmReq 	  *cmd = &inc_cmd->u.mgCmdInd[0]->cmd.u.add;
     U32 		   txn_id = inc_cmd->transId.val;
@@ -53,6 +55,12 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
     MgMgcoTermStateParm *tsp;
     TknU8 *fmt;
     CmSdpMedProtoFmts *format;
+    MgMgcoMediaDesc*   inc_med_desc;
+    MgMgcoAudRetParm *desc;
+    mg_context_t* mg_ctxt;
+
+    memset(&rtp_term_name[0], 0, 32);
+
 
     /********************************************************************/
     ctxtId  = &inc_cmd->contextId;
@@ -80,7 +88,17 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
     if ((NOTPRSNT != ctxtId->type.pres)  &&
             (MGT_CXTID_CHOOSE == ctxtId->type.val)){
 
-		/* TODO - Matt */
+        mg_ctxt = megaco_choose_context(mg_profile);
+
+        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Allocated Context[%p] with context_id[%d]\n", (void*)mg_ctxt, mg_ctxt->context_id);
+
+        /* fill Trillium Context structure with allocated context */
+        MG_SET_VAL_PRES(new_ctxtId->type, MGT_CXTID_OTHER);
+        MG_SET_VAL_PRES(new_ctxtId->val, mg_ctxt->context_id);
+    }
+    else {
+        /* context already present */
+        memcpy(new_ctxtId, &inc_cmd->contextId,sizeof(MgMgcoContextId));
     }
 
     /********************************************************************/
@@ -88,6 +106,9 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
     if ((NOTPRSNT != termId->type.pres)   &&
             (MGT_TERMID_CHOOSE == termId->type.val)){
 
+        is_rtp = 0x01;
+        strcpy(rtp_term_name,"rtp/1");
+
         /* TODO - Matt */
         /* allocate rtp term and associated the same to context */
         /********************************************************************/
@@ -101,6 +122,7 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
             case MGT_MEDIADESC:
                 {
                     int mediaId;
+                    inc_med_desc = &cmd->dl.descs[descId]->u.media;
                     for (mediaId = 0; mediaId < cmd->dl.descs[descId]->u.media.num.val; mediaId++) {
                         MgMgcoMediaPar *mediaPar = cmd->dl.descs[descId]->u.media.parms[mediaId];
                         switch (mediaPar->type.val) {
@@ -268,6 +290,171 @@ switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *i
 
     /* Kapil - to fill the response structure and call the response API to send ADD response */
 
+    /*************************************************************************************************************************/
+    /* sample resp code -- begin */
+    {
+        MgMgcoCommand  rsp;
+        int ret = 0x00;
+        MgMgcoTermId  *out_termId;
+
+        memset(&rsp,0, sizeof(rsp));
+
+        /*copy transaction-id*/
+        memcpy(&rsp.transId, &inc_cmd->transId,sizeof(MgMgcoTransId));
+
+        /*copy context-id*/
+        memcpy(&rsp.contextId, new_ctxtId,sizeof(MgMgcoContextId));
+
+        /*copy peer identifier */
+        memcpy(&rsp.peerId, &inc_cmd->peerId,sizeof(TknU32));
+
+        /*fill response structue */
+        if(SWITCH_STATUS_FALSE == (ret = mg_stack_alloc_mem((Ptr*)&rsp.u.mgCmdRsp[0],sizeof(MgMgcoCmdReply)))){
+            return ret;
+        }
+
+        rsp.u.mgCmdRsp[0]->pres.pres = PRSNT_NODEF;
+        rsp.u.mgCmdRsp[0]->type.pres = PRSNT_NODEF;
+        rsp.u.mgCmdRsp[0]->type.val  = MGT_ADD;
+        rsp.u.mgCmdRsp[0]->u.add.pres.pres = PRSNT_NODEF;
+
+        if(!is_rtp){
+            /* IF ADD request is for Physical term then we can simply copy incoming
+             * termination */
+            mgUtlAllocMgMgcoTermIdLst(&rsp.u.mgCmdRsp[0]->u.add.termIdLst, &inc_cmd->u.mgCmdReq[0]->cmd.u.add.termIdLst);
+
+#ifdef GCP_VER_2_1
+            out_termId = rsp.u.mgCmdRsp[0]->u.add.termIdLst.terms[0];
+#else
+            out_termId = &(rsp.u.mgCmdRsp[0]->u.add.termId);
+#endif
+        }else{
+            /* ADD request is for RTP term we need to create termination */ 
+
+            /* Grow the list of reply parameters */
+            if (mgUtlGrowList((void ***)&rsp.u.mgCmdRsp[0]->u.add.termIdLst.terms, sizeof(MgMgcoTermId),
+                        &rsp.u.mgCmdRsp[0]->u.add.termIdLst.num, &rsp.u.mgCmdRsp[0]->memCp) != ROK)
+            {
+                switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"Grow List failed\n");
+                return SWITCH_STATUS_FALSE;
+            }
+
+            out_termId = rsp.u.mgCmdRsp[0]->u.add.termIdLst.terms[rsp.u.mgCmdRsp[0]->u.add.termIdLst.num.val-1];
+            mg_fill_mgco_termid(out_termId, (char*)rtp_term_name, strlen((char*)rtp_term_name), &rsp.u.mgCmdRsp[0]->memCp);
+        }
+
+        /* Whatever Media descriptor we have received, we can copy that and then
+         * whatever we want we can modify the fields */
+        /* Kapil - TODO - will see if there is any problem of coping the
+         * descriptor */
+
+        if (mgUtlGrowList((void ***)&rsp.u.mgCmdRsp[0]->u.add.audit.parms, sizeof(MgMgcoAudRetParm),
+                    &rsp.u.mgCmdRsp[0]->u.add.audit.num, &rsp.u.mgCmdRsp[0]->memCp) != ROK)
+        {
+            switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"Grow List failed\n");
+            return SWITCH_STATUS_FALSE;
+        }
+
+        /* copy media descriptor */
+
+        desc = rsp.u.mgCmdRsp[0]->u.add.audit.parms[rsp.u.mgCmdRsp[0]->u.add.audit.num.val-1];
+        desc->type.pres = PRSNT_NODEF;
+        desc->type.val = MGT_MEDIADESC;
+        mgUtlCpyMgMgcoMediaDesc(&desc->u.media, inc_med_desc, &rsp.u.mgCmdRsp[0]->memCp);
+
+#if 0
+
+        /* Most probably we need to add local descriptor */
+        {
+            MgMgcoStreamDesc *stream;
+            MgMgcoLocalDesc   *local; 
+            MgMgcoRemoteDesc*  remote;
+            CmSdpInfoSet *psdp;
+            CmSdpInfoSet *prsdp;
+            char* ipAddress = "192.168.1.1";
+
+            /* TODO - considering only one descriptor*/
+            stream = &desc->u.media.parms[0]->u.stream;
+            local  = &stream->sl.local;
+            remote = &stream->sl.remote;
+
+            if(!local->pres.pres) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, " Local stream media not present adding it \n");
+                local->pres.pres = PRSNT_NODEF;
+                psdp = &(local->sdp);
+                prsdp = &(remote->sdp);
+
+                if (mgUtlGrowList((void ***)&psdp->info, sizeof(CmSdpInfo),
+                            &psdp->numComp, &rsp.u.mgCmdRsp[0]->memCp) != ROK)
+                {
+                    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"Grow List failed\n");
+                    return SWITCH_STATUS_FALSE;
+                }
+
+                psdp->info[0]->pres.pres = PRSNT_NODEF;
+
+                /* fill version */
+                memcpy(&psdp->info[0]->ver, &prsdp->info[0]->ver, sizeof(TknU16)); 
+
+                /* fill orig */
+                MG_SET_VAL_PRES( (psdp->info[0]->orig.orig.sdpAddr.u.ip4.u.ip.b[0]), ipAddress[0]);
+                MG_SET_VAL_PRES( (psdp->info[0]->orig.orig.sdpAddr.u.ip4.u.ip.b[1]), ipAddress[1]);
+                MG_SET_VAL_PRES( (psdp->info[0]->orig.orig.sdpAddr.u.ip4.u.ip.b[2]), ipAddress[2]);
+                MG_SET_VAL_PRES( (psdp->info[0]->orig.orig.sdpAddr.u.ip4.u.ip.b[3]), ipAddress[3]);
+
+                /* fill session name */
+                memcpy(&psdp->info[0]->sessName, &prsdp->info[0]->sessName, sizeof(TknStrOSXL));
+
+                /* fill info */
+                MG_SET_VAL_PRES( (psdp->info[0]->conn.u.ip4.u.uniIp.b[0]), ipAddress[0]);
+                MG_SET_VAL_PRES( (psdp->info[0]->conn.u.ip4.u.uniIp.b[1]), ipAddress[1]);
+                MG_SET_VAL_PRES( (psdp->info[0]->conn.u.ip4.u.uniIp.b[2]), ipAddress[2]);
+                MG_SET_VAL_PRES( (psdp->info[0]->conn.u.ip4.u.uniIp.b[3]), ipAddress[3]);
+
+                /* Fill the SDP Connection Info */
+                /* "c=" line - ipaddress */
+                memcpy(&psdp->info[0]->conn, &prsdp->info[0]->conn, sizeof(CmSdpConn));
+
+                /* fill media descriptors */
+                {
+                    CmSdpMediaDescSet* med = &psdp->mediaDescSet;
+                    CmSdpMediaDesc*    m;
+
+                    if (mgUtlGrowList((void ***)&med->mediaDesc, sizeof(CmSdpMediaDesc),
+                                &med->numComp, &rsp.u.mgCmdRsp[0]->memCp) != ROK)
+                    {
+                        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"Grow List failed\n");
+                        return SWITCH_STATUS_FALSE;
+                    }
+                }
+
+                m = med->mediaDesc[0];
+
+                m->pres.pres = PRSNT_NODEF;
+            }
+            else {
+                printf("!local->pres.pres false \n");
+            }
+        }
+#endif
+
+
+
+        /* We will always send one command at a time..*/
+        rsp.cmdStatus.pres = PRSNT_NODEF;
+        rsp.cmdStatus.val  = CH_CMD_STATUS_END_OF_CMD;
+
+        rsp.cmdType.pres = PRSNT_NODEF;
+        rsp.cmdType.val  = CH_CMD_TYPE_RSP;
+
+        ret = sng_mgco_send_cmd( mg_profile->idx, &rsp);
+
+        return ret;
+
+    }
+    /* sample resp code -- end */
+    /*************************************************************************************************************************/
+
 
     return SWITCH_STATUS_SUCCESS;	
 error:
@@ -361,6 +548,10 @@ switch_status_t handle_mg_modify_cmd(megaco_profile_t* mg_profile, MgMgcoCommand
 	/********************************************************************/
 
 
+	/* Media Descriptor processing same as ADD command */
+
+	/* TODO - Will see If we can have common media_descriptor processing API which we can use for both ADD/MODIFY */
+
 	for (descId = 0; descId < cmd->dl.num.val; descId++) {
 		switch (cmd->dl.descs[descId]->type.val) {
 			case MGT_MEDIADESC:
@@ -544,6 +735,147 @@ error:
 	return SWITCH_STATUS_FALSE;	
 }
 
+/*****************************************************************************************************************************/
+
+/*
+*
+*       Fun:  handle_mg_subtract_cmd
+*
+*       Desc: this api will handle the Subtract request received from MG stack 
+*
+*
+*/
+switch_status_t handle_mg_subtract_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *inc_cmd)
+{
+    MgMgcoContextId  *ctxtId;
+    MgStr      	  errTxt;
+    MgMgcoInd  	  *mgErr;
+    MgMgcoTermId     *termId;
+    MgMgcoTermIdLst*  termLst;
+    int 		  err_code;
+    MgMgcoAmmReq 	  *cmd = &inc_cmd->u.mgCmdInd[0]->cmd.u.add;
+    U32 		   txn_id = inc_cmd->transId.val;
+    mg_context_t* mg_ctxt;
+    uint8_t        wild = 0x00;
+
+    wild = inc_cmd->u.mgCmdReq[0]->wild.pres;
+
+
+    /********************************************************************/
+    ctxtId  = &inc_cmd->contextId;
+    termLst = mg_get_term_id_list(inc_cmd);
+    termId  = termLst->terms[0];
+
+    /********************************************************************/
+    /* Validating Subtract request *******************************************/
+
+    /*-- NULL Context & CHOOSE Context not applicable for SUB request --*/
+    if ((NOTPRSNT != ctxtId->type.pres)          &&
+            ((MGT_CXTID_CHOOSE == ctxtId->type.val)     ||
+             (MGT_CXTID_NULL == ctxtId->type.val))) {
+
+        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," SUB Request processing failed, Context CHOOSE/NULL not allowed\n");
+
+        mg_util_set_ctxt_string(&errTxt, ctxtId);
+        err_code = MGT_MGCO_RSP_CODE_PROT_ERROR;
+        goto error;
+    }
+    /* ROOT Termination & CHOOSE Termination not allowed */
+    else if ((NOTPRSNT != termId->type.pres)            &&
+            ((MGT_TERMID_ROOT == termId->type.val)     ||
+             (MGT_TERMID_CHOOSE == termId->type.val))) {
+
+        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," SUB Request processing failed, Termination ROOT/CHOOSE not allowed\n");
+
+        mg_util_set_term_string(&errTxt,termId);
+        err_code = MGT_MGCO_RSP_CODE_INVLD_IDENTIFIER;
+        goto error;
+    }
+
+
+    /********************************************************************/
+    /* Matt - TODO - check if we have terminations in the context */
+
+    /* Matt to indicate ERROR - If there is no terminations in requested context */ 
+
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Received context_id[%d]\n", ctxtId->val.val);
+
+    /*find context based on received context-id */
+    mg_ctxt = megaco_get_context(mg_profile, ctxtId->val.val);
+
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Found Context[%p] for context_id[%d]\n", (void*)mg_ctxt, mg_ctxt->context_id);
+
+    /* TODO - remove terminations from context....as if now there is no termination associated with Context */
+
+    /* release context*/
+    megaco_release_context(mg_ctxt);
+
+    /*************************************************************************************************************************/
+    /* resp code -- begin */
+    {
+        MgMgcoCommand  rsp;
+        int ret = 0x00;
+        MgMgcoTermId  *out_termId;
+
+        memset(&rsp,0, sizeof(rsp));
+
+        /*copy transaction-id*/
+        memcpy(&rsp.transId, &inc_cmd->transId, sizeof(MgMgcoTransId));
+
+        /*copy context-id*/
+        memcpy(&rsp.contextId, &inc_cmd->contextId, sizeof(MgMgcoContextId));
+
+        /*copy peer identifier */
+        memcpy(&rsp.peerId, &inc_cmd->peerId,sizeof(TknU32));
+
+        /*fill response structue */
+        if(SWITCH_STATUS_FALSE == (ret = mg_stack_alloc_mem((Ptr*)&rsp.u.mgCmdRsp[0],sizeof(MgMgcoCmdReply)))){
+            return ret;
+        }
+
+        rsp.u.mgCmdRsp[0]->pres.pres = PRSNT_NODEF;
+        rsp.u.mgCmdRsp[0]->type.pres = PRSNT_NODEF;
+        rsp.u.mgCmdRsp[0]->type.val  = MGT_SUB;
+        rsp.u.mgCmdRsp[0]->u.sub.pres.pres = PRSNT_NODEF;
+
+        if(wild){
+            rsp.u.mgCmdRsp[0]->wild.pres = PRSNT_NODEF;
+        }
+
+        mgUtlAllocMgMgcoTermIdLst(&rsp.u.mgCmdRsp[0]->u.add.termIdLst, &inc_cmd->u.mgCmdReq[0]->cmd.u.add.termIdLst);
+
+#ifdef GCP_VER_2_1
+        out_termId = rsp.u.mgCmdRsp[0]->u.add.termIdLst.terms[0];
+#else
+        out_termId = &(rsp.u.mgCmdRsp[0]->u.add.termId);
+#endif
+
+        /* We will always send one command at a time..*/
+        rsp.cmdStatus.pres = PRSNT_NODEF;
+        rsp.cmdStatus.val  = CH_CMD_STATUS_END_OF_CMD;
+
+        rsp.cmdType.pres = PRSNT_NODEF;
+        rsp.cmdType.val  = CH_CMD_TYPE_RSP;
+
+        ret = sng_mgco_send_cmd( mg_profile->idx, &rsp);
+
+        return ret;
+
+    }
+    /* sample resp code -- end */
+    /*************************************************************************************************************************/
+
+
+    return SWITCH_STATUS_SUCCESS;	
+error:
+    if (SWITCH_STATUS_SUCCESS == 
+            mg_build_mgco_err_request(&mgErr, txn_id, ctxtId, err_code, &errTxt)) {
+        sng_mgco_send_err(mg_profile->idx, mgErr);
+    }
+    mg_free_cmd(cmd);
+    return SWITCH_STATUS_FALSE;	
+}
+
 /*****************************************************************************************************************************/
 /*
 *

src/mod/endpoints/mod_media_gateway/media_gateway_packages.c

@@ -47,10 +47,11 @@ MgPackage_t mg_pkg_list [] =
       1,              /* Version 1 */
       "tdmc",                 /* Package name */
    },
+   /* TODO - not sure IF we need this */
    {  /* INDEX : 7 */
-      MGT_PKG_QTY_ALT,        /*55*/  
+      MGT_PKG_SEGMENTATION,    
       1,              /* Version 1 */
-      "qac",                  /* Package name */
+      "seg",                  /* Package name */
    },
    {  /* INDEX : 8 */
       MGT_PKG_EN_ALERT,       /*59*/  
@@ -58,9 +59,9 @@ MgPackage_t mg_pkg_list [] =
       "alert",                /* Package name */
    },
    {  /* INDEX : 9 */
-      MGT_PKG_AN_DISP,        /*60*/  
+      MGT_PKG_CONTINUITY,        /*60*/  
       2,              /* Version 1 */
-      "andisp",               /* Package name */
+      "ct",               /* Package name */
    },
    {  /* INDEX : 10 */
       MGT_PKG_INACTTIMER,     /*69*/  
@@ -97,6 +98,31 @@ MgPackage_t mg_pkg_list [] =
       1,              /* Version 1 */
       "etsi_nr",              /* Package name */
    },
+   {  /* INDEX : 17 */
+      MGT_PKG_TONEGEN,
+      1,              /* Version 1 */
+      "tonegen",              /* Package name */
+   },
+   {  /* INDEX : 18 */
+      MGT_PKG_DTMFGEN,
+      1,              /* Version 1 */
+      "tonegen",              /* Package name */
+   },
+   {  /* INDEX : 19 */
+      MGT_PKG_CALLPROGGEN,
+      1,              /* Version 1 */
+      "tonegen",              /* Package name */
+   },
+   {  /* INDEX : 20 */
+      MGT_PKG_CALLPROGDET,
+      1,              /* Version 1 */
+      "tonedet",              /* Package name */
+   },
+   {  /* INDEX : 21 */
+      MGT_PKG_ANALOG,
+      1,              /* Version 1 */
+      "analog",              /* Package name */
+   },
   /* Add more packages */
 };
 

src/mod/endpoints/mod_media_gateway/media_gateway_stack.h

@@ -133,7 +133,8 @@ int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, megaco_profile_t* mg_cfg, m
 switch_status_t mg_send_end_of_axn(SuId suId, MgMgcoTransId* transId, MgMgcoContextId* ctxtId, TknU32* peerId);
 void mgco_print_sdp(CmSdpInfoSet *sdp);
 void mg_util_set_ctxt_string ( MgStr  *errTxt, MgMgcoContextId     *ctxtId);
-switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *cmd);
+switch_status_t handle_mg_add_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *inc_cmd, MgMgcoContextId* new_ctxtId);
+switch_status_t handle_mg_subtract_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *inc_cmd);
 switch_status_t handle_mg_modify_cmd(megaco_profile_t* mg_profile, MgMgcoCommand *cmd);
 switch_status_t mg_stack_free_mem(void* msg);
 switch_status_t mg_stack_alloc_mem( Ptr* _memPtr, Size _memSize );

src/mod/endpoints/mod_media_gateway/mod_media_gateway.c

@@ -424,6 +424,7 @@ void handle_mgco_txn_ind(Pst *pst, SuId suId, MgMgcoMsg* msg)
 /*****************************************************************************************************************************/
 void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 {
+	MgMgcoContextId  out_ctxt;
 	U32 txn_id = 0x00;
 	MgMgcoInd  *mgErr;
 	MgStr      errTxt;
@@ -435,6 +436,8 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 	int 		  err_code;
 	megaco_profile_t* mg_profile;
 
+    memset(&out_ctxt,0,sizeof(out_ctxt));
+
 	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 */
@@ -532,6 +535,8 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 		goto error1;
 	}
 
+    memcpy(&out_ctxt, inc_context,sizeof(MgMgcoContextId));
+
 	switch(cmd->cmdType.val)
 	{
 		case CH_CMD_TYPE_IND:
@@ -543,8 +548,8 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 				{
 					case MGT_ADD:
 						{
-							handle_mg_add_cmd(mg_profile, cmd);
+							handle_mg_add_cmd(mg_profile, cmd, &out_ctxt);
-							mg_send_add_rsp(suId, cmd);
+							/*mg_send_add_rsp(suId, cmd);*/
 							break;
 						}
 
@@ -565,7 +570,8 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 					case MGT_SUB:
 						{
 							/*MgMgcoSubAudReq *addReq = &cmdReq->cmd.u.sub;*/
-							mg_send_subtract_rsp(suId, cmd);
+							handle_mg_subtract_cmd(mg_profile, cmd);
+							/*mg_send_subtract_rsp(suId, cmd);*/
 							break;
 						}
 					case MGT_SVCCHG:
@@ -613,6 +619,12 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
 			return;
 	}
 
+    /* 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){
+        mg_send_end_of_axn(suId, &cmd->transId, &out_ctxt, &cmd->peerId);
+    }
+
 	return;
 
 ctxt_error: