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

Commit f6aa7481 authored by LuK1337's avatar LuK1337 Committed by MajorP93
Browse files

net: oplus: Pass socket sk to ip_route_me_harder 

Change-Id: I78dafb86ec7675b14d3001b82345e3508389d2ef
parent 2876d2c3

net/oplus_connectivity_sla/oplus_connectivity_sla.c

+1 −2
Original line number Diff line number Diff line
@@ -479,8 +479,7 @@ static int sla_skb_reroute(struct sk_buff *skb, struct nf_conn *ct, 
{

	int err;



	/* err = ip_route_me_harder(state->net, state->sk, skb, RTN_UNSPEC); */

	err = ip_route_me_harder(state->net, skb, RTN_UNSPEC);

	err = ip_route_me_harder(state->net, state->sk, skb, RTN_UNSPEC);



	if (err < 0) {

		return NF_DROP_ERR(err);

net/oplus_modules/oplus_dns_hook/oplus_dns_hook.c

+0 −8
Original line number Diff line number Diff line
@@ -397,11 +397,7 @@ static int dns_hook_process_postrouting(struct sk_buff *skb, int hook, const str 


    nf_ct_attach(rsp_skb, skb);

    if (skb->protocol == htons(ETH_P_IP)) {

    #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0))

        if (ip_route_me_harder(state->net, state->sk, rsp_skb, RTN_UNSPEC)) {

    #else

        if (ip_route_me_harder(state->net, rsp_skb, RTN_UNSPEC)) {

    #endif

            LOGK(1, "ip_route_me_harder error");

            kfree_skb(rsp_skb);

            return -1;
@@ -409,11 +405,7 @@ static int dns_hook_process_postrouting(struct sk_buff *skb, int hook, const str 
        ret = ip_local_out(state->net, state->sk, rsp_skb);

        LOGK(0, "ip_local_out return %d", ret);

    } else if(skb->protocol == htons(ETH_P_IPV6)) {

    #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0))

        if (ip6_route_me_harder(state->net, state->sk, rsp_skb)) {

    #else

        if (ip6_route_me_harder(state->net, rsp_skb)) {

    #endif

            LOGK(1, "ip6_route_me_harder error");

            kfree_skb(rsp_skb);

            return -1;

net/oplus_sla/oplus_sla.c

+1 −1
Original line number Diff line number Diff line
@@ -2050,7 +2050,7 @@ static int sla_skb_reroute(struct sk_buff *skb,struct nf_conn *ct,const struct n 
{

	int err;



	err = ip_route_me_harder(state->net, skb, RTN_UNSPEC);

	err = ip_route_me_harder(state->net, state->sk, skb, RTN_UNSPEC);

	if (err < 0){

		return NF_DROP_ERR(err);

	}