[GNUnet-SVN] r8633 - in gnunet/src: hello peerinfo

[gnunet]

Author: grothoff
Date: 2009-07-07 14:05:55 -0600 (Tue, 07 Jul 2009)
New Revision: 8633

Modified:
   gnunet/src/hello/hello.c
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
Log:
fixing issues with hello handling

Modified: gnunet/src/hello/hello.c
===================================================================
--- gnunet/src/hello/hello.c    2009-07-07 20:05:38 UTC (rev 8632)
+++ gnunet/src/hello/hello.c    2009-07-07 20:05:55 UTC (rev 8633)
@@ -130,6 +130,7 @@
     {
       /* 0-termination not found */
       GNUNET_break_op (0);
+      abort ();
       return 0;
     }
   pos++;

Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2009-07-07 20:05:38 UTC 
(rev 8632)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2009-07-07 20:05:55 UTC 
(rev 8633)
@@ -371,9 +371,11 @@
       host->hello = mrg;
     }
   fn = get_host_filename (peer);
-  GNUNET_DISK_fn_write (fn, host->hello, GNUNET_HELLO_size (hello),
-      GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-          | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ);
+  GNUNET_DISK_fn_write (fn, 
+                       host->hello, 
+                       GNUNET_HELLO_size (host->hello),
+                       GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
+                       | GNUNET_DISK_PERM_GROUP_READ | 
GNUNET_DISK_PERM_OTHER_READ);
   GNUNET_free (fn);
 }
 
@@ -516,9 +518,11 @@
                               GNUNET_ERROR_TYPE_BULK, "unlink", fn);
   if (new_hello != NULL)
     {
-      GNUNET_DISK_fn_write (fn, new_hello, GNUNET_HELLO_size (new_hello),
-          GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-              | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ);
+      GNUNET_DISK_fn_write (fn, 
+                           new_hello,
+                           GNUNET_HELLO_size (new_hello),
+                           GNUNET_DISK_PERM_USER_READ | 
GNUNET_DISK_PERM_USER_WRITE
+                           | GNUNET_DISK_PERM_GROUP_READ | 
GNUNET_DISK_PERM_OTHER_READ);
       GNUNET_free (new_hello);
     }
   return GNUNET_OK;