From 26db37b47fbc80f547a385a80eedff1143b12650 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Fri, 13 Mar 2009 21:45:13 +0000
Subject: [PATCH] fix crash when running linphonecsh register with a password.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@340 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/console/commands.c | 2 +-
 linphone/coreapi/proxy.c    | 8 +++++---
 linphone/coreapi/sipsetup.c | 7 -------
 linphone/oRTP/src/ortp.c    | 1 +
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/linphone/console/commands.c b/linphone/console/commands.c
index 78725152b..f049694d5 100644
--- a/linphone/console/commands.c
+++ b/linphone/console/commands.c
@@ -1256,7 +1256,7 @@ static int lpc_cmd_register(LinphoneCore *lc, char *args){
 		LinphoneAuthInfo *info;
 		osip_from_init(&from);
 		if (osip_from_parse(from,identity)==0){
-			info=linphone_auth_info_new(from->url->username,NULL,passwd,NULL,NULL);
+			info=linphone_auth_info_new(from->url->username,NULL,passwd,NULL,from->url->host);
 			linphone_core_add_auth_info(lc,info);
 		}
 		osip_from_free(from);
diff --git a/linphone/coreapi/proxy.c b/linphone/coreapi/proxy.c
index 9756f759b..318ad4a84 100644
--- a/linphone/coreapi/proxy.c
+++ b/linphone/coreapi/proxy.c
@@ -571,9 +571,11 @@ void linphone_proxy_config_set_sip_setup(LinphoneProxyConfig *cfg, const char *t
 	if (!ss) return ;
 	ssc=sip_setup_context_new(ss,cfg);
 	if (sip_setup_context_login_account(ssc,cfg->reg_identity,NULL)==0){
-		char proxy[256];
-		if (sip_setup_context_get_proxy(ssc,NULL,proxy,sizeof(proxy))==0){
-			linphone_proxy_config_set_server_addr(cfg,proxy);
+		if (sip_setup_context_get_capabilities(ssc) & SIP_SETUP_CAP_PROXY_PROVIDER){
+			char proxy[256];
+			if (sip_setup_context_get_proxy(ssc,NULL,proxy,sizeof(proxy))==0){
+				linphone_proxy_config_set_server_addr(cfg,proxy);
+			}
 		}
 	}
 	cfg->ssctx=ssc;
diff --git a/linphone/coreapi/sipsetup.c b/linphone/coreapi/sipsetup.c
index 16cd674b1..2055777b7 100644
--- a/linphone/coreapi/sipsetup.c
+++ b/linphone/coreapi/sipsetup.c
@@ -32,14 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 #endif
 
-#ifdef HAVE_FONIS
-extern SipSetup fonis_sip_setup;
-#endif
-
 static SipSetup *all_sip_setups[]={
-#ifdef HAVE_FONIS
-	&fonis_sip_setup,
-#endif
 	NULL
 };
 
diff --git a/linphone/oRTP/src/ortp.c b/linphone/oRTP/src/ortp.c
index 099c224cf..992032f86 100644
--- a/linphone/oRTP/src/ortp.c
+++ b/linphone/oRTP/src/ortp.c
@@ -261,6 +261,7 @@ static void __ortp_logv_out(OrtpLogLevel lev, const char *fmt, va_list args){
   	OutputDebugString("\r\n");
 #else
 	fprintf(__log_file,"ortp-%s-%s" ENDLINE,lname,msg);
+	fflush(__log_file);
 #endif
 
 	ortp_free(msg);