From: Christian Grothoff Date: Thu, 9 Jun 2011 22:53:18 +0000 (+0000) Subject: fixes X-Git-Tag: initial-import-from-subversion-38251~18284 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=86d22ff3235817c58e9e1564797e5a2213a45829;p=oweals%2Fgnunet.git fixes --- diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 031cfe8b9..216fcb0cd 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -213,9 +213,9 @@ libgnunet_plugin_transport_http_la_LIBADD = \ libgnunet_plugin_transport_http_la_LDFLAGS = \ $(GN_LIBMHD) \ $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_transport_https_la_CFLAGS = \ +libgnunet_plugin_transport_http_la_CFLAGS = \ $(CFLAGS) -libgnunet_plugin_transport_https_la_CPPFLAGS = \ +libgnunet_plugin_transport_http_la_CPPFLAGS = \ @LIBCURL_CPPFLAGS@ libgnunet_plugin_transport_https_la_SOURCES = \ diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index b85c04402..e93985f40 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -536,7 +536,7 @@ nat_port_map_callback (void *cls, { case AF_INET: t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; - t6.t6_port = ((struct sockaddr_in *) addr)->sin_port; + t4.t_port = ((struct sockaddr_in *) addr)->sin_port; arg = &t4; args = sizeof (t4); break;