[GNUnet-SVN] r14327 - gnunet/src/include

[gnunet]

Author: nevans
Date: 2011-02-03 17:04:53 +0100 (Thu, 03 Feb 2011)
New Revision: 14327

Added:
   gnunet/src/include/gauger.h
Removed:
   gnunet/src/include/gnunet_gauger.h
Modified:
   gnunet/src/include/gnunet_constants.h
   gnunet/src/include/gnunet_crypto_lib.h
Log:
gauger name

Copied: gnunet/src/include/gauger.h (from rev 14326, 
gnunet/src/include/gnunet_gauger.h)
===================================================================
--- gnunet/src/include/gauger.h                         (rev 0)
+++ gnunet/src/include/gauger.h 2011-02-03 16:04:53 UTC (rev 14327)
@@ -0,0 +1,10 @@
+#ifndef __GAUGER_H__
+#define __GAUGER_H__
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/wait.h>
+
+#define GAUGER(counter, value) {char __gauger_s[32];pid_t 
__gauger_p;if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%d",value);execlp("gauger-cli.py","gauger-cli.py",counter,
 
__gauger_s,(char*)NULL);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}}
+
+#endif

Modified: gnunet/src/include/gnunet_constants.h
===================================================================
--- gnunet/src/include/gnunet_constants.h       2011-02-03 14:41:40 UTC (rev 
14326)
+++ gnunet/src/include/gnunet_constants.h       2011-02-03 16:04:53 UTC (rev 
14327)
@@ -49,13 +49,13 @@
  * After how long do we consider a connection to a peer dead
  * if we don't receive messages from the peer?
  */
-#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MINUTES, 5)
+#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MINUTES, 3)
 
 /**
  * After how long do we consider a connection to a peer dead
  * if we got an explicit disconnect and were unable to reconnect?
  */
-#define GNUNET_CONSTANTS_DISCONNECT_SESSION_TIMEOUT 
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define GNUNET_CONSTANTS_DISCONNECT_SESSION_TIMEOUT 
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
 
 /**
  * How long do we delay reading more from a peer after a quota violation?
@@ -76,7 +76,7 @@
 #define GNUNET_CONSTANTS_SERVICE_RETRY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 500)
 
 /**
- * After how long do we consider a service irresponsive
+ * After how long do we consider a service unresponsive
  * even if we assume that the service commonly does not
  * respond instantly (DNS, Database, etc.).
  */
@@ -85,7 +85,7 @@
 /**
  * How long do we delay messages to get larger packet sizes (CORKing)?
  */
-#define GNUNET_CONSTANTS_MAX_CORK_DELAY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 1)
+#define GNUNET_CONSTANTS_MAX_CORK_DELAY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 10)
 
 /**
  * Until which load do we consider the peer overly idle

Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h      2011-02-03 14:41:40 UTC (rev 
14326)
+++ gnunet/src/include/gnunet_crypto_lib.h      2011-02-03 16:04:53 UTC (rev 
14327)
@@ -691,6 +691,14 @@
 
 
 /**
+ * Get the size of a key file.
+ *
+ * @return size of a gnunet private key
+ */
+uint32_t
+GNUNET_CRYPTO_rsa_key_size ();
+
+/**
  * Create a new private key by reading it from a file.  If the
  * files does not exist, create a new key and write it to the
  * file.  Caller must free return value. Note that this function

Deleted: gnunet/src/include/gnunet_gauger.h
===================================================================
--- gnunet/src/include/gnunet_gauger.h  2011-02-03 14:41:40 UTC (rev 14326)
+++ gnunet/src/include/gnunet_gauger.h  2011-02-03 16:04:53 UTC (rev 14327)
@@ -1,10 +0,0 @@
-#ifndef __GAUGER_H__
-#define __GAUGER_H__
-
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/wait.h>
-
-#define GAUGER(counter, value) {char __gauger_s[32];pid_t 
__gauger_p;if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%d",value);execlp("gauger-cli.py","gauger-cli.py",counter,
 
__gauger_s,(char*)NULL);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}}
-
-#endif