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

Commit ed2361e6 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Pass explicit destination address to rt_get_peer(). 



This will next trickle down to rt_bind_peer().

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bd023f3

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable 


extern void rt_bind_peer(struct rtable *rt, int create);



static inline struct inet_peer *rt_get_peer(struct rtable *rt)

static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)

{

	if (rt->peer)

		return rt->peer;

net/ipv4/tcp_ipv4.c

+3 −3
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 


	if (tcp_death_row.sysctl_tw_recycle &&

	    !tp->rx_opt.ts_recent_stamp && fl4->daddr == daddr) {

		struct inet_peer *peer = rt_get_peer(rt);

		struct inet_peer *peer = rt_get_peer(rt, fl4->daddr);

		/*

		 * VJ's idea. We save last timestamp seen from

		 * the destination in peer table, when entering state
@@ -1353,8 +1353,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		if (tmp_opt.saw_tstamp &&

		    tcp_death_row.sysctl_tw_recycle &&

		    (dst = inet_csk_route_req(sk, &fl4, req)) != NULL &&

		    (peer = rt_get_peer((struct rtable *)dst)) != NULL &&

		    peer->daddr.addr.a4 == saddr) {

		    fl4.daddr == saddr &&

		    (peer = rt_get_peer((struct rtable *)dst, fl4.daddr)) != NULL) {

			inet_peer_refcheck(peer);

			if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&

			    (s32)(peer->tcp_ts - req->ts_recent) >