[GNUnet-SVN] r14531 - gnunet/src/vpn

[gnunet]

Author: toelke
Date: 2011-02-24 15:44:04 +0100 (Thu, 24 Feb 2011)
New Revision: 14531

Modified:
   gnunet/src/vpn/gnunet-daemon-vpn-dns.c
   gnunet/src/vpn/gnunet-daemon-vpn-helper.c
Log:
fix SIGSEGV if dns was slow to start up

Modified: gnunet/src/vpn/gnunet-daemon-vpn-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-dns.c      2011-02-24 14:37:21 UTC (rev 
14530)
+++ gnunet/src/vpn/gnunet-daemon-vpn-dns.c      2011-02-24 14:44:04 UTC (rev 
14531)
@@ -117,9 +117,12 @@
     GNUNET_assert (dns_connection == NULL);
     dns_connection = GNUNET_CLIENT_connect ("dns", cfg);
     /* This would most likely be a misconfiguration */
-    GNUNET_assert(dns_connection != NULL);
+    GNUNET_assert(NULL != dns_connection);
     GNUNET_CLIENT_receive(dns_connection, &dns_answer_handler, NULL, 
GNUNET_TIME_UNIT_FOREVER_REL);
 
+    /* We might not yet be connected. Yay, mps. */
+    if (NULL == dns_connection) return;
+
     /* If a packet is already in the list, schedule to send it */
     if (head != NULL)
       GNUNET_CLIENT_notify_transmit_ready(dns_connection,

Modified: gnunet/src/vpn/gnunet-daemon-vpn-helper.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-02-24 14:37:21 UTC (rev 
14530)
+++ gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-02-24 14:44:04 UTC (rev 
14531)
@@ -122,7 +122,8 @@
      * The routing-table gets flushed if an interface disappears.
      */
     restart_hijack = 1;
-    GNUNET_CLIENT_notify_transmit_ready(dns_connection, sizeof(struct 
GNUNET_MessageHeader), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, 
NULL);
+    if (NULL != dns_connection)
+      GNUNET_CLIENT_notify_transmit_ready(dns_connection, sizeof(struct 
GNUNET_MessageHeader), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, 
NULL);
 }
 /*}}}*/