[GNUnet-SVN] r20739 - in gnunet/src/gns: . proxy

[gnunet]

Author: schanzen
Date: 2012-03-23 19:15:43 +0100 (Fri, 23 Mar 2012)
New Revision: 20739

Modified:
   gnunet/src/gns/Makefile.am
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/gns/proxy/proxy.py
Log:
-fix, will failon werrorr


Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-03-23 17:40:07 UTC (rev 20738)
+++ gnunet/src/gns/Makefile.am  2012-03-23 18:15:43 UTC (rev 20739)
@@ -207,6 +207,7 @@
        $(top_builddir)/src/dns/libgnunetdnsparser.la \
        $(top_builddir)/src/dht/libgnunetdht.la \
        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  -lunistring \
   $(GN_LIBINTL)
 gnunet_service_gns_DEPENDENCIES = \
   $(top_builddir)/src/tun/libgnunettun.la \

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-23 17:40:07 UTC 
(rev 20738)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-23 18:15:43 UTC 
(rev 20739)
@@ -26,6 +26,7 @@
  * @author Martin Schanzenbach
  */
 #include "platform.h"
+#include <unicase.h>
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_dns_service.h"
@@ -1910,6 +1911,9 @@
   struct ResolverHandle *rh;
   struct RecordLookupHandle* rlh;
   char string_hash[MAX_DNS_LABEL_LENGTH];
+  char* normalized_zkey;
+  char nzkey[MAX_DNS_LABEL_LENGTH];
+  size_t normal_len;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting resolution for %s (type=%d)!\n",
@@ -1977,8 +1981,15 @@
 
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "ZKEY is %s!\n", string_hash);
+      
+      normalized_zkey = u8_toupper ((uint8_t*)string_hash, strlen ((char *) 
string_hash),
+                                  NULL, UNINORM_NFD, NULL, &normal_len);
 
-      if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string(string_hash,
+      memcpy(nzkey, normalized_zkey, normal_len);
+      nzkey[normal_len] = '\0';
+      free(normalized_zkey);
+      
+      if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string(nzkey,
                                                       &rh->authority))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -2275,6 +2286,9 @@
   struct NameShortenHandle *nsh;
   char string_hash[MAX_DNS_LABEL_LENGTH];
   struct GNUNET_CRYPTO_ShortHashCode zkey;
+  char* normalized_zkey;
+  size_t normal_len;
+  char nzkey[MAX_DNS_LABEL_LENGTH];
 
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2318,11 +2332,18 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "ZKEY is %s!\n", string_hash);
 
-    if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string(string_hash,
+    normalized_zkey = u8_toupper ((uint8_t*)string_hash, strlen ((char *) 
string_hash),
+                                  NULL, UNINORM_NFD, NULL, &normal_len);
+
+    memcpy(nzkey, normalized_zkey, normal_len);
+    nzkey[normal_len] = '\0';
+    free(normalized_zkey);
+
+    if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string(nzkey,
                                                           &zkey))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot convert ZKEY %s to hash!\n", string_hash);
+                  "Cannot convert ZKEY %s to hash!\n", nzkey);
       GNUNET_free(rh);
       GNUNET_free(nsh);
       proc(proc_cls, name);

Modified: gnunet/src/gns/proxy/proxy.py
===================================================================
--- gnunet/src/gns/proxy/proxy.py       2012-03-23 17:40:07 UTC (rev 20738)
+++ gnunet/src/gns/proxy/proxy.py       2012-03-23 18:15:43 UTC (rev 20739)
@@ -135,7 +135,7 @@
                         out = soc
                     data = i.recv(8192)
                     if data:
-                        if (re.match("(\w+\.)*gnunet", self.host_port[0])):
+                        if (re.match("(\w+\.)*gnunet", self.host_port[0]) or 
1):
                             arr = self.host_port[0].split('.')
                             arr.pop(0)
                             data = re.sub('(a href="http://(\w+\.)*)(\+)',