added autogen script to run autotools to generate configure and necessary make inputs

[ovirt-viewer.git] / wui_thread.c

diff --git a/wui_thread.c b/wui_thread.c
index 7ef6f8e..c51c43f 100644 (file)
--- a/wui_thread.c
+++ b/wui_thread.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+/* For an explanation of the threading model, please main(). */
+
 #include <config.h>
 
 #include <stdio.h>
@@ -667,6 +669,10 @@ do_login (void)
   CURL_CHECK_ERROR (curl_easy_setopt, (curl, CURLOPT_FOLLOWLOCATION, (long) 1));
   CURL_CHECK_ERROR (curl_easy_setopt, (curl, CURLOPT_MAXREDIRS, (long) 10));
 
+  // FIXME when ssl is introduced into ovirt-viewer, remove there two lines
+  CURL_CHECK_ERROR(curl_easy_setopt, (curl, CURLOPT_SSL_VERIFYHOST, 0));
+  CURL_CHECK_ERROR(curl_easy_setopt, (curl, CURLOPT_SSL_VERIFYPEER, 0));
+
   /* Try to fetch the URI. */
   r = CURL_CHECK_ERROR (curl_easy_perform, (curl));
   if (r != CURLE_OK) {
@@ -975,6 +981,7 @@ parse_vm_from_xml (xmlNodePtr node)
   vm.hostid = -1;
   vm.id = -1;
   vm.vnc_port = -1;
+  vm.forward_vnc_port = -1;
   vm.mem_allocated = -1;
   vm.mem_used = -1;
   vm.vcpus_allocated = -1;
@@ -1051,6 +1058,13 @@ parse_vm_from_xml (xmlNodePtr node)
        xmlFree (str);
       }
     }
+    else if (xmlStrcmp (p->name, (const xmlChar *) "forward-vnc-port") == 0) {
+      str = xmlNodeGetContent (p);
+      if (str != NULL) {
+       vm.forward_vnc_port = strtol ((char *) str, NULL, 10);
+       xmlFree (str);
+      }
+    }
     else if (xmlStrcmp (p->name, (const xmlChar *) "vnic-mac-addr") == 0) {
       str = xmlNodeGetContent (p);
       if (str != NULL) {
@@ -1070,6 +1084,8 @@ parse_vm_from_xml (xmlNodePtr node)
     DEBUG ("required field \"description\" missing from <vm> structure");
   else if (vm.vnc_port == -1)
     DEBUG ("required field \"vnc-port\" missing from <vm> structure");
+  else if (vm.forward_vnc_port == -1)
+    DEBUG ("required field \"forward-vnc-port\" missing from <vm> structure");
   else if (vm.uuid == NULL)
     DEBUG ("required field \"uuid\" missing from <vm> structure");
   else