From 8a4135bac1ac75ae0a2897986bb7fb18e70e9e14 Mon Sep 17 00:00:00 2001 From: Michele Marchetto Date: Sun, 6 Dec 2009 16:12:48 +0000 Subject: During the session's initialization, when playing the passive role, send the initialization message before the keepalive. This fixes session initialazion failures noticed by Christophe Fillot. ok claudio@ --- usr.sbin/ldpd/neighbor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ldpd/neighbor.c b/usr.sbin/ldpd/neighbor.c index 5daf2c4a184..f892495ee41 100644 --- a/usr.sbin/ldpd/neighbor.c +++ b/usr.sbin/ldpd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.3 2009/08/01 12:47:02 michele Exp $ */ +/* $OpenBSD: neighbor.c,v 1.4 2009/12/06 16:12:47 michele Exp $ */ /* * Copyright (c) 2009 Michele Marchetto @@ -160,8 +160,8 @@ nbr_fsm(struct nbr *nbr, enum nbr_event event) break; case NBR_ACT_INIT_SEND: /* XXX */ - send_keepalive(nbr); - ret = send_init(nbr); + send_init(nbr); + ret = send_keepalive(nbr); break; case NBR_ACT_KEEPALIVE_SEND: /* XXX */ -- cgit v1.2.3