[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14331 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14331 - gnunet/src/transport |
Date: |
Thu, 3 Feb 2011 17:28:52 +0100 |
Author: grothoff
Date: 2011-02-03 17:28:52 +0100 (Thu, 03 Feb 2011)
New Revision: 14331
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_http.c
Log:
fix compiler error for newer MHD API
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2011-02-03 16:11:49 UTC (rev 14330)
+++ gnunet/src/transport/Makefile.am 2011-02-03 16:28:52 UTC (rev 14331)
@@ -35,7 +35,7 @@
if HAVE_PCAP
if LINUX
if HAVE_EXPERIMENTAL
- WANBIN = gnunet-transport-wlan-helper
+# WANBIN = gnunet-transport-wlan-helper
WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
WLAN_API_TEST = test_transport_api_wlan
endif
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2011-02-03 16:11:49 UTC
(rev 14330)
+++ gnunet/src/transport/plugin_transport_http.c 2011-02-03 16:28:52 UTC
(rev 14331)
@@ -996,10 +996,10 @@
struct Plugin *plugin = cls;
struct MHD_Response *response;
const union MHD_ConnectionInfo * conn_info;
+ const struct sockaddr *client_addr;
+ const struct sockaddr_in *addrin;
+ const struct sockaddr_in6 *addrin6;
- struct sockaddr_in *addrin;
- struct sockaddr_in6 *addrin6;
-
char address[INET6_ADDRSTRLEN+14];
struct GNUNET_PeerIdentity pi_in;
size_t id_num = 0;
@@ -1077,9 +1077,11 @@
conn_info = MHD_get_connection_info(mhd_connection,
MHD_CONNECTION_INFO_CLIENT_ADDRESS );
/* Incoming IPv4 connection */
- if ( AF_INET == conn_info->client_addr->sin_family)
+ /* cast required for legacy MHD API < 0.9.6 */
+ client_addr = (const struct sockaddr *) conn_info->client_addr;
+ if ( AF_INET == client_addr->sa_family)
{
- addrin = conn_info->client_addr;
+ addrin = (const struct sockaddr_in*) client_addr;
inet_ntop(addrin->sin_family,
&(addrin->sin_addr),address,INET_ADDRSTRLEN);
memcpy(&ipv4addr.ipv4_addr,&(addrin->sin_addr),sizeof(struct in_addr));
ipv4addr.u_port = addrin->sin_port;
@@ -1087,9 +1089,9 @@
addr_len = sizeof(struct IPv4HttpAddress);
}
/* Incoming IPv6 connection */
- if ( AF_INET6 == conn_info->client_addr->sin_family)
+ if ( AF_INET6 == client_addr->sa_family)
{
- addrin6 = (struct sockaddr_in6 *) conn_info->client_addr;
+ addrin6 = (const struct sockaddr_in6 *) client_addr;
inet_ntop(addrin6->sin6_family,
&(addrin6->sin6_addr),address,INET6_ADDRSTRLEN);
memcpy(&ipv6addr.ipv6_addr,&(addrin6->sin6_addr),sizeof(struct
in6_addr));
ipv6addr.u6_port = addrin6->sin6_port;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14331 - gnunet/src/transport,
gnunet <=