diff --git a/src/linux/include/trace/hooks/nip_hooks.h b/src/linux/include/trace/hooks/nip_hooks.h index f558266a57c764ce942a2ebf9d2303af9de5e4af..4241169724d2faae1282376c896377e4aac3e674 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 3858935c3ce7274600ac1835035cbf22e4b7f5bc..deea361fd8f6984ffc8d499bdf642045ce034a8a 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,