[ViewVC] Diff of: cvs/gvpe/src/protocol.C

Comparing gvpe/src/protocol.C (file contents):
Revision 1.17 by pcg, Wed Mar 26 01:58:46 2003 UTC vs.
Revision 1.18 by pcg, Wed Mar 26 02:15:38 2003 UTC

       bool send = ri.diff / ri.pcnt > CUTOFF;
       if (send)
         ri.pcnt++;
-      //printf ("RATE %d %f,%f = %f > %f\n", !!send, ri.pcnt, ri.diff, ri.diff / ri.pcnt, CUTOFF);
       push_front (ri);
       return send;
     }
 }
 }
 static unsigned char hmac_digest[EVP_MAX_MD_SIZE];
 struct hmac_packet:net_packet
+{
+  u8 hmac[HMACLENGTH];		// each and every packet has a hmac field, but that is not (yet) checked everywhere
+  void hmac_set (crypto_ctx * ctx);
+  bool hmac_chk (crypto_ctx * ctx);
+private:
+  void hmac_gen (crypto_ctx * ctx)
   {
-    u8 hmac[HMACLENGTH];		// each and every packet has a hmac field, but that is not (yet) checked everywhere
-    void hmac_set (crypto_ctx * ctx);
-    bool hmac_chk (crypto_ctx * ctx);
-private:
-    void hmac_gen (crypto_ctx * ctx)
-    {
-      unsigned int xlen;
+    unsigned int xlen;
-      HMAC_CTX *hctx = &ctx->hctx;
+    HMAC_CTX *hctx = &ctx->hctx;
-      HMAC_Init_ex (hctx, 0, 0, 0, 0);
+    HMAC_Init_ex (hctx, 0, 0, 0, 0);
-      HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
+    HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
-                   len - sizeof (hmac_packet));
+                 len - sizeof (hmac_packet));
-      HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
+    HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
-    }
-  };
+  }
+};
 void
 hmac_packet::hmac_set (crypto_ctx * ctx)
 {
   hmac_gen (ctx);
 }
 void
 connection::establish_connection_cb (tstamp &ts)
 {
-  if (ictx || conf == THISNODE || connectmode == conf_node::C_NEVER)
+  if (ictx || conf == THISNODE
+      || connectmode == conf_node::C_NEVER
+      || connectmode == conf_node::C_DISABLED)
     ts = TSTAMP_CANCEL;
   else if (ts <= NOW)
     {
       double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
                 send_auth_response (ssa, p->id, k);
                 break;
               }
           }
       }
       send_reset (ssa);
       break;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/src/protocol.C (file contents): Revision 1.17 by pcg, Wed Mar 26 01:58:46 2003 UTC vs. Revision 1.18 by pcg, Wed Mar 26 02:15:38 2003 UTC

Diff Legend

Comparing gvpe/src/protocol.C (file contents):
Revision 1.17 by pcg, Wed Mar 26 01:58:46 2003 UTC vs.
Revision 1.18 by pcg, Wed Mar 26 02:15:38 2003 UTC