adding status CLI command to fetch peer/sap/transport-server information from Trilliu...

diff --git a/src/mod/endpoints/mod_megaco/megaco_stack.c b/src/mod/endpoints/mod_megaco/megaco_stack.c
index 516d857ec9c9953c188959592dc1a7aa86b945ab..e5572c19ef8d59327ac7516b5afe694b73f56bab 100644 (file)
--- a/src/mod/endpoints/mod_megaco/megaco_stack.c
+++ b/src/mod/endpoints/mod_megaco/megaco_stack.c
@@ -1675,3 +1675,141 @@ void handle_tucl_alarm(Pst *pst, HiMngmt *sta)
 }   /* handle_sng_tucl_alarm */
 /******************************************************************************/
 
+int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, int mg_cfg_idx)
+{
+       Pst pst;
+       MgMngmt cntrl;
+       sng_mg_cfg_t*  mgCfg  = &megaco_globals.g_mg_cfg.mgCfg[mg_cfg_idx];
+       sng_mg_peer_t*  mgPeer = &megaco_globals.g_mg_cfg.mgPeer.peers[mgCfg->peer_id];
+       CmInetIpAddr   ipAddr = 0;
+
+       memset((U8 *)&pst, 0, sizeof(Pst));
+       memset((U8 *)&cntrl, 0, sizeof(MgCntrl));
+
+       smPstInit(&pst);
+
+       pst.dstEnt = ENTMG;
+
+       /* prepare header */
+       /*cntrl.hdr.msgType     = TCNTRL;  */       /* message type */
+       cntrl.hdr.entId.ent   = ENTMG;          /* entity */
+       cntrl.hdr.entId.inst  = 0;              /* instance */
+       cntrl.hdr.elmId.elmnt = elemId;       /* General */
+
+       cntrl.hdr.response.selector    = 0;
+       cntrl.hdr.response.prior       = PRIOR0;
+       cntrl.hdr.response.route       = RTESPEC;
+       cntrl.hdr.response.mem.region  = S_REG;
+       cntrl.hdr.response.mem.pool    = S_POOL;
+
+       switch(elemId)
+       {
+               case STGCPENT:
+                       {
+                               cntrl.t.ssta.s.mgPeerSta.peerId.pres = PRSNT_NODEF;
+                               cntrl.t.ssta.s.mgPeerSta.peerId.val = mgCfg->peer_id;
+
+                               cntrl.t.ssta.s.mgPeerSta.mid.pres = PRSNT_NODEF;
+                               cntrl.t.ssta.s.mgPeerSta.mid.len  = strlen((char*)mgPeer->mid);
+                               cmMemcpy((U8 *)cntrl.t.ssta.s.mgPeerSta.mid.val, 
+                                               (CONSTANT U8*)(char*)mgPeer->mid, 
+                                               cntrl.t.ssta.s.mgPeerSta.mid.len);      
+                               break;
+                       }
+               case STSSAP:
+                       {
+                               cntrl.t.ssta.s.mgSSAPSta.sapId = mgCfg->id; 
+                               break;
+                       }
+               case STTSAP:
+                       {
+                               cntrl.t.ssta.s.mgTSAPSta.tSapId = GET_TPT_ID(mg_cfg_idx);
+                               break;
+                       }
+               case STSERVER:
+                       {
+                               cntrl.t.ssta.s.mgTptSrvSta.tptAddr.type =  CM_INET_IPV4ADDR_TYPE;
+                               cntrl.t.ssta.s.mgTptSrvSta.tptAddr.u.ipv4TptAddr.port = ntohl(ipAddr);
+                               if(ROK == cmInetAddr((S8*)mgCfg->my_ipaddr, &ipAddr))
+                               {
+                                       cntrl.t.ssta.s.mgTptSrvSta.tptAddr.u.ipv4TptAddr.address = ntohl(ipAddr);
+                               }
+
+
+                               break;
+                       }
+               default:
+                       break;
+       }
+
+       return (sng_sta_mg (&pst, &cntrl, cfm));
+}
+/******************************************************************************/
+switch_status_t megaco_profile_status(switch_stream_handle_t *stream, const char* profilename)
+{
+       int idx   = 0x00;
+       int len   = 0x00;
+       MgMngmt   cfm;
+       char      prntBuf[1024];
+
+       switch_assert(profilename);
+
+       memset((U8 *)&cfm, 0, sizeof(cfm));
+       memset((char *)&prntBuf, 0, sizeof(prntBuf));
+
+       GET_MG_CFG_IDX(profilename, idx);
+
+       if(!idx || (idx == MAX_MG_PROFILES)){
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR," No MG configuration found against profilename[%s]\n",profilename);
+               return SWITCH_STATUS_FALSE;
+       }
+
+       /*stream->write_function(stream, "Collecting MG Profile[%s] status... \n",profilename);*/
+
+       /* Fetch data from Trillium MEGACO Stack        *
+        * SystemId - Software version information      *
+        * SSAP     - MG SAP Information                *
+        * TSAP     - MG Transport SAP Information      *
+        * Peer     - MG Peer Information               *
+        * TPT-Server - MG Transport Server information *
+        */ 
+
+#if 0
+       /* get System ID */
+       sng_mgco_mg_get_status(STSID, &cfm, idx);
+       stream->write_function(stream, "***********************************************\n");
+       stream->write_function(stream, "**** TRILLIUM MEGACO Software Information *****\n");
+       stream->write_function(stream, "Version           = %d \n", cfm.t.ssta.s.systemId.mVer);
+       stream->write_function(stream, "Version Revision  = %d \n", cfm.t.ssta.s.systemId.mRev);
+       stream->write_function(stream, "Branch  Version   = %d \n", cfm.t.ssta.s.systemId.bVer);
+       stream->write_function(stream, "Branch  Revision  = %d \n", cfm.t.ssta.s.systemId.bRev);
+       stream->write_function(stream, "Part    Number    = %d \n", cfm.t.ssta.s.systemId.ptNmb);
+       stream->write_function(stream, "***********************************************\n");
+#endif
+
+       /* MG Peer Information */
+       sng_mgco_mg_get_status(STGCPENT, &cfm, idx);
+       smmgPrntPeerSta(&cfm.t.ssta.s.mgPeerSta);
+
+       /* MG Peer Information */
+       sng_mgco_mg_get_status(STSSAP, &cfm, idx);
+       smmgPrntSsapSta(&cfm.t.ssta.s.mgSSAPSta);
+
+       /* MG Transport SAP Information */
+       sng_mgco_mg_get_status(STTSAP, &cfm, idx);
+       len = len + sprintf(prntBuf+len,"***********************************************\n"); 
+       len = len + sprintf(prntBuf+len,"**********MG TRANSPORT SAP Information**********\n");
+       len = len + sprintf(prntBuf+len,"TSAP status:\n");
+       len = len + sprintf(prntBuf+len,"state = %d, number of listeners %u\n",
+                       (int)(cfm.t.ssta.s.mgTSAPSta.state),
+                       (unsigned int)(cfm.t.ssta.s.mgTSAPSta.numServers));
+       len = len + sprintf(prntBuf+len,"***********************************************\n"); 
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,"%s\n",prntBuf); 
+
+       /* MG Transport Server Information */
+       sng_mgco_mg_get_status(STSERVER, &cfm, idx);
+       smmgPrntSrvSta(&cfm.t.ssta.s.mgTptSrvSta);
+
+       return SWITCH_STATUS_SUCCESS;
+}
+/******************************************************************************/

diff --git a/src/mod/endpoints/mod_megaco/megaco_stack.h b/src/mod/endpoints/mod_megaco/megaco_stack.h
index 64ef1f1ff23042ebc84dd42b588808b7a9268e55..d8a1b55e47a0c2396e8fced55ce015d2ed9a0f30 100644 (file)
--- a/src/mod/endpoints/mod_megaco/megaco_stack.h
+++ b/src/mod/endpoints/mod_megaco/megaco_stack.h
@@ -84,6 +84,7 @@ typedef struct sng_mg_cfg{
 
 
 typedef struct sng_mg_gbl_cfg{
+       int                             num_of_mg_profiles;
        sng_mg_cfg_t                    mgCfg[MAX_MG_PROFILES + 1];
        sng_mg_transport_profile_t      mgTptProf[MG_MAX_PEERS+1];      /* transport profile */
        sng_mg_peers_t                  mgPeer;
@@ -111,6 +112,8 @@ switch_status_t sng_mgco_cfg(const char* profilename);
 switch_status_t sng_mgco_start(const char* profilename);
 switch_status_t sng_mgco_stop(const char* profilename);
 switch_status_t sng_mgco_stack_shutdown(void);
+int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, int mg_cfg_idx);
+switch_status_t megaco_profile_status(switch_stream_handle_t *stream, const char* profilename);
 
 /*****************************************************************************************************/
 

diff --git a/src/mod/endpoints/mod_megaco/mod_megaco.c b/src/mod/endpoints/mod_megaco/mod_megaco.c
index 3d9dc26b8d7ab407021f0b80f99b917263ba0e8e..7bc6320df9b5ba80ebe4a46e2d023edefdfe64ee 100644 (file)
--- a/src/mod/endpoints/mod_megaco/mod_megaco.c
+++ b/src/mod/endpoints/mod_megaco/mod_megaco.c
@@ -16,7 +16,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_megaco_shutdown);
 SWITCH_MODULE_DEFINITION(mod_megaco, mod_megaco_load, mod_megaco_shutdown, NULL);
 
 
-#define MEGACO_FUNCTION_SYNTAX "profile [name] [start | stop]"
+#define MEGACO_FUNCTION_SYNTAX "profile [name] [start | stop] [status]"
 SWITCH_STANDARD_API(megaco_function)
 {
        int argc;
@@ -56,6 +56,13 @@ SWITCH_STANDARD_API(megaco_function)
                        } else {
                                stream->write_function(stream, "-ERR No such profile\n");
                        }
+               }else if(!strcmp(argv[2], "status")) {
+                       megaco_profile_t *profile = megaco_profile_locate(argv[1]);
+                       if (profile) {
+                               megaco_profile_status(stream, profile->name);
+                       } else {
+                               stream->write_function(stream, "-ERR No such profile\n");
+                       }
                }
        }
        
@@ -115,6 +122,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load)
        
        switch_console_set_complete("add megaco profile ::megaco::list_profiles start");
        switch_console_set_complete("add megaco profile ::megaco::list_profiles stop");
+       switch_console_set_complete("add megaco profile ::megaco::list_profiles status");
        switch_console_add_complete_func("::megaco::list_profiles", list_profiles);