#include <glib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
#include <vncdisplay.h>
#ifdef HAVE_NETDB_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.
*/
// 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 viewer_disconnected (GtkWidget *vnc);
static void viewer_credential (GtkWidget *vnc, GValueArray *credList);
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;
{ 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";
"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;
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);
const char *authors[] = {
"Richard W.M. Jones <rjones@redhat.com>",
"Daniel P. Berrange <berrange@redhat.com>",
+ "Mohammed Morsi <mmorsi@redhat.com>",
NULL
};
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
int i, uuidlen, len, fd;
GtkWidget *child;
const char *label;
- const char* hostname;
char *label2;
char new_title[97]; // 47 chars for title + 50 for vm name
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. */
- hostname = gtk_entry_get_text (GTK_ENTRY (ca_hostname));
- fd = viewer_open_vnc_socket(hostname, vm->forward_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 ();
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)
{
gtk_widget_destroy(GTK_WIDGET(dialog));
}
-#if defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS) && defined(HAVE_GETHOSTBYNAME)
+#if defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS)
static int
viewer_open_vnc_socket(const char* vnchost, int vncport)
{
- int socketfd;
- struct hostent *serv;
- struct sockaddr_in serv_addr;
+ int result, socketfd;
+ char port[10];
+ struct addrinfo* vnc_addr;
- socketfd = socket(PF_INET, SOCK_STREAM, 0);
- if(socketfd < 0){
- return -1;
- }
+ sprintf(port, "%d", vncport);
- serv = gethostbyname(vnchost);
- if(serv == NULL){
+ result = getaddrinfo(vnchost, port, NULL, &vnc_addr);
+ if(result != 0 || vnc_addr == NULL)
return -1;
- }
- serv_addr.sin_family = PF_INET;
- serv_addr.sin_port = htons(vncport);
- serv_addr.sin_addr.s_addr = ((struct in_addr *)(serv->h_addr))->s_addr;
+ // just use first found, ignoring rest
+ socketfd = socket(vnc_addr->ai_family,
+ vnc_addr->ai_socktype,
+ vnc_addr->ai_protocol);
- if (connect(socketfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0){
- return -1;
- }
+ if(connect(socketfd, vnc_addr->ai_addr, vnc_addr->ai_addrlen) <0)
+ socketfd = -1;
+
+ freeaddrinfo(vnc_addr);
return socketfd;
}
-#endif /* defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS) && defined(HAVE_GETHOSTBYNAME) */
+#endif /* defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS) */
/* Remove all menu items from the Connect menu. */
static void
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)
{
git.annexia.org / ovirt-viewer.git / blobdiff