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

Commit 911c5622 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: Indicate whether a socket is a transparent socket"

parents c8df36dc 982393f0

net/ipv4/tcp_ipv4.c

+5 −1
Original line number Diff line number Diff line
@@ -2236,6 +2236,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) 
	__be32 src = inet->inet_rcv_saddr;

	__u16 destp = ntohs(inet->inet_dport);

	__u16 srcp = ntohs(inet->inet_sport);

	__u8 state = sk->sk_state;

	int rx_queue;



	if (icsk->icsk_pending == ICSK_TIME_RETRANS ||
@@ -2254,6 +2255,9 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) 
		timer_expires = jiffies;

	}



	if (inet->transparent)

		state |= 0x80;



	if (sk->sk_state == TCP_LISTEN)

		rx_queue = sk->sk_ack_backlog;

	else
@@ -2264,7 +2268,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) 


	seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX "

			"%08X %5u %8d %lu %d %pK %lu %lu %u %u %d",

		i, src, srcp, dest, destp, sk->sk_state,

		i, src, srcp, dest, destp, state,

		tp->write_seq - tp->snd_una,

		rx_queue,

		timer_active,

net/ipv4/udp.c

+2 −0
Original line number Diff line number Diff line
@@ -2403,6 +2403,8 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, 
	__u8 state = sp->sk_state;

	if (up->encap_rcv)

		state |= 0xF0;

	else if (inet->transparent)

		state |= 0x80;



	seq_printf(f, "%5d: %08X:%04X %08X:%04X"

		" %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d",

net/ipv6/datagram.c

+6 −1
Original line number Diff line number Diff line
@@ -906,9 +906,14 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, 
			     __u16 srcp, __u16 destp, int bucket)

{

	const struct in6_addr *dest, *src;

	__u8 state = sp->sk_state;



	dest  = &sp->sk_v6_daddr;

	src   = &sp->sk_v6_rcv_saddr;



	if (inet_sk(sp) && inet_sk(sp)->transparent)

		state |= 0x80;



	seq_printf(seq,

		   "%5d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "

		   "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n",
@@ -917,7 +922,7 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, 
		   src->s6_addr32[2], src->s6_addr32[3], srcp,

		   dest->s6_addr32[0], dest->s6_addr32[1],

		   dest->s6_addr32[2], dest->s6_addr32[3], destp,

		   sp->sk_state,

		   state,

		   sk_wmem_alloc_get(sp),

		   sk_rmem_alloc_get(sp),

		   0, 0L, 0,

net/ipv6/tcp_ipv6.c

+5 −1
Original line number Diff line number Diff line
@@ -1716,6 +1716,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) 
	const struct tcp_sock *tp = tcp_sk(sp);

	const struct inet_connection_sock *icsk = inet_csk(sp);

	struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq;

	__u8 state = sp->sk_state;



	dest  = &sp->sk_v6_daddr;

	src   = &sp->sk_v6_rcv_saddr;
@@ -1736,6 +1737,9 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) 
		timer_expires = jiffies;

	}



	if (inet->transparent)

		state |= 0x80;



	seq_printf(seq,

		   "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "

		   "%02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %lu %lu %u %u %d\n",
@@ -1744,7 +1748,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) 
		   src->s6_addr32[2], src->s6_addr32[3], srcp,

		   dest->s6_addr32[0], dest->s6_addr32[1],

		   dest->s6_addr32[2], dest->s6_addr32[3], destp,

		   sp->sk_state,

		   state,

		   tp->write_seq-tp->snd_una,

		   (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),

		   timer_active,