int flushe;
int cmd;
inet_prefix daddr;
+ inet_prefix saddr;
} f;
static int flush_update(void)
struct rtattr *attrs[TCP_METRICS_ATTR_MAX + 1], *a;
int len = n->nlmsg_len;
char abuf[256];
- inet_prefix daddr;
- int family, i, atype, dlen = 0;
+ inet_prefix daddr, saddr;
+ int family, i, atype, stype, dlen = 0, slen = 0;
if (n->nlmsg_type != genl_family)
return -1;
return 0;
}
+ a = attrs[TCP_METRICS_ATTR_SADDR_IPV4];
+ if (a) {
+ if (f.saddr.family && f.saddr.family != AF_INET)
+ return 0;
+ memcpy(&saddr.data, RTA_DATA(a), 4);
+ saddr.bytelen = 4;
+ stype = TCP_METRICS_ATTR_SADDR_IPV4;
+ slen = RTA_PAYLOAD(a);
+ } else {
+ a = attrs[TCP_METRICS_ATTR_SADDR_IPV6];
+ if (a) {
+ if (f.saddr.family && f.saddr.family != AF_INET6)
+ return 0;
+ memcpy(&saddr.data, RTA_DATA(a), 16);
+ saddr.bytelen = 16;
+ stype = TCP_METRICS_ATTR_SADDR_IPV6;
+ slen = RTA_PAYLOAD(a);
+ }
+ }
+
if (f.daddr.family && f.daddr.bitlen >= 0 &&
inet_addr_match(&daddr, &f.daddr, f.daddr.bitlen))
+ return 0;
+ /* Only check for the source-address if the kernel supports it,
+ * meaning slen != 0.
+ */
+ if (slen && f.saddr.family && f.saddr.bitlen >= 0 &&
+ inet_addr_match(&saddr, &f.saddr, f.saddr.bitlen))
return 0;
if (f.flushb) {
addattr_l(&req2.n, sizeof(req2), atype, &daddr.data,
daddr.bytelen);
+ if (slen)
+ addattr_l(&req2.n, sizeof(req2), stype, &saddr.data,
+ saddr.bytelen);
if (NLMSG_ALIGN(f.flushp) + req2.n.nlmsg_len > f.flushe) {
if (flush_update())
a = attrs[TCP_METRICS_ATTR_VALS];
if (a) {
struct rtattr *m[TCP_METRIC_MAX + 1 + 1];
+ unsigned long rtt = 0, rttvar = 0;
parse_rtattr_nested(m, TCP_METRIC_MAX + 1, a);
a = m[i + 1];
if (!a)
continue;
- if (metric_name[i])
- fprintf(fp, " %s ", metric_name[i]);
- else
- fprintf(fp, " metric_%d ", i);
-
+ if (i != TCP_METRIC_RTT &&
+ i != TCP_METRIC_RTT_US &&
+ i != TCP_METRIC_RTTVAR &&
+ i != TCP_METRIC_RTTVAR_US) {
+ if (metric_name[i])
+ fprintf(fp, " %s ", metric_name[i]);
+ else
+ fprintf(fp, " metric_%d ", i);
+ }
val = rta_getattr_u32(a);
switch (i) {
case TCP_METRIC_RTT:
- fprintf(fp, "%luus", (val * 1000UL) >> 3);
+ if (!rtt)
+ rtt = (val * 1000UL) >> 3;
break;
case TCP_METRIC_RTTVAR:
- fprintf(fp, "%luus", (val * 1000UL) >> 2);
+ if (!rttvar)
+ rttvar = (val * 1000UL) >> 2;
+ break;
+ case TCP_METRIC_RTT_US:
+ rtt = val >> 3;
+ break;
+ case TCP_METRIC_RTTVAR_US:
+ rttvar = val >> 2;
break;
case TCP_METRIC_SSTHRESH:
case TCP_METRIC_CWND:
break;
}
}
+ if (rtt)
+ fprintf(fp, " rtt %luus", rtt);
+ if (rttvar)
+ fprintf(fp, " rttvar %luus", rttvar);
}
a = attrs[TCP_METRICS_ATTR_FOPEN_MSS];
fprintf(fp, " fo_cookie %s", cookie);
}
+ if (slen) {
+ fprintf(fp, " source %s",
+ format_host(family, slen, &saddr.data, abuf,
+ sizeof(abuf)));
+ }
+
fprintf(fp, "\n");
fflush(fp);
static int tcpm_do_cmd(int cmd, int argc, char **argv)
{
TCPM_REQUEST(req, 1024, TCP_METRICS_CMD_GET, NLM_F_REQUEST);
- int atype = -1;
+ int atype = -1, stype = -1;
int ack;
memset(&f, 0, sizeof(f));
f.daddr.bitlen = -1;
f.daddr.family = preferred_family;
+ f.saddr.bitlen = -1;
+ f.saddr.family = preferred_family;
switch (preferred_family) {
case AF_UNSPEC:
}
for (; argc > 0; argc--, argv++) {
- char *who = "address";
-
- if (strcmp(*argv, "addr") == 0 ||
- strcmp(*argv, "address") == 0) {
- who = *argv;
+ if (strcmp(*argv, "src") == 0 ||
+ strcmp(*argv, "source") == 0) {
+ char *who = *argv;
NEXT_ARG();
- }
- if (matches(*argv, "help") == 0)
- usage();
- if (f.daddr.bitlen >= 0)
- duparg2(who, *argv);
-
- get_prefix(&f.daddr, *argv, preferred_family);
- if (f.daddr.bytelen && f.daddr.bytelen * 8 == f.daddr.bitlen) {
- if (f.daddr.family == AF_INET)
- atype = TCP_METRICS_ATTR_ADDR_IPV4;
- else if (f.daddr.family == AF_INET6)
- atype = TCP_METRICS_ATTR_ADDR_IPV6;
- }
- if ((CMD_DEL & cmd) && atype < 0) {
- fprintf(stderr, "Error: a specific IP address is expected rather than \"%s\"\n",
- *argv);
- return -1;
- }
+ if (matches(*argv, "help") == 0)
+ usage();
+ if (f.saddr.bitlen >= 0)
+ duparg2(who, *argv);
+
+ get_prefix(&f.saddr, *argv, preferred_family);
+ if (f.saddr.bytelen && f.saddr.bytelen * 8 == f.saddr.bitlen) {
+ if (f.saddr.family == AF_INET)
+ stype = TCP_METRICS_ATTR_SADDR_IPV4;
+ else if (f.saddr.family == AF_INET6)
+ stype = TCP_METRICS_ATTR_SADDR_IPV6;
+ }
+ if (stype < 0) {
+ fprintf(stderr, "Error: a specific IP address is expected rather than \"%s\"\n",
+ *argv);
+ return -1;
+ }
+ } else {
+ char *who = "address";
+ if (strcmp(*argv, "addr") == 0 ||
+ strcmp(*argv, "address") == 0) {
+ who = *argv;
+ NEXT_ARG();
+ }
+ if (matches(*argv, "help") == 0)
+ usage();
+ if (f.daddr.bitlen >= 0)
+ duparg2(who, *argv);
+
+ get_prefix(&f.daddr, *argv, preferred_family);
+ if (f.daddr.bytelen && f.daddr.bytelen * 8 == f.daddr.bitlen) {
+ if (f.daddr.family == AF_INET)
+ atype = TCP_METRICS_ATTR_ADDR_IPV4;
+ else if (f.daddr.family == AF_INET6)
+ atype = TCP_METRICS_ATTR_ADDR_IPV6;
+ }
+ if ((CMD_DEL & cmd) && atype < 0) {
+ fprintf(stderr, "Error: a specific IP address is expected rather than \"%s\"\n",
+ *argv);
+ return -1;
+ }
+ }
argc--; argv++;
}
/* flush for all addresses ? Single del without address */
if (cmd == CMD_FLUSH && f.daddr.bitlen <= 0 &&
- preferred_family == AF_UNSPEC) {
+ f.saddr.bitlen <= 0 && preferred_family == AF_UNSPEC) {
cmd = CMD_DEL;
req.g.cmd = TCP_METRICS_CMD_DEL;
ack = 1;
if (atype >= 0)
addattr_l(&req.n, sizeof(req), atype, &f.daddr.data,
f.daddr.bytelen);
+ if (stype >= 0)
+ addattr_l(&req.n, sizeof(req), stype, &f.saddr.data,
+ f.saddr.bytelen);
} else {
req.n.nlmsg_flags |= NLM_F_DUMP;
}
}
if (ack) {
- if (rtnl_talk(&grth, &req.n, 0, 0, NULL) < 0)
+ if (rtnl_talk(&grth, &req.n, NULL, 0) < 0)
return -2;
} else if (atype >= 0) {
- if (rtnl_talk(&grth, &req.n, 0, 0, &req.n) < 0)
+ if (rtnl_talk(&grth, &req.n, &req.n, sizeof(req)) < 0)
return -2;
if (process_msg(NULL, &req.n, stdout) < 0) {
fprintf(stderr, "Dump terminated\n");
projects / mirror_iproute2.git / blobdiff