[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24598 - gnunet/src/gns
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r24598 - gnunet/src/gns |
|
Date: |
Mon, 29 Oct 2012 22:14:08 +0100 |
Author: grothoff
Date: 2012-10-29 22:14:08 +0100 (Mon, 29 Oct 2012)
New Revision: 24598
Modified:
gnunet/src/gns/test_gns_cname_lookup.c
gnunet/src/gns/test_gns_ns_lookup.c
Log:
-fix build errors
Modified: gnunet/src/gns/test_gns_cname_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_cname_lookup.c 2012-10-29 16:41:36 UTC (rev
24597)
+++ gnunet/src/gns/test_gns_cname_lookup.c 2012-10-29 21:14:08 UTC (rev
24598)
@@ -94,14 +94,6 @@
}
-static void
-end_badly_now ()
-{
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
static void
shutdown_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -174,31 +166,30 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Lookup failed, rp_filtering?\n");
ok = 2;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
- else
+ ok = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
+ for (i=0; i<rd_count; i++)
{
- ok = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
- for (i=0; i<rd_count; i++)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+ memcpy(&a, rd[i].data, sizeof(a));
+ addr = inet_ntoa(a);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+ if (0 == strcmp(addr, TEST_IP_DNS))
{
- memcpy(&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
- if (0 == strcmp(addr, TEST_IP_DNS))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n", TEST_DOMAIN_DNS, addr);
- ok = 0;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s correctly resolved to %s!\n", TEST_DOMAIN_DNS, addr);
+ ok = 0;
}
- else
+ }
+ else
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
}
- }
}
GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_CNAME,
GNUNET_YES,
@@ -220,37 +211,36 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Lookup failed, rp_filtering?\n");
ok = 2;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
- else
+ ok = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "name: %s\n", (char*)cls);
+ for (i=0; i<rd_count; i++)
{
- ok = 1;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "name: %s\n", (char*)cls);
- for (i=0; i<rd_count; i++)
+ "type: %d\n", rd[i].record_type);
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+ memcpy (&a, rd[i].data, sizeof(a));
+ addr = inet_ntoa(a);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "address: %s\n", addr);
+ if (0 == strcmp (addr, TEST_IP_ZKEY))
{
- memcpy (&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "address: %s\n", addr);
- if (0 == strcmp (addr, TEST_IP_ZKEY))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n",
- TEST_DOMAIN_ZKEY, addr);
- ok = 0;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s correctly resolved to %s!\n",
+ TEST_DOMAIN_ZKEY, addr);
+ ok = 0;
}
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No resolution!\n");
- }
}
-
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No resolution!\n");
+ }
+ }
GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_DNS, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
@@ -271,31 +261,30 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Lookup failed, rp_filtering?\n");
ok = 2;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
- else
+ ok = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
+ for (i=0; i<rd_count; i++)
{
- ok = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
- for (i=0; i<rd_count; i++)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+ memcpy(&a, rd[i].data, sizeof(a));
+ addr = inet_ntoa(a);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+ if (0 == strcmp(addr, TEST_IP_PLUS))
{
- memcpy(&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
- if (0 == strcmp(addr, TEST_IP_PLUS))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n", TEST_DOMAIN_PLUS, addr);
- ok = 0;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s correctly resolved to %s!\n", TEST_DOMAIN_PLUS, addr);
+ ok = 0;
}
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
- }
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
+ }
}
GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ZKEY, GNUNET_GNS_RECORD_A,
GNUNET_YES,
@@ -322,7 +311,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to store record in namestore: %s\n",
emsg);
- end_badly_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
gns_handle = GNUNET_GNS_connect(cfg);
@@ -330,7 +319,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to GNS!\n");
- end_badly_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_A,
@@ -362,7 +351,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to namestore\n");
- end_badly_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -372,7 +361,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to get key from cfg\n");
- end_badly_now ();
+ GNUNET_SCHEDULER_shutdown ();
return;
}
Modified: gnunet/src/gns/test_gns_ns_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.c 2012-10-29 16:41:36 UTC (rev 24597)
+++ gnunet/src/gns/test_gns_ns_lookup.c 2012-10-29 21:14:08 UTC (rev 24598)
@@ -61,7 +61,7 @@
static const struct GNUNET_CONFIGURATION_Handle *cfg;
-static struct GNS_LookupRequest *lr;
+static struct GNUNET_GNS_LookupRequest *lr;
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24598 - gnunet/src/gns,
gnunet <=