diff options
| author | Benny Prijono <bennylp@teluu.com> | 2011-10-28 04:10:00 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2011-10-28 04:10:00 +0000 |
| commit | 10207d9131c6a715910b119de003882fe06a3133 (patch) | |
| tree | f8dbb8213e974d42b9209653a4804c6706834722 | |
| parent | 17b5c995b10b37079298257932f95272f56fda96 (diff) | |
Misc (re #13930; added info about ICE candidates being used (both local and remote) in pjsua dump call output
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3870 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia/config.h | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_dump.c | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 60930818..e8e7f807 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -863,7 +863,7 @@ * Maximum size in bytes of storage buffer of a transport specific info. */ #ifndef PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE -# define PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE (16*sizeof(long)) +# define PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE (36*sizeof(long)) #endif diff --git a/pjsip/src/pjsua-lib/pjsua_dump.c b/pjsip/src/pjsua-lib/pjsua_dump.c index e109fde3..7279e512 100644 --- a/pjsip/src/pjsua-lib/pjsua_dump.c +++ b/pjsip/src/pjsua-lib/pjsua_dump.c @@ -391,6 +391,7 @@ static void dump_media_session(const char *indent, } } else if (tp_info.spc_info[j].type==PJMEDIA_TRANSPORT_TYPE_ICE) { const pjmedia_ice_transport_info *ii; + unsigned jj; ii = (const pjmedia_ice_transport_info*) tp_info.spc_info[j].buffer; @@ -406,6 +407,32 @@ static void dump_media_session(const char *indent, *p++ = '\n'; *p = '\0'; } + + for (jj=0; ii->sess_state==PJ_ICE_STRANS_STATE_RUNNING && jj<2; ++jj) { + const char *type1 = pj_ice_get_cand_type_name(ii->comp[jj].lcand_type); + const char *type2 = pj_ice_get_cand_type_name(ii->comp[jj].rcand_type); + char addr1[PJ_INET6_ADDRSTRLEN+10]; + char addr2[PJ_INET6_ADDRSTRLEN+10]; + const char *comp_name[2] = {"rtp ", "rtcp"}; + + if (pj_sockaddr_has_addr(&ii->comp[jj].lcand_addr)) + pj_sockaddr_print(&ii->comp[jj].lcand_addr, addr1, sizeof(addr1), 3); + else + strcpy(addr1, "0.0.0.0:0"); + if (pj_sockaddr_has_addr(&ii->comp[jj].rcand_addr)) + pj_sockaddr_print(&ii->comp[jj].rcand_addr, addr2, sizeof(addr2), 3); + else + strcpy(addr2, "0.0.0.0:0"); + len = pj_ansi_snprintf(p, end-p, + " %s [%d]: L:%s (%c) --> R:%s (%c)\n", + indent, jj, + addr1, type1[0], + addr2, type2[0]); + if (len > 0 && len < end-p) { + p += len; + *p = '\0'; + } + } } } } |