[GNUnet-SVN] r368 - in GNUnet: contrib src/applications/fs/ecrs src/appl

gnunet-svn

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r368 - in GNUnet: contrib src/applications/fs/ecrs src/appl

From:	grothoff
Subject:	[GNUnet-SVN] r368 - in GNUnet: contrib src/applications/fs/ecrs src/applications/fs/lib src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/topology_default src/server
Date:	Fri, 4 Mar 2005 22:08:04 -0800 (PST)

Author: grothoff
Date: 2005-03-04 22:08:01 -0800 (Fri, 04 Mar 2005)
New Revision: 368

Modified:
   GNUnet/contrib/gnunet.root
   GNUnet/src/applications/fs/ecrs/check.conf
   GNUnet/src/applications/fs/ecrs/uritest.c
   GNUnet/src/applications/fs/lib/check.conf
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/src/applications/sqstore_sqlite/sqlite.c
   GNUnet/src/applications/topology_default/Makefile.am
   GNUnet/src/applications/topology_default/topology.c
   GNUnet/src/server/startup.c
Log:
changing ciphers

Modified: GNUnet/contrib/gnunet.root
===================================================================
--- GNUnet/contrib/gnunet.root  2005-03-05 05:52:13 UTC (rev 367)
+++ GNUnet/contrib/gnunet.root  2005-03-05 06:08:01 UTC (rev 368)
@@ -189,6 +189,11 @@
 # The default is "sqstore_sqlite".
 sqstore = "sqstore_sqlite"
 
+# Which topology should be used?  The only
+# option at the moment is "topology_default".
+#
+# The default is "topology_default"
+topology = "topology_default"
 
 
 ############################################

Modified: GNUnet/src/applications/fs/ecrs/check.conf
===================================================================
--- GNUnet/src/applications/fs/ecrs/check.conf  2005-03-05 05:52:13 UTC (rev 
367)
+++ GNUnet/src/applications/fs/ecrs/check.conf  2005-03-05 06:08:01 UTC (rev 
368)
@@ -18,6 +18,7 @@
 sqstore = "sqstore_sqlite"
 # you can also use sqstore_mysql here if 
 # that DB is available...
+topology = "topology_default"
 
 [NETWORK]
 PORT = 2087

Modified: GNUnet/src/applications/fs/ecrs/uritest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uritest.c   2005-03-05 05:52:13 UTC (rev 
367)
+++ GNUnet/src/applications/fs/ecrs/uritest.c   2005-03-05 06:08:01 UTC (rev 
368)
@@ -66,7 +66,7 @@
     ABORT();
   if (NULL != ECRS_stringToUri("gnunet://ecrs/sks/test"))
     ABORT();
-  ret = 
ECRS_stringToUri("gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK/test");
+  ret = 
ECRS_stringToUri("gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
   if (ret == NULL)
     ABORT();
   if (ECRS_isKeywordURI(ret))
@@ -76,7 +76,7 @@
 
   uri = ECRS_uriToString(ret);
   if (0 != strcmp(uri,
-                 
"gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK/URQEG2OBIIV9E623PTKLCNVG47T4Q3P3"))
 
+                 
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/TOJB1NAAUVJKJAGQHRHS22N9I8VM32C0ESN4EFS836IT950E1MP7LGC5V2GE3LFO9U4BP23VQPTH8DPIOC2CONT9LM76ULVL00KAHVO"))
 
     ABORT();  
   FREE(uri);
   ECRS_freeUri(ret);
@@ -87,13 +87,13 @@
   char * uri;
   struct ECRS_URI * ret;
   
-  if (NULL != 
ECRS_stringToUri("gnunet://ecrs/chk/D1KJSA82Q65VKQ0ML3RFU6U1D3VUK.URQEG2OBIIV9E623PTKLCNVG47T3P3.42"))
+  if (NULL != 
ECRS_stringToUri("gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42"))
     ABORT();
-  if (NULL != 
ECRS_stringToUri("gnunet://ecrs/chk/D1KJSA82Q65VKQ0ML3RFU6U1D3VUK.URQEG2OBIIV9E623PTKLCNVG47T3P3"))
+  if (NULL != 
ECRS_stringToUri("gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000"))
     ABORT();
-  if (NULL != 
ECRS_stringToUri("gnunet://ecrs/chk/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK/URQEG2OBIIV9E623PTKLCNVG47T4Q3P3.FGH"))
+  if (NULL != 
ECRS_stringToUri("gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH"))
     ABORT();
-  ret = 
ECRS_stringToUri("gnunet://ecrs/chk/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK.URQEG2OBIIV9E623PTKLCNVG47T4Q3P3.42");
+  ret = 
ECRS_stringToUri("gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
   if (ret == NULL)
     ABORT();
   if (ECRS_isKeywordURI(ret))
@@ -105,7 +105,7 @@
 
   uri = ECRS_uriToString(ret);
   if (0 != strcmp(uri,
-                 
"gnunet://ecrs/chk/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK.URQEG2OBIIV9E623PTKLCNVG47T4Q3P3.42"))
 {
+                 
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42"))
 {
     ABORT();  
   }
   FREE(uri);

Modified: GNUnet/src/applications/fs/lib/check.conf
===================================================================
--- GNUnet/src/applications/fs/lib/check.conf   2005-03-05 05:52:13 UTC (rev 
367)
+++ GNUnet/src/applications/fs/lib/check.conf   2005-03-05 06:08:01 UTC (rev 
368)
@@ -18,6 +18,7 @@
 sqstore = "sqstore_sqlite"
 # you can also use sqstore_mysql here if 
 # that DB is available...
+topology = "topology_default"
 
 [NETWORK]
 PORT = 2087

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2005-03-05 05:52:13 UTC 
(rev 367)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2005-03-05 06:08:01 UTC 
(rev 368)
@@ -287,7 +287,7 @@
              " expire BIGINT NOT NULL DEFAULT 0," 
              " hash TINYBLOB BINARY NOT NULL DEFAULT '',"
              " value BLOB NOT NULL DEFAULT '',"
-             " INDEX (hash(20)),"
+             " INDEX (hash(64)),"
              " INDEX (prio),"
              " INDEX (expire)"
              ") TYPE=MyISAM");

Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c     2005-03-05 05:52:13 UTC 
(rev 367)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c     2005-03-05 06:08:01 UTC 
(rev 368)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001 - 2005 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

Modified: GNUnet/src/applications/topology_default/Makefile.am
===================================================================
--- GNUnet/src/applications/topology_default/Makefile.am        2005-03-05 
05:52:13 UTC (rev 367)
+++ GNUnet/src/applications/topology_default/Makefile.am        2005-03-05 
06:08:01 UTC (rev 368)
@@ -3,11 +3,11 @@
 plugindir = $(libdir)/GNUnet
 
 plugin_LTLIBRARIES = \
-  libgnunetmodule_topology.la 
+  libgnunetmodule_topology_default.la 
 
-libgnunetmodule_topology_la_SOURCES = \
+libgnunetmodule_topology_default_la_SOURCES = \
   topology.c 
-libgnunetmodule_topology_la_LIBADD = \
+libgnunetmodule_topology_default_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la 
-libgnunetmodule_topology_la_LDFLAGS = \
+libgnunetmodule_topology_default_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2005-03-05 05:52:13 UTC 
(rev 367)
+++ GNUnet/src/applications/topology_default/topology.c 2005-03-05 06:08:01 UTC 
(rev 368)
@@ -255,7 +255,7 @@
 }
 
 Topology_ServiceAPI * 
-provide_module_topology(CoreAPIForApplication * capi) {
+provide_module_topology_default(CoreAPIForApplication * capi) {
   static Topology_ServiceAPI api;
 
   coreAPI = capi;
@@ -302,7 +302,7 @@
   return &api;
 }
 
-int release_module_topology() {
+int release_module_topology_default() {
   delCronJob(&cronCheckLiveness,
             5 * cronSECONDS,
             NULL);
@@ -321,14 +321,14 @@
 static CoreAPIForApplication * myCapi;
 static Topology_ServiceAPI * myTopology;
 
-int initialize_module_topology(CoreAPIForApplication * capi) {
+int initialize_module_topology_default(CoreAPIForApplication * capi) {
   myCapi = capi;
   myTopology = capi->requestService("topology");
   GNUNET_ASSERT(myTopology != NULL);
   return OK;
 }
 
-void done_module_topology() {
+void done_module_topology_default() {
   myCapi->releaseService(myTopology);
   myCapi = NULL;
   myTopology = NULL;

Modified: GNUnet/src/server/startup.c
===================================================================
--- GNUnet/src/server/startup.c 2005-03-05 05:52:13 UTC (rev 367)
+++ GNUnet/src/server/startup.c 2005-03-05 06:08:01 UTC (rev 368)
@@ -256,12 +256,8 @@
  * Check if the compiler did a decent job aligning the structs...
  */
 void checkCompiler() {
-  if (sizeof(HELO_Message) != 556)
-    errexit("sizeof HELO Message wrong! (%d != 556)",
-           sizeof(HELO_Message));
-  if (sizeof(p2p_HEADER) != 4)
-    errexit("sizeof p2p_HEADER wrong! (%d != 4)",
-           sizeof(p2p_HEADER));
+  GNUNET_ASSERT(sizeof(HELO_Message) == 600);
+  GNUNET_ASSERT(sizeof(p2p_HEADER) == 4);
 }
 
 /* *********** PID file handling *************** */

[Prev in Thread]

Current Thread

[Next in Thread]

[GNUnet-SVN] r368 - in GNUnet: contrib src/applications/fs/ecrs src/applications/fs/lib src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/topology_default src/server, grothoff <=

Prev by Date: [GNUnet-SVN] r367 - GNUnet/src/applications/fragmentation
Next by Date: [GNUnet-SVN] r369 - in GNUnet: . src/applications src/applications/identity src/applications/session src/applications/topology_default src/applications/transport src/include src/util
Previous by thread: [GNUnet-SVN] r367 - GNUnet/src/applications/fragmentation
Next by thread: [GNUnet-SVN] r369 - in GNUnet: . src/applications src/applications/identity src/applications/session src/applications/topology_default src/applications/transport src/include src/util
Index(es):
- Date
- Thread