Commit dbf826e2 authored by Sylvain Berfini's avatar Sylvain Berfini

Updated libraries

parent bf8e0621
......@@ -12,3 +12,4 @@ ARM/
Linphone.sdf
Linphone.opensdf
Agents/RegistrationHelper.cs
Linphone/Linphone.csproj.user
\ No newline at end of file
......@@ -63,7 +63,8 @@ namespace Linphone.Agents
// Initiate incoming call processing by creating the Linphone Core
LpConfig config = OopServer.LinphoneCoreFactory.CreateLpConfig(ApplicationData.Current.LocalFolder.Path + "\\linphonerc", "Assets/linphonerc-factory");
OopServer.LinphoneCoreFactory.CreateLinphoneCore(null, config);
OopServer.LinphoneCore.SetRootCA("Assets/rootca.pem");
OopServer.LinphoneCore.SetRootCA("Assets/rootca.pem");
OopServer.LinphoneCore.SetUserAgent("LinphoneWP8PushNotification", "");
//Globals.Instance.BackgroundModeLogger.Configure(true, OutputTraceDest.TCPRemote, "192.168.0.217:38954");
//Globals.Instance.LinphoneCoreFactory.OutputTraceListener = Globals.Instance.BackgroundModeLogger;
......
......@@ -47,6 +47,7 @@ namespace Linphone.Agents
server.LinphoneCoreFactory.CreateLinphoneCore(this, config);
server.LinphoneCore.SetRootCA("Assets/rootca.pem");
server.LinphoneCore.SetNetworkReachable(true);
server.LinphoneCore.SetUserAgent("LinphoneWP8KeepAlive", "");
Debug.WriteLine("[KeepAliveAgent] Linphone Core created");
}
else
......@@ -81,7 +82,7 @@ namespace Linphone.Agents
/// <summary>
/// Callback for LinphoneCoreListener
/// </summary>
public void AuthInfoRequested(string realm, string username)
public void AuthInfoRequested(string realm, string username, string domain)
{
}
......
......@@ -87,7 +87,7 @@ void Linphone::Core::LinphoneAuthInfo::SetHa1(Platform::String^ ha1)
gApiLock.Unlock();
}
Linphone::Core::LinphoneAuthInfo::LinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm)
Linphone::Core::LinphoneAuthInfo::LinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain)
{
gApiLock.Lock();
const char* cc_username = Utils::pstoccs(username);
......@@ -95,12 +95,14 @@ Linphone::Core::LinphoneAuthInfo::LinphoneAuthInfo(Platform::String^ username, P
const char* cc_realm = Utils::pstoccs(realm);
const char* cc_userid = Utils::pstoccs(userid);
const char* cc_ha1 = Utils::pstoccs(ha1);
this->auth_info = linphone_auth_info_new(cc_username, cc_userid, cc_password, cc_ha1, cc_realm);
const char* cc_domain = Utils::pstoccs(domain);
this->auth_info = linphone_auth_info_new(cc_username, cc_userid, cc_password, cc_ha1, cc_realm, cc_domain);
delete(cc_username);
delete(cc_userid);
delete(cc_password);
delete(cc_ha1);
delete(cc_realm);
delete(cc_domain);
gApiLock.Unlock();
}
......
......@@ -84,7 +84,7 @@ namespace Linphone
friend class Linphone::Core::Utils;
friend ref class Linphone::Core::LinphoneCore;
LinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm);
LinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain);
LinphoneAuthInfo(::LinphoneAuthInfo *auth_info);
~LinphoneAuthInfo();
......
......@@ -257,10 +257,10 @@ void Linphone::Core::LinphoneCore::AddAuthInfo(Linphone::Core::LinphoneAuthInfo^
gApiLock.Unlock();
}
Linphone::Core::LinphoneAuthInfo^ Linphone::Core::LinphoneCore::CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm)
Linphone::Core::LinphoneAuthInfo^ Linphone::Core::LinphoneCore::CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain)
{
gApiLock.Lock();
Linphone::Core::LinphoneAuthInfo^ authInfo = ref new Linphone::Core::LinphoneAuthInfo(username, userid, password, ha1, realm);
Linphone::Core::LinphoneAuthInfo^ authInfo = ref new Linphone::Core::LinphoneAuthInfo(username, userid, password, ha1, realm, domain);
gApiLock.Unlock();
return authInfo;
}
......@@ -1461,12 +1461,12 @@ void global_state_changed(::LinphoneCore *lc, ::LinphoneGlobalState gstate, cons
Linphone::Core::gApiLock.LeaveListener();
}
void auth_info_requested(LinphoneCore *lc, const char *realm, const char *username)
void auth_info_requested(LinphoneCore *lc, const char *realm, const char *username, const char *domain)
{
Linphone::Core::gApiLock.EnterListener();
Linphone::Core::LinphoneCoreListener^ listener = Linphone::Core::Globals::Instance->LinphoneCore->CoreListener;
if (listener != nullptr) {
listener->AuthInfoRequested(Linphone::Core::Utils::cctops(realm), Linphone::Core::Utils::cctops(username));
listener->AuthInfoRequested(Linphone::Core::Utils::cctops(realm), Linphone::Core::Utils::cctops(username), Linphone::Core::Utils::cctops(domain));
}
Linphone::Core::gApiLock.LeaveListener();
}
......
......@@ -235,7 +235,8 @@ namespace Linphone
/// <param name="password">The authentication password</param>
/// <param name="ha1">The authentication ha1</param>
/// <param name="realm">The authentication realm</param>
LinphoneAuthInfo^ CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm);
/// <param name="realm">The authentication domain</param>
LinphoneAuthInfo^ CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain);
/// <summary>
/// Gets the current auth infos.
......
......@@ -62,10 +62,10 @@ Linphone::Core::LpConfig^ LinphoneCoreFactory::CreateLpConfig(Platform::String^
return lpConfig;
}
Linphone::Core::LinphoneAuthInfo^ LinphoneCoreFactory::CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm)
Linphone::Core::LinphoneAuthInfo^ LinphoneCoreFactory::CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain)
{
gApiLock.Lock();
Linphone::Core::LinphoneAuthInfo^ authInfo = dynamic_cast<Linphone::Core::LinphoneAuthInfo^>(Utils::CreateLinphoneAuthInfo(username, userid, password, ha1, realm));
Linphone::Core::LinphoneAuthInfo^ authInfo = dynamic_cast<Linphone::Core::LinphoneAuthInfo^>(Utils::CreateLinphoneAuthInfo(username, userid, password, ha1, realm, domain));
gApiLock.Unlock();
return authInfo;
}
......
......@@ -86,8 +86,9 @@ namespace Linphone
/// <param name="password">The authentication password</param>
/// <param name="ha1">The authentication ha1</param>
/// <param name="realm">The authentication realm</param>
/// <param name="realm">The authentication domain</param>
/// <returns>The LinphoneAuthInfo that has been created</returns>
LinphoneAuthInfo^ CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm);
LinphoneAuthInfo^ CreateAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain);
/// <summary>
/// Creates a LinphoneAddress.
......
......@@ -22,7 +22,7 @@ namespace Linphone
/// </summary>
/// <param name="realm">The realm for which authentication information are requested</param>
/// <param name="username">The username for which authentication information are requested</param>
void AuthInfoRequested(Platform::String^ realm, Platform::String^ username);
void AuthInfoRequested(Platform::String^ realm, Platform::String^ username, Platform::String^ domain);
/// <summary>
/// Callback method called when the application state has changed.
......
......@@ -137,9 +137,9 @@ Platform::Object^ Linphone::Core::Utils::CreateLinphoneAuthInfo(void* auth_info)
return ref new Linphone::Core::LinphoneAuthInfo((::LinphoneAuthInfo *)auth_info);
}
Platform::Object^ Linphone::Core::Utils::CreateLinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm)
Platform::Object^ Linphone::Core::Utils::CreateLinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain)
{
return ref new Linphone::Core::LinphoneAuthInfo(username, userid, password, ha1, realm);
return ref new Linphone::Core::LinphoneAuthInfo(username, userid, password, ha1, realm, domain);
}
Platform::Object^ Linphone::Core::Utils::CreateLinphoneProxyConfig(void* proxy_config)
......
......@@ -102,8 +102,9 @@ namespace Linphone
/// <param name="password">The authentication password</param>
/// <param name="ha1">The authentication ha1</param>
/// <param name="realm">The authentication realm</param>
/// <param name="realm">The authentication domain</param>
/// <returns>The created Linphone::Core::LinphoneAuthInfo as a Platform::Object</returns>
static Platform::Object^ CreateLinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm);
static Platform::Object^ CreateLinphoneAuthInfo(Platform::String^ username, Platform::String^ userid, Platform::String^ password, Platform::String^ ha1, Platform::String^ realm, Platform::String^ domain);
/// <summary>
/// Creates a C++/CX LinphoneProxyConfig object using pointer to C structure.
......
......@@ -707,9 +707,9 @@ namespace Linphone.Model
/// <summary>
/// Callback for LinphoneCoreListener
/// </summary>
public void AuthInfoRequested(string realm, string username)
public void AuthInfoRequested(string realm, string username, string domain)
{
Logger.Msg("[LinphoneManager] Auth info requested: realm=" + realm + ", username=" + username);
Logger.Msg("[LinphoneManager] Auth info requested: realm=" + realm + ", username=" + username + ", domain=" + domain);
}
/// <summary>
......
......@@ -450,7 +450,7 @@ namespace Linphone.Model
}
// Can't set string to null: http://stackoverflow.com/questions/12980915/exception-when-trying-to-read-null-string-in-c-sharp-winrt-component-from-winjs
var auth = lc.CreateAuthInfo(username, "", password, "", "");
var auth = lc.CreateAuthInfo(username, "", password, "", "", domain);
lc.AddAuthInfo(auth);
lc.AddProxyConfig(cfg);
......
belle-sip @ e641faf7
Subproject commit 9a922e7c8739925d6bc605690e73bff13482a421
Subproject commit e641faf7bd5582f72d91fe06946139ada90988fa
linphone @ c97a7a67
Subproject commit 0933640e54f37e3521578f979d44e84ca6e795f7
Subproject commit c97a7a6704a1db46aec9e1e755603b6255029890
mediastreamer2 @ 25e49c70
Subproject commit 1287f8c9fccf25e5d17fb8586d5680a905bd78f9
Subproject commit 25e49c70527ddb3867dab164b9560b097f3f2df4
oRTP @ b5d1414e
Subproject commit e96c55df4436db74656d5feedf3e8fd12adb74e4
Subproject commit b5d1414e63b21c83eb8e26988a3fe423ff8fc3b3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment