From 573c0a55ee62a8086488184f05a2b7d46db07453 Mon Sep 17 00:00:00 2001 From: liangbotong Date: Mon, 26 Dec 2022 15:40:12 +0800 Subject: [PATCH] =?UTF-8?q?newip=E5=86=85=E6=A0=B8=E6=8F=92=E6=A1=A9?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangbotong --- src/linux/include/trace/hooks/nip_hooks.h | 5 ++--- src/linux/net/newip/nip_hooks_register.c | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/linux/include/trace/hooks/nip_hooks.h b/src/linux/include/trace/hooks/nip_hooks.h index f558266..4241169 100644 --- a/src/linux/include/trace/hooks/nip_hooks.h +++ b/src/linux/include/trace/hooks/nip_hooks.h @@ -19,9 +19,8 @@ struct net; struct nip_addr; DECLARE_HOOK(ninet_ehashfn_hook, - TP_PROTO(const struct net *net, const struct nip_addr *laddr, const u16 lport, - const struct nip_addr *faddr, const __be16 fport, u32 *ret), - TP_ARGS(net, laddr, lport, faddr, fport, ret) + TP_PROTO(const struct sock *sk, u32 *ret), + TP_ARGS(sk, ret) ); struct net_device; diff --git a/src/linux/net/newip/nip_hooks_register.c b/src/linux/net/newip/nip_hooks_register.c index 3858935..deea361 100644 --- a/src/linux/net/newip/nip_hooks_register.c +++ b/src/linux/net/newip/nip_hooks_register.c @@ -11,11 +11,10 @@ #include #include -void ninet_ehashfn_hook(void *data, const struct net *net, - const struct nip_addr *laddr, const u16 lport, - const struct nip_addr *faddr, const __be16 fport, u32 *ret) +void ninet_ehashfn_hook(void *data, const struct sock *sk, u32 *ret) { - *ret = ninet_ehashfn(net, laddr, lport, faddr, fport); + *ret = ninet_ehashfn(sock_net(sk), &sk->sk_nip_rcv_saddr, + sk->sk_num, &sk->sk_nip_daddr, sk->sk_dport); } void ninet_gifconf_hook(void *data, struct net_device *dev, -- Gitee