adding code to

  1) parse incoming MODIFY request for ITO package ,
  2) starting timer based on MGC requested time
  3) on expiry generate Inactivity Notify to MGC

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 37effcbe95215a10e0124cbe121b2f201514f91d..ec760398e7749ff8719a53bb58b45c842afc23a6 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
@@ -19,6 +19,159 @@ const char *mg_service_change_reason[] = {
        0
 };
 
+
+/*****************************************************************************************************************************/
+switch_status_t mg_activate_ito_timer(megaco_profile_t* profile)
+{
+
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Starting IT/ITO Timer \n");
+    mg_print_time();
+
+    switch_scheduler_add_task(switch_epoch_time_now(NULL)+profile->inact_tmr, mg_inactivity_timer_exp,"","media_gateway",0,profile,0);
+       return SWITCH_STATUS_SUCCESS;
+}
+
+/*****************************************************************************************************************************/
+static void mg_inactivity_timer_exp(switch_scheduler_task_t *task)
+{
+    megaco_profile_t* profile = (megaco_profile_t*) task->cmd_arg;
+    /* TODO */
+
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," mg_inactivity_timer_exp for profile[%s]\n", profile->name);
+    mg_print_time();
+
+    mg_send_ito_notify(profile);
+
+    /*task->runtime = switch_epoch_time_now(NULL)+100; */ /* interval in seconds */
+}
+
+/*****************************************************************************************************************************/
+switch_status_t mg_is_ito_pkg_req(megaco_profile_t* mg_profile, MgMgcoCommand *cmd)
+{
+    int                  descId = 0x00;
+    MgMgcoAmmReq* desc = NULL;
+
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"cmd->cmdType.val[%d]\n",cmd->cmdType.val);
+
+    if(CH_CMD_TYPE_IND != cmd->cmdType.val)
+        return SWITCH_STATUS_FALSE;
+
+    if(MGT_MODIFY != cmd->u.mgCmdInd[0]->cmd.type.val)
+        return SWITCH_STATUS_FALSE;
+
+    desc = &cmd->u.mgCmdInd[0]->cmd.u.mod;
+
+    if(NULL == desc){
+        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"No Valid descriptor found \n");
+        return SWITCH_STATUS_FALSE;
+    }
+
+    if(NOTPRSNT == desc->dl.num.pres){
+        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"No descriptor found in-coming megaco request \n");
+        return SWITCH_STATUS_SUCCESS;
+    }
+
+
+    for (descId = 0; descId < desc->dl.num.val; descId++) {
+        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR,"descriptors[%d] type in-coming megaco request \n", desc->dl.descs[descId]->type.val); 
+        switch (desc->dl.descs[descId]->type.val) {
+            case MGT_MEDIADESC:
+                {
+                    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," Media descriptor on ROOT termination..Not Supporting now\n");
+                    break;
+                }
+
+            case MGT_REQEVTDESC:
+                {
+                    MgMgcoReqEvtDesc* evts = &desc->dl.descs[descId]->u.evts; 
+                    MgMgcoEvtPar     *reqEvtPar;
+                    MgMgcoReqEvt     *evt;
+                    int              numEvts = 0;
+                    int              i;
+
+                    /* As of now only handling ito package */
+
+                    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," Requested Event descriptor\n");
+
+                    if (evts->el.num.pres)
+                        numEvts = evts->el.num.val;
+
+                    for (i = 0; i < numEvts; i++)
+                    {
+                        evt = evts->el.revts[i];
+                        if (evt->pl.num.pres)
+                        {
+                            /* Check for the package */
+                            if((MGT_PKG_KNOWN == evt->pkg.valType.val) &&
+                                    (MGT_PKG_INACTTIMER != evt->pkg.u.val.val))
+                            {
+                                continue;
+                            }
+                            else
+                            {
+                                if((MGT_GEN_TYPE_KNOWN == evt->name.type.val) &&
+                                   (MGT_PKG_ENUM_REQEVT_INACTTIMER_INACT_TIMOUT == 
+                                        evt->name.u.val.val)){
+
+                                    if((evt->pl.num.pres != NOTPRSNT) &&
+                                            (evt->pl.num.val != 0)) {
+
+                                        reqEvtPar = evt->pl.parms[0];
+
+                                        if((NULL != reqEvtPar) &&
+                                                (reqEvtPar->type.val == MGT_EVTPAR_OTHER)      &&
+                                                (reqEvtPar->u.other.name.type.pres == PRSNT_NODEF) &&
+                                                (reqEvtPar->u.other.name.type.val == MGT_GEN_TYPE_KNOWN) &&
+                                                (reqEvtPar->u.other.name.u.val.pres == PRSNT_NODEF)  &&
+                                                (reqEvtPar->u.other.name.u.val.val ==
+                                                 MGT_PKG_ENUM_REQEVTOTHER_INACTTIMER_INACT_TIMOUT_MAX_IATIME)&&
+                                                (reqEvtPar->u.other.val.type.pres == PRSNT_NODEF) &&
+                                                (reqEvtPar->u.other.val.type.val == MGT_VALUE_EQUAL) &&
+                                                (reqEvtPar->u.other.val.u.eq.type.pres == PRSNT_NODEF) &&
+                                                (reqEvtPar->u.other.val.u.eq.type.val == MGT_VALTYPE_UINT32))
+                                        {
+                                            switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO," Received Inactivity timer value [%d]\n", 
+                                                    reqEvtPar->u.other.val.u.eq.u.decInt.val); 
+
+                                            mg_profile->inact_tmr = reqEvtPar->u.other.val.u.eq.u.decInt.val/MG_INACTIVITY_TMR_RESOLUTION;
+
+                                            if(0 == mg_profile->inact_tmr){
+                                                /* value ZERO means MGC wantes  to disable ito timer */
+
+                                                /* TODO - check and stop  currently running ito timer  */
+                                            } else {
+                                                mg_activate_ito_timer(mg_profile);
+                                            }
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    break;
+                }
+            case MGT_SIGNALSDESC:
+                {
+                    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR," Signal descriptor on ROOT termination..Not Supporting now\n");
+                    break;
+                }
+            case MGT_MODEMDESC:
+            case MGT_MUXDESC:
+            case MGT_EVBUFDESC:
+            case MGT_DIGMAPDESC:
+            case MGT_AUDITDESC:
+            case MGT_STATSDESC:
+                break;
+
+        }
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+
 /*****************************************************************************************************************************/
 
 /*
@@ -773,6 +926,10 @@ switch_status_t handle_mg_modify_cmd(megaco_profile_t* mg_profile, MgMgcoCommand
     if(MGT_TERMID_ROOT == termId->type.val){
         switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO,
                 "Modify request is for ROOT termination \n");
+
+        /* check if we have ito packg request */
+        mg_is_ito_pkg_req(mg_profile, inc_cmd);
+
         /* TODO */
 
        /********************************************************************/

diff --git a/src/mod/endpoints/mod_media_gateway/media_gateway_stack.h b/src/mod/endpoints/mod_media_gateway/media_gateway_stack.h
index d5b82a5b54018b974de9d424c020f305d8595148..37c1c321ebe8ccba0f5c840f2cdbfcb2e1f18c53 100644 (file)
--- a/src/mod/endpoints/mod_media_gateway/media_gateway_stack.h
+++ b/src/mod/endpoints/mod_media_gateway/media_gateway_stack.h
@@ -13,6 +13,8 @@
 
 #define MAX_MID_LEN    30
 
+#define MG_INACTIVITY_TMR_RESOLUTION   100          /* mit in ito package is experessed in 10ms steps */
+
 typedef enum{
         SNG_MG_TPT_NONE,
         SNG_MG_TPT_UDP,
@@ -147,6 +149,7 @@ switch_status_t sng_mgco_init(sng_mg_event_interface_t* event);
 switch_status_t sng_mgco_stack_shutdown(void);
 int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, megaco_profile_t* mg_cfg, mg_peer_profile_t* mg_peer);
 
+switch_status_t mg_is_ito_pkg_req(megaco_profile_t* mg_profile, MgMgcoCommand *cmd);
 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);
@@ -185,6 +188,8 @@ switch_status_t  mg_send_notify(megaco_profile_t* mg_profile, const char* term_n
 switch_status_t  mg_send_dtmf_notify(megaco_profile_t* mg_profile, const char* term_name, char* digits, int num_of_collected_digits);
 switch_status_t  mg_send_ito_notify(megaco_profile_t* mg_profile);
 switch_status_t  mg_util_build_obs_evt_desc (MgMgcoObsEvt *obs_event, MgMgcoRequestId *request_id, MgMgcoObsEvtDesc **ptr_obs_desc);
+void mg_print_time();
+switch_status_t mg_activate_ito_timer(megaco_profile_t* profile);
 
 
 

diff --git a/src/mod/endpoints/mod_media_gateway/media_gateway_utils.c b/src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
index e8788ea6f275c11befbd025aadb2598a826d5d6b..4e4d34b73656e767e097e54b7d5e0dbc4eefbe16 100644 (file)
--- a/src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
+++ b/src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
@@ -1405,3 +1405,11 @@ switch_status_t  mg_util_build_obs_evt_desc (MgMgcoObsEvt *obs_event, MgMgcoRequ
    return SWITCH_STATUS_SUCCESS;
 }
 /*****************************************************************************************************************************/
+void mg_print_time()
+{
+    time_t now;
+    time(&now);
+
+    switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO,"Current Time = %s", ctime(&now));
+}
+/*****************************************************************************************************************************/

diff --git a/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h b/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
index f5f83c6dd608abe47b6ddce9ee2434dff0cf32c2..050ffcbad3659b4925e0e224c1802615258673d4 100644 (file)
--- a/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
+++ b/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
@@ -15,6 +15,7 @@
 
 #define MG_MAX_PEERS    5
 
+
 #define MG_CONTEXT_MAX_TERMS 3
 
 #define MEGACO_CLI_SYNTAX "profile|logging"
@@ -149,6 +150,7 @@ struct megaco_profile_s {
        char*                                   rtp_termination_id_prefix;
        int                                             rtp_termination_id_len;
        char*                   peer_list[MG_MAX_PEERS];     /* MGC Peer ID LIST */
+       int                                             inact_tmr;                   /* inactivity timer value */
     
     switch_thread_rwlock_t  *contexts_rwlock;
     uint32_t next_context_id;