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 935064f4d2aee42cae984101c987684e2665221c..1457df8158d7f7e1e5e399a80aad4802e85c53cb 100644 (file)
--- a/lib/hook.c
+++ b/lib/hook.c
@@ -1,35 +1,32 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2016  David Lamparter, for NetDEF, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE 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;
@@ -54,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;
                }
 }