[or-cvs] Remove ip address change flapping detection. It is not rea...

[weasel@xxxxxxxx (Peter Palfrader)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv6022

Modified Files:
	main.c router.c 
Log Message:
Remove ip address change flapping detection.  It is not really needed and I do not think it works quite right.

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -d -r1.589 -r1.590
--- main.c	15 Nov 2005 03:05:19 -0000	1.589
+++ main.c	18 Nov 2005 19:28:34 -0000	1.590
@@ -94,7 +94,7 @@
 
 #define FORCE_REGENERATE_DESCRIPTOR_INTERVAL 18*60*60 /* 18 hours */
 #define CHECK_DESCRIPTOR_INTERVAL 60 /* one minute */
-#define CHECK_IPADDRESS_INTERVAL (5*60) /* five minutes */
+#define CHECK_IPADDRESS_INTERVAL (15*60) /* five minutes */
 #define BUF_SHRINK_INTERVAL 60 /* one minute */
 #define DESCRIPTOR_RETRY_INTERVAL 10
 #define DESCRIPTOR_FAILURE_RESET_INTERVAL 60*60

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- router.c	5 Nov 2005 20:15:27 -0000	1.229
+++ router.c	18 Nov 2005 19:28:34 -0000	1.230
@@ -910,15 +910,12 @@
   }
 }
 
-#define MAX_IPADDRESS_CHANGE_FREQ 60*60
 /** Check whether our own address as defined by the Address configuration
  * has changed. This is for routers that get their address from a service
  * like dyndns. If our address has changed, mark our descriptor dirty. */
 void
 check_descriptor_ipaddress_changed(time_t now)
 {
-  static time_t last_changed = 0;
-  static time_t last_warned_lastchangetime = 0;
   uint32_t prev, cur;
   or_options_t *options = get_options();
 
@@ -943,19 +940,8 @@
     in_cur.s_addr = htonl(cur);
     tor_inet_ntoa(&in_cur, addrbuf_cur, sizeof(addrbuf_cur));
 
-    if (last_changed+MAX_IPADDRESS_CHANGE_FREQ < now) {
-      info(LD_GENERAL,"Our IP Address has changed from %s to %s; rebuilding descriptor.", addrbuf_prev, addrbuf_cur);
-      mark_my_descriptor_dirty();
-      last_changed = now;
-      last_warned_lastchangetime = 0;
-    }
-    else
-    {
-      if (last_warned_lastchangetime != last_changed) {
-        warn(LD_GENERAL,"Our IP Address seems to be flapping.  It has changed twice within one hour (from %s to %s this time).  Ignoring for now.", addrbuf_prev, addrbuf_cur);
-        last_warned_lastchangetime = last_changed;
-      }
-    }
+    info(LD_GENERAL,"Our IP Address has changed from %s to %s; rebuilding descriptor.", addrbuf_prev, addrbuf_cur);
+    mark_my_descriptor_dirty();
   }
 }