Get value for update_interval from net->config.

98fb1d30 · Juliusz Chroboczek · 1e5eadb8 · 98fb1d30 · 98fb1d30
Commit 98fb1d30 authored Apr 17, 2009 by Juliusz Chroboczek
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

network.c network.c +4 -0

network.h network.h +2 -1

No files found.
--- a/network.c
+++ b/network.c
@@ -275,6 +275,8 @@ network_up(struct network *net, int up)
            else
                net->flags &= ~NET_LQ;
            net->update_interval =
+                NET_CONF(net, update_interval) > 0 ?
+                NET_CONF(net, update_interval) :
                NET_CONF(net, hello_interval) > 0 ?
                NET_CONF(net, hello_interval) * 5 :
                wired_hello_interval * 5;
@@ -291,6 +293,8 @@ network_up(struct network *net, int up)
            else
                net->flags |= NET_LQ;
            net->update_interval =
+                NET_CONF(net, update_interval) > 0 ?
+                NET_CONF(net, update_interval) :
                NET_CONF(net, hello_interval) > 0 ?
                NET_CONF(net, hello_interval) * 5 :
                wireless_hello_interval * 5;

--- a/network.h
+++ b/network.h
@@ -29,8 +29,9 @@ struct buffered_update {

 struct network_conf {
    char *ifname;
-    unsigned short cost;
    unsigned hello_interval;
+    unsigned update_interval;
+    unsigned short cost;
    char wired;
    char split_horizon;
    char lq;