server/: Rename `TIMER' to `QUICKRAND'.

The purpose of the `TIMER' is to feed the entropy a small quantity of
entropy on a regular basis.  Encoding the implementation in the name was
an error which this commit fixes.

diff --git a/server/admin.c b/server/admin.c
index b25e511e61cf1814c552b485367f0f7f1582477f..3257c7da2807e43d7192c3a241bcfd986fd866aa 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -1013,7 +1013,7 @@ static void a_resolved(struct hostent *h, void *v)
   admin_resop *r = v;
 
   T( trace(T_ADMIN, "admin: resop %s resolved", BGTAG(r)); )
   admin_resop *r = v;
 
   T( trace(T_ADMIN, "admin: resop %s resolved", BGTAG(r)); )

-  TIMER;
+  QUICKRAND;

   if (!h) {
     a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
     r->func(r, ARES_FAIL);
   if (!h) {
     a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END);
     r->func(r, ARES_FAIL);


@@ -2155,7 +2155,7 @@ static void a_line(char *p, size_t len, void *vp)
   char *av[16 + 1];
   size_t ac;
 
   char *av[16 + 1];
   size_t ac;
 

-  TIMER;
+  QUICKRAND;

   if (a->f & AF_DEAD)
     return;
   if (!p) {
   if (a->f & AF_DEAD)
     return;
   if (!p) {

diff --git a/server/peer.c b/server/peer.c
index 06dd33db2c29e15bfa42b112d151f8e896f3b1c4..57891e7b5cc4fd3eb274f7e81399c0163f837c40 100644 (file)
--- a/server/peer.c
+++ b/server/peer.c
@@ -313,7 +313,7 @@ static void p_read(int fd, unsigned mode, void *v)
 
   /* --- Read the data --- */
 
 
   /* --- Read the data --- */
 

-  TIMER;
+  QUICKRAND;

   sz = sizeof(addr);
   n = recvfrom(fd, buf_i, sizeof(buf_i), 0, &a.sa, &sz);
   if (n < 0) {
   sz = sizeof(addr);
   n = recvfrom(fd, buf_i, sizeof(buf_i), 0, &a.sa, &sz);
   if (n < 0) {


@@ -658,7 +658,7 @@ void p_tun(peer *p, buf *b)
 {
   buf *bb = p_txstart(p, MSG_PACKET);
 
 {
   buf *bb = p_txstart(p, MSG_PACKET);
 

-  TIMER;
+  QUICKRAND;

   p_encrypt(p, MSG_PACKET, b, bb);
   if (BOK(bb) && BLEN(bb)) {
     p->st.n_ipout++;
   p_encrypt(p, MSG_PACKET, b, bb);
   if (BOK(bb) && BLEN(bb)) {
     p->st.n_ipout++;

diff --git a/server/tripe.h b/server/tripe.h
index d419c287cf348165061ea4d21ec68a8437cda4e3..9e298c806f6749f6a0c076e92351953d09193e9f 100644 (file)
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -576,7 +576,7 @@ extern unsigned tr_flags;           /* Trace options flags */
 
 /*----- Other macros ------------------------------------------------------*/
 
 
 /*----- Other macros ------------------------------------------------------*/
 

-#define TIMER noise_timer(RAND_GLOBAL)
+#define QUICKRAND noise_timer(RAND_GLOBAL)

 
 /*----- Key management ----------------------------------------------------*/
 
 
 /*----- Key management ----------------------------------------------------*/