[Phonehome-commits] r74 - trunk/client/src

[pamadio at garage.maemo.org]

Author: pamadio
Date: 2008-10-19 12:57:16 +0300 (Sun, 19 Oct 2008)
New Revision: 74

Modified:
   trunk/client/src/dsk_mgr.c
Log:
proxy auth works

Modified: trunk/client/src/dsk_mgr.c
===================================================================
--- trunk/client/src/dsk_mgr.c	2008-10-19 08:59:05 UTC (rev 73)
+++ trunk/client/src/dsk_mgr.c	2008-10-19 09:57:16 UTC (rev 74)
@@ -64,6 +64,8 @@
 ConIcProxyMode proxy_mode=CON_IC_PROXY_MODE_NONE ;
 gchar* http_proxy_host=NULL;
 gint http_proxy_port=0;
+gchar* soup_proxy_uri_string=NULL;
+SoupUri* soup_proxy_uri=NULL;
 
 
 typedef struct {
@@ -503,8 +505,19 @@
 gboolean test_xmlrpc_login(){
   SoupSession*  soup_session;
   char *uri = xmlrpc_server;
+  g_print("testing login\n");
+  g_print("proxy_mode=%i\n",proxy_mode);
   //soup_session=soup_session_sync_new_with_options(SOUP_SESSION_MAX_CONNS,5);
-  soup_session=soup_session_sync_new();
+  if(proxy_mode==CON_IC_PROXY_MODE_NONE) {
+    soup_session=soup_session_sync_new();
+  } else if (proxy_mode==CON_IC_PROXY_MODE_MANUAL){
+    g_print("using a manual proxy:%s\n",soup_proxy_uri_string);
+    soup_session=soup_session_sync_new_with_options(SOUP_SESSION_PROXY_URI,soup_proxy_uri,NULL);
+  } else {
+    g_print("Automatic proxy mode not supported\n");
+    return FALSE;
+  }
+
   SoupXmlrpcMessage *msg;
   SoupXmlrpcResponse *rpc_response;
   guint rpc_status;
@@ -608,10 +621,19 @@
 	g_free(http_proxy_host);
 	http_proxy_host=g_strdup(host);
       }
+      
+      if(soup_proxy_uri_string==NULL){
+	soup_proxy_uri_string=g_strdup_printf("http://%s:%i",http_proxy_host,http_proxy_port);
+	soup_proxy_uri=soup_uri_new(soup_proxy_uri_string);
+	
+      }else{
+	g_free(soup_proxy_uri_string);
+	soup_uri_free (soup_proxy_uri);
+	soup_proxy_uri_string=g_strdup_printf("http://%s:%i",http_proxy_host,http_proxy_port);
+	soup_proxy_uri=soup_uri_new(soup_proxy_uri_string);
+      }
 
 
-      g_print("yo %s,%i\n",http_proxy_host,http_proxy_port);
-
     }
     if( proxy_mode==CON_IC_PROXY_MODE_AUTO) {
       g_print("automatic proxy mode not supported\n");