From 66636a6030e0d236d5c0b57170705649d081a31a Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 12 Apr 2014 14:27:44 +0200 Subject: [PATCH] Remove unused files. --- src/info.c | 275 -------------------------------------------- src/info.h | 27 ----- src/top.c | 327 ----------------------------------------------------- src/top.h | 26 ----- 4 files changed, 655 deletions(-) delete mode 100644 src/info.c delete mode 100644 src/info.h delete mode 100644 src/top.c delete mode 100644 src/top.h diff --git a/src/info.c b/src/info.c deleted file mode 100644 index af085bc3..00000000 --- a/src/info.c +++ /dev/null @@ -1,275 +0,0 @@ -/* - info.c -- Show information about a node, subnet or address - Copyright (C) 2012-2013 Guus Sliepen - - 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "system.h" - -#include "control_common.h" -#include "list.h" -#include "subnet.h" -#include "tincctl.h" -#include "info.h" -#include "xalloc.h" - -void logger(int level, int priority, const char *format, ...) { - va_list ap; - va_start(ap, format); - vfprintf(stderr, format, ap); - va_end(ap); - fputc('\n', stderr); -} - -char *strip_weight(char *netstr) { - int len = strlen(netstr); - if(len >= 3 && !strcmp(netstr + len - 3, "#10")) - netstr[len - 3] = 0; - return netstr; -} - -static int info_node(int fd, const char *item) { - // Check the list of nodes - sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_NODES, item); - - bool found = false; - char line[4096]; - - char node[4096]; - char from[4096]; - char to[4096]; - char subnet[4096]; - char host[4096]; - char port[4096]; - char via[4096]; - char nexthop[4096]; - int code, req, cipher, digest, maclength, compression, distance; - short int pmtu, minmtu, maxmtu; - unsigned int options; - union { - node_status_t bits; - uint32_t raw; - } status_union; - node_status_t status; - long int last_state_change; - - while(recvline(fd, line, sizeof line)) { - int n = sscanf(line, "%d %d %s %s port %s %d %d %d %d %x %"PRIx32" %s %s %d %hd %hd %hd %ld", &code, &req, node, host, port, &cipher, &digest, &maclength, &compression, &options, &status_union.raw, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change); - - if(n == 2) - break; - - if(n != 18) { - fprintf(stderr, "Unable to parse node dump from tincd.\n"); - return 1; - } - - if(!strcmp(node, item)) { - found = true; - break; - } - } - - if(!found) { - fprintf(stderr, "Unknown node %s.\n", item); - return 1; - } - - while(recvline(fd, line, sizeof line)) { - if(sscanf(line, "%d %d %s", &code, &req, node) == 2) - break; - } - - printf("Node: %s\n", item); - printf("Address: %s port %s\n", host, port); - - char timestr[32] = "never"; - time_t lsc_time = last_state_change; - - if(last_state_change) - strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&lsc_time)); - - status = status_union.bits; - - if(status.reachable) - printf("Online since: %s\n", timestr); - else - printf("Last seen: %s\n", timestr); - - printf("Status: "); - if(status.validkey) - printf(" validkey"); - if(status.visited) - printf(" visited"); - if(status.reachable) - printf(" reachable"); - if(status.indirect) - printf(" indirect"); - if(status.sptps) - printf(" sptps"); - if(status.udp_confirmed) - printf(" udp_confirmed"); - printf("\n"); - - printf("Options: "); - if(options & OPTION_INDIRECT) - printf(" indirect"); - if(options & OPTION_TCPONLY) - printf(" tcponly"); - if(options & OPTION_PMTU_DISCOVERY) - printf(" pmtu_discovery"); - if(options & OPTION_CLAMP_MSS) - printf(" clamp_mss"); - printf("\n"); - printf("Protocol: %d.%d\n", PROT_MAJOR, OPTION_VERSION(options)); - printf("Reachability: "); - if(!strcmp(host, "MYSELF")) - printf("can reach itself\n"); - else if(!status.reachable) - printf("unreachable\n"); - else if(strcmp(via, item)) - printf("indirectly via %s\n", via); - else if(!status.validkey) - printf("unknown\n"); - else if(minmtu > 0) - printf("directly with UDP\nPMTU: %d\n", pmtu); - else if(!strcmp(nexthop, item)) - printf("directly with TCP\n"); - else - printf("none, forwarded via %s\n", nexthop); - - // List edges - printf("Edges: "); - sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_EDGES, item); - while(recvline(fd, line, sizeof line)) { - int n = sscanf(line, "%d %d %s %s", &code, &req, from, to); - if(n == 2) - break; - if(n != 4) { - fprintf(stderr, "Unable to parse edge dump from tincd.\n%s\n", line); - return 1; - } - if(!strcmp(from, item)) - printf(" %s", to); - } - printf("\n"); - - // List subnets - printf("Subnets: "); - sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_SUBNETS, item); - while(recvline(fd, line, sizeof line)) { - int n = sscanf(line, "%d %d %s %s", &code, &req, subnet, from); - if(n == 2) - break; - if(n != 4) { - fprintf(stderr, "Unable to parse subnet dump from tincd.\n"); - return 1; - } - if(!strcmp(from, item)) - printf(" %s", strip_weight(subnet)); - } - printf("\n"); - - return 0; -} - -static int info_subnet(int fd, const char *item) { - subnet_t subnet, find; - - if(!str2net(&find, item)) { - fprintf(stderr, "Could not parse subnet or address '%s'.\n", item); - return 1; - } - - bool address = !strchr(item, '/'); - bool weight = strchr(item, '#'); - bool found = false; - - char line[4096]; - char netstr[4096]; - char owner[4096]; - - int code, req; - - sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_SUBNETS, item); - while(recvline(fd, line, sizeof line)) { - int n = sscanf(line, "%d %d %s %s", &code, &req, netstr, owner); - if(n == 2) - break; - - if(n != 4 || !str2net(&subnet, netstr)) { - fprintf(stderr, "Unable to parse subnet dump from tincd.\n"); - return 1; - } - - if(find.type != subnet.type) - continue; - - if(weight) { - if(find.weight != subnet.weight) - continue; - } - - if(find.type == SUBNET_IPV4) { - if(address) { - if(maskcmp(&find.net.ipv4.address, &subnet.net.ipv4.address, subnet.net.ipv4.prefixlength)) - continue; - } else { - if(find.net.ipv4.prefixlength != subnet.net.ipv4.prefixlength) - continue; - if(memcmp(&find.net.ipv4.address, &subnet.net.ipv4.address, sizeof subnet.net.ipv4)) - continue; - } - } else if(find.type == SUBNET_IPV6) { - if(address) { - if(maskcmp(&find.net.ipv6.address, &subnet.net.ipv6.address, subnet.net.ipv6.prefixlength)) - continue; - } else { - if(find.net.ipv6.prefixlength != subnet.net.ipv6.prefixlength) - continue; - if(memcmp(&find.net.ipv6.address, &subnet.net.ipv6.address, sizeof subnet.net.ipv6)) - continue; - } - } if(find.type == SUBNET_MAC) { - if(memcmp(&find.net.mac.address, &subnet.net.mac.address, sizeof subnet.net.mac)) - continue; - } - - found = true; - printf("Subnet: %s\n", strip_weight(netstr)); - printf("Owner: %s\n", owner); - } - - if(!found) { - if(address) - fprintf(stderr, "Unknown address %s.\n", item); - else - fprintf(stderr, "Unknown subnet %s.\n", item); - return 1; - } - - return 0; -} - -int info(int fd, const char *item) { - if(check_id(item)) - return info_node(fd, item); - if(strchr(item, '.') || strchr(item, ':')) - return info_subnet(fd, item); - - fprintf(stderr, "Argument is not a node name, subnet or address.\n"); - return 1; -} diff --git a/src/info.h b/src/info.h deleted file mode 100644 index a3f387ff..00000000 --- a/src/info.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - info.h -- header for info.c. - Copyright (C) 2012 Guus Sliepen - - 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef __TINC_INFO_H__ -#define __TINC_INFO_H__ - -extern int info(int fd, const char *item); -extern char *strip_weight(char *); - -#endif - diff --git a/src/top.c b/src/top.c deleted file mode 100644 index 2824261c..00000000 --- a/src/top.c +++ /dev/null @@ -1,327 +0,0 @@ -/* - top.c -- Show real-time statistics from a running tincd - Copyright (C) 2011-2013 Guus Sliepen - - 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "system.h" - -#ifdef HAVE_CURSES - -#include - -#include "control_common.h" -#include "list.h" -#include "names.h" -#include "tincctl.h" -#include "top.h" -#include "xalloc.h" - -typedef struct nodestats_t { - char *name; - int i; - uint64_t in_packets; - uint64_t in_bytes; - uint64_t out_packets; - uint64_t out_bytes; - float in_packets_rate; - float in_bytes_rate; - float out_packets_rate; - float out_bytes_rate; - bool known; -} nodestats_t; - -static const char *const sortname[] = { - "name", - "in pkts", - "in bytes", - "out pkts", - "out bytes", - "tot pkts", - "tot bytes", -}; - -static int sortmode = 0; -static bool cumulative = false; - -static list_t node_list; -static struct timeval cur, prev, diff; -static int delay = 1000; -static bool changed = true; -static const char *bunit = "bytes"; -static float bscale = 1; -static const char *punit = "pkts"; -static float pscale = 1; - -static bool update(int fd) { - if(!sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC)) - return false; - - gettimeofday(&cur, NULL); - - timersub(&cur, &prev, &diff); - prev = cur; - float interval = diff.tv_sec + diff.tv_usec * 1e-6; - - char line[4096]; - char name[4096]; - int code; - int req; - uint64_t in_packets; - uint64_t in_bytes; - uint64_t out_packets; - uint64_t out_bytes; - - for list_each(nodestats_t, ns, &node_list) - ns->known = false; - - while(recvline(fd, line, sizeof line)) { - int n = sscanf(line, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, &code, &req, name, &in_packets, &in_bytes, &out_packets, &out_bytes); - - if(n == 2) - return true; - - if(n != 7) - return false; - - nodestats_t *found = NULL; - - for list_each(nodestats_t, ns, &node_list) { - int result = strcmp(name, ns->name); - if(result > 0) { - continue; - } if(result == 0) { - found = ns; - break; - } else { - found = xzalloc(sizeof *found); - found->name = xstrdup(name); - list_insert_before(&node_list, node, found); - changed = true; - break; - } - } - - if(!found) { - found = xzalloc(sizeof *found); - found->name = xstrdup(name); - list_insert_tail(&node_list, found); - changed = true; - } - - found->known = true; - found->in_packets_rate = (in_packets - found->in_packets) / interval; - found->in_bytes_rate = (in_bytes - found->in_bytes) / interval; - found->out_packets_rate = (out_packets - found->out_packets) / interval; - found->out_bytes_rate = (out_bytes - found->out_bytes) / interval; - found->in_packets = in_packets; - found->in_bytes = in_bytes; - found->out_packets = out_packets; - found->out_bytes = out_bytes; - } - - return false; -} - -static int cmpfloat(float a, float b) { - if(a < b) - return -1; - else if(a > b) - return 1; - else - return 0; -} - -static int cmpu64(uint64_t a, uint64_t b) { - if(a < b) - return -1; - else if(a > b) - return 1; - else - return 0; -} - -static int sortfunc(const void *a, const void *b) { - const nodestats_t *na = *(const nodestats_t **)a; - const nodestats_t *nb = *(const nodestats_t **)b; - switch(sortmode) { - case 1: - if(cumulative) - return -cmpu64(na->in_packets, nb->in_packets) ?: na->i - nb->i; - else - return -cmpfloat(na->in_packets_rate, nb->in_packets_rate) ?: na->i - nb->i; - case 2: - if(cumulative) - return -cmpu64(na->in_bytes, nb->in_bytes) ?: na->i - nb->i; - else - return -cmpfloat(na->in_bytes_rate, nb->in_bytes_rate) ?: na->i - nb->i; - case 3: - if(cumulative) - return -cmpu64(na->out_packets, nb->out_packets) ?: na->i - nb->i; - else - return -cmpfloat(na->out_packets_rate, nb->out_packets_rate) ?: na->i - nb->i; - case 4: - if(cumulative) - return -cmpu64(na->out_bytes, nb->out_bytes) ?: na->i - nb->i; - else - return -cmpfloat(na->out_bytes_rate, nb->out_bytes_rate) ?: na->i - nb->i; - case 5: - if(cumulative) - return -cmpu64(na->in_packets + na->out_packets, nb->in_packets + nb->out_packets) ?: na->i - nb->i; - else - return -cmpfloat(na->in_packets_rate + na->out_packets_rate, nb->in_packets_rate + nb->out_packets_rate) ?: na->i - nb->i; - case 6: - if(cumulative) - return -cmpu64(na->in_bytes + na->out_bytes, nb->in_bytes + nb->out_bytes) ?: na->i - nb->i; - else - return -cmpfloat(na->in_bytes_rate + na->out_bytes_rate, nb->in_bytes_rate + nb->out_bytes_rate) ?: na->i - nb->i; - default: - return strcmp(na->name, nb->name) ?: na->i - nb->i; - } -} - -static void redraw(void) { - erase(); - - mvprintw(0, 0, "Tinc %-16s Nodes: %4d Sort: %-10s %s", netname ?: "", node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current"); - attrset(A_REVERSE); - mvprintw(2, 0, "Node IN %s IN %s OUT %s OUT %s", punit, bunit, punit, bunit); - chgat(-1, A_REVERSE, 0, NULL); - - static nodestats_t **sorted = 0; - static int n = 0; - if(changed) { - n = 0; - sorted = xrealloc(sorted, node_list.count * sizeof *sorted); - for list_each(nodestats_t, ns, &node_list) - sorted[n++] = ns; - changed = false; - } - - for(int i = 0; i < n; i++) - sorted[i]->i = i; - - if(sorted) - qsort(sorted, n, sizeof *sorted, sortfunc); - - for(int i = 0, row = 3; i < n; i++, row++) { - nodestats_t *node = sorted[i]; - if(node->known) - if(node->in_packets_rate || node->out_packets_rate) - attrset(A_BOLD); - else - attrset(A_NORMAL); - else - attrset(A_DIM); - - if(cumulative) - mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f", - node->name, node->in_packets * pscale, node->in_bytes * bscale, node->out_packets * pscale, node->out_bytes * bscale); - else - mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f", - node->name, node->in_packets_rate * pscale, node->in_bytes_rate * bscale, node->out_packets_rate * pscale, node->out_bytes_rate * bscale); - } - - attrset(A_NORMAL); - move(1, 0); - - refresh(); -} - -void top(int fd) { - initscr(); - timeout(delay); - bool running = true; - - while(running) { - if(!update(fd)) - break; - - redraw(); - - switch(getch()) { - case 's': { - timeout(-1); - float input = delay * 1e-3; - mvprintw(1, 0, "Change delay from %.1fs to: ", input); - scanw("%f", &input); - if(input < 0.1) - input = 0.1; - delay = input * 1e3; - timeout(delay); - break; - } - case 'c': - cumulative = !cumulative; - break; - case 'n': - sortmode = 0; - break; - case 'i': - sortmode = 2; - break; - case 'I': - sortmode = 1; - break; - case 'o': - sortmode = 4; - break; - case 'O': - sortmode = 3; - break; - case 't': - sortmode = 6; - break; - case 'T': - sortmode = 5; - break; - case 'b': - bunit = "bytes"; - bscale = 1; - punit = "pkts"; - pscale = 1; - break; - case 'k': - bunit = "kbyte"; - bscale = 1e-3; - punit = "pkts"; - pscale = 1; - break; - case 'M': - bunit = "Mbyte"; - bscale = 1e-6; - punit = "kpkt"; - pscale = 1e-3; - break; - case 'G': - bunit = "Gbyte"; - bscale = 1e-9; - punit = "Mpkt"; - pscale = 1e-6; - break; - case 'q': - case KEY_BREAK: - running = false; - break; - default: - break; - } - } - - endwin(); -} - -#endif diff --git a/src/top.h b/src/top.h deleted file mode 100644 index b3a264da..00000000 --- a/src/top.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - top.h -- header for top.c. - Copyright (C) 2011 Guus Sliepen - - 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 2 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, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef __TINC_TOP_H__ -#define __TINC_TOP_H__ - -extern void top(int fd); - -#endif - -- 2.39.2