diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-25 09:56:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-25 09:56:17 +0000 |
commit | ced3124f0f10728cfcb55946af572f025214a88d (patch) | |
tree | e23ba7d4c4cbc8fd2c2c32b72179ba9e394ed13c /src/dns | |
parent | 73c3eaf7b25a8f493ea4bd263d968a6c67931e4b (diff) | |
download | gnunet-ced3124f0f10728cfcb55946af572f025214a88d.tar.gz gnunet-ced3124f0f10728cfcb55946af572f025214a88d.zip |
-fix
Diffstat (limited to 'src/dns')
-rw-r--r-- | src/dns/gnunet-service-dns.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index 9f3a64334..f4ce54692 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c | |||
@@ -1223,7 +1223,9 @@ process_helper_messages (void *cls GNUNET_UNUSED, void *client, | |||
1223 | 1223 | ||
1224 | /* setup new request */ | 1224 | /* setup new request */ |
1225 | rr->phase = RP_INIT; | 1225 | rr->phase = RP_INIT; |
1226 | if (ip4->version == 4) | 1226 | switch (ntohs (tun->proto)) |
1227 | { | ||
1228 | case ETH_P_IPV4: | ||
1227 | { | 1229 | { |
1228 | srca4 = (struct sockaddr_in*) &rr->src_addr; | 1230 | srca4 = (struct sockaddr_in*) &rr->src_addr; |
1229 | dsta4 = (struct sockaddr_in*) &rr->dst_addr; | 1231 | dsta4 = (struct sockaddr_in*) &rr->dst_addr; |
@@ -1240,7 +1242,8 @@ process_helper_messages (void *cls GNUNET_UNUSED, void *client, | |||
1240 | dsta4->sin_len = sizeof (sizeof (struct sockaddr_in)); | 1242 | dsta4->sin_len = sizeof (sizeof (struct sockaddr_in)); |
1241 | #endif | 1243 | #endif |
1242 | } | 1244 | } |
1243 | else /* ipv6 */ | 1245 | break; |
1246 | case ETH_P_IPV6: | ||
1244 | { | 1247 | { |
1245 | srca6 = (struct sockaddr_in6*) &rr->src_addr; | 1248 | srca6 = (struct sockaddr_in6*) &rr->src_addr; |
1246 | dsta6 = (struct sockaddr_in6*) &rr->dst_addr; | 1249 | dsta6 = (struct sockaddr_in6*) &rr->dst_addr; |
@@ -1256,6 +1259,9 @@ process_helper_messages (void *cls GNUNET_UNUSED, void *client, | |||
1256 | srca6->sin6_len = sizeof (sizeof (struct sockaddr_in6)); | 1259 | srca6->sin6_len = sizeof (sizeof (struct sockaddr_in6)); |
1257 | dsta6->sin6_len = sizeof (sizeof (struct sockaddr_in6)); | 1260 | dsta6->sin6_len = sizeof (sizeof (struct sockaddr_in6)); |
1258 | #endif | 1261 | #endif |
1262 | break; | ||
1263 | default: | ||
1264 | GNUNET_assert (0); | ||
1259 | } | 1265 | } |
1260 | rr->payload = GNUNET_malloc (msize); | 1266 | rr->payload = GNUNET_malloc (msize); |
1261 | rr->payload_length = msize; | 1267 | rr->payload_length = msize; |