From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 3 Jun 2016 08:56:10 +0000 (-0400)
Subject: zebra: Fix last sent command to protocol
X-Git-Tag: frr-2.0-rc1~587
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=80ab3edfbbfa655ccf3baf360a1b98e281cdcf84;p=matthieu%2Ffrr.git

zebra: Fix last sent command to protocol

With the addition of VRF's we were not properly
storing the last sent command to individual
protocols from zebra.  This commit fixes this:

Pre-Fix:
Client: bgp
------------------------
FD: 14
Route Table ID: 0
Connect Time: 00:10:51
Not registered for Nexthop Updates
Last Msg Rx Time: 00:10:51
Last Msg Tx Time: 00:00:04
Last Rcvd Cmd: ZEBRA_REDISTRIBUTE_ADD
Last Sent Cmd: (null)

Post-Fix:
Client: bgp
------------------------
FD: 14
Route Table ID: 0
Connect Time: 00:02:42
Not registered for Nexthop Updates
Last Msg Rx Time: 00:02:42
Last Msg Tx Time: 00:00:09
Last Rcvd Cmd: ZEBRA_REDISTRIBUTE_ADD
Last Sent Cmd: ZEBRA_INTERFACE_UP

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 8bc90130be..6e4f9bbe7d 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -108,7 +108,7 @@ zebra_server_send_message(struct zserv *client)
     return -1;
 
   stream_set_getp(client->obuf, 0);
-  client->last_write_cmd = stream_getw_from(client->obuf, 4);
+  client->last_write_cmd = stream_getw_from(client->obuf, 6);
   switch (buffer_write(client->wb, client->sock, STREAM_DATA(client->obuf),
 		       stream_get_endp(client->obuf)))
     {