diff options
Diffstat (limited to 'src/gns/gnunet-gns-helper-service-w32.c')
-rw-r--r-- | src/gns/gnunet-gns-helper-service-w32.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index f0bf6577c..187ee41ae 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c | |||
@@ -282,13 +282,13 @@ process_ip_lookup_result (void* cls, | |||
282 | { | 282 | { |
283 | switch (rd[i].record_type) | 283 | switch (rd[i].record_type) |
284 | { | 284 | { |
285 | case GNUNET_GNS_RECORD_A: | 285 | case GNUNET_DNSPARSER_TYPE_A: |
286 | if (rd[i].data_size != sizeof (struct in_addr)) | 286 | if (rd[i].data_size != sizeof (struct in_addr)) |
287 | continue; | 287 | continue; |
288 | size += sizeof (CSADDR_INFO) + sizeof (struct sockaddr_in) * 2; | 288 | size += sizeof (CSADDR_INFO) + sizeof (struct sockaddr_in) * 2; |
289 | csanum++; | 289 | csanum++; |
290 | break; | 290 | break; |
291 | case GNUNET_GNS_RECORD_AAAA: | 291 | case GNUNET_DNSPARSER_TYPE_AAAA: |
292 | if (rd[i].data_size != sizeof (struct in6_addr)) | 292 | if (rd[i].data_size != sizeof (struct in6_addr)) |
293 | continue; | 293 | continue; |
294 | size += sizeof (CSADDR_INFO) + sizeof (struct sockaddr_in6) * 2; | 294 | size += sizeof (CSADDR_INFO) + sizeof (struct sockaddr_in6) * 2; |
@@ -305,13 +305,13 @@ process_ip_lookup_result (void* cls, | |||
305 | blobsize += sizeof (void *); /* For addresses */ | 305 | blobsize += sizeof (void *); /* For addresses */ |
306 | for (i = 0; i < rd_count; i++) | 306 | for (i = 0; i < rd_count; i++) |
307 | { | 307 | { |
308 | if ((rq->af == AF_INET || rq->af == AF_UNSPEC) && rd[i].record_type == GNUNET_GNS_RECORD_A) | 308 | if ((rq->af == AF_INET || rq->af == AF_UNSPEC) && rd[i].record_type == GNUNET_DNSPARSER_TYPE_A) |
309 | { | 309 | { |
310 | blobsize += sizeof (void *); | 310 | blobsize += sizeof (void *); |
311 | blobsize += sizeof (struct in_addr); | 311 | blobsize += sizeof (struct in_addr); |
312 | blobaddrcount++; | 312 | blobaddrcount++; |
313 | } | 313 | } |
314 | else if (rq->af == AF_INET6 && rd[i].record_type == GNUNET_GNS_RECORD_AAAA) | 314 | else if (rq->af == AF_INET6 && rd[i].record_type == GNUNET_DNSPARSER_TYPE_AAAA) |
315 | { | 315 | { |
316 | blobsize += sizeof (void *); | 316 | blobsize += sizeof (void *); |
317 | blobsize += sizeof (struct in6_addr); | 317 | blobsize += sizeof (struct in6_addr); |
@@ -367,7 +367,7 @@ process_ip_lookup_result (void* cls, | |||
367 | { | 367 | { |
368 | switch (rd[i].record_type) | 368 | switch (rd[i].record_type) |
369 | { | 369 | { |
370 | case GNUNET_GNS_RECORD_A: | 370 | case GNUNET_DNSPARSER_TYPE_A: |
371 | if (rd[i].data_size != sizeof (struct in_addr)) | 371 | if (rd[i].data_size != sizeof (struct in_addr)) |
372 | continue; | 372 | continue; |
373 | qs->lpcsaBuffer[j].iSocketType = SOCK_STREAM; | 373 | qs->lpcsaBuffer[j].iSocketType = SOCK_STREAM; |
@@ -389,7 +389,7 @@ process_ip_lookup_result (void* cls, | |||
389 | size_recalc += sizeof (CSADDR_INFO) + sizeof (struct sockaddr_in) * 2; | 389 | size_recalc += sizeof (CSADDR_INFO) + sizeof (struct sockaddr_in) * 2; |
390 | j++; | 390 | j++; |
391 | break; | 391 | break; |
392 | case GNUNET_GNS_RECORD_AAAA: | 392 | case GNUNET_DNSPARSER_TYPE_AAAA: |
393 | if (rd[i].data_size != sizeof (struct in6_addr)) | 393 | if (rd[i].data_size != sizeof (struct in6_addr)) |
394 | continue; | 394 | continue; |
395 | qs->lpcsaBuffer[j].iSocketType = SOCK_STREAM; | 395 | qs->lpcsaBuffer[j].iSocketType = SOCK_STREAM; |
@@ -460,7 +460,7 @@ process_ip_lookup_result (void* cls, | |||
460 | for (i = 0; i < rd_count; i++) | 460 | for (i = 0; i < rd_count; i++) |
461 | { | 461 | { |
462 | if ((rq->af == AF_INET || rq->af == AF_UNSPEC) && | 462 | if ((rq->af == AF_INET || rq->af == AF_UNSPEC) && |
463 | rd[i].record_type == GNUNET_GNS_RECORD_A) | 463 | rd[i].record_type == GNUNET_DNSPARSER_TYPE_A) |
464 | { | 464 | { |
465 | he->h_addr_list[j] = (char *) ptr; | 465 | he->h_addr_list[j] = (char *) ptr; |
466 | ptr += sizeof (struct in_addr); | 466 | ptr += sizeof (struct in_addr); |
@@ -471,7 +471,7 @@ process_ip_lookup_result (void* cls, | |||
471 | memcpy (he->h_addr_list[j], rd[i].data, sizeof (struct in_addr)); | 471 | memcpy (he->h_addr_list[j], rd[i].data, sizeof (struct in_addr)); |
472 | j++; | 472 | j++; |
473 | } | 473 | } |
474 | else if (rq->af == AF_INET6 && rd[i].record_type == GNUNET_GNS_RECORD_AAAA) | 474 | else if (rq->af == AF_INET6 && rd[i].record_type == GNUNET_DNSPARSER_TYPE_AAAA) |
475 | { | 475 | { |
476 | he->h_addr_list[j] = (char *) ptr; | 476 | he->h_addr_list[j] = (char *) ptr; |
477 | ptr += sizeof (struct in6_addr); | 477 | ptr += sizeof (struct in6_addr); |
@@ -512,25 +512,25 @@ get_ip_from_hostname (struct GNUNET_SERVER_Client *client, | |||
512 | uint32_t rtype; | 512 | uint32_t rtype; |
513 | 513 | ||
514 | if (IsEqualGUID (&SVCID_DNS_TYPE_A, &sc)) | 514 | if (IsEqualGUID (&SVCID_DNS_TYPE_A, &sc)) |
515 | rtype = GNUNET_GNS_RECORD_A; | 515 | rtype = GNUNET_DNSPARSER_TYPE_A; |
516 | else if (IsEqualGUID (&SVCID_DNS_TYPE_NS, &sc)) | 516 | else if (IsEqualGUID (&SVCID_DNS_TYPE_NS, &sc)) |
517 | rtype = GNUNET_GNS_RECORD_NS; | 517 | rtype = GNUNET_DNSPARSER_TYPE_NS; |
518 | else if (IsEqualGUID (&SVCID_DNS_TYPE_CNAME, &sc)) | 518 | else if (IsEqualGUID (&SVCID_DNS_TYPE_CNAME, &sc)) |
519 | rtype = GNUNET_GNS_RECORD_CNAME; | 519 | rtype = GNUNET_DNSPARSER_TYPE_CNAME; |
520 | else if (IsEqualGUID (&SVCID_DNS_TYPE_SOA, &sc)) | 520 | else if (IsEqualGUID (&SVCID_DNS_TYPE_SOA, &sc)) |
521 | rtype = GNUNET_GNS_RECORD_SOA; | 521 | rtype = GNUNET_DNSPARSER_TYPE_SOA; |
522 | else if (IsEqualGUID (&SVCID_DNS_TYPE_PTR, &sc)) | 522 | else if (IsEqualGUID (&SVCID_DNS_TYPE_PTR, &sc)) |
523 | rtype = GNUNET_GNS_RECORD_PTR; | 523 | rtype = GNUNET_DNSPARSER_TYPE_PTR; |
524 | else if (IsEqualGUID (&SVCID_DNS_TYPE_MX, &sc)) | 524 | else if (IsEqualGUID (&SVCID_DNS_TYPE_MX, &sc)) |
525 | rtype = GNUNET_GNS_RECORD_MX; | 525 | rtype = GNUNET_DNSPARSER_TYPE_MX; |
526 | else if (IsEqualGUID (&SVCID_DNS_TYPE_TEXT, &sc)) | 526 | else if (IsEqualGUID (&SVCID_DNS_TYPE_TEXT, &sc)) |
527 | rtype = GNUNET_GNS_RECORD_TXT; | 527 | rtype = GNUNET_DNSPARSER_TYPE_TXT; |
528 | else if (IsEqualGUID (&SVCID_DNS_TYPE_AAAA, &sc)) | 528 | else if (IsEqualGUID (&SVCID_DNS_TYPE_AAAA, &sc)) |
529 | rtype = GNUNET_GNS_RECORD_AAAA; | 529 | rtype = GNUNET_DNSPARSER_TYPE_AAAA; |
530 | else if (IsEqualGUID (&SVCID_DNS_TYPE_SRV, &sc)) | 530 | else if (IsEqualGUID (&SVCID_DNS_TYPE_SRV, &sc)) |
531 | rtype = GNUNET_GNS_RECORD_SRV; | 531 | rtype = GNUNET_DNSPARSER_TYPE_SRV; |
532 | else if (IsEqualGUID (&SVCID_INET_HOSTADDRBYNAME, &sc)) | 532 | else if (IsEqualGUID (&SVCID_INET_HOSTADDRBYNAME, &sc)) |
533 | rtype = GNUNET_GNS_RECORD_A; | 533 | rtype = GNUNET_DNSPARSER_TYPE_A; |
534 | else | 534 | else |
535 | { | 535 | { |
536 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 536 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |