[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31445 - gnunet-gtk/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31445 - gnunet-gtk/src/namestore |
Date: |
Mon, 16 Dec 2013 22:51:50 +0100 |
Author: grothoff
Date: 2013-12-16 22:51:50 +0100 (Mon, 16 Dec 2013)
New Revision: 31445
Modified:
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
Log:
-permit CNAME/PSEU despite existence of NICK, remove legacly NS logic
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-12-16 21:48:28 UTC
(rev 31444)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-12-16 21:51:50 UTC
(rev 31445)
@@ -660,7 +660,9 @@
gint n_type)
{
unsigned int i;
+ unsigned int nick;
+ nick = 0;
for (i=0;i<rd_count;i++)
{
switch (rd[i].record_type)
@@ -674,22 +676,20 @@
return GNUNET_NO;
case GNUNET_GNSRECORD_TYPE_PKEY:
return GNUNET_NO;
+ case GNUNET_GNSRECORD_TYPE_NICK:
+ nick++;
+ break;
default:
break;
}
}
+ rd_count -= nick;
if (0 == rd_count)
return GNUNET_OK;
switch (n_type)
{
case GNUNET_DNSPARSER_TYPE_CNAME:
return GNUNET_NO;
- case GNUNET_DNSPARSER_TYPE_NS:
- for (i=0;i<rd_count;i++)
- if ( (GNUNET_DNSPARSER_TYPE_A != rd[i].record_type) &&
- (GNUNET_DNSPARSER_TYPE_AAAA != rd[i].record_type) )
- return GNUNET_NO;
- return GNUNET_OK;
case GNUNET_GNSRECORD_TYPE_PKEY:
return GNUNET_NO;
default:
@@ -1544,6 +1544,11 @@
{
struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc;
+ if (NULL == current_zone_option)
+ {
+ GNUNET_break (0);
+ return;
+ }
edc = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginEnvironment);
if ( (NULL != ri) &&
(off < ri->rd_count) )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31445 - gnunet-gtk/src/namestore,
gnunet <=