From: Mark Stapp <mjs@labn.net>
Date: Tue, 27 Jun 2023 20:32:54 +0000 (-0400)
Subject: isisd, ospfd: fix opaque zapi source parsing
X-Git-Tag: base_9.1~313^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=220dc6df98b1aa8f52676040b77066c7c75ea0fd;p=mirror%2Ffrr.git

isisd, ospfd: fix opaque zapi source parsing

Opaque zapi messages carry the sender's zclient tuple now,
daemons shouldn't try to parse those bits directly.

Signed-off-by: Mark Stapp <mjs@labn.net>
---

diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index 59b80c1e20..95bd37812f 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -772,9 +772,9 @@ static int isis_opaque_msg_handler(ZAPI_CALLBACK_ARGS)
 
 	switch (info.type) {
 	case LINK_STATE_SYNC:
-		STREAM_GETC(s, dst.proto);
-		STREAM_GETW(s, dst.instance);
-		STREAM_GETL(s, dst.session_id);
+		dst.proto = info.src_proto;
+		dst.instance = info.src_instance;
+		dst.session_id = info.src_session_id;
 		dst.type = LINK_STATE_SYNC;
 		ret = isis_te_sync_ted(dst);
 		break;
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 27d74cd4fc..a5372dfc49 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -2161,9 +2161,9 @@ static int ospf_opaque_msg_handler(ZAPI_CALLBACK_ARGS)
 
 	switch (info.type) {
 	case LINK_STATE_SYNC:
-		STREAM_GETC(s, dst.proto);
-		STREAM_GETW(s, dst.instance);
-		STREAM_GETL(s, dst.session_id);
+		dst.proto = info.src_proto;
+		dst.instance = info.src_instance;
+		dst.session_id = info.src_session_id;
 		dst.type = LINK_STATE_SYNC;
 		ret = ospf_te_sync_ted(dst);
 		break;