X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=lib%2Fhook.c;h=895243aad7265239815b17b619160dd79e97e5cd;hb=b19cb2310433a03da6057cd63ca633a7681a616e;hp=935064f4d2aee42cae984101c987684e2665221c;hpb=18ba0693221986a380c0dd131e53c887fed1af09;p=mirror_frr.git

diff --git a/lib/hook.c b/lib/hook.c
index 935064f4d..895243aad 100644
--- a/lib/hook.c
+++ b/lib/hook.c
@@ -1,35 +1,43 @@
 /*
  * 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:
+ * 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 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.
+ * 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;
@@ -54,7 +62,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;
 		}
 }