Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / lib / hook.c

diff --git a/lib/hook.c b/lib/hook.c
index 870d158aac4484d540251c4681c5aa5c20bebb59..1457df8158d7f7e1e5e399a80aad4802e85c53cb 100644 (file)
--- a/lib/hook.c
+++ b/lib/hook.c
@@ -1,33 +1,32 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2016  David Lamparter, for NetDEF, Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "memory.h"
 #include "hook.h"
 
-DEFINE_MTYPE_STATIC(LIB, HOOK_ENTRY, "Hook entry")
+DEFINE_MTYPE_STATIC(LIB, HOOK_ENTRY, "Hook entry");
 
-void _hook_register(struct hook *hook, void *funcptr, void *arg, bool has_arg,
-                   struct frrmod_runtime *module, const char *funcname,
-                   int priority)
+void _hook_register(struct hook *hook, struct hookent *stackent, void *funcptr,
+                   void *arg, bool has_arg, struct frrmod_runtime *module,
+                   const char *funcname, int priority)
 {
-       struct hookent *he = XCALLOC(MTYPE_HOOK_ENTRY, sizeof(*he)), **pos;
+       struct hookent *he, **pos;
+
+       if (!stackent->ent_used)
+               he = stackent;
+       else {
+               he = XCALLOC(MTYPE_HOOK_ENTRY, sizeof(*he));
+               he->ent_on_heap = true;
+       }
+       he->ent_used = true;
        he->hookfn = funcptr;
        he->hookarg = arg;
        he->has_arg = has_arg;
@@ -52,7 +51,10 @@ void _hook_unregister(struct hook *hook, void *funcptr, void *arg, bool has_arg)
                if (he->hookfn == funcptr && he->hookarg == arg
                    && he->has_arg == has_arg) {
                        *prev = he->next;
-                       XFREE(MTYPE_HOOK_ENTRY, he);
+                       if (he->ent_on_heap)
+                               XFREE(MTYPE_HOOK_ENTRY, he);
+                       else
+                               memset(he, 0, sizeof(*he));
                        break;
                }
 }