Commit afbdf6db authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Remove self_update_interval.

This is a throw-back to the Babel 0 (!) protocol.  There's no longer any
reason to treat self-updates specially.
parent 71a6b742
......@@ -543,7 +543,6 @@ main(int argc, char **argv)
continue;
timeval_min(&tv, &net->flush_timeout);
timeval_min(&tv, &net->hello_timeout);
timeval_min(&tv, &net->self_update_timeout);
timeval_min(&tv, &net->update_timeout);
timeval_min(&tv, &net->update_flush_timeout);
}
......@@ -693,8 +692,6 @@ main(int argc, char **argv)
send_hello(net);
if(timeval_compare(&now, &net->update_timeout) >= 0)
send_update(net, 0, NULL, 0);
if(timeval_compare(&now, &net->self_update_timeout) >= 0)
send_self_update(net);
if(timeval_compare(&now, &net->update_flush_timeout) >= 0)
flushupdates(net);
}
......
......@@ -1077,7 +1077,6 @@ send_self_update(struct network *net)
for(i = 0; i < numxroutes; i++)
send_update(net, 0, xroutes[i].prefix, xroutes[i].plen);
}
delay_jitter(&net->self_update_timeout, net->self_update_interval);
}
void
......
......@@ -115,9 +115,6 @@ update_hello_interval(struct network *net)
rc = 1;
}
net->self_update_interval =
MAX(update_interval / 2, net->hello_interval);
return rc;
}
......@@ -323,7 +320,6 @@ network_up(struct network *net, int up)
}
}
delay_jitter(&net->hello_timeout, net->hello_interval);
delay_jitter(&net->self_update_timeout, net->self_update_interval);
delay_jitter(&net->update_timeout, update_interval);
send_hello(net);
send_request(net, NULL, 0);
......
......@@ -53,7 +53,6 @@ struct network {
unsigned short flags;
unsigned short cost;
struct timeval hello_timeout;
struct timeval self_update_timeout;
struct timeval update_timeout;
struct timeval flush_timeout;
struct timeval update_flush_timeout;
......@@ -79,7 +78,6 @@ struct network {
time_t activity_time;
unsigned short hello_seqno;
unsigned short hello_interval;
unsigned short self_update_interval;
};
#define NET_CONF(_net, _field) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment