Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17b085ea authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[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: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8c2190e

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static inline void tcp_clear_xmit_timers(struct sock *sk) 
extern unsigned int tcp_sync_mss(struct sock *sk, u32 pmtu);

extern unsigned int tcp_current_mss(struct sock *sk, int large);



/* tcp_diag.c */

/* tcp.c */

extern void tcp_get_info(struct sock *, struct tcp_info *);



/* Read 'sendfile()'-style from a TCP socket */

net/dccp/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ config IP_DCCP 


	  If in doubt, say N.



config IP_DCCP_DIAG

	depends on IP_DCCP && IP_INET_DIAG

	def_tristate y if (IP_DCCP = y && IP_INET_DIAG = y)

config INET_DCCP_DIAG

	depends on IP_DCCP && INET_DIAG

	def_tristate y if (IP_DCCP = y && INET_DIAG = y)

	def_tristate m



source "net/dccp/ccids/Kconfig"

net/dccp/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ obj-$(CONFIG_IP_DCCP) += dccp.o 
dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \

	  timer.o packet_history.o



obj-$(CONFIG_IP_DCCP_DIAG) += dccp_diag.o



obj-y += ccids/

obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o



dccp_diag-y := diag.o



obj-y += ccids/

net/ipv4/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ config INET_TUNNEL 
	  

	  If unsure, say Y.



config IP_INET_DIAG

	tristate "IP: INET socket monitoring interface"

config INET_DIAG

	tristate "INET: socket monitoring interface"

	default y

	---help---

	  Support for INET (TCP, DCCP, etc) socket monitoring interface used by
@@ -423,6 +423,10 @@ config IP_INET_DIAG 
	  

	  If unsure, say Y.



config INET_TCP_DIAG

	depends on INET_DIAG

	def_tristate INET_DIAG



config TCP_CONG_ADVANCED

	bool "TCP: advanced congestion control"

	---help---

net/ipv4/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ obj-$(CONFIG_IP_ROUTE_MULTIPATH_WRANDOM) += multipath_wrandom.o 
obj-$(CONFIG_IP_ROUTE_MULTIPATH_DRR) += multipath_drr.o

obj-$(CONFIG_NETFILTER)	+= netfilter/

obj-$(CONFIG_IP_VS) += ipvs/

obj-$(CONFIG_IP_INET_DIAG) += inet_diag.o 

obj-$(CONFIG_INET_DIAG) += inet_diag.o 

obj-$(CONFIG_IP_ROUTE_MULTIPATH_CACHED) += multipath.o

obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o

obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o

obj-$(CONFIG_TCP_CONG_WESTWOOD) += tcp_westwood.o

obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o