From 41c7a67e7de5c8b8d129c22881d4686eae73ed10 Mon Sep 17 00:00:00 2001
From: pierre-luc <pierre-luc.bacon@savoirfairelinux.com>
Date: Tue, 11 Aug 2009 10:12:25 -0400
Subject: [PATCH] [#2026] keyExchange was set to ZRTP instead of "1" when using
the assistant.
---
sflphone-client-gnome/src/assistant.c | 2 +-
sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/assistant.c
index b1daa76995..0e8e6dfedc 100644
--- a/sflphone-client-gnome/src/assistant.c
+++ b/sflphone-client-gnome/src/assistant.c
@@ -141,7 +141,7 @@ static void sip_apply_callback( void ) {
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->zrtp_enable)) == TRUE) {
g_hash_table_insert(current->properties, g_strdup(ACCOUNT_SRTP_ENABLED), g_strdup((gchar *)"TRUE"));
- g_hash_table_insert(current->properties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup((gchar *)"ZRTP"));
+ g_hash_table_insert(current->properties, g_strdup(ACCOUNT_KEY_EXCHANGE), g_strdup((gchar *)"1"));
g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ZRTP_DISPLAY_SAS), g_strdup((gchar *)"TRUE"));
g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ZRTP_NOT_SUPP_WARNING), g_strdup((gchar *)"TRUE"));
g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ZRTP_HELLO_HASH), g_strdup((gchar *)"TRUE"));
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
index 9efca7608f..4745bd9160 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
@@ -141,6 +141,7 @@ namespace sfl {
ost::MutexLock mutex(_audioRtpThreadMutex);
_debug("Stopping audio rtp session\n");
if (_rtpSession == NULL) {
+ _debugException("_rtpSession is null\n");
throw AudioRtpFactoryException();
}
try {
--
GitLab