zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / module.c

diff --git a/lib/module.c b/lib/module.c
index c7dd5538cd9cf5b9e5921ea756c5837629388bf4..6754b945796ac174041190eec6fd9383a422448e 100644 (file)
--- a/lib/module.c
+++ b/lib/module.c
@@ -1,23 +1,17 @@
 /*
  * Copyright (c) 2015-16  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.
  */
 
 #include "config.h"
@@ -42,8 +36,11 @@ static struct frrmod_info frrmod_default_info = {
        .description = "libfrr core module",
 };
 union _frrmod_runtime_u frrmod_default = {
-       .r.info = &frrmod_default_info,
-       .r.finished_loading = 1,
+       .r =
+               {
+                       .info = &frrmod_default_info,
+                       .finished_loading = 1,
+               },
 };
 
 // if defined(HAVE_SYS_WEAK_ALIAS_ATTRIBUTE)
@@ -68,11 +65,11 @@ void frrmod_init(struct frrmod_runtime *modinfo)
        execname = modinfo->info->name;
 }
 
-struct frrmod_runtime *frrmod_load(const char *spec,
-               const char *dir, char *err, size_t err_len)
+struct frrmod_runtime *frrmod_load(const char *spec, const char *dir, char *err,
+                                  size_t err_len)
 {
        void *handle = NULL;
-       char name[PATH_MAX], fullpath[PATH_MAX], *args;
+       char name[PATH_MAX], fullpath[PATH_MAX * 2], *args;
        struct frrmod_runtime *rtinfo, **rtinfop;
        const struct frrmod_info *info;
 
@@ -82,14 +79,14 @@ struct frrmod_runtime *frrmod_load(const char *spec,
                *args++ = '\0';
 
        if (!strchr(name, '/')) {
-               if (!handle && execname) {
-                       snprintf(fullpath, sizeof(fullpath), "%s/%s_%s.so",
-                                       dir, execname, name);
+               if (execname) {
+                       snprintf(fullpath, sizeof(fullpath), "%s/%s_%s.so", dir,
+                                execname, name);
                        handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
                }
                if (!handle) {
-                       snprintf(fullpath, sizeof(fullpath), "%s/%s.so",
-                                       dir, name);
+                       snprintf(fullpath, sizeof(fullpath), "%s/%s.so", dir,
+                                name);
                        handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
                }
        }
@@ -100,8 +97,8 @@ struct frrmod_runtime *frrmod_load(const char *spec,
        if (!handle) {
                if (err)
                        snprintf(err, err_len,
-                                       "loading module \"%s\" failed: %s",
-                                       name, dlerror());
+                                "loading module \"%s\" failed: %s", name,
+                                dlerror());
                return NULL;
        }
 
@@ -110,8 +107,8 @@ struct frrmod_runtime *frrmod_load(const char *spec,
                dlclose(handle);
                if (err)
                        snprintf(err, err_len,
-                                       "\"%s\" is not a Quagga module: %s",
-                                       name, dlerror());
+                                "\"%s\" is not an FRR module: %s", name,
+                                dlerror());
                return NULL;
        }
        rtinfo = *rtinfop;
@@ -124,9 +121,8 @@ struct frrmod_runtime *frrmod_load(const char *spec,
        if (rtinfo->finished_loading) {
                dlclose(handle);
                if (err)
-                       snprintf(err, err_len,
-                                       "module \"%s\" already loaded",
-                                       name);
+                       snprintf(err, err_len, "module \"%s\" already loaded",
+                                name);
                goto out_fail;
        }
 
@@ -134,8 +130,7 @@ struct frrmod_runtime *frrmod_load(const char *spec,
                dlclose(handle);
                if (err)
                        snprintf(err, err_len,
-                                       "module \"%s\" initialisation failed",
-                                       name);
+                                "module \"%s\" initialisation failed", name);
                goto out_fail;
        }