kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 12:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Fix mapping of pjsip's ICE roles to ours

Browse Source 
Change-Id: Ia578ede1a55b21014581793992a429441903278b
This commit is contained in:
Sean Bright
2017-07-25 16:17:45 -04:00
parent 1c07c80eef
commit d056f6b2fe
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
res/res_rtp_asterisk.c
View File

@@ -701,6 +701,37 @@ static void ice_wrap_dtor(void *vdoomed)
} }
} }
static void ast2pj_rtp_ice_role(enum ast_rtp_ice_role ast_role, enum pj_ice_sess_role *pj_role)
{
switch (ast_role) {
case AST_RTP_ICE_ROLE_CONTROLLED:
*pj_role = PJ_ICE_SESS_ROLE_CONTROLLED;
break;
case AST_RTP_ICE_ROLE_CONTROLLING:
*pj_role = PJ_ICE_SESS_ROLE_CONTROLLING;
break;
}
}
static void pj2ast_rtp_ice_role(enum pj_ice_sess_role pj_role, enum ast_rtp_ice_role *ast_role)
{
switch (pj_role) {
case PJ_ICE_SESS_ROLE_CONTROLLED:
*ast_role = AST_RTP_ICE_ROLE_CONTROLLED;
return;
case PJ_ICE_SESS_ROLE_CONTROLLING:
*ast_role = AST_RTP_ICE_ROLE_CONTROLLING;
return;
case PJ_ICE_SESS_ROLE_UNKNOWN:
/* Don't change anything */
return;
default:
/* If we aren't explicitly handling something, it's a bug */
ast_assert(0);
return;
}
}
/*! \pre instance is locked */ /*! \pre instance is locked */
static int ice_reset_session(struct ast_rtp_instance *instance) static int ice_reset_session(struct ast_rtp_instance *instance)
{ {
@@ -717,8 +748,9 @@ static int ice_reset_session(struct ast_rtp_instance *instance)
res = ice_create(instance, &rtp->ice_original_rtp_addr, rtp->ice_port, 1); res = ice_create(instance, &rtp->ice_original_rtp_addr, rtp->ice_port, 1);
if (!res) { if (!res) {
/* Use the current expected role for the ICE session */ /* Use the current expected role for the ICE session */
pj_ice_sess_change_role(rtp->ice->real_ice, rtp->role == AST_RTP_ICE_ROLE_CONTROLLED ? enum pj_ice_sess_role role = PJ_ICE_SESS_ROLE_UNKNOWN;
PJ_ICE_SESS_ROLE_CONTROLLED : PJ_ICE_SESS_ROLE_CONTROLLING); ast2pj_rtp_ice_role(rtp->role, &role);
pj_ice_sess_change_role(rtp->ice->real_ice, role);
} }
/* If we only have one component now, and we previously set up TURN for RTCP, /* If we only have one component now, and we previously set up TURN for RTCP,
@@ -790,7 +822,7 @@ static void ast_rtp_ice_start(struct ast_rtp_instance *instance)
ao2_cleanup(rtp->ice_proposed_remote_candidates); ao2_cleanup(rtp->ice_proposed_remote_candidates);
rtp->ice_proposed_remote_candidates = NULL; rtp->ice_proposed_remote_candidates = NULL;
/* If this ICE session is being preserved then go back to the role it currently is */ /* If this ICE session is being preserved then go back to the role it currently is */
rtp->role = rtp->ice->real_ice->role; pj2ast_rtp_ice_role(rtp->ice->real_ice->role, &rtp->role);
return; return;
} }