[GNUnet-SVN] r32583 - in gnunet/src: nat peerinfo-tool transport

[gnunet]

Author: grothoff
Date: 2014-03-07 11:54:40 +0100 (Fri, 07 Mar 2014)
New Revision: 32583

Modified:
   gnunet/src/nat/nat_mini.c
   gnunet/src/peerinfo-tool/Makefile.am
   gnunet/src/transport/Makefile.am
Log:
-fix linkage issue that could cause a transport service crash on exit for 
certain NAT configurations

Modified: gnunet/src/nat/nat_mini.c
===================================================================
--- gnunet/src/nat/nat_mini.c   2014-03-07 10:38:13 UTC (rev 32582)
+++ gnunet/src/nat/nat_mini.c   2014-03-07 10:54:40 UTC (rev 32583)
@@ -625,7 +625,7 @@
 /**
  * Process output from our 'unmap' command.
  *
- * @param cls the 'struct GNUNET_NAT_MiniHandle'
+ * @param cls the `struct GNUNET_NAT_MiniHandle`
  * @param line line of output, NULL at the end
  */
 static void

Modified: gnunet/src/peerinfo-tool/Makefile.am
===================================================================
--- gnunet/src/peerinfo-tool/Makefile.am        2014-03-07 10:38:13 UTC (rev 
32582)
+++ gnunet/src/peerinfo-tool/Makefile.am        2014-03-07 10:54:40 UTC (rev 
32583)
@@ -10,7 +10,7 @@
 endif
 
 bin_PROGRAMS = \
- gnunet-peerinfo 
+ gnunet-peerinfo
 
 gnunet_peerinfo_SOURCES = \
  gnunet-peerinfo.c \
@@ -18,14 +18,15 @@
 
 gnunet_peerinfo_LDADD = \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_PYTHON
 check_SCRIPTS = \
- test_gnunet_peerinfo.py 
+ test_gnunet_peerinfo.py
 endif
 
 if ENABLE_TEST_RUN

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2014-03-07 10:38:13 UTC (rev 32582)
+++ gnunet/src/transport/Makefile.am    2014-03-07 10:54:40 UTC (rev 32583)
@@ -105,8 +105,8 @@
      test_quota_compliance_unix_asymmetric
 if LINUX
  UNIX_API_ABSTRACT_TEST = test_transport_api_unix_abstract
-endif     
 endif
+endif
 
 noinst_PROGRAMS = \
  $(WLAN_BIN_SENDER) \
@@ -212,11 +212,17 @@
  gnunet-service-transport_plugins.h gnunet-service-transport_plugins.c \
  gnunet-service-transport_validation.h gnunet-service-transport_validation.c \
  gnunet-service-transport_manipulation.h 
gnunet-service-transport_manipulation.c
+# Note that while gnunet-service-transport does not use libgnunetnat
+# directly, we must link against it as GNUNET_NAT_mini_map_stop will
+# leave a 'dangling' task to process_unmap_output which will cause
+# a crash on unloading of a plugin unless the service links against
+# that library as well.
 gnunet_service_transport_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_GLPK) \
@@ -1095,6 +1101,7 @@
 test_quota_compliance_bluetooth_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_bluetooth_LDADD = \
+ $(top_builddir)/src/nat/libgnunetnat.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \