void logger(int level, int priority, const char *format, ...) {
va_list ap;
- va_start(ap, format);
- vfprintf(stderr, format, ap);
- va_end(ap);
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
}
-static char *strip_weight(char *netstr) {
+char *strip_weight(char *netstr) {
int len = strlen(netstr);
if(len >= 3 && !strcmp(netstr + len - 3, "#10"))
netstr[len - 3] = 0;
char via[4096];
char nexthop[4096];
int code, req, cipher, digest, maclength, compression, distance;
- short int pmtu, minmtu, maxmtu;
+ 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 at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", &code, &req, node, host, port, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu);
+ 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 != 17) {
- *port = 0;
- n = sscanf(line, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", &code, &req, node, host, &cipher, &digest, &maclength, &compression, &options, (unsigned *)&status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu);
-
- if(n != 16) {
- fprintf(stderr, "Unable to parse node dump from tincd.\n");
- return 1;
- }
+ if(n != 18) {
+ fprintf(stderr, "Unable to parse node dump from tincd.\n");
+ return 1;
}
if(!strcmp(node, item)) {
if(sscanf(line, "%d %d %s", &code, &req, node) == 2)
break;
}
-
+
printf("Node: %s\n", item);
- if(*port)
- printf("Address: %s port %s\n", host, port);
+ 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");
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");
printf("\n");
printf("Protocol: %d.%d\n", PROT_MAJOR, OPTION_VERSION(options));
printf("Reachability: ");
- if(!*port)
+ if(!strcmp(host, "MYSELF"))
printf("can reach itself\n");
else if(!status.reachable)
printf("unreachable\n");
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 to %s", &code, &req, from, to);
+ int n = sscanf(line, "%d %d %s %s", &code, &req, from, to);
if(n == 2)
break;
if(n != 4) {
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 owner %s", &code, &req, subnet, from);
+ int n = sscanf(line, "%d %d %s %s", &code, &req, subnet, from);
if(n == 2)
break;
if(n != 4) {
sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_SUBNETS, item);
while(recvline(fd, line, sizeof line)) {
- int n = sscanf(line, "%d %d %s owner %s", &code, &req, netstr, owner);
+ int n = sscanf(line, "%d %d %s %s", &code, &req, netstr, owner);
if(n == 2)
break;