diff --git a/src/olsrd.c b/src/olsrd.c
index 123520a47b288e85fe14b2ce5f69a6ae0159363d..be422ab61068d284ef5f1bbc9455bb7e9a214db4 100644 (file)
--- a/src/olsrd.c
+++ b/src/olsrd.c
#include "plugin.h"
#include <sys/types.h>
-#include <sys/socket.h>
#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
#define OLSRD_DEFAULT_NODE "localhost"
#define OLSRD_DEFAULT_SERVICE "2006"
static double nlq_sum;
static uint32_t nlq_num;
- double lq; /* tx */
- double nlq; /* rx */
+ double lq;
+ double nlq;
char *endptr;
lq = lq_sum / ((double) lq_num);
DEBUG ("olsrd plugin: Average LQ: %g", lq);
olsrd_submit (/* p.-inst = */ "links", /* type = */ "signal_quality",
- "average-tx", lq);
+ "average-lq", lq);
nlq = NAN;
if (nlq_num > 0)
nlq = nlq_sum / ((double) nlq_num);
DEBUG ("olsrd plugin: Average NLQ: %g", nlq);
olsrd_submit (/* p.-inst = */ "links", /* type = */ "signal_quality",
- "average-rx", nlq);
+ "average-nlq", nlq);
return (0);
}
{
char type_instance[DATA_MAX_NAME_LEN];
- ssnprintf (type_instance, sizeof (type_instance), "%s-%s-tx",
+ ssnprintf (type_instance, sizeof (type_instance), "%s-%s-lq",
fields[0], fields[1]);
DEBUG ("olsrd plugin: links: type_instance = %s; lq = %g;",
char type_instance[DATA_MAX_NAME_LEN];
memset (type_instance, 0, sizeof (type_instance));
- ssnprintf (type_instance, sizeof (type_instance), "%s-%s-rx",
+ ssnprintf (type_instance, sizeof (type_instance), "%s-%s-lq",
fields[0], fields[1]);
DEBUG ("olsrd plugin: type_instance = %s; lq = %g;", type_instance, lq);
olsrd_submit (/* p.-inst = */ "topology", /* type = */ "signal_quality",
char type_instance[DATA_MAX_NAME_LEN];
memset (type_instance, 0, sizeof (type_instance));
- ssnprintf (type_instance, sizeof (type_instance), "%s-%s-tx",
+ ssnprintf (type_instance, sizeof (type_instance), "%s-%s-nlq",
fields[0], fields[1]);
DEBUG ("olsrd plugin: type_instance = %s; nlq = %g;", type_instance, nlq);
olsrd_submit (/* p.-inst = */ "topology", /* type = */ "signal_quality",
if (fh == NULL)
return (-1);
+ fputs ("\r\n", fh);
+ fflush (fh);
+
while (fgets (buffer, sizeof (buffer), fh) != NULL)
{
buffer_len = strchomp (buffer);