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

Commit 569508c9 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[TCP]: Format addresses appropriately in debug messages. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7d632b6

net/ipv4/tcp_input.c

+19 −6
Original line number Diff line number Diff line
@@ -2309,6 +2309,7 @@ static void DBGUNDO(struct sock *sk, const char *msg) 
	struct tcp_sock *tp = tcp_sk(sk);

	struct inet_sock *inet = inet_sk(sk);



	if (sk->sk_family == AF_INET) {

		printk(KERN_DEBUG "Undo %s " NIPQUAD_FMT "/%u c%u l%u ss%u/%u p%u\n",

		       msg,

		       NIPQUAD(inet->daddr), ntohs(inet->dport),
@@ -2316,6 +2317,18 @@ static void DBGUNDO(struct sock *sk, const char *msg) 
		       tp->snd_ssthresh, tp->prior_ssthresh,

		       tp->packets_out);

	}

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	else if (sk->sk_family == AF_INET6) {

		struct ipv6_pinfo *np = inet6_sk(sk);

		printk(KERN_DEBUG "Undo %s " NIP6_FMT "/%u c%u l%u ss%u/%u p%u\n",

		       msg,

		       NIP6(np->daddr), ntohs(inet->dport),

		       tp->snd_cwnd, tcp_left_out(tp),

		       tp->snd_ssthresh, tp->prior_ssthresh,

		       tp->packets_out);

	}

#endif

}

#else

#define DBGUNDO(x...) do { } while (0)

#endif

net/ipv4/tcp_timer.c

+10 −2
Original line number Diff line number Diff line
@@ -299,12 +299,20 @@ static void tcp_retransmit_timer(struct sock *sk) 
		 * we cannot allow such beasts to hang infinitely.

		 */

#ifdef TCP_DEBUG

		if (1) {

		struct inet_sock *inet = inet_sk(sk);

		if (sk->sk_family == AF_INET) {

			LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer " NIPQUAD_FMT ":%u/%u shrinks window %u:%u. Repaired.\n",

			       NIPQUAD(inet->daddr), ntohs(inet->dport),

			       inet->num, tp->snd_una, tp->snd_nxt);

		}

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

		else if (sk->sk_family == AF_INET6) {

			struct ipv6_pinfo *np = inet6_sk(sk);

			LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer " NIP6_FMT ":%u/%u shrinks window %u:%u. Repaired.\n",

			       NIP6(np->daddr), ntohs(inet->dport),

			       inet->num, tp->snd_una, tp->snd_nxt);

		}

#endif

#endif

		if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) {

			tcp_write_err(sk);