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

[pamadio at garage.maemo.org]

Author: pamadio
Date: 2008-10-19 18:29:34 +0300 (Sun, 19 Oct 2008)
New Revision: 85

Modified:
   trunk/client/src/dsk_mgr.c
Log:
ssl proxy should work

Modified: trunk/client/src/dsk_mgr.c
===================================================================
--- trunk/client/src/dsk_mgr.c	2008-10-19 15:16:25 UTC (rev 84)
+++ trunk/client/src/dsk_mgr.c	2008-10-19 15:29:34 UTC (rev 85)
@@ -65,6 +65,8 @@
 ConIcProxyMode proxy_mode=CON_IC_PROXY_MODE_NONE ;
 gchar* http_proxy_host=NULL;
 gint http_proxy_port=0;
+gchar* https_proxy_host=NULL;
+gint https_proxy_port=0;
 gchar* soup_proxy_uri_string=NULL;
 SoupUri* soup_proxy_uri=NULL;
 
@@ -85,6 +87,13 @@
     printf("n");
   }
 }
+
+gboolean use_ssl(){
+  if(xmlrpc_server==NULL) {return FALSE;}
+  if(g_str_has_prefix(xmlrpc_server,"https")==TRUE){return TRUE;}
+  return FALSE;
+}
+
 gboolean send_jpeg(unsigned char *data)
 {
   g_print("send_jpg \n");
@@ -849,10 +858,14 @@
     g_print("proxy_mode=%i\n",proxy_mode);
     if( proxy_mode==CON_IC_PROXY_MODE_MANUAL) {
       const gchar* host=con_ic_connection_get_proxy_host(connection,CON_IC_PROXY_PROTOCOL_HTTP);
+      const gchar* host_ssl=con_ic_connection_get_proxy_host(connection,CON_IC_PROXY_PROTOCOL_HTTPS);
 
       g_print("manual proxy mode\n");
       g_print("proxy=%s\n",host);
+      g_print("ssl proxy=%s\n",host_ssl);
+
       http_proxy_port=con_ic_connection_get_proxy_port(connection,CON_IC_PROXY_PROTOCOL_HTTP);
+      https_proxy_port=con_ic_connection_get_proxy_port(connection,CON_IC_PROXY_PROTOCOL_HTTPS);
       
       if(http_proxy_host==NULL){
 	http_proxy_host=g_strdup(host);
@@ -860,15 +873,31 @@
 	g_free(http_proxy_host);
 	http_proxy_host=g_strdup(host);
       }
+
+      if(https_proxy_host==NULL){
+	https_proxy_host=g_strdup(host_ssl);
+      } else {
+	g_free(https_proxy_host);
+	https_proxy_host=g_strdup(host_ssl);
+      }
       
+
       if(soup_proxy_uri_string==NULL){
-	soup_proxy_uri_string=g_strdup_printf("http://%s:%i",http_proxy_host,http_proxy_port);
+	if(use_ssl()){
+	  soup_proxy_uri_string=g_strdup_printf("http://%s:%i",https_proxy_host,https_proxy_port);
+	}else{
+	  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);
+	if(use_ssl()){
+	  soup_proxy_uri_string=g_strdup_printf("http://%s:%i",https_proxy_host,https_proxy_port);
+	}else{
+	  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);
       }
 
@@ -1054,11 +1083,6 @@
   */
   g_print("xmlr_rpc_server=%s\n",xmlrpc_server);
   
-  
-
-
-
-
   g_print("test gst:%i\n",init_gstreamer_stuff(&argc,&argv));
 
   //Main loop