endif
if BUILD_PORT_MONITORS
-port_monitors = libtcp-portmon.h libtcp-portmon.c
+port_monitors = libtcp-portmon.h libtcp-portmon.c \
+ tcp-portmon.h tcp-portmon.c
endif
if BUILD_X11
}
#ifdef TCP_PORT_MONITOR
if (NEED(INFO_TCP_PORT_MONITOR)) {
- update_tcp_port_monitor_collection(info.p_tcp_port_monitor_collection);
+ tcp_portmon_update();
}
#endif
if (NEED(INFO_ENTROPY)) {
/* pad percentages to decimals? */
static int pad_percents = 0;
-#ifdef TCP_PORT_MONITOR
-tcp_port_monitor_args_t tcp_port_monitor_args;
-#endif
-
static char *global_text = 0;
long global_text_lines;
int a, b;
} pair; /* 2 */
#ifdef TCP_PORT_MONITOR
- struct {
- /* starting port to monitor */
- in_port_t port_range_begin;
- /* ending port to monitor */
- in_port_t port_range_end;
- /* enum from libtcp-portmon.h, e.g. COUNT, etc. */
- int item;
- /* 0 to n-1 connections. */
- int connection_index;
- } tcp_port_monitor;
+ struct tcp_port_monitor_data tcp_port_monitor;
#endif
#ifdef HDDTEMP
struct {
#endif
#ifdef TCP_PORT_MONITOR
END OBJ(tcp_portmon, INFO_TCP_PORT_MONITOR)
- int argc, port_begin, port_end, item, connection_index;
- char itembuf[32];
-
- memset(itembuf, 0, sizeof(itembuf));
- connection_index = 0;
- /* massive argument checking */
- if (!arg) {
- CRIT_ERR("tcp_portmon: needs arguments");
- }
- argc = sscanf(arg, "%d %d %31s %d", &port_begin, &port_end, itembuf,
- &connection_index);
- if ((argc != 3) && (argc != 4)) {
- CRIT_ERR("tcp_portmon: requires 3 or 4 arguments");
- }
- if ((port_begin < 1) || (port_begin > 65535) || (port_end < 1)
- || (port_end > 65535)) {
- CRIT_ERR("tcp_portmon: port values must be from 1 to 65535");
- }
- if (port_begin > port_end) {
- CRIT_ERR("tcp_portmon: starting port must be <= ending port");
- }
- if (strncmp(itembuf, "count", 31) == EQUAL) {
- item = COUNT;
- } else if (strncmp(itembuf, "rip", 31) == EQUAL) {
- item = REMOTEIP;
- } else if (strncmp(itembuf, "rhost", 31) == EQUAL) {
- item = REMOTEHOST;
- } else if (strncmp(itembuf, "rport", 31) == EQUAL) {
- item = REMOTEPORT;
- } else if (strncmp(itembuf, "rservice", 31) == EQUAL) {
- item = REMOTESERVICE;
- } else if (strncmp(itembuf, "lip", 31) == EQUAL) {
- item = LOCALIP;
- } else if (strncmp(itembuf, "lhost", 31) == EQUAL) {
- item = LOCALHOST;
- } else if (strncmp(itembuf, "lport", 31) == EQUAL) {
- item = LOCALPORT;
- } else if (strncmp(itembuf, "lservice", 31) == EQUAL) {
- item = LOCALSERVICE;
- } else {
- CRIT_ERR("tcp_portmon: invalid item specified");
- }
- if ((argc == 3) && (item != COUNT)) {
- CRIT_ERR("tcp_portmon: 3 argument form valid only for \"count\" "
- "item");
- }
- if ((argc == 4) && (connection_index < 0)) {
- CRIT_ERR("tcp_portmon: connection index must be non-negative");
- }
- /* ok, args looks good. save the text object data */
- obj->data.tcp_port_monitor.port_range_begin = (in_port_t) port_begin;
- obj->data.tcp_port_monitor.port_range_end = (in_port_t) port_end;
- obj->data.tcp_port_monitor.item = item;
- obj->data.tcp_port_monitor.connection_index = connection_index;
-
- /* if the port monitor collection hasn't been created,
- * we must create it */
- if (!info.p_tcp_port_monitor_collection) {
- info.p_tcp_port_monitor_collection =
- create_tcp_port_monitor_collection();
- if (!info.p_tcp_port_monitor_collection) {
- CRIT_ERR("tcp_portmon: unable to create port monitor "
- "collection");
- }
- }
-
- /* if a port monitor for this port does not exist,
- * create one and add it to the collection */
- if (find_tcp_port_monitor(info.p_tcp_port_monitor_collection,
- port_begin, port_end) == NULL) {
- tcp_port_monitor_t *p_monitor = create_tcp_port_monitor(port_begin,
- port_end, &tcp_port_monitor_args);
-
- if (!p_monitor) {
- CRIT_ERR("tcp_portmon: unable to create port monitor");
- }
- /* add the newly created monitor to the collection */
- if (insert_tcp_port_monitor_into_collection(
- info.p_tcp_port_monitor_collection, p_monitor) != 0) {
- CRIT_ERR("tcp_portmon: unable to add port monitor to "
- "collection");
- }
- }
+ tcp_portmon_init(arg, &obj->data.tcp_port_monitor);
#endif
END OBJ(entropy_avail, INFO_ENTROPY)
END OBJ(entropy_poolsize, INFO_ENTROPY)
}
#ifdef TCP_PORT_MONITOR
OBJ(tcp_portmon) {
- /* grab a pointer to this port monitor */
- tcp_port_monitor_t *p_monitor =
- find_tcp_port_monitor(info.p_tcp_port_monitor_collection,
- obj->data.tcp_port_monitor.port_range_begin,
- obj->data.tcp_port_monitor.port_range_end);
-
- if (!p_monitor) {
- snprintf(p, p_max_size, "monitor not found");
- break;
- }
-
- /* now grab the text of interest */
- if (peek_tcp_port_monitor(p_monitor,
- obj->data.tcp_port_monitor.item,
- obj->data.tcp_port_monitor.connection_index, p,
- p_max_size) != 0) {
- snprintf(p, p_max_size, "monitor peek error");
- break;
- }
+ tcp_portmon_action(p, p_max_size,
+ &obj->data.tcp_port_monitor);
}
#endif
#endif /* X11 */
#ifdef TCP_PORT_MONITOR
- destroy_tcp_port_monitor_collection(info.p_tcp_port_monitor_collection);
+ tcp_portmon_clear();
#endif
if (current_config) {
XClearWindow(display, RootWindow(display, screen));
#endif /* X11 */
-#ifdef TCP_PORT_MONITOR
- info.p_tcp_port_monitor_collection = NULL;
-#endif
extract_variable_text(global_text);
free(global_text);
global_text = NULL;
free(current_config);
#ifdef TCP_PORT_MONITOR
- destroy_tcp_port_monitor_collection(info.p_tcp_port_monitor_collection);
- info.p_tcp_port_monitor_collection = NULL;
+ tcp_portmon_clear();
#endif
#ifdef RSS
free_rss_info();
info.users.number = 1;
#ifdef TCP_PORT_MONITOR
- tcp_port_monitor_args.max_port_monitor_connections =
- MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ /* set default connection limit */
+ tcp_portmon_set_max_connections(0);
#endif
}
}
#ifdef TCP_PORT_MONITOR
CONF("max_port_monitor_connections") {
- if (!value || (sscanf(value, "%d",
- &tcp_port_monitor_args.max_port_monitor_connections) != 1)
- || tcp_port_monitor_args.max_port_monitor_connections < 0) {
+ int max;
+ if (!value || (sscanf(value, "%d", &max) != 1)) {
/* an error. use default, warn and continue. */
- tcp_port_monitor_args.max_port_monitor_connections =
- MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ tcp_portmon_set_max_connections(0);
+ CONF_ERR;
+ } else if (tcp_portmon_set_max_connections(max)) {
+ /* max is < 0, default has been set*/
CONF_ERR;
- } else if (tcp_port_monitor_args.max_port_monitor_connections
- == 0) {
- /* no error, just use default */
- tcp_port_monitor_args.max_port_monitor_connections =
- MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
}
- /* else tcp_port_monitor_args.max_port_monitor_connections > 0
- * as per config */
}
#endif
CONF("if_up_strictness") {
clear_net_stats();
#ifdef TCP_PORT_MONITOR
- tcp_port_monitor_args.max_port_monitor_connections =
- MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ /* set default connection limit */
+ tcp_portmon_set_max_connections(0);
#endif
/* handle command line parameters that don't change configs */
#endif
#ifdef TCP_PORT_MONITOR
-#include "libtcp-portmon.h"
+#include "tcp-portmon.h"
#endif
enum {
struct process *memu[10];
struct process *first_process;
unsigned long looped;
-#ifdef TCP_PORT_MONITOR
- tcp_port_monitor_collection_t *p_tcp_port_monitor_collection;
-#endif
struct entropy_s entropy;
double music_player_interval;
--- /dev/null
+/* tcp-portmon.c - libtcp-portmon hooks
+ *
+ * Copyright (C) 2008 Phil Sutter <Phil@nwl.cc>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * $Id$
+ *
+ */
+#include "conky.h"
+#include "tcp-portmon.h"
+#include "libtcp-portmon.h"
+
+static tcp_port_monitor_collection_t *pmc = NULL;
+static tcp_port_monitor_args_t pma;
+
+int tcp_portmon_init(const char *arg, struct tcp_port_monitor_data *pmd)
+{
+ int argc, port_begin, port_end, item, connection_index;
+ char itembuf[32];
+
+ memset(itembuf, 0, sizeof(itembuf));
+ connection_index = 0;
+ /* massive argument checking */
+ if (!arg) {
+ CRIT_ERR("tcp_portmon: needs arguments");
+ }
+ argc = sscanf(arg, "%d %d %31s %d", &port_begin, &port_end, itembuf,
+ &connection_index);
+ if ((argc != 3) && (argc != 4)) {
+ CRIT_ERR("tcp_portmon: requires 3 or 4 arguments");
+ }
+ if ((port_begin < 1) || (port_begin > 65535) || (port_end < 1)
+ || (port_end > 65535)) {
+ CRIT_ERR("tcp_portmon: port values must be from 1 to 65535");
+ }
+ if (port_begin > port_end) {
+ CRIT_ERR("tcp_portmon: starting port must be <= ending port");
+ }
+ if (strncmp(itembuf, "count", 31) == EQUAL) {
+ item = COUNT;
+ } else if (strncmp(itembuf, "rip", 31) == EQUAL) {
+ item = REMOTEIP;
+ } else if (strncmp(itembuf, "rhost", 31) == EQUAL) {
+ item = REMOTEHOST;
+ } else if (strncmp(itembuf, "rport", 31) == EQUAL) {
+ item = REMOTEPORT;
+ } else if (strncmp(itembuf, "rservice", 31) == EQUAL) {
+ item = REMOTESERVICE;
+ } else if (strncmp(itembuf, "lip", 31) == EQUAL) {
+ item = LOCALIP;
+ } else if (strncmp(itembuf, "lhost", 31) == EQUAL) {
+ item = LOCALHOST;
+ } else if (strncmp(itembuf, "lport", 31) == EQUAL) {
+ item = LOCALPORT;
+ } else if (strncmp(itembuf, "lservice", 31) == EQUAL) {
+ item = LOCALSERVICE;
+ } else {
+ CRIT_ERR("tcp_portmon: invalid item specified");
+ }
+ if ((argc == 3) && (item != COUNT)) {
+ CRIT_ERR("tcp_portmon: 3 argument form valid only for \"count\" "
+ "item");
+ }
+ if ((argc == 4) && (connection_index < 0)) {
+ CRIT_ERR("tcp_portmon: connection index must be non-negative");
+ }
+ /* ok, args looks good. save the text object data */
+ pmd->port_range_begin = (in_port_t) port_begin;
+ pmd->port_range_end = (in_port_t) port_end;
+ pmd->item = item;
+ pmd->connection_index = connection_index;
+
+ /* if the port monitor collection hasn't been created,
+ * we must create it */
+ if (!pmc) {
+ pmc = create_tcp_port_monitor_collection();
+ if (!pmc) {
+ CRIT_ERR("tcp_portmon: unable to create port monitor "
+ "collection");
+ }
+ }
+
+ /* if a port monitor for this port does not exist,
+ * create one and add it to the collection */
+ if (find_tcp_port_monitor(pmc, port_begin, port_end) == NULL) {
+ tcp_port_monitor_t *p_monitor = create_tcp_port_monitor(port_begin,
+ port_end, &pma);
+
+ if (!p_monitor) {
+ CRIT_ERR("tcp_portmon: unable to create port monitor");
+ }
+ /* add the newly created monitor to the collection */
+ if (insert_tcp_port_monitor_into_collection(pmc, p_monitor) != 0) {
+ CRIT_ERR("tcp_portmon: unable to add port monitor to "
+ "collection");
+ }
+ }
+ return 0;
+}
+
+int tcp_portmon_action(char *p, int p_max_size, struct tcp_port_monitor_data *pmd)
+{
+ tcp_port_monitor_t *p_monitor;
+
+ /* grab a pointer to this port monitor */
+ p_monitor = find_tcp_port_monitor(pmc, pmd->port_range_begin,
+ pmd->port_range_end);
+
+ if (!p_monitor) {
+ snprintf(p, p_max_size, "monitor not found");
+ return 1;
+ }
+
+ /* now grab the text of interest */
+ if (peek_tcp_port_monitor(p_monitor, pmd->item,
+ pmd->connection_index, p, p_max_size) != 0) {
+ snprintf(p, p_max_size, "monitor peek error");
+ return 1;
+ }
+ return 0;
+}
+
+int tcp_portmon_update(void)
+{
+ update_tcp_port_monitor_collection(pmc);
+ return 0;
+}
+
+int tcp_portmon_clear(void)
+{
+ destroy_tcp_port_monitor_collection(pmc);
+ pmc = NULL;
+ return 0;
+}
+
+int tcp_portmon_set_max_connections(int max)
+{
+ if (max <= 0) {
+ pma.max_port_monitor_connections =
+ MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ } else {
+ pma.max_port_monitor_connections = max;
+ }
+ return (max < 0) ? 1 : 0;
+}
+
--- /dev/null
+/* tcp-portmon.h - libtcp-portmon hooks protoypes
+ *
+ * Copyright (C) 2008 Phil Sutter <Phil@nwl.cc>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * $Id$
+ *
+ */
+#ifndef _TCP_PORTMON_H
+#define _TCP_PORTMON_H
+
+#include "libtcp-portmon.h"
+
+struct tcp_port_monitor_data {
+ /* starting port to monitor */
+ in_port_t port_range_begin;
+ /* ending port to monitor */
+ in_port_t port_range_end;
+ /* enum from libtcp-portmon.h, e.g. COUNT, etc. */
+ int item;
+ /* 0 to n-1 connections. */
+ int connection_index;
+};
+
+int tcp_portmon_init(const char *, struct tcp_port_monitor_data *);
+int tcp_portmon_action(char *, int, struct tcp_port_monitor_data *);
+int tcp_portmon_update(void);
+int tcp_portmon_clear(void);
+int tcp_portmon_set_max_connections(int);
+
+#endif /* _TCP_PORTMON_H */
projects / monky / commitdiff