* [PATCH iproute2 1/3] tcp_metrics: Rename addr to daddr and add local variable
2014-02-06 22:15 [PATCH iproute2 0/3] Support for tcp-metrics source address Christoph Paasch
@ 2014-02-06 22:15 ` Christoph Paasch
2014-02-06 22:15 ` [PATCH iproute2 2/3] tcp_metrics: Display source-address Christoph Paasch
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Paasch @ 2014-02-06 22:15 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Renaming addr to daddr, because we will introduce saddr later.
The local variable is necessary to store RTA_PAYLOAD(a) temporarily.
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
---
ip/tcp_metrics.c | 51 ++++++++++++++++++++++++++-------------------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index c6be3c94415f..4b30771ae3a8 100644
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -74,7 +74,7 @@ static struct
int flushp;
int flushe;
int cmd;
- inet_prefix addr;
+ inet_prefix daddr;
} f;
static int flush_update(void)
@@ -95,8 +95,8 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
struct rtattr *attrs[TCP_METRICS_ATTR_MAX + 1], *a;
int len = n->nlmsg_len;
char abuf[256];
- inet_prefix addr;
- int family, i, atype;
+ inet_prefix daddr;
+ int family, i, atype, dlen = 0;
if (n->nlmsg_type != genl_family)
return -1;
@@ -114,35 +114,37 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
a = attrs[TCP_METRICS_ATTR_ADDR_IPV4];
if (a) {
- if (f.addr.family && f.addr.family != AF_INET)
+ if (f.daddr.family && f.daddr.family != AF_INET)
return 0;
- memcpy(&addr.data, RTA_DATA(a), 4);
- addr.bytelen = 4;
+ memcpy(&daddr.data, RTA_DATA(a), 4);
+ daddr.bytelen = 4;
family = AF_INET;
atype = TCP_METRICS_ATTR_ADDR_IPV4;
+ dlen = RTA_PAYLOAD(a);
} else {
a = attrs[TCP_METRICS_ATTR_ADDR_IPV6];
if (a) {
- if (f.addr.family && f.addr.family != AF_INET6)
+ if (f.daddr.family && f.daddr.family != AF_INET6)
return 0;
- memcpy(&addr.data, RTA_DATA(a), 16);
- addr.bytelen = 16;
+ memcpy(&daddr.data, RTA_DATA(a), 16);
+ daddr.bytelen = 16;
family = AF_INET6;
atype = TCP_METRICS_ATTR_ADDR_IPV6;
+ dlen = RTA_PAYLOAD(a);
} else
return 0;
}
- if (f.addr.family && f.addr.bitlen >= 0 &&
- inet_addr_match(&addr, &f.addr, f.addr.bitlen))
+ if (f.daddr.family && f.daddr.bitlen >= 0 &&
+ inet_addr_match(&daddr, &f.daddr, f.daddr.bitlen))
return 0;
if (f.flushb) {
struct nlmsghdr *fn;
TCPM_REQUEST(req2, 128, TCP_METRICS_CMD_DEL, NLM_F_REQUEST);
- addattr_l(&req2.n, sizeof(req2), atype, &addr.data,
- addr.bytelen);
+ addattr_l(&req2.n, sizeof(req2), atype, &daddr.data,
+ daddr.bytelen);
if (NLMSG_ALIGN(f.flushp) + req2.n.nlmsg_len > f.flushe) {
if (flush_update())
@@ -161,8 +163,7 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
fprintf(fp, "Deleted ");
fprintf(fp, "%s",
- format_host(family, RTA_PAYLOAD(a), &addr.data,
- abuf, sizeof(abuf)));
+ format_host(family, dlen, &daddr.data, abuf, sizeof(abuf)));
a = attrs[TCP_METRICS_ATTR_AGE];
if (a) {
@@ -260,8 +261,8 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
int ack;
memset(&f, 0, sizeof(f));
- f.addr.bitlen = -1;
- f.addr.family = preferred_family;
+ f.daddr.bitlen = -1;
+ f.daddr.family = preferred_family;
switch (preferred_family) {
case AF_UNSPEC:
@@ -283,14 +284,14 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
}
if (matches(*argv, "help") == 0)
usage();
- if (f.addr.bitlen >= 0)
+ if (f.daddr.bitlen >= 0)
duparg2(who, *argv);
- get_prefix(&f.addr, *argv, preferred_family);
- if (f.addr.bytelen && f.addr.bytelen * 8 == f.addr.bitlen) {
- if (f.addr.family == AF_INET)
+ 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.addr.family == AF_INET6)
+ else if (f.daddr.family == AF_INET6)
atype = TCP_METRICS_ATTR_ADDR_IPV6;
}
if ((CMD_DEL & cmd) && atype < 0) {
@@ -310,7 +311,7 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
cmd = CMD_DEL;
/* flush for all addresses ? Single del without address */
- if (cmd == CMD_FLUSH && f.addr.bitlen <= 0 &&
+ if (cmd == CMD_FLUSH && f.daddr.bitlen <= 0 &&
preferred_family == AF_UNSPEC) {
cmd = CMD_DEL;
req.g.cmd = TCP_METRICS_CMD_DEL;
@@ -338,8 +339,8 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
if (ack)
req.n.nlmsg_flags |= NLM_F_ACK;
if (atype >= 0)
- addattr_l(&req.n, sizeof(req), atype, &f.addr.data,
- f.addr.bytelen);
+ addattr_l(&req.n, sizeof(req), atype, &f.daddr.data,
+ f.daddr.bytelen);
} else {
req.n.nlmsg_flags |= NLM_F_DUMP;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH iproute2 2/3] tcp_metrics: Display source-address
2014-02-06 22:15 [PATCH iproute2 0/3] Support for tcp-metrics source address Christoph Paasch
2014-02-06 22:15 ` [PATCH iproute2 1/3] tcp_metrics: Rename addr to daddr and add local variable Christoph Paasch
@ 2014-02-06 22:15 ` Christoph Paasch
2014-02-06 22:15 ` [PATCH iproute2 3/3] tcp_metrics: Allow removal based on the source-IP Christoph Paasch
2014-02-10 22:47 ` [PATCH iproute2 0/3] Support for tcp-metrics source address Stephen Hemminger
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Paasch @ 2014-02-06 22:15 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
This patch allows to display the source-IP.
stype will be used in the next patch that allows to remove based on the
source-IP.
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
---
include/linux/tcp_metrics.h | 2 ++
ip/tcp_metrics.c | 30 ++++++++++++++++++++++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/include/linux/tcp_metrics.h b/include/linux/tcp_metrics.h
index cb5157b55f32..54a37b13f2c4 100644
--- a/include/linux/tcp_metrics.h
+++ b/include/linux/tcp_metrics.h
@@ -35,6 +35,8 @@ enum {
TCP_METRICS_ATTR_FOPEN_SYN_DROPS, /* u16, count of drops */
TCP_METRICS_ATTR_FOPEN_SYN_DROP_TS, /* msecs age */
TCP_METRICS_ATTR_FOPEN_COOKIE, /* binary */
+ TCP_METRICS_ATTR_SADDR_IPV4, /* u32 */
+ TCP_METRICS_ATTR_SADDR_IPV6, /* binary */
__TCP_METRICS_ATTR_MAX,
};
diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index 4b30771ae3a8..a7215c86379f 100644
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -95,8 +95,8 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
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;
@@ -135,6 +135,26 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
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;
@@ -248,6 +268,12 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
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);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH iproute2 3/3] tcp_metrics: Allow removal based on the source-IP
2014-02-06 22:15 [PATCH iproute2 0/3] Support for tcp-metrics source address Christoph Paasch
2014-02-06 22:15 ` [PATCH iproute2 1/3] tcp_metrics: Rename addr to daddr and add local variable Christoph Paasch
2014-02-06 22:15 ` [PATCH iproute2 2/3] tcp_metrics: Display source-address Christoph Paasch
@ 2014-02-06 22:15 ` Christoph Paasch
2014-02-10 22:47 ` [PATCH iproute2 0/3] Support for tcp-metrics source address Stephen Hemminger
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Paasch @ 2014-02-06 22:15 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
This patch allows adding the source-IP attribute to the netlink-command.
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
---
ip/tcp_metrics.c | 87 ++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 62 insertions(+), 25 deletions(-)
diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index a7215c86379f..e0f03449e94b 100644
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -75,6 +75,7 @@ static struct
int flushe;
int cmd;
inet_prefix daddr;
+ inet_prefix saddr;
} f;
static int flush_update(void)
@@ -157,6 +158,12 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
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) {
@@ -165,6 +172,9 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
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())
@@ -283,12 +293,14 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
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:
@@ -301,31 +313,53 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
}
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++;
}
@@ -338,7 +372,7 @@ static int tcpm_do_cmd(int cmd, int argc, char **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;
@@ -367,6 +401,9 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
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;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH iproute2 0/3] Support for tcp-metrics source address
2014-02-06 22:15 [PATCH iproute2 0/3] Support for tcp-metrics source address Christoph Paasch
` (2 preceding siblings ...)
2014-02-06 22:15 ` [PATCH iproute2 3/3] tcp_metrics: Allow removal based on the source-IP Christoph Paasch
@ 2014-02-10 22:47 ` Stephen Hemminger
3 siblings, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2014-02-10 22:47 UTC (permalink / raw)
To: Christoph Paasch; +Cc: netdev
On Thu, 6 Feb 2014 23:15:01 +0100
Christoph Paasch <christoph.paasch@uclouvain.be> wrote:
> This patchset implements support for showing and deleting tcp-metrics
> based on the source-address.
>
> Christoph Paasch (3):
> tcp_metrics: Rename addr to daddr and add local variable
> tcp_metrics: Display source-address
> tcp_metrics: Allow removal based on the source-IP
>
> include/linux/tcp_metrics.h | 2 +
> ip/tcp_metrics.c | 154 +++++++++++++++++++++++++++++++-------------
> 2 files changed, 111 insertions(+), 45 deletions(-)
>
Applied
^ permalink raw reply [flat|nested] 5+ messages in thread