summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmanuele Di Pascale <emanuele@voltanet.io>2019-07-10 15:20:14 +0200
committerEmanuele Di Pascale <emanuele@voltanet.io>2019-07-10 15:20:27 +0200
commitdcfeb7a956b9737ea1ef5bd2eec14e7c4284bc1e (patch)
treec330ea2e1e02478e9100ab9b6af661ac7bf4a6a7
parentzebra: label manager refactor (diff)
downloadfrr-dcfeb7a956b9737ea1ef5bd2eec14e7c4284bc1e.tar.xz
frr-dcfeb7a956b9737ea1ef5bd2eec14e7c4284bc1e.zip
ldpd: set default instance to 1
LDP opens two sockets to zebra, one through ldpd (always using instance 0) and another through lde (using whatever instance was set through the -n command line parameter). If no instance was set, both connections would use the same protocol and instance, making it impossible to distinguish them through zserv_find_client. This meant that a response to a lm connect would erroneously go to the wrong process. Fix this by having a default instance value of 1, in case the user does not specify a different one. Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
-rw-r--r--ldpd/ldpd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 9fccb085d..a6f0519bd 100644
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -236,6 +236,9 @@ main(int argc, char *argv[])
" --ctl_socket Override ctl socket path\n"
" -n, --instance Instance id\n");
+ /* set default instance (to differentiate ldpd socket from lde one */
+ init.instance = 1;
+
while (1) {
int opt;