X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-ui%2Fzssh.c;h=b49d3328e33cac0b71ba6ee75cb624a620eb8a60;hb=e5cc6bde6390048349a3edef991d9278a13cdaf6;hp=12b78bfe9c596970e17cce5ac7685de72c486c7f;hpb=cc8fac1d1854b9ef290723e038d2566d316dfb86;p=catta

diff --git a/avahi-ui/zssh.c b/avahi-ui/zssh.c
index 12b78bf..b49d332 100644
--- a/avahi-ui/zssh.c
+++ b/avahi-ui/zssh.c
@@ -26,12 +26,14 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <stdlib.h>
 
 #include <gtk/gtk.h>
 
 #include <avahi-client/client.h>
 #include <avahi-common/strlst.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/domain.h>
 
 #include "avahi-ui.h"
 
@@ -39,53 +41,93 @@ int main(int argc, char*argv[]) {
     GtkWidget *d;
 
     gtk_init(&argc, &argv);
-    
-    d = aui_service_dialog_new("Choose SSH server");
-    aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp",  /*"_ftp._tcp", "_http._tcp",*/ NULL);
+
+    if (g_str_has_suffix(argv[0], "zvnc")) {
+        d = aui_service_dialog_new("Choose VNC server", NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
+        aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
+    } else {
+        d = aui_service_dialog_new("Choose SSH server", NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
+        aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
+    }
+        
     aui_service_dialog_set_resolve_service(AUI_SERVICE_DIALOG(d), TRUE);
     aui_service_dialog_set_resolve_host_name(AUI_SERVICE_DIALOG(d), !avahi_nss_support());
 
     gtk_window_present(GTK_WINDOW(d));
 
-    if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
-        char p[16], a[AVAHI_ADDRESS_STR_MAX], *u = NULL;
-        char *h = NULL;
+    if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_ACCEPT) {
+        char a[AVAHI_ADDRESS_STR_MAX], *u = NULL, *n = NULL;
+        char *h = NULL, *t = NULL;
         const AvahiStringList *txt;
         
-        snprintf(p, sizeof(p), "%u", aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d)));
-
+        t = g_strdup(aui_service_dialog_get_service_type(AUI_SERVICE_DIALOG(d)));
+        n = g_strdup(aui_service_dialog_get_service_name(AUI_SERVICE_DIALOG(d)));
+        
         if (avahi_nss_support())
             h = g_strdup(aui_service_dialog_get_host_name(AUI_SERVICE_DIALOG(d)));
         else
             h = g_strdup(avahi_address_snprint(a, sizeof(a), aui_service_dialog_get_address(AUI_SERVICE_DIALOG(d))));
 
-        for (txt = aui_service_dialog_get_txt_data(AUI_SERVICE_DIALOG(d)); txt; txt = txt->next) {
-            char *key, *value;
-            
-            if (avahi_string_list_get_pair((AvahiStringList*) txt, &key, &value, NULL) < 0)
-                break;
+        g_print("Connecting to '%s' ...\n", n);
+        
+        if (avahi_domain_equal(t, "_rfb._tcp")) {
+            char p[AVAHI_DOMAIN_NAME_MAX+16];
+            snprintf(p, sizeof(p), "%s:%u", h, aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d))-5900);
 
-            if (strcmp(key, "u") == 0)
-                u = g_strdup(value);
+            gtk_widget_destroy(d);
+            
+            g_print("xvncviewer %s\n", p);
+            execlp("xvncviewer", "xvncviewer", p, NULL); 
             
-            avahi_free(key);
-            avahi_free(value);
-        }
-
-        gtk_widget_destroy(d);
-
-        if (u) {
-            g_print("ssh -p %s -l %s %s\n", p, u, h);
-            execlp("ssh", "ssh", "-p", p, "-l", u, h, NULL); 
         } else {
-            g_print("ssh -p %s %s\n", p, h);
-            execlp("ssh", "ssh", "-p", p, h, NULL); 
+            char p[16];
+            
+            snprintf(p, sizeof(p), "%u", aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d)));
+            
+            for (txt = aui_service_dialog_get_txt_data(AUI_SERVICE_DIALOG(d)); txt; txt = txt->next) {
+                char *key, *value;
+                
+                if (avahi_string_list_get_pair((AvahiStringList*) txt, &key, &value, NULL) < 0)
+                    break;
+                
+                if (strcmp(key, "u") == 0)
+                    u = g_strdup(value);
+                
+                avahi_free(key);
+                avahi_free(value);
+            }
+
+            gtk_widget_destroy(d);
+
+            if (u) {
+                g_print("ssh -p %s -l %s %s\n", p, u, h);
+
+                if (isatty(0) || !getenv("DISPLAY"))
+                    execlp("ssh", "ssh", "-p", p, "-l", u, h, NULL);
+                else {
+                    execlp("x-terminal-emulator", "x-terminal-emulator", "-T", n, "-e", "ssh", "-p", p, "-l", u, h, NULL); 
+                    execlp("gnome-terminal", "gnome-terminal", "-t", n, "-x", "ssh", "-p", p, "-l", u, h, NULL);
+                    execlp("xterm", "xterm", "-T", n, "-e", "ssh", "-p", p, "-l", u, h, NULL);
+                }
+            } else {
+                g_print("ssh -p %s %s\n", p, h);
+                
+                if (isatty(0) || !getenv("DISPLAY"))
+                    execlp("ssh", "ssh", "-p", p, h, NULL); 
+                else {
+                    execlp("x-terminal-emulator", "x-terminal-emulator", "-T", n, "-e", "ssh", "-p", p, h, NULL); 
+                    execlp("gnome-terminal", "gnome-terminal", "-t", n, "-x", "ssh", "-p", p, h, NULL);
+                    execlp("xterm", "xterm", "-T", n, "-e", "ssh", "-p", p, h, NULL);
+                }
+            }
         }
 
-        g_warning("execlp() failed: %s", strerror(errno));
+        g_warning("execlp() failed: %s\n", strerror(errno));
 
         g_free(h);
         g_free(u);
+        g_free(t);
+        g_free(n);
         
     } else {
         gtk_widget_destroy(d);