iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Add __icmp_send helper.

Browse Source 
[ Upstream commit 9ef6b42ad6 ]

Add __icmp_send function having ip_options struct parameter

Signed-off-by: Sergey Nazarov <s-nazarov@yandex.ru>
Reviewed-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nazarov Sergey
2019-02-25 19:24:15 +03:00
committed by Greg Kroah-Hartman
parent 1902c0cb70
commit 153100388f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/icmp.h
View File

@ -22,6 +22,7 @@
#include <net/inet_sock.h> #include <net/inet_sock.h>
#include <net/snmp.h> #include <net/snmp.h>
#include <net/ip.h>
struct icmp_err { struct icmp_err {
int errno; int errno;
@ -39,7 +40,13 @@ struct net_proto_family;
struct sk_buff; struct sk_buff;
struct net; struct net;
void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info); void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
const struct ip_options *opt);
static inline void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
{
__icmp_send(skb_in, type, code, info, &IPCB(skb_in)->opt);
}
int icmp_rcv(struct sk_buff *skb); int icmp_rcv(struct sk_buff *skb);
void icmp_err(struct sk_buff *skb, u32 info); void icmp_err(struct sk_buff *skb, u32 info);
int icmp_init(void); int icmp_init(void);

7
net/ipv4/icmp.c
View File

@ -573,7 +573,8 @@ relookup_failed:
* MUST reply to only the first fragment. * MUST reply to only the first fragment.
*/ */
void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
const struct ip_options *opt)
{ {
struct iphdr *iph; struct iphdr *iph;
int room; int room;
@ -694,7 +695,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
iph->tos; iph->tos;
mark = IP4_REPLY_MARK(net, skb_in->mark); mark = IP4_REPLY_MARK(net, skb_in->mark);
if (ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in)) if (__ip_options_echo(net, &icmp_param.replyopts.opt.opt, skb_in, opt))
goto out_unlock; goto out_unlock;
@ -747,7 +748,7 @@ out_bh_enable:
local_bh_enable(); local_bh_enable();
out:; out:;
} }
EXPORT_SYMBOL(icmp_send); EXPORT_SYMBOL(__icmp_send);
static void icmp_socket_deliver(struct sk_buff *skb, u32 info) static void icmp_socket_deliver(struct sk_buff *skb, u32 info)