[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20683 - in gnunet/src/gns: . proxy
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20683 - in gnunet/src/gns: . proxy |
Date: |
Thu, 22 Mar 2012 18:52:23 +0100 |
Author: schanzen
Date: 2012-03-22 18:52:23 +0100 (Thu, 22 Mar 2012)
New Revision: 20683
Modified:
gnunet/src/gns/gnunet-gns.c
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/proxy/proxy.py
Log:
-cli tool fix, bugfix
Modified: gnunet/src/gns/gnunet-gns.c
===================================================================
--- gnunet/src/gns/gnunet-gns.c 2012-03-22 17:52:14 UTC (rev 20682)
+++ gnunet/src/gns/gnunet-gns.c 2012-03-22 17:52:23 UTC (rev 20683)
@@ -89,27 +89,25 @@
const struct GNUNET_NAMESTORE_RecordData *rd)
{
int i;
- char* addr;
char* name = (char*) cls;
+ const char* typename;
+ char* string_val;
if (rd_count == 0)
printf("No results.\n");
+ else
+ printf("%s:\n", name);
+
+
for (i=0; i<rd_count; i++)
{
- if (rd[i].record_type != rtype)
- continue;
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
- {
- addr = inet_ntoa(*((struct in_addr*)rd[i].data));
- printf("Got A record for %s: %s\n", name, addr);
- }
- if (rd[i].record_type == GNUNET_GNS_RECORD_MX)
- {
- printf("Got MX record for %s: %s\n", name, (char*)rd[i].data);
- }
+ typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
+ string_val = GNUNET_NAMESTORE_value_to_string(rd[i].record_type,
+ rd[i].data,
+ rd[i].data_size);
+ printf("Got %s record: %s\n", typename, string_val);
- //FIXME others? maybe to string method for records?
}
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
@@ -135,7 +133,10 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
gns = GNUNET_GNS_connect (cfg);
- rtype = GNUNET_GNS_RECORD_TYPE_A;
+ if (lookup_type != NULL)
+ rtype = GNUNET_NAMESTORE_typename_to_number(lookup_type);
+ else
+ rtype = GNUNET_GNS_RECORD_TYPE_A;
if (NULL == gns)
{
@@ -153,6 +154,8 @@
if (lookup_name != NULL)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Lookup\n");
GNUNET_GNS_lookup(gns, lookup_name, rtype,
&process_lookup_result, lookup_name);
}
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-03-22 17:52:14 UTC
(rev 20682)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-03-22 17:52:23 UTC
(rev 20683)
@@ -1168,6 +1168,10 @@
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Expanded to %s\n", *dest);
}
+ else
+ {
+ memcpy(*dest, src, s_len+1);
+ }
}
/**
Modified: gnunet/src/gns/proxy/proxy.py
===================================================================
--- gnunet/src/gns/proxy/proxy.py 2012-03-22 17:52:14 UTC (rev 20682)
+++ gnunet/src/gns/proxy/proxy.py 2012-03-22 17:52:23 UTC (rev 20683)
@@ -140,7 +140,7 @@
arr.pop(0)
data = re.sub('(a href="http://(\w+\.)*)(\+)',
self.replace_and_shorten(to_repl), data)
- print data
+ #print data
out.send(data)
count = 0
else:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20683 - in gnunet/src/gns: . proxy,
gnunet <=