Small compiler bugfixes for parser

Fix for plugin loader

diff --git a/src/parser.c b/src/parser.c
index 440d828..584e9f5 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -244,7 +244,7 @@ static void parse_packet(struct olsr *olsr, int size, struct interface *in_if, u
   if (count < MIN_PACKET_SIZE(olsr_cnf->ip_version)) {
     return;
   }
-  if (ntohs(olsr->olsr_packlen) != size) {
+  if (ntohs(olsr->olsr_packlen) != (size_t)size) {
     OLSR_WARN(LOG_PACKET_PARSING, "Size error detected in received packet from %s.\nRecieved %d, in packet %d\n",
         olsr_ip_to_string(&buf, from_addr), size, ntohs(olsr->olsr_packlen));
     return;

diff --git a/src/plugin_loader.c b/src/plugin_loader.c
index f29fc56..83f515e 100644 (file)
--- a/src/plugin_loader.c
+++ b/src/plugin_loader.c
@@ -93,19 +93,17 @@ static int olsr_load_dl(char *libname, struct plugin_param *params)
     struct olsr_plugin *plugin = olsr_malloc(sizeof(struct olsr_plugin), "Plugin entry");
     int rv;
 
-    OLSR_INFO(LOG_PLUGINS, "---------- LOADING LIBRARY %s ----------\n", libname);
-
     if (olsr_cnf->dlPath) {
       char *path = olsr_malloc(strlen(olsr_cnf->dlPath) + strlen(libname)+1, "Memory for absolute library path");
       strcpy(path, olsr_cnf->dlPath);
       strcat(path, libname);
-      plugin->dlhandle = dlopen(libname, RTLD_NOW);
+      OLSR_INFO(LOG_PLUGINS, "---------- LOADING LIBRARY %s from %s (%s)----------\n", libname, olsr_cnf->dlPath, path);
+      plugin->dlhandle = dlopen(path, RTLD_NOW);
       free(path);
-      fprintf(stderr, "1\n");
     }
     else {
+      OLSR_INFO(LOG_PLUGINS, "---------- LOADING LIBRARY %s ----------\n", libname);
       plugin->dlhandle = dlopen(libname, RTLD_NOW);
-      fprintf(stderr, "2\n");
     }
     if(plugin->dlhandle == NULL) {
         const int save_errno = errno;