summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2012-03-16 13:01:12 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2012-03-16 13:01:12 +0100
commitfd087589f80a435a42cedb87b917c71363b11860 (patch)
tree5c48c7e1a72fef945554c0e2fb09fa6a36e8e53f
parent0f808c066f3b5b190de951db042a34a1eb957a16 (diff)
Fixes broken vlinks in OSPF.
-rw-r--r--proto/ospf/config.Y2
-rw-r--r--proto/ospf/iface.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 9c48a9b8..75c132da 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -219,7 +219,7 @@ ospf_stubnet_item:
ospf_vlink:
ospf_vlink_start '{' ospf_vlink_opts '}' { ospf_iface_finish(); }
- | ospf_vlink_start
+ | ospf_vlink_start { ospf_iface_finish(); }
;
ospf_vlink_opts:
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 13d5efb6..405e49df 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -570,6 +570,9 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
{
ifa->voa = ospf_find_area(oa->po, ip->voa);
ifa->vid = ip->vid;
+
+ ifa->hello_timer = tm_new_set(ifa->pool, hello_timer_hook, ifa, 0, ifa->helloint);
+
return; /* Don't lock, don't add sockets */
}