From 67373e787dff34a649163b9d258047956637a377 Mon Sep 17 00:00:00 2001 From: kapil Date: Mon, 4 Jun 2012 22:48:12 +0530 Subject: [PATCH] fixing ip address cli print --- src/mod/endpoints/mod_megaco/megaco_stack.c | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/mod/endpoints/mod_megaco/megaco_stack.c b/src/mod/endpoints/mod_megaco/megaco_stack.c index 5036797ddb..74874e75d5 100644 --- a/src/mod/endpoints/mod_megaco/megaco_stack.c +++ b/src/mod/endpoints/mod_megaco/megaco_stack.c @@ -1205,7 +1205,7 @@ void handle_mg_alarm(Pst *pst, MgMngmt *usta) { U16 ret; int len = 0x00; - char prBuf[10024]; + char prBuf[3048]; memset(&prBuf[0], 0, sizeof(prBuf)); @@ -1826,6 +1826,8 @@ switch_status_t megaco_profile_xmlstatus(switch_stream_handle_t *stream, const c sng_mg_cfg_t* mgCfg = NULL; sng_mg_peer_t* mgPeer = NULL; int i = 0x00; + char *asciiAddr; + CmInetIpAddr ip; switch_assert(profilename); @@ -1845,7 +1847,6 @@ switch_status_t megaco_profile_xmlstatus(switch_stream_handle_t *stream, const c len = len + sprintf(&prntBuf[0] + len,"%s\n",xmlhdr); - len = len + sprintf(&prntBuf[0] + len,"\n"); len = len + sprintf(&prntBuf[0] + len,"%s\n",mgCfg->name); len = len + sprintf(&prntBuf[0] + len,"%s\n",profilename); @@ -1889,7 +1890,9 @@ switch_status_t megaco_profile_xmlstatus(switch_stream_handle_t *stream, const c { case CM_NETADDR_IPV4: { - len = len + sprintf(prntBuf+len, "%lu\n", (long unsigned int)(cfm.t.ssta.s.mgSSAPSta.peerInfo[i].dname.netAddr.u.ipv4NetAddr)); + ip = ntohl(cfm.t.ssta.s.mgSSAPSta.peerInfo[i].dname.netAddr.u.ipv4NetAddr); + cmInetNtoa(ip, &asciiAddr); + len = len + sprintf(prntBuf+len, "%s\n",asciiAddr); break; } default: @@ -1939,8 +1942,9 @@ switch_status_t megaco_profile_xmlstatus(switch_stream_handle_t *stream, const c } case CM_TPTADDR_IPV4: { - len = len + sprintf(prntBuf+len, "IPv4 IP address #%lu, port %u", - (unsigned long)(cfm.t.ssta.s.mgTptSrvSta.tptAddr.u.ipv4TptAddr.address), + ip = ntohl(cfm.t.ssta.s.mgTptSrvSta.tptAddr.u.ipv4TptAddr.address); + cmInetNtoa(ip, &asciiAddr); + len = len + sprintf(prntBuf+len, "IPv4 IP address #%s, port %u",asciiAddr, (unsigned int)(cfm.t.ssta.s.mgTptSrvSta.tptAddr.u.ipv4TptAddr.port)); break; @@ -1967,6 +1971,9 @@ void get_peer_xml_buffer(char* prntBuf, MgPeerSta* cfm) { int len = 0x00; int i = 0x00; + char *asciiAddr; + CmInetIpAddr ip; + if(PRSNT_NODEF == cfm->namePres.pres) { len = len + sprintf(prntBuf+len, " %s \n", (char *)(cfm->name)); @@ -1985,8 +1992,9 @@ void get_peer_xml_buffer(char* prntBuf, MgPeerSta* cfm) { case CM_NETADDR_IPV4: { - len = len + sprintf(prntBuf+len, "%lu\n", (unsigned long) - (cfm->peerAddrTbl.netAddr[i].u.ipv4NetAddr)); + ip = ntohl(cfm->peerAddrTbl.netAddr[i].u.ipv4NetAddr); + cmInetNtoa(ip, &asciiAddr); + len = len + sprintf(prntBuf+len, "%s\n",asciiAddr); break; } case CM_NETADDR_IPV6: