summaryrefslogtreecommitdiff
path: root/cleopatre/application
diff options
context:
space:
mode:
authorCyril Jourdan2011-12-06 14:21:21 +0100
committerCyril Jourdan2011-12-20 15:52:39 +0100
commit213e790acdf1e8ec4e4cad7fb74cdb07d083e8cf (patch)
tree664848f8caad2f4149345f21d1d2c6f6d67ffea1 /cleopatre/application
parent280a0fd825eb8a126fd55f8638bde3a12a9c3d36 (diff)
cleo/app/managerd: fix compilation warnings, no refs
Diffstat (limited to 'cleopatre/application')
-rw-r--r--cleopatre/application/managerd/inc/bridge.h1
-rw-r--r--cleopatre/application/managerd/inc/vs_mme.h1
-rw-r--r--cleopatre/application/managerd/src/mme_nl.c7
-rw-r--r--cleopatre/application/managerd/src/vs_mme.c7
4 files changed, 9 insertions, 7 deletions
diff --git a/cleopatre/application/managerd/inc/bridge.h b/cleopatre/application/managerd/inc/bridge.h
index 3a29d15055..b1d3723e01 100644
--- a/cleopatre/application/managerd/inc/bridge.h
+++ b/cleopatre/application/managerd/inc/bridge.h
@@ -24,6 +24,7 @@
#include "libmme.h"
#include "mme_nl.h"
#include "managerd.h"
+#include "vs_mme.h"
/** Interfaces name */
#define BR_IFNAME "br0"
diff --git a/cleopatre/application/managerd/inc/vs_mme.h b/cleopatre/application/managerd/inc/vs_mme.h
index 52159c63f4..80bd46cf94 100644
--- a/cleopatre/application/managerd/inc/vs_mme.h
+++ b/cleopatre/application/managerd/inc/vs_mme.h
@@ -81,5 +81,6 @@ typedef struct {
extern enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request, MME_t * confirm, int len);
extern enum bridge_status vs_mme_eth_stats (struct managerd_ctx *ctx, MME_t *request, MME_t * confirm, int len);
+extern enum bridge_status vs_mme_reset (struct managerd_ctx *ctx, MME_t *request, MME_t *confirm, int len);
#endif /* VS_MME_H */
diff --git a/cleopatre/application/managerd/src/mme_nl.c b/cleopatre/application/managerd/src/mme_nl.c
index 6b7cc7b6f8..0edcc7ff01 100644
--- a/cleopatre/application/managerd/src/mme_nl.c
+++ b/cleopatre/application/managerd/src/mme_nl.c
@@ -56,7 +56,7 @@ int mme_nl_receive(struct managerd_ctx *ctx, uint8_t *buffer, int len)
struct nlmsghdr *nlh;
struct sockaddr_nl kernel_addr;
struct iovec iov;
- int msg_len, result;
+ int msg_len;
/* create message from MME netlink */
nlh=(struct nlmsghdr *)malloc (sizeof(struct nlmsghdr) + len);
@@ -85,9 +85,8 @@ int mme_nl_receive(struct managerd_ctx *ctx, uint8_t *buffer, int len)
}
memcpy (buffer, NLMSG_DATA (nlh), msg_len);
- result = msg_len;
free (nlh);
- return result;
+ return msg_len;
}
/**
@@ -102,7 +101,7 @@ int mme_nl_send(struct managerd_ctx *ctx, uint8_t *buffer, int len)
{
struct sockaddr_nl kernel_addr;
struct nlmsghdr *nlh;
- int msg_len, result;
+ int msg_len;
struct iovec iov;
struct msghdr msg;
diff --git a/cleopatre/application/managerd/src/vs_mme.c b/cleopatre/application/managerd/src/vs_mme.c
index dbbe35cc93..cc3191d4d0 100644
--- a/cleopatre/application/managerd/src/vs_mme.c
+++ b/cleopatre/application/managerd/src/vs_mme.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <syslog.h>
#include <stdlib.h>
+#include <unistd.h>
#include <pthread.h>
#include "bridge.h"
@@ -63,7 +64,7 @@ enum bridge_status vs_mme_get_version (struct managerd_ctx *ctx, MME_t *request,
assert (NULL != ctx);
assert (NULL != request);
assert (NULL != confirm);
- assert (len >= sizeof (vs_get_version_cnf_t) + sizeof (MME_t));
+ assert ((unsigned int)len >= sizeof (vs_get_version_cnf_t) + sizeof (MME_t));
/* check for request content */
if (memcmp ((char *) request + sizeof (MME_t), OUI_SPIDCOM, 3))
@@ -153,7 +154,7 @@ enum bridge_status vs_mme_eth_stats (struct managerd_ctx *ctx, MME_t *request, M
assert (NULL != ctx);
assert (NULL != request);
assert (NULL != confirm);
- assert (len >= sizeof(vs_eth_stats_cnf_t) + sizeof(MME_t));
+ assert ((unsigned int)len >= sizeof(vs_eth_stats_cnf_t) + sizeof(MME_t));
eth_stats_req = (vs_eth_stats_req_t *)((unsigned char*)request + sizeof(MME_t));
eth_stats_cnf = (vs_eth_stats_cnf_t *)((unsigned char*)confirm + sizeof(MME_t));
@@ -246,7 +247,7 @@ enum bridge_status vs_mme_reset (struct managerd_ctx *ctx, MME_t *request, MME_t
assert (NULL != ctx);
assert (NULL != request);
assert (NULL != confirm);
- assert (len >= sizeof(vs_reset_cnf_t) + sizeof(MME_t));
+ assert ((unsigned int)len >= sizeof(vs_reset_cnf_t) + sizeof(MME_t));
/* check for request content */
if (memcmp((char*) request + sizeof(MME_t), OUI_SPIDCOM, 3)) return TO_DROP;