[hipl-commit] [tiny] Rev 3652: Disable NOTIFY keep-alives, when the heartbeat module is enabled.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 10 Mar 2010 17:17:36 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Wed Mar 10 16:17:14 2010 +0100
Revision: 3652
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Disable NOTIFY keep-alives, when the heartbeat module is enabled.

Modified:
  M  hipd/maintenance.c

=== modified file 'hipd/maintenance.c'
--- hipd/maintenance.c  2010-03-08 15:47:13 +0000
+++ hipd/maintenance.c  2010-03-10 15:17:14 +0000
@@ -191,11 +191,7 @@
         precreate_counter--;
     }
 
-
-    /** @todo Disable NOTIFY keepalives, when heartbeat is enabled */
-    if (hip_nat_status) {
-        /* Send NOTIFY keepalives for NATs only when ICMPv6
-         * keepalives are disabled */
+    if (!lmod_module_exists("heartbeat") && hip_nat_status) {
         if (nat_keep_alive_counter < 0) {
             HIP_IFEL(hip_nat_refresh_port(),
                      -ECOMM,

Other related posts:

  • » [hipl-commit] [tiny] Rev 3652: Disable NOTIFY keep-alives, when the heartbeat module is enabled. - Tim Just