aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-12 11:59:17 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 18:57:54 -0400
commit17b085eacef81a6286bd478f2ec75e04abb091cb (patch)
treeb990ca4a3b8e2c08fbcf09ba18e9ae469754b2df
parenta8c2190ee7da1a1dc68ff1a6b5f03feb61e523a5 (diff)
[INET_DIAG]: Move the tcp_diag interface to the proper place
With this the previous setup is back, i.e. tcp_diag can be built as a module, as dccp_diag and both share the infrastructure available in inet_diag. If one selects CONFIG_INET_DIAG as module CONFIG_INET_TCP_DIAG will also be built as a module, as will CONFIG_INET_DCCP_DIAG, if CONFIG_IP_DCCP was selected static or as a module, if CONFIG_INET_DIAG is y, being statically linked CONFIG_INET_TCP_DIAG will follow suit and CONFIG_INET_DCCP_DIAG will be built in the same manner as CONFIG_IP_DCCP. Now to aim at UDP, converting it to use inet_hashinfo, so that we can use iproute2 for UDP sockets as well. Ah, just to show an example of this new infrastructure working for DCCP :-) [root@qemu ~]# ./ss -dane State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 0 *:5001 *:* ino:942 sk:cfd503a0 ESTAB 0 0 127.0.0.1:5001 127.0.0.1:32770 ino:943 sk:cfd50a60 ESTAB 0 0 127.0.0.1:32770 127.0.0.1:5001 ino:947 sk:cfd50700 TIME-WAIT 0 0 127.0.0.1:32769 127.0.0.1:5001 timer:(timewait,3.430ms,0) ino:0 sk:cf209620 Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/tcp.h2
-rw-r--r--net/dccp/Kconfig6
-rw-r--r--net/dccp/Makefile6
-rw-r--r--net/ipv4/Kconfig8
-rw-r--r--net/ipv4/Makefile3
-rw-r--r--net/ipv4/inet_diag.c27
-rw-r--r--net/ipv4/tcp_diag.c54
7 files changed, 70 insertions, 36 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index fef122782b44..d958260af23c 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -479,7 +479,7 @@ static inline void tcp_clear_xmit_timers(struct sock *sk)
479extern unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu); 479extern unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu);
480extern unsigned int tcp_current_mss(struct sock *sk, int large); 480extern unsigned int tcp_current_mss(struct sock *sk, int large);
481 481
482/* tcp_diag.c */ 482/* tcp.c */
483extern void tcp_get_info(struct sock *, struct tcp_info *); 483extern void tcp_get_info(struct sock *, struct tcp_info *);
484 484
485/* Read 'sendfile()'-style from a TCP socket */ 485/* Read 'sendfile()'-style from a TCP socket */
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index efce4f346fd0..6760830c490f 100644
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -19,9 +19,9 @@ config IP_DCCP
19 19
20 If in doubt, say N. 20 If in doubt, say N.
21 21
22config IP_DCCP_DIAG 22config INET_DCCP_DIAG
23 depends on IP_DCCP && IP_INET_DIAG 23 depends on IP_DCCP && INET_DIAG
24 def_tristate y if (IP_DCCP = y && IP_INET_DIAG = y) 24 def_tristate y if (IP_DCCP = y && INET_DIAG = y)
25 def_tristate m 25 def_tristate m
26 26
27source "net/dccp/ccids/Kconfig" 27source "net/dccp/ccids/Kconfig"
diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index 5741fffc436f..44a867f29184 100644
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -3,8 +3,8 @@ obj-$(CONFIG_IP_DCCP) += dccp.o
3dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \ 3dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
4 timer.o packet_history.o 4 timer.o packet_history.o
5 5
6obj-$(CONFIG_IP_DCCP_DIAG) += dccp_diag.o 6obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
7
8obj-y += ccids/
9 7
10dccp_diag-y := diag.o 8dccp_diag-y := diag.o
9
10obj-y += ccids/
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 019e88d8f29e..e55136ae09f4 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -413,8 +413,8 @@ config INET_TUNNEL
413 413
414 If unsure, say Y. 414 If unsure, say Y.
415 415
416config IP_INET_DIAG 416config INET_DIAG
417 tristate "IP: INET socket monitoring interface" 417 tristate "INET: socket monitoring interface"
418 default y 418 default y
419 ---help--- 419 ---help---
420 Support for INET (TCP, DCCP, etc) socket monitoring interface used by 420 Support for INET (TCP, DCCP, etc) socket monitoring interface used by
@@ -423,6 +423,10 @@ config IP_INET_DIAG
423 423
424 If unsure, say Y. 424 If unsure, say Y.
425 425
426config INET_TCP_DIAG
427 depends on INET_DIAG
428 def_tristate INET_DIAG
429
426config TCP_CONG_ADVANCED 430config TCP_CONG_ADVANCED
427 bool "TCP: advanced congestion control" 431 bool "TCP: advanced congestion control"
428 ---help--- 432 ---help---
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index fe5accbb56bf..f0435d00db6b 100644
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -30,8 +30,9 @@ obj-$(CONFIG_IP_ROUTE_MULTIPATH_WRANDOM) += multipath_wrandom.o
30obj-$(CONFIG_IP_ROUTE_MULTIPATH_DRR) += multipath_drr.o 30obj-$(CONFIG_IP_ROUTE_MULTIPATH_DRR) += multipath_drr.o
31obj-$(CONFIG_NETFILTER) += netfilter/ 31obj-$(CONFIG_NETFILTER) += netfilter/
32obj-$(CONFIG_IP_VS) += ipvs/ 32obj-$(CONFIG_IP_VS) += ipvs/
33obj-$(CONFIG_IP_INET_DIAG) += inet_diag.o 33obj-$(CONFIG_INET_DIAG) += inet_diag.o
34obj-$(CONFIG_IP_ROUTE_MULTIPATH_CACHED) += multipath.o 34obj-$(CONFIG_IP_ROUTE_MULTIPATH_CACHED) += multipath.o
35obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o
35obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o 36obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o
36obj-$(CONFIG_TCP_CONG_WESTWOOD) += tcp_westwood.o 37obj-$(CONFIG_TCP_CONG_WESTWOOD) += tcp_westwood.o
37obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o 38obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 3bd510941da0..1880ad8575d8 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -797,25 +797,6 @@ static void inet_diag_rcv(struct sock *sk, int len)
797 } 797 }
798} 798}
799 799
800static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
801 void *_info)
802{
803 const struct tcp_sock *tp = tcp_sk(sk);
804 struct tcp_info *info = _info;
805
806 r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
807 r->idiag_wqueue = tp->write_seq - tp->snd_una;
808 if (info != NULL)
809 tcp_get_info(sk, info);
810}
811
812static struct inet_diag_handler tcp_diag_handler = {
813 .idiag_hashinfo = &tcp_hashinfo,
814 .idiag_get_info = tcp_diag_get_info,
815 .idiag_type = TCPDIAG_GETSOCK,
816 .idiag_info_size = sizeof(struct tcp_info),
817};
818
819static DEFINE_SPINLOCK(inet_diag_register_lock); 800static DEFINE_SPINLOCK(inet_diag_register_lock);
820 801
821int inet_diag_register(const struct inet_diag_handler *h) 802int inet_diag_register(const struct inet_diag_handler *h)
@@ -864,19 +845,13 @@ static int __init inet_diag_init(void)
864 goto out; 845 goto out;
865 846
866 memset(inet_diag_table, 0, inet_diag_table_size); 847 memset(inet_diag_table, 0, inet_diag_table_size);
867
868 idiagnl = netlink_kernel_create(NETLINK_INET_DIAG, inet_diag_rcv, 848 idiagnl = netlink_kernel_create(NETLINK_INET_DIAG, inet_diag_rcv,
869 THIS_MODULE); 849 THIS_MODULE);
870 if (idiagnl == NULL) 850 if (idiagnl == NULL)
871 goto out_free_table; 851 goto out_free_table;
872 852 err = 0;
873 err = inet_diag_register(&tcp_diag_handler);
874 if (err)
875 goto out_sock_release;
876out: 853out:
877 return err; 854 return err;
878out_sock_release:
879 sock_release(idiagnl->sk_socket);
880out_free_table: 855out_free_table:
881 kfree(inet_diag_table); 856 kfree(inet_diag_table);
882 goto out; 857 goto out;
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
new file mode 100644
index 000000000000..c148c1081880
--- /dev/null
+++ b/net/ipv4/tcp_diag.c
@@ -0,0 +1,54 @@
1/*
2 * tcp_diag.c Module for monitoring TCP transport protocols sockets.
3 *
4 * Version: $Id: tcp_diag.c,v 1.3 2002/02/01 22:01:04 davem Exp $
5 *
6 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
7 *
8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License
10 * as published by the Free Software Foundation; either version
11 * 2 of the License, or (at your option) any later version.
12 */
13
14#include <linux/config.h>
15
16#include <linux/module.h>
17#include <linux/inet_diag.h>
18
19#include <linux/tcp.h>
20
21#include <net/tcp.h>
22
23static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
24 void *_info)
25{
26 const struct tcp_sock *tp = tcp_sk(sk);
27 struct tcp_info *info = _info;
28
29 r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
30 r->idiag_wqueue = tp->write_seq - tp->snd_una;
31 if (info != NULL)
32 tcp_get_info(sk, info);
33}
34
35static struct inet_diag_handler tcp_diag_handler = {
36 .idiag_hashinfo = &tcp_hashinfo,
37 .idiag_get_info = tcp_diag_get_info,
38 .idiag_type = TCPDIAG_GETSOCK,
39 .idiag_info_size = sizeof(struct tcp_info),
40};
41
42static int __init tcp_diag_init(void)
43{
44 return inet_diag_register(&tcp_diag_handler);
45}
46
47static void __exit tcp_diag_exit(void)
48{
49 inet_diag_unregister(&tcp_diag_handler);
50}
51
52module_init(tcp_diag_init);
53module_exit(tcp_diag_exit);
54MODULE_LICENSE("GPL");