From d862e980b2fc37cd14377ed606fe89d65bc365ad Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Fri, 26 Jan 2007 01:07:30 -0800 Subject: [PATCH] --- yaml --- r: 45879 b: refs/heads/master c: a46bf7d5a81b350cd204b82bd25ee6ffbc2967d4 h: refs/heads/master i: 45877: 0ee1b4342ba8e98c96de8c713479b3fc23baf881 45875: 65e6d64a773e54dae591d8a6df8ec50e4da6de31 45871: e2996cc7c1815c9edd10f30d815853128c61fa72 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/nf_nat_pptp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a2565ed4c329..e020b4a60a9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c72c6b2a291bb6c61b1546d116784a79e15a6c29 +refs/heads/master: a46bf7d5a81b350cd204b82bd25ee6ffbc2967d4 diff --git a/trunk/net/ipv4/netfilter/nf_nat_pptp.c b/trunk/net/ipv4/netfilter/nf_nat_pptp.c index 0ae45b79a4eb..5df4fcae3ab6 100644 --- a/trunk/net/ipv4/netfilter/nf_nat_pptp.c +++ b/trunk/net/ipv4/netfilter/nf_nat_pptp.c @@ -72,9 +72,9 @@ static void pptp_nat_expected(struct nf_conn *ct, DEBUGP("we are PAC->PNS\n"); /* build tuple for PNS->PAC */ t.src.l3num = AF_INET; - t.src.u3.ip = master->tuplehash[exp->dir].tuple.src.u3.ip; + t.src.u3.ip = master->tuplehash[!exp->dir].tuple.src.u3.ip; t.src.u.gre.key = nat_pptp_info->pns_call_id; - t.dst.u3.ip = master->tuplehash[exp->dir].tuple.dst.u3.ip; + t.dst.u3.ip = master->tuplehash[!exp->dir].tuple.dst.u3.ip; t.dst.u.gre.key = nat_pptp_info->pac_call_id; t.dst.protonum = IPPROTO_GRE; }