From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 16 Mar 2012 12:01:12 +0000 (+0100)
Subject: Fixes broken vlinks in OSPF.
X-Git-Tag: v1.3.7~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd087589f80a435a42cedb87b917c71363b11860;p=thirdparty%2Fbird.git

Fixes broken vlinks in OSPF.
---

diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 9c48a9b8b..75c132da0 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 13d5efb64..405e49dfd 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 */
   }