zebra: Consolidate the stream_failure section with normal return

[mirror_frr.git] / zebra / zapi_msg.h

diff --git a/zebra/zapi_msg.h b/zebra/zapi_msg.h
index dad40c200df58647f0f284acf778cf7ba7663f6a..ce8e154465ffa093f7e76582407234cd2f2cd4d9 100644 (file)
--- a/zebra/zapi_msg.h
+++ b/zebra/zapi_msg.h
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Zebra API message creation & consumption.
  * Portions:
  *   Copyright (C) 1997-1999  Kunihiro Ishiguro
  *   Copyright (C) 2015-2018  Cumulus Networks, Inc.
  *   et al.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "lib/if.h"
@@ -65,8 +52,7 @@ extern void nbr_connected_delete_ipv6(struct interface *ifp,
 extern int zsend_interface_update(int cmd, struct zserv *client,
                                  struct interface *ifp);
 extern int zsend_redistribute_route(int cmd, struct zserv *zclient,
-                                   const struct prefix *p,
-                                   const struct prefix *src_p,
+                                   const struct route_node *rn,
                                    const struct route_entry *re);
 
 extern int zsend_router_id_update(struct zserv *zclient, afi_t afi,
@@ -76,8 +62,8 @@ extern int zsend_interface_vrf_update(struct zserv *zclient,
 extern int zsend_interface_link_params(struct zserv *zclient,
                                       struct interface *ifp);
 extern int zsend_pw_update(struct zserv *client, struct zebra_pw *pw);
-extern int zsend_route_notify_owner(struct route_entry *re,
-                                   const struct prefix *p,
+extern int zsend_route_notify_owner(const struct route_node *rn,
+                                   struct route_entry *re,
                                    enum zapi_route_notify_owner note,
                                    afi_t afi, safi_t safi);
 extern int zsend_route_notify_owner_ctx(const struct zebra_dplane_ctx *ctx,
@@ -116,7 +102,7 @@ extern int zsend_client_close_notify(struct zserv *client,
 int zsend_nhg_notify(uint16_t type, uint16_t instance, uint32_t session_id,
                     uint32_t id, enum zapi_nhg_notify_owner note);
 
-extern void zapi_opaque_free(struct opaque *opaque);
+extern void zapi_re_opaque_free(struct re_opaque *opaque);
 
 extern int zsend_zebra_srv6_locator_add(struct zserv *client,
                                        struct srv6_locator *loc);