[Olsr-dev] [PATCH v1 022/115] jsoninfo: move ipc_print_* functions into a 'printers' unit
Ferry Huberts
(spam-protected)
Wed Dec 2 21:27:55 CET 2015
From: Ferry Huberts <(spam-protected)>
Signed-off-by: Ferry Huberts <(spam-protected)>
---
.../src/{olsrd_jsoninfo.c => jsoninfo_printers.c} | 779 +++++----------------
.../src/jsoninfo_printers.h} | 13 +-
lib/jsoninfo/src/olsrd_jsoninfo.c | 750 +-------------------
lib/jsoninfo/src/olsrd_jsoninfo.h | 2 -
4 files changed, 173 insertions(+), 1371 deletions(-)
copy lib/jsoninfo/src/{olsrd_jsoninfo.c => jsoninfo_printers.c} (70%)
copy lib/{txtinfo/src/txtinfo_printers.h => jsoninfo/src/jsoninfo_printers.h} (89%)
diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.c b/lib/jsoninfo/src/jsoninfo_printers.c
similarity index 70%
copy from lib/jsoninfo/src/olsrd_jsoninfo.c
copy to lib/jsoninfo/src/jsoninfo_printers.c
index 68db7b1..145e66f 100644
--- a/lib/jsoninfo/src/olsrd_jsoninfo.c
+++ b/lib/jsoninfo/src/jsoninfo_printers.c
@@ -39,356 +39,37 @@
*
*/
-/*
- * Dynamic linked library for the olsr.org olsr daemon
- */
+#include "jsoninfo_printers.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifndef _WIN32
-#include <sys/select.h>
-#endif /* _WIN32 */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <time.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
+#include <ctype.h>
+#include <libgen.h>
#include "ipcalc.h"
-#include "olsr.h"
#include "builddata.h"
-#include "olsr_types.h"
#include "neighbor_table.h"
-#include "two_hop_neighbor_table.h"
#include "mpr_selector_set.h"
-#include "tc_set.h"
-#include "hna_set.h"
+#include "routing_table.h"
#include "mid_set.h"
-#include "link_set.h"
-#include "net_olsr.h"
-#include "lq_plugin.h"
-#include "common/autobuf.h"
#include "gateway.h"
-#include "../../info/http_headers.h"
-
-#include <ctype.h>
-#include <libgen.h>
#include "egressTypes.h"
#include "olsrd_jsoninfo_helpers.h"
-
-#include "olsrd_jsoninfo.h"
#include "olsrd_plugin.h"
-#ifdef _WIN32
-#define close(x) closesocket(x)
-#endif /* _WIN32 */
-
-/* defines to make txtinfo and jsoninfo look alike */
-#define PLUGIN_NAME "JSONINFO"
-#define info_accept_ip jsoninfo_accept_ip
-#define info_listen_ip jsoninfo_listen_ip
-#define info_ipv6_only jsoninfo_ipv6_only
-#ifdef JSONINFO_ALLOW_LOCALHOST
-#define INFO_ALLOW_LOCALHOST JSONINFO_ALLOW_LOCALHOST
-#endif
-
-static int ipc_socket;
-
-/* IPC initialization function */
-static int plugin_ipc_init(void);
-
-static void send_info(unsigned int /*send_what*/, int /*socket*/);
-
-static void ipc_action(int, void *, unsigned int);
-
-#define TXT_IPC_BUFSIZE 256
-
-/* these provide all of the runtime status info */
-#define SIW_NEIGHBORS 0x0001
-#define SIW_LINKS 0x0002
-#define SIW_ROUTES 0x0004
-#define SIW_HNA 0x0008
-#define SIW_MID 0x0010
-#define SIW_TOPOLOGY 0x0020
-#define SIW_GATEWAYS 0x0040
-#define SIW_INTERFACES 0x0080
-#define SIW_2HOP 0x0100
-#define SIW_SGW 0x0200
-#define SIW_RUNTIME_ALL (SIW_NEIGHBORS | SIW_LINKS | SIW_ROUTES | SIW_HNA | SIW_MID | SIW_TOPOLOGY | SIW_GATEWAYS | SIW_INTERFACES | SIW_2HOP | SIW_SGW)
-
-/* these only change at olsrd startup */
-#define SIW_VERSION 0x0400
-#define SIW_CONFIG 0x0800
-#define SIW_PLUGINS 0x1000
-#define SIW_STARTUP_ALL (SIW_VERSION | SIW_CONFIG | SIW_PLUGINS)
-
-/* this is everything in normal format */
-#define SIW_ALL (SIW_RUNTIME_ALL | SIW_STARTUP_ALL)
-
-/* this data is not normal format but olsrd.conf format */
-#define SIW_OLSRD_CONF 0x2000
-
-#define MAX_CLIENTS 3
-
-static char *outbuffer[MAX_CLIENTS];
-static size_t outbuffer_size[MAX_CLIENTS];
-static size_t outbuffer_written[MAX_CLIENTS];
-static int outbuffer_socket[MAX_CLIENTS];
-static int outbuffer_count = 0;
-
-static struct timer_entry *writetimer_entry;
-static struct timeval start_time;
-
-static void determine_action(unsigned int *send_what, char *requ) {
- if (strstr(requ, "/olsrd.conf"))
- *send_what |= SIW_OLSRD_CONF;
- else if (strstr(requ, "/all"))
- *send_what = SIW_ALL;
- else {
- // these are the two overarching categories
- if (strstr(requ, "/runtime"))
- *send_what |= SIW_RUNTIME_ALL;
- if (strstr(requ, "/startup"))
- *send_what |= SIW_STARTUP_ALL;
-
- // these are the individual sections
- if (strstr(requ, "/neighbors"))
- *send_what |= SIW_NEIGHBORS;
- if (strstr(requ, "/links"))
- *send_what |= SIW_LINKS;
- if (strstr(requ, "/routes"))
- *send_what |= SIW_ROUTES;
- if (strstr(requ, "/hna"))
- *send_what |= SIW_HNA;
- if (strstr(requ, "/mid"))
- *send_what |= SIW_MID;
- if (strstr(requ, "/topology"))
- *send_what |= SIW_TOPOLOGY;
- if (strstr(requ, "/gateways"))
- *send_what |= SIW_GATEWAYS;
- if (strstr(requ, "/interfaces"))
- *send_what |= SIW_INTERFACES;
- if (strstr(requ, "/2hop"))
- *send_what |= SIW_2HOP;
- if (strstr(requ, "/sgw"))
- *send_what |= SIW_SGW;
-
- // specials
- if (strstr(requ, "/version"))
- *send_what |= SIW_VERSION;
- if (strstr(requ, "/config"))
- *send_what |= SIW_CONFIG;
- if (strstr(requ, "/plugins"))
- *send_what |= SIW_PLUGINS;
-
- /* To print out neighbours only on the Freifunk Status
- * page the normal output is somewhat lengthy. The
- * header parsing is sufficient for standard wget.
- */
- if (strstr(requ, "/neighbours"))
- *send_what = SIW_NEIGHBORS | SIW_LINKS;
- }
-}
+extern char uuidfile[FILENAME_MAX];
+
+struct timeval start_time;
-static void plugin_init(void) {
+void plugin_init(const char *plugin_name) {
/* Get start time */
gettimeofday(&start_time, NULL);
if (!strlen(uuidfile))
strscpy(uuidfile, "uuid.txt", sizeof(uuidfile));
- read_uuid_from_file(PLUGIN_NAME, uuidfile);
-}
-
-/**
- *Do initialization here
- *
- *This function is called by the my_init
- *function in uolsrd_plugin.c
- */
-int olsrd_plugin_init(void) {
- /* Initial IPC value */
- ipc_socket = -1;
-
- plugin_init();
-
- plugin_ipc_init();
- return 1;
+ read_uuid_from_file(plugin_name, uuidfile);
}
-/**
- * destructor - called at unload
- */
-void olsr_plugin_exit(void) {
- if (ipc_socket != -1)
- close(ipc_socket);
-}
-
-static int plugin_ipc_init(void) {
- union olsr_sockaddr sst;
- uint32_t yes = 1;
- socklen_t addrlen;
-
- /* Init ipc socket */
- if ((ipc_socket = socket(olsr_cnf->ip_version, SOCK_STREAM, 0)) == -1) {
-#ifndef NODEBUG
- olsr_printf(1, "("PLUGIN_NAME") socket()=%s\n", strerror(errno));
-#endif /* NODEBUG */
- return 0;
- } else {
- if (setsockopt(ipc_socket, SOL_SOCKET, SO_REUSEADDR, (char *) &yes, sizeof(yes)) < 0) {
-#ifndef NODEBUG
- olsr_printf(1, "("PLUGIN_NAME") setsockopt()=%s\n", strerror(errno));
-#endif /* NODEBUG */
- return 0;
- }
-#if (defined __FreeBSD__ || defined __FreeBSD_kernel__) && defined SO_NOSIGPIPE
- if (setsockopt(ipc_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *) &yes, sizeof(yes)) < 0) {
- perror("SO_REUSEADDR failed");
- return 0;
- }
-#endif /* (defined __FreeBSD__ || defined __FreeBSD_kernel__) && defined SO_NOSIGPIPE */
-#if defined linux && defined IPV6_V6ONLY
- if (info_ipv6_only && olsr_cnf->ip_version == AF_INET6) {
- if (setsockopt(ipc_socket, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &yes, sizeof(yes)) < 0) {
- perror("IPV6_V6ONLY failed");
- return 0;
- }
- }
-#endif /* defined linux && defined IPV6_V6ONLY */
- /* Bind the socket */
-
- /* complete the socket structure */
- memset(&sst, 0, sizeof(sst));
- if (olsr_cnf->ip_version == AF_INET) {
- sst.in4.sin_family = AF_INET;
- addrlen = sizeof(struct sockaddr_in);
-#ifdef SIN6_LEN
- sst.in4.sin_len = addrlen;
-#endif /* SIN6_LEN */
- sst.in4.sin_addr.s_addr = info_listen_ip.v4.s_addr;
- sst.in4.sin_port = htons(ipc_port);
- } else {
- sst.in6.sin6_family = AF_INET6;
- addrlen = sizeof(struct sockaddr_in6);
-#ifdef SIN6_LEN
- sst.in6.sin6_len = addrlen;
-#endif /* SIN6_LEN */
- sst.in6.sin6_addr = info_listen_ip.v6;
- sst.in6.sin6_port = htons(ipc_port);
- }
-
- /* bind the socket to the port number */
- if (bind(ipc_socket, &sst.in, addrlen) == -1) {
-#ifndef NODEBUG
- olsr_printf(1, "("PLUGIN_NAME") bind()=%s\n", strerror(errno));
-#endif /* NODEBUG */
- return 0;
- }
-
- /* show that we are willing to listen */
- if (listen(ipc_socket, 1) == -1) {
-#ifndef NODEBUG
- olsr_printf(1, "("PLUGIN_NAME") listen()=%s\n", strerror(errno));
-#endif /* NODEBUG */
- return 0;
- }
-
- /* Register with olsrd */
- add_olsr_socket(ipc_socket, &ipc_action, NULL, NULL, SP_PR_READ);
-
-#ifndef NODEBUG
- olsr_printf(2, "("PLUGIN_NAME") listening on port %d\n", ipc_port);
-#endif /* NODEBUG */
- }
- return 1;
-}
-
-static void ipc_action(int fd, void *data __attribute__ ((unused)), unsigned int flags __attribute__ ((unused))) {
- union olsr_sockaddr pin;
-
- char addr[INET6_ADDRSTRLEN];
- fd_set rfds;
- struct timeval tv;
- unsigned int send_what = 0;
- int ipc_connection;
-
- socklen_t addrlen = sizeof(pin);
-
- if (outbuffer_count >= MAX_CLIENTS) {
- return;
- }
-
- if ((ipc_connection = accept(fd, &pin.in, &addrlen)) == -1) {
-#ifndef NODEBUG
- olsr_printf(1, "("PLUGIN_NAME") accept()=%s\n", strerror(errno));
-#endif /* NODEBUG */
- return;
- }
-
- tv.tv_sec = tv.tv_usec = 0;
- if (olsr_cnf->ip_version == AF_INET) {
- if (inet_ntop(olsr_cnf->ip_version, &pin.in4.sin_addr, addr, INET6_ADDRSTRLEN) == NULL)
- addr[0] = '\0';
- if (!ip4equal(&pin.in4.sin_addr, &info_accept_ip.v4) && info_accept_ip.v4.s_addr != INADDR_ANY) {
-#ifdef INFO_ALLOW_LOCALHOST
- if (ntohl(pin.in4.sin_addr.s_addr) != INADDR_LOOPBACK) {
-#endif /* INFO_ALLOW_LOCALHOST */
- olsr_printf(1, "("PLUGIN_NAME") From host(%s) not allowed!\n", addr);
- close(ipc_connection);
- return;
-#ifdef INFO_ALLOW_LOCALHOST
- }
-#endif /* INFO_ALLOW_LOCALHOST */
- }
- } else {
- if (inet_ntop(olsr_cnf->ip_version, &pin.in6.sin6_addr, addr, INET6_ADDRSTRLEN) == NULL)
- addr[0] = '\0';
- /* Use in6addr_any (::) in olsr.conf to allow anybody. */
- if (!ip6equal(&in6addr_any, &info_accept_ip.v6) && !ip6equal(&pin.in6.sin6_addr, &info_accept_ip.v6)) {
- olsr_printf(1, "("PLUGIN_NAME") From host(%s) not allowed!\n", addr);
- close(ipc_connection);
- return;
- }
- }
-
-#ifndef NODEBUG
- olsr_printf(2, "("PLUGIN_NAME") Connect from %s\n", addr);
-#endif /* NODEBUG */
-
- /* purge read buffer to prevent blocking on linux */
- FD_ZERO(&rfds);
- FD_SET((unsigned int )ipc_connection, &rfds); /* Win32 needs the cast here */
- if (0 <= select(ipc_connection + 1, &rfds, NULL, NULL, &tv)) {
- char requ[1024];
- ssize_t s = recv(ipc_connection, (void *) &requ, sizeof(requ) - 1, 0); /* Win32 needs the cast here */
-
- if (s == sizeof(requ) - 1) {
- /* input was much too long, just skip the rest */
- char dummy[1024];
-
- while (recv(ipc_connection, (void *) &dummy, sizeof(dummy), 0) == sizeof(dummy))
- ;
- }
-
- if (0 < s) {
- requ[s] = 0;
- determine_action(&send_what, requ);
- }
-
- if (!send_what)
- send_what = SIW_ALL;
- }
-
- send_info(send_what, ipc_connection);
-}
-
-static void ipc_print_neighbors(struct autobuf *abuf, bool list_2hop) {
+void ipc_print_neighbors(struct autobuf *abuf, bool list_2hop) {
struct ipaddr_str buf1;
struct neighbor_entry *neigh;
struct neighbor_2_list_entry *list_2;
@@ -431,7 +112,7 @@ static void ipc_print_neighbors(struct autobuf *abuf, bool list_2hop) {
abuf_json_mark_object(false, true, abuf, NULL);
}
-static void ipc_print_links(struct autobuf *abuf) {
+void ipc_print_links(struct autobuf *abuf) {
struct ipaddr_str buf1, buf2;
struct lqtextbuffer lqbuffer1;
@@ -460,7 +141,7 @@ static void ipc_print_links(struct autobuf *abuf) {
abuf_json_mark_object(false, true, abuf, NULL);
}
-static void ipc_print_routes(struct autobuf *abuf) {
+void ipc_print_routes(struct autobuf *abuf) {
struct ipaddr_str buf1, buf2;
struct rt_entry *rt;
@@ -485,7 +166,7 @@ static void ipc_print_routes(struct autobuf *abuf) {
abuf_json_mark_object(false, true, abuf, NULL);
}
-static void ipc_print_topology(struct autobuf *abuf) {
+void ipc_print_topology(struct autobuf *abuf) {
struct tc_entry *tc;
abuf_json_mark_object(true, true, abuf, "topology");
@@ -521,7 +202,7 @@ static void ipc_print_topology(struct autobuf *abuf) {
abuf_json_mark_object(false, true, abuf, NULL);
}
-static void ipc_print_hna(struct autobuf *abuf) {
+void ipc_print_hna(struct autobuf *abuf) {
struct hna_entry *tmp_hna;
struct hna_net *tmp_net;
struct ipaddr_str buf, mainaddrbuf;
@@ -547,7 +228,7 @@ static void ipc_print_hna(struct autobuf *abuf) {
abuf_json_mark_object(false, true, abuf, NULL);
}
-static void ipc_print_mid(struct autobuf *abuf) {
+void ipc_print_mid(struct autobuf *abuf) {
int idx;
struct mid_entry *entry;
struct mid_address *alias;
@@ -584,7 +265,7 @@ static void ipc_print_mid(struct autobuf *abuf) {
abuf_json_mark_object(false, true, abuf, NULL); // mid
}
-static void ipc_print_gateways(struct autobuf *abuf) {
+void ipc_print_gateways(struct autobuf *abuf) {
#ifndef __linux__
abuf_json_string(abuf, "error", "Gateway mode is only supported in Linux");
#else /* __linux__ */
@@ -646,36 +327,6 @@ static void ipc_print_gateways(struct autobuf *abuf) {
#endif /* __linux__ */
}
-static void ipc_print_plugins(struct autobuf *abuf) {
- struct plugin_entry *pentry;
- struct plugin_param *pparam;
- abuf_json_mark_object(true, true, abuf, "plugins");
- if (olsr_cnf->plugins)
- for (pentry = olsr_cnf->plugins; pentry; pentry = pentry->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "plugin", pentry->name);
- for (pparam = pentry->params; pparam; pparam = pparam->next) {
- int i, keylen = strlen(pparam->key);
- char key[keylen + 1];
- long value;
- char valueTest[256];
- strcpy(key, pparam->key);
- for (i = 0; i < keylen; i++)
- key[i] = tolower(key[i]);
-
- // test if a int/long and set as such in JSON
- value = atol(pparam->value);
- snprintf(valueTest, 255, "%li", value);
- if (!strcmp(valueTest, pparam->value))
- abuf_json_int(abuf, key, value);
- else
- abuf_json_string(abuf, key, pparam->value);
- }
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
#ifdef __linux__
/** interface names for smart gateway tunnel interfaces, IPv4 */
@@ -742,7 +393,7 @@ static void sgw_ipvx(struct autobuf *abuf, bool ipv6) {
}
#endif /* __linux__ */
-static void ipc_print_sgw(struct autobuf *abuf) {
+void ipc_print_sgw(struct autobuf *abuf) {
#ifndef __linux__
abuf_json_string(abuf, "error", "Gateway mode is only supported in Linux");
#else
@@ -755,7 +406,7 @@ static void ipc_print_sgw(struct autobuf *abuf) {
#endif /* __linux__ */
}
-static void ipc_print_version(struct autobuf *abuf) {
+void ipc_print_version(struct autobuf *abuf) {
abuf_json_mark_object(true, false, abuf, "version");
abuf_json_string(abuf, "version", olsrd_version);
@@ -765,11 +416,127 @@ static void ipc_print_version(struct autobuf *abuf) {
abuf_json_mark_object(false, false, abuf, NULL);
}
-static void ipc_print_olsrd_conf(struct autobuf *abuf) {
+void ipc_print_olsrd_conf(struct autobuf *abuf) {
olsrd_write_cnf_autobuf(abuf, olsr_cnf);
}
-static void ipc_print_config(struct autobuf *abuf) {
+void ipc_print_interfaces(struct autobuf *abuf) {
+#ifdef __linux__
+ int linklen;
+ char path[PATH_MAX], linkpath[PATH_MAX];
+#endif /* __linux__ */
+ char ipv6_buf[INET6_ADDRSTRLEN]; /* buffer for IPv6 inet_htop */
+ struct olsr_lq_mult *mult;
+ const struct olsr_if *ifs;
+ abuf_json_mark_object(true, true, abuf, "interfaces");
+ for (ifs = olsr_cnf->interfaces; ifs != NULL ; ifs = ifs->next) {
+ const struct interface_olsr * const rifs = ifs->interf;
+ abuf_json_mark_array_entry(true, abuf);
+ abuf_json_string(abuf, "name", ifs->name);
+
+ abuf_json_mark_object(true, true, abuf, "linkQualityMultipliers");
+ for (mult = ifs->cnf->lq_mult; mult != NULL ; mult = mult->next) {
+ abuf_json_mark_array_entry(true, abuf);
+ abuf_json_string(abuf, "route", inet_ntop(olsr_cnf->ip_version, &mult->addr, ipv6_buf, sizeof(ipv6_buf)));
+ abuf_json_float(abuf, "multiplier", mult->value / 65535.0);
+ abuf_json_mark_array_entry(false, abuf);
+ }
+ abuf_json_mark_object(false, true, abuf, NULL);
+
+ if (!rifs) {
+ abuf_json_string(abuf, "state", "down");
+ } else {
+ abuf_json_string(abuf, "state", "up");
+ abuf_json_string(abuf, "nameFromKernel", rifs->int_name);
+ abuf_json_int(abuf, "interfaceMode", rifs->mode);
+ abuf_json_boolean(abuf, "emulatedHostClientInterface", rifs->is_hcif);
+ abuf_json_boolean(abuf, "sendTcImmediately", rifs->immediate_send_tc);
+ abuf_json_int(abuf, "fishEyeTtlIndex", rifs->ttl_index);
+ abuf_json_int(abuf, "olsrForwardingTimeout", rifs->fwdtimer);
+ abuf_json_int(abuf, "olsrMessageSequenceNumber", rifs->olsr_seqnum);
+ abuf_json_int(abuf, "olsrInterfaceMetric", rifs->int_metric);
+ abuf_json_int(abuf, "olsrMTU", rifs->int_mtu);
+ abuf_json_int(abuf, "helloEmissionInterval", rifs->hello_etime);
+ abuf_json_int(abuf, "helloValidityTime", me_to_reltime(rifs->valtimes.hello));
+ abuf_json_int(abuf, "tcValidityTime", me_to_reltime(rifs->valtimes.tc));
+ abuf_json_int(abuf, "midValidityTime", me_to_reltime(rifs->valtimes.mid));
+ abuf_json_int(abuf, "hnaValidityTime", me_to_reltime(rifs->valtimes.hna));
+ abuf_json_boolean(abuf, "wireless", rifs->is_wireless);
+
+#ifdef __linux__
+ abuf_json_boolean(abuf, "icmpRedirect", rifs->nic_state.redirect);
+ abuf_json_boolean(abuf, "spoofFilter", rifs->nic_state.spoof);
+#endif /* __linux__ */
+
+ if (olsr_cnf->ip_version == AF_INET) {
+ struct ipaddr_str addrbuf, maskbuf, bcastbuf;
+ abuf_json_string(abuf, "ipv4Address", ip4_to_string(&addrbuf, rifs->int_addr.sin_addr));
+ abuf_json_string(abuf, "netmask", ip4_to_string(&maskbuf, rifs->int_netmask.sin_addr));
+ abuf_json_string(abuf, "broadcast", ip4_to_string(&bcastbuf, rifs->int_broadaddr.sin_addr));
+ } else {
+ struct ipaddr_str addrbuf, maskbuf;
+ abuf_json_string(abuf, "ipv6Address", ip6_to_string(&addrbuf, &rifs->int6_addr.sin6_addr));
+ abuf_json_string(abuf, "multicast", ip6_to_string(&maskbuf, &rifs->int6_multaddr.sin6_addr));
+ }
+ }
+#ifdef __linux__
+ snprintf(path, PATH_MAX, "/sys/class/net/%s/device/driver/module", ifs->name);
+ linklen = readlink(path, linkpath, PATH_MAX - 1);
+ if (linklen > 1) {
+ linkpath[linklen] = '\0';
+ abuf_json_string(abuf, "kernelModule", basename(linkpath));
+ }
+
+ abuf_json_sys_class_net(abuf, "addressLength", ifs->name, "addr_len");
+ abuf_json_sys_class_net(abuf, "carrier", ifs->name, "carrier");
+ abuf_json_sys_class_net(abuf, "dormant", ifs->name, "dormant");
+ abuf_json_sys_class_net(abuf, "features", ifs->name, "features");
+ abuf_json_sys_class_net(abuf, "flags", ifs->name, "flags");
+ abuf_json_sys_class_net(abuf, "linkMode", ifs->name, "link_mode");
+ abuf_json_sys_class_net(abuf, "macAddress", ifs->name, "address");
+ abuf_json_sys_class_net(abuf, "ethernetMTU", ifs->name, "mtu");
+ abuf_json_sys_class_net(abuf, "operationalState", ifs->name, "operstate");
+ abuf_json_sys_class_net(abuf, "txQueueLength", ifs->name, "tx_queue_len");
+ abuf_json_sys_class_net(abuf, "collisions", ifs->name, "statistics/collisions");
+ abuf_json_sys_class_net(abuf, "multicastPackets", ifs->name, "statistics/multicast");
+ abuf_json_sys_class_net(abuf, "rxBytes", ifs->name, "statistics/rx_bytes");
+ abuf_json_sys_class_net(abuf, "rxCompressed", ifs->name, "statistics/rx_compressed");
+ abuf_json_sys_class_net(abuf, "rxCrcErrors", ifs->name, "statistics/rx_crc_errors");
+ abuf_json_sys_class_net(abuf, "rxDropped", ifs->name, "statistics/rx_dropped");
+ abuf_json_sys_class_net(abuf, "rxErrors", ifs->name, "statistics/rx_errors");
+ abuf_json_sys_class_net(abuf, "rxFifoErrors", ifs->name, "statistics/rx_fifo_errors");
+ abuf_json_sys_class_net(abuf, "rxFrameErrors", ifs->name, "statistics/rx_frame_errors");
+ abuf_json_sys_class_net(abuf, "rxLengthErrors", ifs->name, "statistics/rx_length_errors");
+ abuf_json_sys_class_net(abuf, "rxMissedErrors", ifs->name, "statistics/rx_missed_errors");
+ abuf_json_sys_class_net(abuf, "rxOverErrors", ifs->name, "statistics/rx_over_errors");
+ abuf_json_sys_class_net(abuf, "rxPackets", ifs->name, "statistics/rx_packets");
+ abuf_json_sys_class_net(abuf, "txAbortedErrors", ifs->name, "statistics/tx_aborted_errors");
+ abuf_json_sys_class_net(abuf, "txBytes", ifs->name, "statistics/tx_bytes");
+ abuf_json_sys_class_net(abuf, "txCarrierErrors", ifs->name, "statistics/tx_carrier_errors");
+ abuf_json_sys_class_net(abuf, "txCompressed", ifs->name, "statistics/tx_compressed");
+ abuf_json_sys_class_net(abuf, "txDropped", ifs->name, "statistics/tx_dropped");
+ abuf_json_sys_class_net(abuf, "txErrors", ifs->name, "statistics/tx_errors");
+ abuf_json_sys_class_net(abuf, "txFifoErrors", ifs->name, "statistics/tx_fifo_errors");
+ abuf_json_sys_class_net(abuf, "txHeartbeatErrors", ifs->name, "statistics/tx_heartbeat_errors");
+ abuf_json_sys_class_net(abuf, "txPackets", ifs->name, "statistics/tx_packets");
+ abuf_json_sys_class_net(abuf, "txWindowErrors", ifs->name, "statistics/tx_window_errors");
+ abuf_json_sys_class_net(abuf, "beaconing", ifs->name, "wireless/beacon");
+ abuf_json_sys_class_net(abuf, "encryptionKey", ifs->name, "wireless/crypt");
+ abuf_json_sys_class_net(abuf, "fragmentationThreshold", ifs->name, "wireless/fragment");
+ abuf_json_sys_class_net(abuf, "signalLevel", ifs->name, "wireless/level");
+ abuf_json_sys_class_net(abuf, "linkQuality", ifs->name, "wireless/link");
+ abuf_json_sys_class_net(abuf, "misc", ifs->name, "wireless/misc");
+ abuf_json_sys_class_net(abuf, "noiseLevel", ifs->name, "wireless/noise");
+ abuf_json_sys_class_net(abuf, "nwid", ifs->name, "wireless/nwid");
+ abuf_json_sys_class_net(abuf, "wirelessRetries", ifs->name, "wireless/retries");
+ abuf_json_sys_class_net(abuf, "wirelessStatus", ifs->name, "wireless/status");
+#endif /* __linux__ */
+ abuf_json_mark_array_entry(false, abuf);
+ }
+ abuf_json_mark_object(false, true, abuf, NULL);
+}
+
+void ipc_print_config(struct autobuf *abuf) {
struct ip_prefix_list *hna;
struct ipaddr_str buf, mainaddrbuf;
struct ip_prefix_list *ipcn;
@@ -975,260 +742,32 @@ static void ipc_print_config(struct autobuf *abuf) {
abuf_json_mark_object(false, false, abuf, NULL);
}
-static void ipc_print_interfaces(struct autobuf *abuf) {
-#ifdef __linux__
- int linklen;
- char path[PATH_MAX], linkpath[PATH_MAX];
-#endif /* __linux__ */
- char ipv6_buf[INET6_ADDRSTRLEN]; /* buffer for IPv6 inet_htop */
- struct olsr_lq_mult *mult;
- const struct olsr_if *ifs;
- abuf_json_mark_object(true, true, abuf, "interfaces");
- for (ifs = olsr_cnf->interfaces; ifs != NULL ; ifs = ifs->next) {
- const struct interface_olsr * const rifs = ifs->interf;
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "name", ifs->name);
-
- abuf_json_mark_object(true, true, abuf, "linkQualityMultipliers");
- for (mult = ifs->cnf->lq_mult; mult != NULL ; mult = mult->next) {
+void ipc_print_plugins(struct autobuf *abuf) {
+ struct plugin_entry *pentry;
+ struct plugin_param *pparam;
+ abuf_json_mark_object(true, true, abuf, "plugins");
+ if (olsr_cnf->plugins)
+ for (pentry = olsr_cnf->plugins; pentry; pentry = pentry->next) {
abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "route", inet_ntop(olsr_cnf->ip_version, &mult->addr, ipv6_buf, sizeof(ipv6_buf)));
- abuf_json_float(abuf, "multiplier", mult->value / 65535.0);
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-
- if (!rifs) {
- abuf_json_string(abuf, "state", "down");
- } else {
- abuf_json_string(abuf, "state", "up");
- abuf_json_string(abuf, "nameFromKernel", rifs->int_name);
- abuf_json_int(abuf, "interfaceMode", rifs->mode);
- abuf_json_boolean(abuf, "emulatedHostClientInterface", rifs->is_hcif);
- abuf_json_boolean(abuf, "sendTcImmediately", rifs->immediate_send_tc);
- abuf_json_int(abuf, "fishEyeTtlIndex", rifs->ttl_index);
- abuf_json_int(abuf, "olsrForwardingTimeout", rifs->fwdtimer);
- abuf_json_int(abuf, "olsrMessageSequenceNumber", rifs->olsr_seqnum);
- abuf_json_int(abuf, "olsrInterfaceMetric", rifs->int_metric);
- abuf_json_int(abuf, "olsrMTU", rifs->int_mtu);
- abuf_json_int(abuf, "helloEmissionInterval", rifs->hello_etime);
- abuf_json_int(abuf, "helloValidityTime", me_to_reltime(rifs->valtimes.hello));
- abuf_json_int(abuf, "tcValidityTime", me_to_reltime(rifs->valtimes.tc));
- abuf_json_int(abuf, "midValidityTime", me_to_reltime(rifs->valtimes.mid));
- abuf_json_int(abuf, "hnaValidityTime", me_to_reltime(rifs->valtimes.hna));
- abuf_json_boolean(abuf, "wireless", rifs->is_wireless);
-
-#ifdef __linux__
- abuf_json_boolean(abuf, "icmpRedirect", rifs->nic_state.redirect);
- abuf_json_boolean(abuf, "spoofFilter", rifs->nic_state.spoof);
-#endif /* __linux__ */
+ abuf_json_string(abuf, "plugin", pentry->name);
+ for (pparam = pentry->params; pparam; pparam = pparam->next) {
+ int i, keylen = strlen(pparam->key);
+ char key[keylen + 1];
+ long value;
+ char valueTest[256];
+ strcpy(key, pparam->key);
+ for (i = 0; i < keylen; i++)
+ key[i] = tolower(key[i]);
- if (olsr_cnf->ip_version == AF_INET) {
- struct ipaddr_str addrbuf, maskbuf, bcastbuf;
- abuf_json_string(abuf, "ipv4Address", ip4_to_string(&addrbuf, rifs->int_addr.sin_addr));
- abuf_json_string(abuf, "netmask", ip4_to_string(&maskbuf, rifs->int_netmask.sin_addr));
- abuf_json_string(abuf, "broadcast", ip4_to_string(&bcastbuf, rifs->int_broadaddr.sin_addr));
- } else {
- struct ipaddr_str addrbuf, maskbuf;
- abuf_json_string(abuf, "ipv6Address", ip6_to_string(&addrbuf, &rifs->int6_addr.sin6_addr));
- abuf_json_string(abuf, "multicast", ip6_to_string(&maskbuf, &rifs->int6_multaddr.sin6_addr));
+ // test if a int/long and set as such in JSON
+ value = atol(pparam->value);
+ snprintf(valueTest, 255, "%li", value);
+ if (!strcmp(valueTest, pparam->value))
+ abuf_json_int(abuf, key, value);
+ else
+ abuf_json_string(abuf, key, pparam->value);
}
+ abuf_json_mark_array_entry(false, abuf);
}
-#ifdef __linux__
- snprintf(path, PATH_MAX, "/sys/class/net/%s/device/driver/module", ifs->name);
- linklen = readlink(path, linkpath, PATH_MAX - 1);
- if (linklen > 1) {
- linkpath[linklen] = '\0';
- abuf_json_string(abuf, "kernelModule", basename(linkpath));
- }
-
- abuf_json_sys_class_net(abuf, "addressLength", ifs->name, "addr_len");
- abuf_json_sys_class_net(abuf, "carrier", ifs->name, "carrier");
- abuf_json_sys_class_net(abuf, "dormant", ifs->name, "dormant");
- abuf_json_sys_class_net(abuf, "features", ifs->name, "features");
- abuf_json_sys_class_net(abuf, "flags", ifs->name, "flags");
- abuf_json_sys_class_net(abuf, "linkMode", ifs->name, "link_mode");
- abuf_json_sys_class_net(abuf, "macAddress", ifs->name, "address");
- abuf_json_sys_class_net(abuf, "ethernetMTU", ifs->name, "mtu");
- abuf_json_sys_class_net(abuf, "operationalState", ifs->name, "operstate");
- abuf_json_sys_class_net(abuf, "txQueueLength", ifs->name, "tx_queue_len");
- abuf_json_sys_class_net(abuf, "collisions", ifs->name, "statistics/collisions");
- abuf_json_sys_class_net(abuf, "multicastPackets", ifs->name, "statistics/multicast");
- abuf_json_sys_class_net(abuf, "rxBytes", ifs->name, "statistics/rx_bytes");
- abuf_json_sys_class_net(abuf, "rxCompressed", ifs->name, "statistics/rx_compressed");
- abuf_json_sys_class_net(abuf, "rxCrcErrors", ifs->name, "statistics/rx_crc_errors");
- abuf_json_sys_class_net(abuf, "rxDropped", ifs->name, "statistics/rx_dropped");
- abuf_json_sys_class_net(abuf, "rxErrors", ifs->name, "statistics/rx_errors");
- abuf_json_sys_class_net(abuf, "rxFifoErrors", ifs->name, "statistics/rx_fifo_errors");
- abuf_json_sys_class_net(abuf, "rxFrameErrors", ifs->name, "statistics/rx_frame_errors");
- abuf_json_sys_class_net(abuf, "rxLengthErrors", ifs->name, "statistics/rx_length_errors");
- abuf_json_sys_class_net(abuf, "rxMissedErrors", ifs->name, "statistics/rx_missed_errors");
- abuf_json_sys_class_net(abuf, "rxOverErrors", ifs->name, "statistics/rx_over_errors");
- abuf_json_sys_class_net(abuf, "rxPackets", ifs->name, "statistics/rx_packets");
- abuf_json_sys_class_net(abuf, "txAbortedErrors", ifs->name, "statistics/tx_aborted_errors");
- abuf_json_sys_class_net(abuf, "txBytes", ifs->name, "statistics/tx_bytes");
- abuf_json_sys_class_net(abuf, "txCarrierErrors", ifs->name, "statistics/tx_carrier_errors");
- abuf_json_sys_class_net(abuf, "txCompressed", ifs->name, "statistics/tx_compressed");
- abuf_json_sys_class_net(abuf, "txDropped", ifs->name, "statistics/tx_dropped");
- abuf_json_sys_class_net(abuf, "txErrors", ifs->name, "statistics/tx_errors");
- abuf_json_sys_class_net(abuf, "txFifoErrors", ifs->name, "statistics/tx_fifo_errors");
- abuf_json_sys_class_net(abuf, "txHeartbeatErrors", ifs->name, "statistics/tx_heartbeat_errors");
- abuf_json_sys_class_net(abuf, "txPackets", ifs->name, "statistics/tx_packets");
- abuf_json_sys_class_net(abuf, "txWindowErrors", ifs->name, "statistics/tx_window_errors");
- abuf_json_sys_class_net(abuf, "beaconing", ifs->name, "wireless/beacon");
- abuf_json_sys_class_net(abuf, "encryptionKey", ifs->name, "wireless/crypt");
- abuf_json_sys_class_net(abuf, "fragmentationThreshold", ifs->name, "wireless/fragment");
- abuf_json_sys_class_net(abuf, "signalLevel", ifs->name, "wireless/level");
- abuf_json_sys_class_net(abuf, "linkQuality", ifs->name, "wireless/link");
- abuf_json_sys_class_net(abuf, "misc", ifs->name, "wireless/misc");
- abuf_json_sys_class_net(abuf, "noiseLevel", ifs->name, "wireless/noise");
- abuf_json_sys_class_net(abuf, "nwid", ifs->name, "wireless/nwid");
- abuf_json_sys_class_net(abuf, "wirelessRetries", ifs->name, "wireless/retries");
- abuf_json_sys_class_net(abuf, "wirelessStatus", ifs->name, "wireless/status");
-#endif /* __linux__ */
- abuf_json_mark_array_entry(false, abuf);
- }
abuf_json_mark_object(false, true, abuf, NULL);
}
-
-static void info_write_data(void *foo __attribute__ ((unused))) {
- fd_set set;
- int result, i, j, max;
- struct timeval tv;
-
- FD_ZERO(&set);
- max = 0;
- for (i = 0; i < outbuffer_count; i++) {
- /* And we cast here since we get a warning on Win32 */
- FD_SET((unsigned int )(outbuffer_socket[i]), &set);
-
- if (outbuffer_socket[i] > max) {
- max = outbuffer_socket[i];
- }
- }
-
- tv.tv_sec = 0;
- tv.tv_usec = 0;
-
- result = select(max + 1, NULL, &set, NULL, &tv);
- if (result <= 0) {
- return;
- }
-
- for (i = 0; i < outbuffer_count; i++) {
- if (FD_ISSET(outbuffer_socket[i], &set)) {
- result = send(outbuffer_socket[i], outbuffer[i] + outbuffer_written[i], outbuffer_size[i] - outbuffer_written[i], 0);
- if (result > 0) {
- outbuffer_written[i] += result;
- }
-
- if (result <= 0 || outbuffer_written[i] == outbuffer_size[i]) {
- /* close this socket and cleanup*/
- close(outbuffer_socket[i]);
- free(outbuffer[i]);
-
- for (j = i + 1; j < outbuffer_count; j++) {
- outbuffer[j - 1] = outbuffer[j];
- outbuffer_size[j - 1] = outbuffer_size[j];
- outbuffer_socket[j - 1] = outbuffer_socket[j];
- outbuffer_written[j - 1] = outbuffer_written[j];
- }
- outbuffer_count--;
- }
- }
- }
- if (!outbuffer_count) {
- olsr_stop_timer(writetimer_entry);
- }
-}
-
-static void send_info(unsigned int send_what, int the_socket) {
- struct autobuf abuf;
-
- const char *content_type = (send_what & SIW_ALL) ? "application/json; charset=utf-8" : "text/plain; charset=utf-8";
- int contentLengthPlaceholderStart = 0;
- int headerLength = 0;
-
- /* global variables for tracking when to put a comma in for JSON */
- abuf_json_reset_entry_number_and_depth();
-
- abuf_init(&abuf, 2 * 4096);
-
- if (http_headers) {
- build_http_header(PLUGIN_NAME, HTTP_200, content_type, &abuf, &contentLengthPlaceholderStart);
- headerLength = abuf.len;
- }
-
- // only add if normal format
- if (send_what & SIW_ALL) {
- abuf_json_mark_output(true, &abuf);
-
- abuf_json_int(&abuf, "systemTime", time(NULL));
- abuf_json_int(&abuf, "timeSinceStartup", now_times);
- if (*uuid)
- abuf_json_string(&abuf, "uuid", uuid);
-
- if (send_what & SIW_LINKS)
- ipc_print_links(&abuf);
- if (send_what & SIW_NEIGHBORS)
- ipc_print_neighbors(&abuf, false);
- if (send_what & SIW_TOPOLOGY)
- ipc_print_topology(&abuf);
- if (send_what & SIW_HNA)
- ipc_print_hna(&abuf);
- if (send_what & SIW_SGW)
- ipc_print_sgw(&abuf);
- if (send_what & SIW_MID)
- ipc_print_mid(&abuf);
- if (send_what & SIW_ROUTES)
- ipc_print_routes(&abuf);
- if (send_what & SIW_GATEWAYS)
- ipc_print_gateways(&abuf);
- if (send_what & SIW_CONFIG)
- ipc_print_config(&abuf);
- if (send_what & SIW_INTERFACES)
- ipc_print_interfaces(&abuf);
- if (send_what & SIW_2HOP)
- ipc_print_neighbors(&abuf, true);
- if (send_what & SIW_VERSION)
- ipc_print_version(&abuf);
- if (send_what & SIW_PLUGINS)
- ipc_print_plugins(&abuf);
-
- abuf_json_mark_output(false, &abuf);
- abuf_puts(&abuf, "\n");
- } else if (send_what & SIW_OLSRD_CONF) {
- /* this outputs the olsrd.conf text directly, not normal format */
- ipc_print_olsrd_conf(&abuf);
- }
-
- if (http_headers) {
- http_header_adjust_content_length(&abuf, contentLengthPlaceholderStart, abuf.len - headerLength);
- }
-
- /* avoid a memcpy: just move the abuf.buf pointer and clear abuf */
- outbuffer[outbuffer_count] = abuf.buf;
- outbuffer_size[outbuffer_count] = abuf.len;
- outbuffer_written[outbuffer_count] = 0;
- outbuffer_socket[outbuffer_count] = the_socket;
- abuf.buf = NULL;
- abuf.len = 0;
- abuf.size = 0;
-
- outbuffer_count++;
-
- if (outbuffer_count == 1) {
- writetimer_entry = olsr_start_timer(100, 0, OLSR_TIMER_PERIODIC, &info_write_data, NULL, 0);
- }
-
- abuf_free(&abuf);
-}
-
-/*
- * Local Variables:
- * mode: c
- * style: linux
- * c-basic-offset: 2
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/lib/txtinfo/src/txtinfo_printers.h b/lib/jsoninfo/src/jsoninfo_printers.h
similarity index 89%
copy from lib/txtinfo/src/txtinfo_printers.h
copy to lib/jsoninfo/src/jsoninfo_printers.h
index 3fcd86c..43052a9 100644
--- a/lib/txtinfo/src/txtinfo_printers.h
+++ b/lib/jsoninfo/src/jsoninfo_printers.h
@@ -39,13 +39,18 @@
*
*/
-#ifndef _OLSRD_TXTINFO_PRINTERS_H
-#define _OLSRD_TXTINFO_PRINTERS_H
+#ifndef _OLSRD_JSONINFO_PRINTERS_H
+#define _OLSRD_JSONINFO_PRINTERS_H
#include <stdbool.h>
+#include <time.h>
#include "common/autobuf.h"
+extern struct timeval start_time;
+
+void plugin_init(const char * plugin_name);
+
void ipc_print_neighbors(struct autobuf *abuf, bool list_2hop);
void ipc_print_links(struct autobuf *abuf);
void ipc_print_routes(struct autobuf *abuf);
@@ -57,5 +62,7 @@ void ipc_print_sgw(struct autobuf *abuf);
void ipc_print_version(struct autobuf *abuf);
void ipc_print_olsrd_conf(struct autobuf *abuf);
void ipc_print_interfaces(struct autobuf *abuf);
+void ipc_print_config(struct autobuf *abuf);
+void ipc_print_plugins(struct autobuf *abuf);
-#endif /* _OLSRD_TXTINFO_PRINTERS_H */
+#endif /* _OLSRD_JSONINFO_PRINTERS_H */
diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.c b/lib/jsoninfo/src/olsrd_jsoninfo.c
index 68db7b1..190ed8d 100644
--- a/lib/jsoninfo/src/olsrd_jsoninfo.c
+++ b/lib/jsoninfo/src/olsrd_jsoninfo.c
@@ -43,47 +43,18 @@
* Dynamic linked library for the olsr.org olsr daemon
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifndef _WIN32
-#include <sys/select.h>
-#endif /* _WIN32 */
-#include <netinet/in.h>
#include <arpa/inet.h>
-#include <sys/time.h>
-#include <time.h>
-#include <math.h>
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
+#include <stddef.h>
#include "ipcalc.h"
#include "olsr.h"
-#include "builddata.h"
-#include "olsr_types.h"
-#include "neighbor_table.h"
-#include "two_hop_neighbor_table.h"
-#include "mpr_selector_set.h"
-#include "tc_set.h"
-#include "hna_set.h"
-#include "mid_set.h"
-#include "link_set.h"
-#include "net_olsr.h"
-#include "lq_plugin.h"
-#include "common/autobuf.h"
-#include "gateway.h"
+#include "scheduler.h"
#include "../../info/http_headers.h"
-
-#include <ctype.h>
-#include <libgen.h>
-#include "egressTypes.h"
+#include "jsoninfo_printers.h"
#include "olsrd_jsoninfo_helpers.h"
-
#include "olsrd_jsoninfo.h"
-#include "olsrd_plugin.h"
#ifdef _WIN32
#define close(x) closesocket(x)
@@ -143,7 +114,6 @@ static int outbuffer_socket[MAX_CLIENTS];
static int outbuffer_count = 0;
static struct timer_entry *writetimer_entry;
-static struct timeval start_time;
static void determine_action(unsigned int *send_what, char *requ) {
if (strstr(requ, "/olsrd.conf"))
@@ -196,15 +166,6 @@ static void determine_action(unsigned int *send_what, char *requ) {
}
}
-static void plugin_init(void) {
- /* Get start time */
- gettimeofday(&start_time, NULL);
-
- if (!strlen(uuidfile))
- strscpy(uuidfile, "uuid.txt", sizeof(uuidfile));
- read_uuid_from_file(PLUGIN_NAME, uuidfile);
-}
-
/**
*Do initialization here
*
@@ -215,7 +176,7 @@ int olsrd_plugin_init(void) {
/* Initial IPC value */
ipc_socket = -1;
- plugin_init();
+ plugin_init(PLUGIN_NAME);
plugin_ipc_init();
return 1;
@@ -388,709 +349,6 @@ static void ipc_action(int fd, void *data __attribute__ ((unused)), unsigned int
send_info(send_what, ipc_connection);
}
-static void ipc_print_neighbors(struct autobuf *abuf, bool list_2hop) {
- struct ipaddr_str buf1;
- struct neighbor_entry *neigh;
- struct neighbor_2_list_entry *list_2;
- int thop_cnt;
-
- if (!list_2hop)
- abuf_json_mark_object(true, true, abuf, "neighbors");
- else
- abuf_json_mark_object(true, true, abuf, "2hop");
-
- /* Neighbors */
- OLSR_FOR_ALL_NBR_ENTRIES(neigh)
- {
- abuf_json_mark_array_entry(true, abuf);
-
- abuf_json_string(abuf, "ipAddress", olsr_ip_to_string(&buf1, &neigh->neighbor_main_addr));
- abuf_json_boolean(abuf, "symmetric", (neigh->status == SYM));
- abuf_json_boolean(abuf, "multiPointRelay", neigh->is_mpr);
- abuf_json_boolean(abuf, "multiPointRelaySelector", olsr_lookup_mprs_set(&neigh->neighbor_main_addr) != NULL);
- abuf_json_int(abuf, "willingness", neigh->willingness);
- thop_cnt = 0;
-
- if (!list_2hop) {
- for (list_2 = neigh->neighbor_2_list.next; list_2 != &neigh->neighbor_2_list; list_2 = list_2->next) {
- thop_cnt++;
- }
- abuf_json_int(abuf, "twoHopNeighborCount", thop_cnt);
- } else {
- abuf_json_mark_object(true, true, abuf, "twoHopNeighbors");
- for (list_2 = neigh->neighbor_2_list.next; list_2 != &neigh->neighbor_2_list; list_2 = list_2->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "ipAddress", olsr_ip_to_string(&buf1, &list_2->neighbor_2->neighbor_2_addr));
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, false);
- }
-
- abuf_json_mark_array_entry(false, abuf);
- }OLSR_FOR_ALL_NBR_ENTRIES_END(neigh);
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
-static void ipc_print_links(struct autobuf *abuf) {
- struct ipaddr_str buf1, buf2;
- struct lqtextbuffer lqbuffer1;
-
- struct link_entry *my_link = NULL;
-
- abuf_json_mark_object(true, true, abuf, "links");
-
- OLSR_FOR_ALL_LINK_ENTRIES(my_link)
- {
- const char* lqs;
- int diff = (unsigned int) (my_link->link_timer->timer_clock - now_times);
-
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "localIP", olsr_ip_to_string(&buf1, &my_link->local_iface_addr));
- abuf_json_string(abuf, "remoteIP", olsr_ip_to_string(&buf2, &my_link->neighbor_iface_addr));
- abuf_json_int(abuf, "validityTime", diff);
- lqs = get_link_entry_text(my_link, '\t', &lqbuffer1);
- abuf_json_float(abuf, "linkQuality", atof(lqs));
- abuf_json_float(abuf, "neighborLinkQuality", atof(strrchr(lqs, '\t')));
- if (my_link->linkcost >= LINK_COST_BROKEN)
- abuf_json_int(abuf, "linkCost", LINK_COST_BROKEN);
- else
- abuf_json_int(abuf, "linkCost", my_link->linkcost);
- abuf_json_mark_array_entry(false, abuf);
- }OLSR_FOR_ALL_LINK_ENTRIES_END(my_link);
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
-static void ipc_print_routes(struct autobuf *abuf) {
- struct ipaddr_str buf1, buf2;
- struct rt_entry *rt;
-
- abuf_json_mark_object(true, true, abuf, "routes");
-
- /* Walk the route table */
- OLSR_FOR_ALL_RT_ENTRIES(rt)
- {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "destination", olsr_ip_to_string(&buf1, &rt->rt_dst.prefix));
- abuf_json_int(abuf, "genmask", rt->rt_dst.prefix_len);
- abuf_json_string(abuf, "gateway", olsr_ip_to_string(&buf2, &rt->rt_best->rtp_nexthop.gateway));
- abuf_json_int(abuf, "metric", rt->rt_best->rtp_metric.hops);
- if (rt->rt_best->rtp_metric.cost >= ROUTE_COST_BROKEN)
- abuf_json_int(abuf, "rtpMetricCost", ROUTE_COST_BROKEN);
- else
- abuf_json_int(abuf, "rtpMetricCost", rt->rt_best->rtp_metric.cost);
- abuf_json_string(abuf, "networkInterface", if_ifwithindex_name(rt->rt_best->rtp_nexthop.iif_index));
- abuf_json_mark_array_entry(false, abuf);
- }OLSR_FOR_ALL_RT_ENTRIES_END(rt);
-
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
-static void ipc_print_topology(struct autobuf *abuf) {
- struct tc_entry *tc;
-
- abuf_json_mark_object(true, true, abuf, "topology");
-
- /* Topology */
- OLSR_FOR_ALL_TC_ENTRIES(tc)
- {
- struct tc_edge_entry *tc_edge;
- OLSR_FOR_ALL_TC_EDGE_ENTRIES(tc, tc_edge)
- {
- if (tc_edge->edge_inv) {
- struct ipaddr_str dstbuf, addrbuf;
- struct lqtextbuffer lqbuffer1;
- uint32_t vt = tc->validity_timer != NULL ? (tc->validity_timer->timer_clock - now_times) : 0;
- int diff = (int) (vt);
- const char* lqs;
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "destinationIP", olsr_ip_to_string(&dstbuf, &tc_edge->T_dest_addr));
- abuf_json_string(abuf, "lastHopIP", olsr_ip_to_string(&addrbuf, &tc->addr));
- lqs = get_tc_edge_entry_text(tc_edge, '\t', &lqbuffer1);
- abuf_json_float(abuf, "linkQuality", atof(lqs));
- abuf_json_float(abuf, "neighborLinkQuality", atof(strrchr(lqs, '\t')));
- if (tc_edge->cost >= LINK_COST_BROKEN)
- abuf_json_int(abuf, "tcEdgeCost", LINK_COST_BROKEN);
- else
- abuf_json_int(abuf, "tcEdgeCost", tc_edge->cost);
- abuf_json_int(abuf, "validityTime", diff);
- abuf_json_mark_array_entry(false, abuf);
- }
- }OLSR_FOR_ALL_TC_EDGE_ENTRIES_END(tc, tc_edge);
- }OLSR_FOR_ALL_TC_ENTRIES_END(tc);
-
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
-static void ipc_print_hna(struct autobuf *abuf) {
- struct hna_entry *tmp_hna;
- struct hna_net *tmp_net;
- struct ipaddr_str buf, mainaddrbuf;
-
- abuf_json_mark_object(true, true, abuf, "hna");
-
- OLSR_FOR_ALL_HNA_ENTRIES(tmp_hna)
- {
-
- /* Check all networks */
- for (tmp_net = tmp_hna->networks.next; tmp_net != &tmp_hna->networks; tmp_net = tmp_net->next) {
- uint32_t vt = tmp_net->hna_net_timer != NULL ? (tmp_net->hna_net_timer->timer_clock - now_times) : 0;
- int diff = (int) (vt);
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "destination", olsr_ip_to_string(&buf, &tmp_net->hna_prefix.prefix)), abuf_json_int(abuf, "genmask",
- tmp_net->hna_prefix.prefix_len);
- abuf_json_string(abuf, "gateway", olsr_ip_to_string(&mainaddrbuf, &tmp_hna->A_gateway_addr));
- abuf_json_int(abuf, "validityTime", diff);
- abuf_json_mark_array_entry(false, abuf);
- }
- }OLSR_FOR_ALL_HNA_ENTRIES_END(tmp_hna);
-
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
-static void ipc_print_mid(struct autobuf *abuf) {
- int idx;
- struct mid_entry *entry;
- struct mid_address *alias;
-
- abuf_json_mark_object(true, true, abuf, "mid");
-
- /* MID */
- for (idx = 0; idx < HASHSIZE; idx++) {
- entry = mid_set[idx].next;
-
- while (entry != &mid_set[idx]) {
- struct ipaddr_str buf, buf2;
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "ipAddress", olsr_ip_to_string(&buf, &entry->main_addr));
-
- abuf_json_mark_object(true, true, abuf, "aliases");
- alias = entry->aliases;
- while (alias) {
- uint32_t vt = alias->vtime - now_times;
- int diff = (int) (vt);
-
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "ipAddress", olsr_ip_to_string(&buf2, &alias->alias));
- abuf_json_int(abuf, "validityTime", diff);
- abuf_json_mark_array_entry(false, abuf);
-
- alias = alias->next_alias;
- }
- abuf_json_mark_object(false, true, abuf, NULL); // aliases
- abuf_json_mark_array_entry(false, abuf);
- entry = entry->next;
- }
- }
- abuf_json_mark_object(false, true, abuf, NULL); // mid
-}
-
-static void ipc_print_gateways(struct autobuf *abuf) {
-#ifndef __linux__
- abuf_json_string(abuf, "error", "Gateway mode is only supported in Linux");
-#else /* __linux__ */
-
- struct ipaddr_str buf;
- struct gateway_entry *gw;
-
- abuf_json_mark_object(true, true, abuf, "gateways");
- OLSR_FOR_ALL_GATEWAY_ENTRIES(gw)
- {
- const char *v4 = "", *v6 = "";
- bool autoV4 = false, autoV6 = false;
- const char *ipType = "";
- struct tc_entry *tc;
-
- if ((tc = olsr_lookup_tc_entry(&gw->originator)) == NULL) {
- continue;
- }
-
- if (gw == olsr_get_inet_gateway(false)) {
- v4 = "s";
- } else if (gw->ipv4 && (olsr_cnf->ip_version == AF_INET || olsr_cnf->use_niit) && (olsr_cnf->smart_gw_allow_nat || !gw->ipv4nat)) {
- v4 = "u";
- }
-
- if (gw == olsr_get_inet_gateway(true)) {
- v6 = "s";
- } else if (gw->ipv6 && olsr_cnf->ip_version == AF_INET6) {
- v6 = "u";
- }
-
- abuf_json_mark_array_entry(true, abuf);
- if (gw->ipv4) {
- ipType = "ipv4";
- abuf_json_string(abuf, "ipv4Status", v4);
- } else if (gw->ipv6) {
- ipType = "ipv6";
- abuf_json_string(abuf, "ipv6Status", v6);
- }
- abuf_json_string(abuf, "ipType", ipType);
- abuf_json_boolean(abuf, "ipv4", gw->ipv4);
- abuf_json_boolean(abuf, "ipv4Nat", gw->ipv4nat);
- abuf_json_boolean(abuf, "ipv6", gw->ipv6);
- abuf_json_boolean(abuf, "autoIpv4", autoV4);
- abuf_json_boolean(abuf, "autoIpv6", autoV6);
- abuf_json_string(abuf, "ipAddress", olsr_ip_to_string(&buf, &gw->originator));
- if (tc->path_cost >= ROUTE_COST_BROKEN)
- abuf_json_int(abuf, "tcPathCost", ROUTE_COST_BROKEN);
- else
- abuf_json_int(abuf, "tcPathCost", tc->path_cost);
- abuf_json_int(abuf, "hopCount", tc->hops);
- abuf_json_int(abuf, "uplinkSpeed", gw->uplink);
- abuf_json_int(abuf, "downlinkSpeed", gw->downlink);
- if (!gw->external_prefix.prefix_len)
- abuf_json_string(abuf, "externalPrefix", olsr_ip_prefix_to_string(&gw->external_prefix));
- abuf_json_mark_array_entry(false, abuf);
- }OLSR_FOR_ALL_GATEWAY_ENTRIES_END(gw)
- abuf_json_mark_object(false, true, abuf, NULL);
-#endif /* __linux__ */
-}
-
-static void ipc_print_plugins(struct autobuf *abuf) {
- struct plugin_entry *pentry;
- struct plugin_param *pparam;
- abuf_json_mark_object(true, true, abuf, "plugins");
- if (olsr_cnf->plugins)
- for (pentry = olsr_cnf->plugins; pentry; pentry = pentry->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "plugin", pentry->name);
- for (pparam = pentry->params; pparam; pparam = pparam->next) {
- int i, keylen = strlen(pparam->key);
- char key[keylen + 1];
- long value;
- char valueTest[256];
- strcpy(key, pparam->key);
- for (i = 0; i < keylen; i++)
- key[i] = tolower(key[i]);
-
- // test if a int/long and set as such in JSON
- value = atol(pparam->value);
- snprintf(valueTest, 255, "%li", value);
- if (!strcmp(valueTest, pparam->value))
- abuf_json_int(abuf, key, value);
- else
- abuf_json_string(abuf, key, pparam->value);
- }
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
-#ifdef __linux__
-
-/** interface names for smart gateway tunnel interfaces, IPv4 */
-extern struct interfaceName * sgwTunnel4InterfaceNames;
-
-/** interface names for smart gateway tunnel interfaces, IPv6 */
-extern struct interfaceName * sgwTunnel6InterfaceNames;
-
-/**
- * Construct the sgw table for a given ip version
- *
- * @param abuf the string buffer
- * @param ipv6 true for IPv6, false for IPv4
- * @param fmtv the format for printing
- */
-static void sgw_ipvx(struct autobuf *abuf, bool ipv6) {
- struct interfaceName * sgwTunnelInterfaceNames;
-
- abuf_json_mark_object(true, true, abuf, ipv6 ? "ipv6" : "ipv4");
-
- sgwTunnelInterfaceNames = !ipv6 ? sgwTunnel4InterfaceNames : sgwTunnel6InterfaceNames;
- if (olsr_cnf->smart_gw_active && sgwTunnelInterfaceNames) {
- struct gateway_entry * current_gw = olsr_get_inet_gateway(ipv6);
- int i;
- for (i = 0; i < olsr_cnf->smart_gw_use_count; i++) {
- struct interfaceName * node = &sgwTunnelInterfaceNames[i];
- struct gateway_entry * gw = node->gw;
-
- if (!gw) {
- continue;
- }
-
- abuf_json_mark_array_entry(true, abuf);
- {
- struct tc_entry* tc = olsr_lookup_tc_entry(&gw->originator);
-
- struct ipaddr_str originatorStr;
- const char * originator = olsr_ip_to_string(&originatorStr, &gw->originator);
- struct ipaddr_str prefixIpStr;
- const char * prefix = olsr_ip_to_string(&prefixIpStr, &gw->external_prefix.prefix);
-
- abuf_json_boolean(abuf, "selected", current_gw && (current_gw == gw));
- abuf_json_string(abuf, "originator", originator);
- abuf_json_string(abuf, "prefix", prefix);
- abuf_json_int(abuf, "prefixLen", gw->external_prefix.prefix_len);
- abuf_json_int(abuf, "uplink", gw->uplink);
- abuf_json_int(abuf, "downlink", gw->downlink);
- abuf_json_int(abuf, "pathcost", !tc ? ROUTE_COST_BROKEN : tc->path_cost);
- abuf_json_boolean(abuf, "IPv4", gw->ipv4);
- abuf_json_boolean(abuf, "IPv4-NAT", gw->ipv4nat);
- abuf_json_boolean(abuf, "IPv6", gw->ipv6);
- abuf_json_string(abuf, "tunnel", node->name);
- abuf_json_string(abuf, "destination", originator);
- abuf_json_int(abuf, "cost", gw->path_cost);
- abuf_json_int(abuf, "tableNr", node->tableNr);
- abuf_json_int(abuf, "ruleNr", node->ruleNr);
- abuf_json_int(abuf, "bypassRuleNr", node->bypassRuleNr);
- }
- abuf_json_mark_array_entry(false, abuf);
- }
- }
-
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-#endif /* __linux__ */
-
-static void ipc_print_sgw(struct autobuf *abuf) {
-#ifndef __linux__
- abuf_json_string(abuf, "error", "Gateway mode is only supported in Linux");
-#else
- abuf_json_mark_object(true, false, abuf, "sgw");
-
- sgw_ipvx(abuf, false);
- sgw_ipvx(abuf, true);
-
- abuf_json_mark_object(false, false, abuf, NULL);
-#endif /* __linux__ */
-}
-
-static void ipc_print_version(struct autobuf *abuf) {
- abuf_json_mark_object(true, false, abuf, "version");
-
- abuf_json_string(abuf, "version", olsrd_version);
- abuf_json_string(abuf, "date", build_date);
- abuf_json_string(abuf, "host", build_host);
-
- abuf_json_mark_object(false, false, abuf, NULL);
-}
-
-static void ipc_print_olsrd_conf(struct autobuf *abuf) {
- olsrd_write_cnf_autobuf(abuf, olsr_cnf);
-}
-
-static void ipc_print_config(struct autobuf *abuf) {
- struct ip_prefix_list *hna;
- struct ipaddr_str buf, mainaddrbuf;
- struct ip_prefix_list *ipcn;
- struct olsr_lq_mult *mult;
- char ipv6_buf[INET6_ADDRSTRLEN]; /* buffer for IPv6 inet_htop */
-
- abuf_json_mark_object(true, false, abuf, "config");
-
- abuf_json_int(abuf, "olsrPort", olsr_cnf->olsrport);
- abuf_json_int(abuf, "debugLevel", olsr_cnf->debug_level);
- abuf_json_boolean(abuf, "noFork", olsr_cnf->no_fork);
- abuf_json_boolean(abuf, "hostEmulation", olsr_cnf->host_emul);
- abuf_json_int(abuf, "ipVersion", olsr_cnf->ip_version);
- abuf_json_boolean(abuf, "allowNoInterfaces", olsr_cnf->allow_no_interfaces);
- abuf_json_int(abuf, "typeOfService", olsr_cnf->tos);
- abuf_json_int(abuf, "rtProto", olsr_cnf->rt_proto);
- abuf_json_int(abuf, "rtTable", olsr_cnf->rt_table);
- abuf_json_int(abuf, "rtTableDefault", olsr_cnf->rt_table_default);
- abuf_json_int(abuf, "rtTableTunnel", olsr_cnf->rt_table_tunnel);
- abuf_json_int(abuf, "rtTablePriority", olsr_cnf->rt_table_pri);
- abuf_json_int(abuf, "rtTableTunnelPriority", olsr_cnf->rt_table_tunnel_pri);
- abuf_json_int(abuf, "rtTableDefauiltOlsrPriority", olsr_cnf->rt_table_defaultolsr_pri);
- abuf_json_int(abuf, "rtTableDefaultPriority", olsr_cnf->rt_table_default_pri);
- abuf_json_int(abuf, "willingness", olsr_cnf->willingness);
- abuf_json_boolean(abuf, "willingnessAuto", olsr_cnf->willingness_auto);
-
- abuf_json_int(abuf, "brokenLinkCost", LINK_COST_BROKEN);
- abuf_json_int(abuf, "brokenRouteCost", ROUTE_COST_BROKEN);
-
- abuf_json_string(abuf, "fibMetrics", FIB_METRIC_TXT[olsr_cnf->fib_metric]);
-
- abuf_json_string(abuf, "defaultIpv6Multicast", inet_ntop(AF_INET6, &olsr_cnf->interface_defaults->ipv6_multicast.v6, ipv6_buf, sizeof(ipv6_buf)));
- if (olsr_cnf->interface_defaults->ipv4_multicast.v4.s_addr)
- abuf_json_string(abuf, "defaultIpv4Broadcast", inet_ntoa(olsr_cnf->interface_defaults->ipv4_multicast.v4));
- else
- abuf_json_string(abuf, "defaultIpv4Broadcast", "auto");
-
- if (olsr_cnf->interface_defaults->mode == IF_MODE_ETHER)
- abuf_json_string(abuf, "defaultInterfaceMode", "ether");
- else
- abuf_json_string(abuf, "defaultInterfaceMode", "mesh");
-
- abuf_json_float(abuf, "defaultHelloEmissionInterval", olsr_cnf->interface_defaults->hello_params.emission_interval);
- abuf_json_float(abuf, "defaultHelloValidityTime", olsr_cnf->interface_defaults->hello_params.validity_time);
- abuf_json_float(abuf, "defaultTcEmissionInterval", olsr_cnf->interface_defaults->tc_params.emission_interval);
- abuf_json_float(abuf, "defaultTcValidityTime", olsr_cnf->interface_defaults->tc_params.validity_time);
- abuf_json_float(abuf, "defaultMidEmissionInterval", olsr_cnf->interface_defaults->mid_params.emission_interval);
- abuf_json_float(abuf, "defaultMidValidityTime", olsr_cnf->interface_defaults->mid_params.validity_time);
- abuf_json_float(abuf, "defaultHnaEmissionInterval", olsr_cnf->interface_defaults->hna_params.emission_interval);
- abuf_json_float(abuf, "defaultHnaValidityTime", olsr_cnf->interface_defaults->hna_params.validity_time);
- abuf_json_boolean(abuf, "defaultAutoDetectChanges", olsr_cnf->interface_defaults->autodetect_chg);
-
- abuf_json_mark_object(true, true, abuf, "defaultLinkQualityMultipliers");
- for (mult = olsr_cnf->interface_defaults->lq_mult; mult != NULL ; mult = mult->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "route", inet_ntop(olsr_cnf->ip_version, &mult->addr, ipv6_buf, sizeof(ipv6_buf)));
- abuf_json_float(abuf, "multiplier", mult->value / 65535.0);
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-
- abuf_json_mark_object(true, true, abuf, "hna");
- for (hna = olsr_cnf->hna_entries; hna != NULL ; hna = hna->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "destination", olsr_ip_to_string(&buf, &hna->net.prefix));
- abuf_json_int(abuf, "genmask", hna->net.prefix_len);
- abuf_json_string(abuf, "gateway", olsr_ip_to_string(&mainaddrbuf, &olsr_cnf->main_addr));
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-
- abuf_json_int(abuf, "totalIpcConnectionsAllowed", olsr_cnf->ipc_connections);
- abuf_json_mark_object(true, true, abuf, "ipcAllowedAddresses");
- if (olsr_cnf->ipc_connections) {
- for (ipcn = olsr_cnf->ipc_nets; ipcn != NULL ; ipcn = ipcn->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "ipAddress", olsr_ip_to_string(&mainaddrbuf, &ipcn->net.prefix));
- abuf_json_int(abuf, "netmask", ipcn->net.prefix_len);
- abuf_json_mark_array_entry(false, abuf);
- }
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-
- // keep all time in ms, so convert these two, which are in seconds
- abuf_json_int(abuf, "pollRate", olsr_cnf->pollrate * 1000);
- abuf_json_int(abuf, "nicChangePollInterval", olsr_cnf->nic_chgs_pollrate * 1000);
- abuf_json_boolean(abuf, "clearScreen", olsr_cnf->clear_screen);
- abuf_json_int(abuf, "tcRedundancy", olsr_cnf->tc_redundancy);
- abuf_json_int(abuf, "mprCoverage", olsr_cnf->mpr_coverage);
-
- if (!olsr_cnf->lq_level) {
- abuf_json_boolean(abuf, "useHysteresis", olsr_cnf->use_hysteresis);
- if (olsr_cnf->use_hysteresis) {
- abuf_json_float(abuf, "hysteresisScaling", olsr_cnf->hysteresis_param.scaling);
- abuf_json_float(abuf, "hysteresisLowThreshold", olsr_cnf->hysteresis_param.thr_low);
- abuf_json_float(abuf, "hysteresisHighThreshold", olsr_cnf->hysteresis_param.thr_high);
- }
- }
- abuf_json_int(abuf, "linkQualityLevel", olsr_cnf->lq_level);
- abuf_json_float(abuf, "linkQualityAging", olsr_cnf->lq_aging);
- abuf_json_boolean(abuf, "linkQualityFisheye", olsr_cnf->lq_fish);
- abuf_json_string(abuf, "linkQualityAlgorithm", olsr_cnf->lq_algorithm);
- // keep all time in ms, so convert this from seconds
- abuf_json_int(abuf, "minTcValidTime", olsr_cnf->min_tc_vtime * 1000);
- abuf_json_boolean(abuf, "setIpForward", olsr_cnf->set_ip_forward);
- abuf_json_string(abuf, "lockFile", olsr_cnf->lock_file);
- abuf_json_boolean(abuf, "useNiit", olsr_cnf->use_niit);
-
-#ifdef __linux__
- abuf_json_boolean(abuf, "smartGateway", olsr_cnf->smart_gw_active);
- if (olsr_cnf->smart_gw_active) {
- abuf_json_boolean(abuf, "smartGatewayAlwaysRemoveServerTunnel", olsr_cnf->smart_gw_always_remove_server_tunnel);
- abuf_json_int(abuf, "smartGatewayUseCount", olsr_cnf->smart_gw_use_count);
- abuf_json_string(abuf, "smartGatewayInstanceId", olsr_cnf->smart_gw_instance_id);
- abuf_json_string(abuf, "smartGatewayPolicyRoutingScript", olsr_cnf->smart_gw_policyrouting_script);
- {
- struct autobuf egressbuf;
- struct sgw_egress_if * egressif = olsr_cnf->smart_gw_egress_interfaces;
-
- abuf_init(&egressbuf, (olsr_cnf->smart_gw_egress_interfaces_count * IFNAMSIZ) /* interface names */
- + (olsr_cnf->smart_gw_egress_interfaces_count - 1) /* commas */);
- while (egressif) {
- if (egressbuf.len) {
- abuf_puts(&egressbuf, ",");
- }
- abuf_appendf(&egressbuf, "%s", egressif->name);
- egressif = egressif->next;
- }
- abuf_json_string(abuf, "smartGatewayEgressInterfaces", egressbuf.buf);
- abuf_free(&egressbuf);
- }
- abuf_json_int(abuf, "smartGatewayTablesOffset", olsr_cnf->smart_gw_offset_tables);
- abuf_json_int(abuf, "smartGatewayRulesOffset", olsr_cnf->smart_gw_offset_rules);
- abuf_json_boolean(abuf, "smartGatewayAllowNat", olsr_cnf->smart_gw_allow_nat);
- abuf_json_boolean(abuf, "smartGatewayUplinkNat", olsr_cnf->smart_gw_uplink_nat);
- abuf_json_int(abuf, "smartGatewayPeriod", olsr_cnf->smart_gw_period);
- abuf_json_int(abuf, "smartGatewayStableCount", olsr_cnf->smart_gw_stablecount);
- abuf_json_int(abuf, "smartGatewayThreshold", olsr_cnf->smart_gw_thresh);
- abuf_json_int(abuf, "smartGatewayUplink", olsr_cnf->smart_gw_uplink);
- abuf_json_int(abuf, "smartGatewayDownlink", olsr_cnf->smart_gw_downlink);
- abuf_json_int(abuf, "smartGatewayType", olsr_cnf->smart_gw_type);
- abuf_json_string(abuf, "smartGatewayPrefix", olsr_ip_to_string(&mainaddrbuf, &olsr_cnf->smart_gw_prefix.prefix));
- abuf_json_int(abuf, "smartGatewayPrefixLength", olsr_cnf->smart_gw_prefix.prefix_len);
- }
-#endif /* __linux__ */
-
- abuf_json_string(abuf, "mainIpAddress", olsr_ip_to_string(&mainaddrbuf, &olsr_cnf->main_addr));
- abuf_json_string(abuf, "unicastSourceIpAddress", olsr_ip_to_string(&mainaddrbuf, &olsr_cnf->unicast_src_ip));
-
- abuf_json_boolean(abuf, "useSourceIpRoutes", olsr_cnf->use_src_ip_routes);
-
- abuf_json_int(abuf, "maxPrefixLength", olsr_cnf->maxplen);
- abuf_json_int(abuf, "ipSize", olsr_cnf->ipsize);
- abuf_json_boolean(abuf, "deleteInternetGatewaysAtStartup", olsr_cnf->del_gws);
- // keep all time in ms, so convert this from seconds
- abuf_json_int(abuf, "willingnessUpdateInterval", olsr_cnf->will_int * 1000);
- abuf_json_float(abuf, "maxSendMessageJitter", olsr_cnf->max_jitter);
- abuf_json_int(abuf, "exitValue", olsr_cnf->exit_value);
- // keep all time in ms, so convert this from seconds
- abuf_json_int(abuf, "maxTcValidTime", olsr_cnf->max_tc_vtime * 1000);
-
- abuf_json_int(abuf, "niit4to6InterfaceIndex", olsr_cnf->niit4to6_if_index);
- abuf_json_int(abuf, "niit6to4InterfaceIndex", olsr_cnf->niit6to4_if_index);
-
- abuf_json_boolean(abuf, "hasIpv4Gateway", olsr_cnf->has_ipv4_gateway);
- abuf_json_boolean(abuf, "hasIpv6Gateway", olsr_cnf->has_ipv6_gateway);
-
- abuf_json_int(abuf, "ioctlSocket", olsr_cnf->ioctl_s);
-#ifdef __linux__
- abuf_json_int(abuf, "routeNetlinkSocket", olsr_cnf->rtnl_s);
- abuf_json_int(abuf, "routeMonitorSocket", olsr_cnf->rt_monitor_socket);
-#endif /* __linux__ */
-
-#if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__
- abuf_json_int(abuf, "routeChangeSocket", olsr_cnf->rts);
-#endif /* defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __APPLE__ || defined __NetBSD__ || defined __OpenBSD__ */
- abuf_json_float(abuf, "linkQualityNatThreshold", olsr_cnf->lq_nat_thresh);
-
- abuf_json_string(abuf, "olsrdVersion", olsrd_version);
- abuf_json_string(abuf, "olsrdBuildDate", build_date);
- abuf_json_string(abuf, "olsrdBuildHost", build_host);
-
-#if defined _WIN32 || defined _WIN64
- abuf_json_string(abuf, "os", "Windows");
-#elif defined __gnu_linux__
- abuf_json_string(abuf, "os", "GNU/Linux");
-#elif defined __ANDROID__
- abuf_json_string(abuf, "os", "Android");
-#elif defined __APPLE__
- abuf_json_string(abuf, "os", "Mac OS X");
-#elif defined __NetBSD__
- abuf_json_string(abuf, "os", "NetBSD");
-#elif defined __OpenBSD__
- abuf_json_string(abuf, "os", "OpenBSD");
-#elif defined __FreeBSD__ || defined __FreeBSD_kernel__
- abuf_json_string(abuf, "os", "FreeBSD");
-#else /* OS detection */
- abuf_json_string(abuf, "os", "Undefined");
-#endif /* OS detection */
-
- abuf_json_int(abuf, "startTime", start_time.tv_sec);
-
- abuf_json_mark_object(false, false, abuf, NULL);
-}
-
-static void ipc_print_interfaces(struct autobuf *abuf) {
-#ifdef __linux__
- int linklen;
- char path[PATH_MAX], linkpath[PATH_MAX];
-#endif /* __linux__ */
- char ipv6_buf[INET6_ADDRSTRLEN]; /* buffer for IPv6 inet_htop */
- struct olsr_lq_mult *mult;
- const struct olsr_if *ifs;
- abuf_json_mark_object(true, true, abuf, "interfaces");
- for (ifs = olsr_cnf->interfaces; ifs != NULL ; ifs = ifs->next) {
- const struct interface_olsr * const rifs = ifs->interf;
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "name", ifs->name);
-
- abuf_json_mark_object(true, true, abuf, "linkQualityMultipliers");
- for (mult = ifs->cnf->lq_mult; mult != NULL ; mult = mult->next) {
- abuf_json_mark_array_entry(true, abuf);
- abuf_json_string(abuf, "route", inet_ntop(olsr_cnf->ip_version, &mult->addr, ipv6_buf, sizeof(ipv6_buf)));
- abuf_json_float(abuf, "multiplier", mult->value / 65535.0);
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-
- if (!rifs) {
- abuf_json_string(abuf, "state", "down");
- } else {
- abuf_json_string(abuf, "state", "up");
- abuf_json_string(abuf, "nameFromKernel", rifs->int_name);
- abuf_json_int(abuf, "interfaceMode", rifs->mode);
- abuf_json_boolean(abuf, "emulatedHostClientInterface", rifs->is_hcif);
- abuf_json_boolean(abuf, "sendTcImmediately", rifs->immediate_send_tc);
- abuf_json_int(abuf, "fishEyeTtlIndex", rifs->ttl_index);
- abuf_json_int(abuf, "olsrForwardingTimeout", rifs->fwdtimer);
- abuf_json_int(abuf, "olsrMessageSequenceNumber", rifs->olsr_seqnum);
- abuf_json_int(abuf, "olsrInterfaceMetric", rifs->int_metric);
- abuf_json_int(abuf, "olsrMTU", rifs->int_mtu);
- abuf_json_int(abuf, "helloEmissionInterval", rifs->hello_etime);
- abuf_json_int(abuf, "helloValidityTime", me_to_reltime(rifs->valtimes.hello));
- abuf_json_int(abuf, "tcValidityTime", me_to_reltime(rifs->valtimes.tc));
- abuf_json_int(abuf, "midValidityTime", me_to_reltime(rifs->valtimes.mid));
- abuf_json_int(abuf, "hnaValidityTime", me_to_reltime(rifs->valtimes.hna));
- abuf_json_boolean(abuf, "wireless", rifs->is_wireless);
-
-#ifdef __linux__
- abuf_json_boolean(abuf, "icmpRedirect", rifs->nic_state.redirect);
- abuf_json_boolean(abuf, "spoofFilter", rifs->nic_state.spoof);
-#endif /* __linux__ */
-
- if (olsr_cnf->ip_version == AF_INET) {
- struct ipaddr_str addrbuf, maskbuf, bcastbuf;
- abuf_json_string(abuf, "ipv4Address", ip4_to_string(&addrbuf, rifs->int_addr.sin_addr));
- abuf_json_string(abuf, "netmask", ip4_to_string(&maskbuf, rifs->int_netmask.sin_addr));
- abuf_json_string(abuf, "broadcast", ip4_to_string(&bcastbuf, rifs->int_broadaddr.sin_addr));
- } else {
- struct ipaddr_str addrbuf, maskbuf;
- abuf_json_string(abuf, "ipv6Address", ip6_to_string(&addrbuf, &rifs->int6_addr.sin6_addr));
- abuf_json_string(abuf, "multicast", ip6_to_string(&maskbuf, &rifs->int6_multaddr.sin6_addr));
- }
- }
-#ifdef __linux__
- snprintf(path, PATH_MAX, "/sys/class/net/%s/device/driver/module", ifs->name);
- linklen = readlink(path, linkpath, PATH_MAX - 1);
- if (linklen > 1) {
- linkpath[linklen] = '\0';
- abuf_json_string(abuf, "kernelModule", basename(linkpath));
- }
-
- abuf_json_sys_class_net(abuf, "addressLength", ifs->name, "addr_len");
- abuf_json_sys_class_net(abuf, "carrier", ifs->name, "carrier");
- abuf_json_sys_class_net(abuf, "dormant", ifs->name, "dormant");
- abuf_json_sys_class_net(abuf, "features", ifs->name, "features");
- abuf_json_sys_class_net(abuf, "flags", ifs->name, "flags");
- abuf_json_sys_class_net(abuf, "linkMode", ifs->name, "link_mode");
- abuf_json_sys_class_net(abuf, "macAddress", ifs->name, "address");
- abuf_json_sys_class_net(abuf, "ethernetMTU", ifs->name, "mtu");
- abuf_json_sys_class_net(abuf, "operationalState", ifs->name, "operstate");
- abuf_json_sys_class_net(abuf, "txQueueLength", ifs->name, "tx_queue_len");
- abuf_json_sys_class_net(abuf, "collisions", ifs->name, "statistics/collisions");
- abuf_json_sys_class_net(abuf, "multicastPackets", ifs->name, "statistics/multicast");
- abuf_json_sys_class_net(abuf, "rxBytes", ifs->name, "statistics/rx_bytes");
- abuf_json_sys_class_net(abuf, "rxCompressed", ifs->name, "statistics/rx_compressed");
- abuf_json_sys_class_net(abuf, "rxCrcErrors", ifs->name, "statistics/rx_crc_errors");
- abuf_json_sys_class_net(abuf, "rxDropped", ifs->name, "statistics/rx_dropped");
- abuf_json_sys_class_net(abuf, "rxErrors", ifs->name, "statistics/rx_errors");
- abuf_json_sys_class_net(abuf, "rxFifoErrors", ifs->name, "statistics/rx_fifo_errors");
- abuf_json_sys_class_net(abuf, "rxFrameErrors", ifs->name, "statistics/rx_frame_errors");
- abuf_json_sys_class_net(abuf, "rxLengthErrors", ifs->name, "statistics/rx_length_errors");
- abuf_json_sys_class_net(abuf, "rxMissedErrors", ifs->name, "statistics/rx_missed_errors");
- abuf_json_sys_class_net(abuf, "rxOverErrors", ifs->name, "statistics/rx_over_errors");
- abuf_json_sys_class_net(abuf, "rxPackets", ifs->name, "statistics/rx_packets");
- abuf_json_sys_class_net(abuf, "txAbortedErrors", ifs->name, "statistics/tx_aborted_errors");
- abuf_json_sys_class_net(abuf, "txBytes", ifs->name, "statistics/tx_bytes");
- abuf_json_sys_class_net(abuf, "txCarrierErrors", ifs->name, "statistics/tx_carrier_errors");
- abuf_json_sys_class_net(abuf, "txCompressed", ifs->name, "statistics/tx_compressed");
- abuf_json_sys_class_net(abuf, "txDropped", ifs->name, "statistics/tx_dropped");
- abuf_json_sys_class_net(abuf, "txErrors", ifs->name, "statistics/tx_errors");
- abuf_json_sys_class_net(abuf, "txFifoErrors", ifs->name, "statistics/tx_fifo_errors");
- abuf_json_sys_class_net(abuf, "txHeartbeatErrors", ifs->name, "statistics/tx_heartbeat_errors");
- abuf_json_sys_class_net(abuf, "txPackets", ifs->name, "statistics/tx_packets");
- abuf_json_sys_class_net(abuf, "txWindowErrors", ifs->name, "statistics/tx_window_errors");
- abuf_json_sys_class_net(abuf, "beaconing", ifs->name, "wireless/beacon");
- abuf_json_sys_class_net(abuf, "encryptionKey", ifs->name, "wireless/crypt");
- abuf_json_sys_class_net(abuf, "fragmentationThreshold", ifs->name, "wireless/fragment");
- abuf_json_sys_class_net(abuf, "signalLevel", ifs->name, "wireless/level");
- abuf_json_sys_class_net(abuf, "linkQuality", ifs->name, "wireless/link");
- abuf_json_sys_class_net(abuf, "misc", ifs->name, "wireless/misc");
- abuf_json_sys_class_net(abuf, "noiseLevel", ifs->name, "wireless/noise");
- abuf_json_sys_class_net(abuf, "nwid", ifs->name, "wireless/nwid");
- abuf_json_sys_class_net(abuf, "wirelessRetries", ifs->name, "wireless/retries");
- abuf_json_sys_class_net(abuf, "wirelessStatus", ifs->name, "wireless/status");
-#endif /* __linux__ */
- abuf_json_mark_array_entry(false, abuf);
- }
- abuf_json_mark_object(false, true, abuf, NULL);
-}
-
static void info_write_data(void *foo __attribute__ ((unused))) {
fd_set set;
int result, i, j, max;
diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.h b/lib/jsoninfo/src/olsrd_jsoninfo.h
index 9018686..fd1479a 100644
--- a/lib/jsoninfo/src/olsrd_jsoninfo.h
+++ b/lib/jsoninfo/src/olsrd_jsoninfo.h
@@ -53,8 +53,6 @@
/* uncomment this to allow connections from 127.0.0.1 regardless of olsrd.conf (useful to allow externel ip/network + localhost) (ipv4 only)*/
/* #define JSONINFO_ALLOW_LOCALHOST */
-extern char uuidfile[FILENAME_MAX];
-
extern union olsr_ip_addr jsoninfo_accept_ip;
extern union olsr_ip_addr jsoninfo_listen_ip;
extern int ipc_port;
--
2.5.0
More information about the Olsr-dev
mailing list