[GNUnet-SVN] r33677 - in gnunet-gtk: contrib src/namestore

[gnunet]

Author: grothoff
Date: 2014-06-16 22:51:04 +0200 (Mon, 16 Jun 2014)
New Revision: 33677

Modified:
   gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
   gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c
Log:
-misc fixes

Modified: gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-06-16 20:44:39 UTC 
(rev 33676)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-06-16 20:51:04 UTC 
(rev 33677)
@@ -599,10 +599,10 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property name="tooltip_text" 
translatable="yes">Enter identifier to import certificate information from the 
network.
-For example, for X.509 specify the DNS name.
-For PGP, specify the key identifier.
+For example, for X.509 specify the DNS domain name.
+For PGP, specify the key identifier (not implemented).
 </property>
-                                        <property 
name="max_length">15</property>
+                                        <property 
name="max_length">253</property>
                                         <property 
name="invisible_char">●</property>
                                         <property 
name="primary_icon_activatable">False</property>
                                         <property 
name="secondary_icon_activatable">False</property>

Modified: gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c
===================================================================
--- gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c        2014-06-16 
20:44:39 UTC (rev 33676)
+++ gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c        2014-06-16 
20:51:04 UTC (rev 33677)
@@ -744,6 +744,11 @@
    * Domain name of the site we use to get the TLS cert record from.
    */
   char *name;
+
+  /**
+   * We succeeded with our TLS handshake, ignore further DNS replies.
+   */
+  int done;
 };
 
 
@@ -772,12 +777,15 @@
 
   if (NULL == addr)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Name resolution failed\n"));
+    if (GNUNET_YES != ic->done)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  _("Name resolution failed\n"));
     GNUNET_free (ic->name);
     GNUNET_free (ic);
     return;
   }
+  if (GNUNET_YES == ic->done)
+    return;
   port = gtk_spin_button_get_value
     (GTK_SPIN_BUTTON (gtk_builder_get_object (ic->builder,
                                               "edit_dialog_port_spinbutton")));
@@ -826,7 +834,6 @@
     GNUNET_NETWORK_socket_close (ic->sock);
     return;
   }
-  GNUNET_RESOLVER_request_cancel (ic->rh);
 
   /* initialize TLS session */
   gnutls_init (&session, GNUTLS_CLIENT);
@@ -898,6 +905,8 @@
                 gnutls_strerror (ret));
   }
   gnutls_bye (session, GNUTLS_SHUT_RDWR);
+  ic->done = GNUNET_YES;
+
  cleanup:
   GNUNET_break (GNUNET_OK ==
                 GNUNET_NETWORK_socket_close (ic->sock));