diff options
| author | David Howells <dhowells@redhat.com> | 2016-09-13 09:49:05 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-09-14 00:09:13 +0200 |
| commit | 1c2bc7b948a2adee0d3e070f4ce14645efa0a2d2 (patch) | |
| tree | f0be7662a6eaadbf8a0c7ba232df1557bec8ddf4 /net/rxrpc/local_event.c | |
| parent | rxrpc: Don't specify protocol to when creating transport socket (diff) | |
| download | linux-1c2bc7b948a2adee0d3e070f4ce14645efa0a2d2.tar.xz linux-1c2bc7b948a2adee0d3e070f4ce14645efa0a2d2.zip | |
rxrpc: Use rxrpc_extract_addr_from_skb() rather than doing this manually
There are two places that want to transmit a packet in response to one just
received and manually pick the address to reply to out of the sk_buff.
Make them use rxrpc_extract_addr_from_skb() instead so that IPv6 is handled
automatically.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/local_event.c')
| -rw-r--r-- | net/rxrpc/local_event.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/rxrpc/local_event.c b/net/rxrpc/local_event.c index cdd58e6e9fbd..f073e932500e 100644 --- a/net/rxrpc/local_event.c +++ b/net/rxrpc/local_event.c @@ -15,8 +15,6 @@ #include <linux/net.h> #include <linux/skbuff.h> #include <linux/slab.h> -#include <linux/udp.h> -#include <linux/ip.h> #include <net/sock.h> #include <net/af_rxrpc.h> #include <generated/utsrelease.h> @@ -33,7 +31,7 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, { struct rxrpc_wire_header whdr; struct rxrpc_skb_priv *sp = rxrpc_skb(skb); - struct sockaddr_in sin; + struct sockaddr_rxrpc srx; struct msghdr msg; struct kvec iov[2]; size_t len; @@ -41,12 +39,11 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, _enter(""); - sin.sin_family = AF_INET; - sin.sin_port = udp_hdr(skb)->source; - sin.sin_addr.s_addr = ip_hdr(skb)->saddr; + if (rxrpc_extract_addr_from_skb(&srx, skb) < 0) + return; - msg.msg_name = &sin; - msg.msg_namelen = sizeof(sin); + msg.msg_name = &srx.transport; + msg.msg_namelen = srx.transport_len; msg.msg_control = NULL; msg.msg_controllen = 0; msg.msg_flags = 0; |