Added support for SpiceProxy into Opaque.

Author: iiordanov

eclipse_projects/Opaque/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.undatech.opaque"
-    android:versionCode="124"
-    android:versionName="1.2.4" >
+    android:versionCode="125"
+    android:versionName="1.2.5" >
 
     <uses-sdk
         android:minSdkVersion="9"

eclipse_projects/Opaque/jni/src/android/android-service.c

@@ -151,7 +151,7 @@ spice_session_setup_from_vv(VirtViewerFile *file, SpiceSession *session)
 
 void spice_session_setup(SpiceSession *session, const char *host, const char *port,
                             const char *tls_port, const char *password, const char *ca_file,
-                            GByteArray *ca_cert, const char *cert_subj) {
+                            GByteArray *ca_cert, const char *cert_subj, const char *proxy) {
 
     g_return_if_fail(SPICE_IS_SESSION(session));
 
@@ -170,6 +170,8 @@ void spice_session_setup(SpiceSession *session, const char *host, const char *po
         g_object_set(session, "ca", ca_cert, NULL);
     if (cert_subj)
         g_object_set(session, "cert-subject", cert_subj, NULL);
+    if (proxy)
+        g_object_set(session, "proxy", proxy, NULL);
 }
 
 static void signal_handler(int signal, siginfo_t *info, void *reserved) {
@@ -214,7 +216,7 @@ gboolean getJvmAndMethodReferences (JNIEnv *env) {
 
 JNIEXPORT jint JNICALL
 Java_com_undatech_opaque_SpiceCommunicator_SpiceClientConnect (JNIEnv *env, jobject obj, jstring h, jstring p,
-                                                                       jstring tp, jstring pw, jstring cf, jstring cs, jboolean sound)
+                                                               jstring tp, jstring pw, jstring cf, jstring cs, jboolean sound)
 {
 	const gchar *host = NULL;
 	const gchar *port = NULL;
@@ -235,7 +237,7 @@ Java_com_undatech_opaque_SpiceCommunicator_SpiceClientConnect (JNIEnv *env, jobj
 	ca_file   = (*env)->GetStringUTFChars(env, cf, NULL);
 	cert_subj = (*env)->GetStringUTFChars(env, cs, NULL);
 
-	result = spiceClientConnect (host, port, tls_port, password, ca_file, NULL, cert_subj, sound);
+	result = spiceClientConnect (host, port, tls_port, password, ca_file, NULL, cert_subj, sound, NULL);
 
 	jvm                  = NULL;
 	jni_connector_class  = NULL;
@@ -246,14 +248,14 @@ Java_com_undatech_opaque_SpiceCommunicator_SpiceClientConnect (JNIEnv *env, jobj
 
 
 int spiceClientConnect (const gchar *h, const gchar *p, const gchar *tp,
-		                   const gchar *pw, const gchar *cf, GByteArray *cc,
-                           const gchar *cs, const gboolean sound)
+                        const gchar *pw, const gchar *cf, GByteArray *cc,
+                        const gchar *cs, const gboolean sound, const gchar *proxy)
 {
 	spice_connection *conn;
 
     soundEnabled = sound;
     conn = connection_new();
-	spice_session_setup(conn->session, h, p, tp, pw, cf, cc, cs);
+	spice_session_setup(conn->session, h, p, tp, pw, cf, cc, cs, proxy);
 	return connectSession(conn);
 }
 
@@ -477,6 +479,7 @@ int CreateOvirtSession(JNIEnv *env, jobject obj, const gchar *uri, const gchar *
     gchar *ghost = NULL;
     gchar *ticket = NULL;
     gchar *spice_host_subject = NULL;
+    gchar *proxyuri = NULL;
 
     if (!getJvmAndMethodReferences (env)) {
     	success = -1;
@@ -597,6 +600,7 @@ int CreateOvirtSession(JNIEnv *env, jobject obj, const gchar *uri, const gchar *
                  "secure-port", &secure_port,
                  "ticket", &ticket,
                  "host-subject", &spice_host_subject,
+                 "proxy", &proxyuri,
                  NULL);
 
     gport = g_strdup_printf("%d", port);
@@ -622,7 +626,7 @@ int CreateOvirtSession(JNIEnv *env, jobject obj, const gchar *uri, const gchar *
     	g_object_get(G_OBJECT(proxy), "ca-cert", &ca_cert, NULL);
 
     	// We are ready to start the SPICE connection.
-    	success = spiceClientConnect (ghost, gport, gtlsport, ticket, NULL, ca_cert, spice_host_subject, sound);
+    	success = spiceClientConnect (ghost, gport, gtlsport, ticket, NULL, ca_cert, spice_host_subject, sound, proxyuri);
     }
 
 error:

eclipse_projects/Opaque/jni/src/android/android-service.h

@@ -57,7 +57,7 @@ void detachThreadFromJvm ();
 
 int spiceClientConnect (const gchar *h, const gchar *p, const gchar *tp,
 		                   const gchar *pw, const gchar *cf, GByteArray *cc,
-                           const gchar *cs, const gboolean sound);
+                           const gchar *cs, const gboolean sound, const gchar *proxy);
 
 int spiceClientConnectVv (VirtViewerFile *vv_file, const gboolean sound);