Merge pull request #5789 from donaldsharp/bgp_ebgp_reason

[mirror_frr.git] / zebra / zebra_mroute.c

diff --git a/zebra/zebra_mroute.c b/zebra/zebra_mroute.c
index 82c7f404b7a285fe848c8cc794dd9cc4623e0f6e..583b666e66acc71350251ced00b0a2f405d106a8 100644 (file)
--- a/zebra/zebra_mroute.c
+++ b/zebra/zebra_mroute.c
@@ -30,38 +30,43 @@
 #include "zebra/zebra_vrf.h"
 #include "zebra/zebra_mroute.h"
 #include "zebra/rt.h"
+#include "zebra/debug.h"
 
-int
-zebra_ipmr_route_stats (struct zserv *client, int fd, u_short length, struct zebra_vrf *zvrf)
+void zebra_ipmr_route_stats(ZAPI_HANDLER_ARGS)
 {
-  struct mcast_route_data mroute;
-  struct stream *s;
-  int suc;
+       struct mcast_route_data mroute;
+       struct stream *s;
+       int suc = -1;
 
-  char sbuf[40];
-  char gbuf[40];
+       memset(&mroute, 0, sizeof(mroute));
+       STREAM_GET(&mroute.sg.src, msg, 4);
+       STREAM_GET(&mroute.sg.grp, msg, 4);
+       STREAM_GETL(msg, mroute.ifindex);
 
-  memset (&mroute, 0, sizeof (mroute));
-  stream_get (&mroute.sg.src, client->ibuf, 4);
-  stream_get (&mroute.sg.grp, client->ibuf, 4);
-  mroute.ifindex = stream_getl (client->ibuf);
+       if (IS_ZEBRA_DEBUG_KERNEL) {
+               char sbuf[40];
+               char gbuf[40];
 
-  strcpy (sbuf, inet_ntoa (mroute.sg.src));
-  strcpy (gbuf, inet_ntoa (mroute.sg.grp));
+               strlcpy(sbuf, inet_ntoa(mroute.sg.src), sizeof(sbuf));
+               strlcpy(gbuf, inet_ntoa(mroute.sg.grp), sizeof(gbuf));
 
-  suc = kernel_get_ipmr_sg_stats (&mroute);
+               zlog_debug("Asking for (%s,%s)[%s(%u)] mroute information",
+                          sbuf, gbuf, zvrf->vrf->name, zvrf->vrf->vrf_id);
+       }
 
-  s = client->obuf;
+       suc = kernel_get_ipmr_sg_stats(zvrf, &mroute);
 
-  stream_reset (s);
+stream_failure:
+       s = stream_new(ZEBRA_MAX_PACKET_SIZ);
 
-  zserv_create_header (s, ZEBRA_IPMR_ROUTE_STATS, zvrf_id (zvrf));
-  stream_put_in_addr (s, &mroute.sg.src);
-  stream_put_in_addr (s, &mroute.sg.grp);
-  stream_put (s, &mroute.lastused, sizeof (mroute.lastused));
-  stream_putl (s, suc);
+       stream_reset(s);
 
-  stream_putw_at (s, 0, stream_get_endp (s));
-  zebra_server_send_message (client);
-  return 0;
+       zclient_create_header(s, ZEBRA_IPMR_ROUTE_STATS, zvrf_id(zvrf));
+       stream_put_in_addr(s, &mroute.sg.src);
+       stream_put_in_addr(s, &mroute.sg.grp);
+       stream_put(s, &mroute.lastused, sizeof(mroute.lastused));
+       stream_putl(s, suc);
+
+       stream_putw_at(s, 0, stream_get_endp(s));
+       zserv_send_message(client, s);
 }