#include <glib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
#include <vncdisplay.h>
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#include <arpa/inet.h>
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
gboolean debug = 0;
+gboolean verbose = 0;
+
/* Usually /etc/pki/tls/certs/ca-bundle.crt unless overridden during
* configure or on the command line.
*/
const char *cainfo = CAINFO;
-gboolean check_cert = TRUE;
+gboolean check_cert = FALSE; // do we want this enabled by default ?
+ // would require a CA by default (self-signed wont work)
+ // (don't set to true, change var/flag to no_check_cert)
+
+/* The WUI thread has updated the vm list. Here in the main thread
+* we keep our own copy of the vmlist.
+*/
+static GSList *vmlist = NULL;
+
+/* internal.h shared constructs */
+const char* hostname;
+struct vm* vm_in_focus;
/* Private functions. */
static void start_ui (void);
static GtkWidget *menu_item_new (int which_menu);
+static void refresh_menu_vm_list (GtkWidget *, gpointer);
+static void connect_to_wui_on_enter (GtkWidget *, gpointer);
static void connect_to_wui (GtkWidget *, gpointer);
+static void send_key_to_vm (GtkWidget *widget, gpointer _keyComboDef);
+static void login_to_wui_on_enter (GtkWidget *, gpointer);
static void login_to_wui (GtkWidget *, gpointer);
static gboolean delete_event (GtkWidget *widget, GdkEvent *event, gpointer data);
static void destroy (GtkWidget *widget, gpointer data);
static void clear_connectmenu (void);
static void help_about (GtkWidget *menu);
static void viewer_shutdown (GtkWidget *src, void *dummy, GtkWidget *vnc);
+#if 0
static void viewer_quit (GtkWidget *src, GtkWidget *vnc);
+#endif
static void viewer_connected (GtkWidget *vnc);
static void viewer_initialized (GtkWidget *vnc, GtkWidget *data);
static void viewer_disconnected (GtkWidget *vnc);
static void viewer_credential (GtkWidget *vnc, GValueArray *credList);
-static int viewer_open_tunnel_ssh (const char *sshhost, int sshport, const char *sshuser, int vncport);
+static int viewer_open_vnc_socket (const char *vnchost, int vncport);
+static void add_vm_to_connectmenu (gpointer _vm, gpointer data);
/* For any widgets accessed from multiple functions. */
static GtkWidget *window;
static GtkWidget *la_username;
static GtkWidget *la_password;
static GtkWidget *la_button;
+static GtkWidget *la_error;
static GtkWidget *notebook;
static GtkWidget *statusbar;
static guint statusbar_ctx;
{ HELP_MENU, NULL, "_Help", "Help" }
};
+#define MAX_KEY_COMBO 3
+ struct keyComboDef {
+ guint keys[MAX_KEY_COMBO];
+ guint nkeys;
+ const char *label;
+ };
+
+#define NUM_KEY_COMBOS 17
+static struct keyComboDef keyCombos[] = {
+ { { GDK_Control_L, GDK_Alt_L, GDK_Delete }, 3, "Ctrl+Alt+Del"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_BackSpace }, 3, "Ctrl+Alt+Backspace"},
+ { {}, 0, "" },
+ { { GDK_Control_L, GDK_Alt_L, GDK_F1 }, 3, "Ctrl+Alt+F1"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F2 }, 3, "Ctrl+Alt+F2"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F3 }, 3, "Ctrl+Alt+F3"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F4 }, 3, "Ctrl+Alt+F4"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F5 }, 3, "Ctrl+Alt+F5"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F6"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F7"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F8"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F5 }, 3, "Ctrl+Alt+F9"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F6 }, 3, "Ctrl+Alt+F10"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F7 }, 3, "Ctrl+Alt+F11"},
+ { { GDK_Control_L, GDK_Alt_L, GDK_F8 }, 3, "Ctrl+Alt+F12"},
+ { {}, 0, "" },
+ { { GDK_Print }, 1, "PrintScreen"},
+};
+
/* Window title. */
static const char *title = "oVirt Viewer";
+// when running vm
+// 47 chars
+static const char *title_vm =
+ "oVirt Viewer: (ctrl+alt to grab/release mouse) ";
+
/* Gtk widget styles. Avoid installation hassles by keeping this
* inside the binary. It can still be overridden by the user (who
* will do that?)
{ "cainfo", 0, 0, G_OPTION_ARG_STRING, &cainfo,
"set the path of the CA certificate bundle", NULL },
{ "check-certificate", 0, 0, G_OPTION_ARG_NONE, &check_cert,
- "if --no-check-certificate is passed we don't check the SSL certificate of the server", NULL },
+ "check the SSL certificate of the server", NULL },
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &debug,
"turn on debugging messages", NULL },
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
+ "turn on verbose messages", NULL },
{ "version", 'V', 0, G_OPTION_ARG_NONE, &print_version,
"display version and exit", NULL },
{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
* processed in the main thread - see:
* http://mail.gnome.org/archives/gtk-app-devel-list/2007-March/msg00232.html
*
+ * A tunnel thread is also started to locally listen for vnc packets
+ * and make them proxyable, adding the vm name, before forwarding onto
+ * the server
+ *
* Note that under Win32 you must confine all Gtk/Gdk interactions
* to a single thread - see:
* http://developer.gimp.org/api/2.0/gdk/gdk-Threads.html
gtk_main ();
stop_wui_thread ();
+ stop_tunnel();
exit (0);
}
static void
start_ui (void)
{
+ int i;
GtkWidget *vbox;
GtkWidget *menubar;
GtkWidget *view;
GtkWidget *viewmenu;
GtkWidget *sendkey;
GtkWidget *sendkeymenu;
+ GtkWidget *sendkeymenuitem;
GtkWidget *wind;
GtkWidget *windmenu;
GtkWidget *help;
GtkWidget *ca_vbox;
GtkWidget *ca_hbox;
GtkWidget *ca_label;
+ GtkWidget *la_vbox;
GtkWidget *la_hbox;
+ GtkWidget *la_label;
DEBUG ("creating viewer windows and menus");
refresh_vmlist_separator = gtk_separator_menu_item_new ();
g_object_ref (refresh_vmlist_separator);
+ g_signal_connect (G_OBJECT (refresh_vmlist), "activate",
+ G_CALLBACK (refresh_menu_vm_list), NULL);
+
#if 0
screenshot = gtk_menu_item_new_with_mnemonic ("_Screenshot");
gtk_menu_append (GTK_MENU (filemenu), screenshot);
sendkeymenu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (sendkey), sendkeymenu);
+ for(i = 0; i < NUM_KEY_COMBOS; ++i){
+ sendkeymenuitem = gtk_menu_item_new_with_label (keyCombos[i].label);
+ gtk_menu_append (GTK_MENU (sendkeymenu), sendkeymenuitem);
+ g_signal_connect (G_OBJECT (sendkeymenuitem), "activate",
+ G_CALLBACK (send_key_to_vm), &(keyCombos[i]));
+ }
+
wind = menu_item_new (WINDOW_MENU);
windmenu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (wind), windmenu);
gtk_widget_set_name (connection_area, "ovirt-viewer-connection-area");
+ g_signal_connect (G_OBJECT (ca_hostname), "key-release-event",
+ G_CALLBACK (connect_to_wui_on_enter), NULL);
g_signal_connect (G_OBJECT (ca_button), "clicked",
G_CALLBACK (connect_to_wui), NULL);
login_area = gtk_event_box_new ();
+ la_vbox = gtk_vbox_new (FALSE, 0);
la_hbox = gtk_hbox_new (FALSE, 0);
+ la_label = gtk_label_new ("Username / password:");
la_username = gtk_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (la_username), 12);
la_password = gtk_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (la_password), 12);
gtk_entry_set_visibility (GTK_ENTRY (la_password), FALSE);
la_button = gtk_button_new_with_label ("Login");
+ la_error = gtk_label_new (NULL);
gtk_container_add (GTK_CONTAINER (la_hbox), la_username);
gtk_container_add (GTK_CONTAINER (la_hbox), la_password);
gtk_container_add (GTK_CONTAINER (la_hbox), la_button);
- gtk_container_add (GTK_CONTAINER (login_area), la_hbox);
+ gtk_box_pack_start (GTK_BOX (la_vbox), la_label, TRUE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (la_vbox), la_hbox, TRUE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (la_vbox), la_error, TRUE, FALSE, 4);
+ gtk_container_add (GTK_CONTAINER (login_area), la_vbox);
gtk_widget_set_name (login_area, "ovirt-viewer-login-area");
+ g_signal_connect (G_OBJECT (la_username), "key-release-event",
+ G_CALLBACK (login_to_wui_on_enter), NULL);
+ g_signal_connect (G_OBJECT (la_password), "key-release-event",
+ G_CALLBACK (login_to_wui_on_enter), NULL);
g_signal_connect (G_OBJECT (la_button), "clicked",
G_CALLBACK (login_to_wui), NULL);
const char *authors[] = {
"Richard W.M. Jones <rjones@redhat.com>",
"Daniel P. Berrange <berrange@redhat.com>",
+ "Mohammed Morsi <mmorsi@redhat.com>",
NULL
};
}
static void
+refresh_menu_vm_list(GtkWidget *widget, gpointer data)
+{
+ wui_thread_send_refresh_vm_list();
+}
+
+static void
+connect_to_wui_on_enter (GtkWidget *widget, gpointer data)
+{
+ // if key released was not 'enter' key
+ if(((GdkEventKey *)data)->type == GDK_KEY_RELEASE && (((GdkEventKey *)data)->keyval & 0xFF) != 13 ) return;
+
+ connect_to_wui(widget, data);
+}
+
+static void
connect_to_wui (GtkWidget *widget, gpointer data)
{
- const char *hostname;
char *uri;
int len;
snprintf (uri, len, HTTPS "://%s/ovirt", hostname);
wui_thread_send_connect (uri);
+ start_tunnel();
+}
+
+static void
+login_to_wui_on_enter (GtkWidget *widget, gpointer data)
+{
+ // if key released was not 'enter' key
+ if(((GdkEventKey *)data)->type == GDK_KEY_RELEASE && (((GdkEventKey *)data)->keyval & 0xFF) != 13 ) return;
+
+ login_to_wui(widget, data);
}
static void
GtkWidget *child;
const char *label;
char *label2;
+ char new_title[97]; // 47 chars for title + 50 for vm name
DEBUG ("searching tabs for uuid %s", vm->uuid);
DEBUG ("not found, creating new tab");
+ // before we open vnc connection, make sure vm is running
+ gboolean vm_running = main_vmlist_has_running_vm(vm);
+
+ if(!vm_running){
+ main_status_error (g_strdup ("VM not running"));
+ return;
+ }
+
+ // FIXME on notebook tab switch, change vm_in_focus
+ vm_in_focus = vm;
+
/* This VM isn't in the notebook already, so create a new console. */
- fd = viewer_open_tunnel_ssh (/*vm->host XXX*/ "192.168.50.6",
- 0, /* Default SSH port. */
- "root", /* Root account. */
- vm->vnc_port);
+ DEBUG ("connecting to local tunnel on port %i", tunnel_port);
+ fd = viewer_open_vnc_socket("127.0.0.1", tunnel_port);
if (fd == -1) return; /* We've already given an error. */
child = vnc_display_new ();
return;
}
+ main_status_error(g_strdup(""));
+
+ for(i = 0; i < 47; ++i) new_title[i] = title_vm[i];
+ for(i = 0; i < 50; ++i){
+ if(vm->description[i] == '\0') break;
+ new_title[47 + i] = vm->description[i];
+ }
+ new_title[i < 50 ? i+47 : 96] = '\0';
+ gtk_window_set_title (GTK_WINDOW (window), new_title);
+
/*
gtk_signal_connect(GTK_OBJECT(child), "vnc-pointer-grab",
GTK_SIGNAL_FUNC(viewer_grab), window);
DEBUG ("finished creating new tab");
}
+/* Send key to a virtual machine. This callback is called from the
+ * send key menu. If finds vm in focus, and sends specified key to it
+ */
+static void
+send_key_to_vm (GtkWidget *widget, gpointer _keyComboDef)
+{
+ GtkWidget* viewer;
+ struct keyComboDef* key_combo = (struct keyComboDef*) _keyComboDef;
+ int c = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+
+ if(c < 0){
+ return;
+ }
+
+ viewer = gtk_notebook_get_nth_page(GTK_NOTEBOOK (notebook), c);
+ if(viewer != NULL){
+ DEBUG ("sending keys to vm");
+ vnc_display_send_keys(VNC_DISPLAY(viewer),
+ key_combo->keys,
+ key_combo->nkeys);
+ }
+}
+
+
/*
static void viewer_grab(GtkWidget *vnc, GtkWidget *window)
{
vnc));
}
+#if 0
static void
viewer_quit (GtkWidget *src, GtkWidget *vnc)
{
viewer_shutdown (src, NULL, vnc);
}
+#endif
static void
viewer_connected (GtkWidget *vnc)
gtk_widget_destroy(GTK_WIDGET(dialog));
}
-#if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK)
+#if defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS)
-static int viewer_open_tunnel(const char **cmd)
+static int
+viewer_open_vnc_socket(const char* vnchost, int vncport)
{
- int fd[2];
- pid_t pid;
+ int result, socketfd;
+ char port[10];
+ struct addrinfo* vnc_addr;
- if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd) < 0)
- return -1;
+ sprintf(port, "%d", vncport);
- pid = fork();
- if (pid == -1) {
- close(fd[0]);
- close(fd[1]);
- return -1;
- }
+ result = getaddrinfo(vnchost, port, NULL, &vnc_addr);
+ if(result != 0 || vnc_addr == NULL)
+ return -1;
- if (pid == 0) { /* child */
- close(fd[0]);
- close(0);
- close(1);
- if (dup(fd[1]) < 0)
- _exit(1);
- if (dup(fd[1]) < 0)
- _exit(1);
- close(fd[1]);
- execvp("ssh", (char *const*)cmd);
- _exit(1);
- }
- close(fd[1]);
- return fd[0];
-}
+ // just use first found, ignoring rest
+ socketfd = socket(vnc_addr->ai_family,
+ vnc_addr->ai_socktype,
+ vnc_addr->ai_protocol);
-static int
-viewer_open_tunnel_ssh (const char *sshhost, int sshport, const char *sshuser,
- int vncport)
-{
- const char *cmd[10];
- char portstr[50], portstr2[50];
- int n = 0;
-
- if (!sshport)
- sshport = 22;
+ if(connect(socketfd, vnc_addr->ai_addr, vnc_addr->ai_addrlen) <0)
+ socketfd = -1;
- snprintf (portstr, sizeof portstr, "%d", sshport);
- snprintf (portstr2, sizeof portstr2, "%d", vncport);
-
- cmd[n++] = "ssh";
- cmd[n++] = "-p";
- cmd[n++] = portstr;
- if (sshuser) {
- cmd[n++] = "-l";
- cmd[n++] = sshuser;
- }
- cmd[n++] = sshhost;
- cmd[n++] = "nc";
- cmd[n++] = "localhost";
- cmd[n++] = portstr2;
- cmd[n++] = NULL;
+ freeaddrinfo(vnc_addr);
- return viewer_open_tunnel(cmd);
+ return socketfd;
}
-#endif /* defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK) */
+#endif /* defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS) */
/* Remove all menu items from the Connect menu. */
static void
DEBUG ("login error: %s", str);
ASSERT_IS_MAIN_THREAD ();
- /*
gtk_label_set_text (GTK_LABEL (la_error), str);
- */
g_free (str);
return FALSE;
return FALSE;
}
-/* The WUI thread has updated the vm list. Here in the main thread
- * we keep our own copy of the vmlist.
- */
-static GSList *vmlist = NULL;
-
-static void add_vm_to_connectmenu (gpointer _vm, gpointer data);
-
gboolean
main_vmlist_updated (gpointer data)
{
struct vm *vm = (struct vm *) _vm;
GtkWidget *item;
+ // TODO only present running vms ?
+ // if(vm->state == "running")
+
DEBUG ("adding %s to Connect menu", vm->description);
item = gtk_menu_item_new_with_label (vm->description);
git.annexia.org / ovirt-viewer.git / blobdiff