update ms2 and oRTP, add documentation for zrtp related functions. Fix bug about sesion name not taken into SDP answers.

This commit is contained in:
Simon Morlat 2014-04-01 22:43:23 +02:00
parent 0ceef7f4b9
commit 97ef67377c
4 changed files with 19 additions and 2 deletions

View file

@ -82,6 +82,14 @@ const char* linphone_call_get_authentication_token(LinphoneCall *call){
return call->auth_token;
}
/**
* Returns whether ZRTP authentication token is verified.
* If not, it must be verified by users as described in ZRTP procedure.
* Once done, the application must inform of the results with linphone_call_set_authentication_token_verified().
* @param call the LinphoneCall
* @return TRUE if authentication token is verifed, false otherwise.
* @ingroup call_control
**/
bool_t linphone_call_get_authentication_token_verified(LinphoneCall *call){
return call->auth_token_verified;
}
@ -172,6 +180,13 @@ static void linphone_call_audiostream_auth_token_ready(void *data, const char* a
ms_message("Authentication token is %s (%s)", auth_token, verified?"verified":"unverified");
}
/**
* Set the result of ZRTP short code verification by user.
* If remote party also does the same, it will update the ZRTP cache so that user's verification will not be required for the two users.
* @param call the LinphoneCall
* @param verified whether the ZRTP SAS is verified.
* @ingroup call_control
**/
void linphone_call_set_authentication_token_verified(LinphoneCall *call, bool_t verified){
if (call->audiostream==NULL){
ms_error("linphone_call_set_authentication_token_verified(): No audio stream");

View file

@ -388,6 +388,8 @@ int offer_answer_initiate_incoming(const SalMediaDescription *local_capabilities
strcpy(result->ice_ufrag, local_capabilities->ice_ufrag);
result->ice_lite = local_capabilities->ice_lite;
result->ice_completed = local_capabilities->ice_completed;
strcpy(result->name,local_capabilities->name);
// Handle session RTCP XR attribute
memset(&result->rtcp_xr, 0, sizeof(result->rtcp_xr));

@ -1 +1 @@
Subproject commit fa22310955303f6a2185fec8c5610aa6f24b46fb
Subproject commit c3593dcba131ae28837f10d9f01c0500f1ebffe9

2
oRTP

@ -1 +1 @@
Subproject commit dc4197cfceb4074018a0b7ad22a3c24fa454c129
Subproject commit 5008a70e077b3706de4a48374f162f93071b4d08