Skip to content

Commit

Permalink
[NETFILTER]: PPTP conntrack: remove more dead code
Browse files Browse the repository at this point in the history
The calculated sequence numbers are not used for anything.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Sep 22, 2006
1 parent a1ad1de commit 5256f66
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions net/ipv4/netfilter/ip_conntrack_helper_pptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ static void pptp_destroy_siblings(struct ip_conntrack *ct)
/* expect GRE connections (PNS->PAC and PAC->PNS direction) */
static inline int
exp_gre(struct ip_conntrack *master,
u_int32_t seq,
__be16 callid,
__be16 peer_callid)
{
Expand Down Expand Up @@ -336,7 +335,6 @@ pptp_inbound_pkt(struct sk_buff **pskb,
struct ip_ct_pptp_master *info = &ct->help.ct_pptp_info;
u_int16_t msg;
__be16 *cid, *pcid;
u_int32_t seq;

ctlh = skb_header_pointer(*pskb, nexthdr_off, sizeof(_ctlh), &_ctlh);
if (!ctlh) {
Expand Down Expand Up @@ -432,12 +430,7 @@ pptp_inbound_pkt(struct sk_buff **pskb,

info->cstate = PPTP_CALL_OUT_CONF;

seq = ntohl(tcph->seq) + sizeof(struct pptp_pkt_hdr)
+ sizeof(struct PptpControlHeader)
+ ((void *)pcid - (void *)pptpReq);

if (exp_gre(ct, seq, *cid, *pcid) != 0)
printk("ip_conntrack_pptp: error during exp_gre\n");
exp_gre(ct, *cid, *pcid);
break;

case PPTP_IN_CALL_REQUEST:
Expand Down Expand Up @@ -488,13 +481,7 @@ pptp_inbound_pkt(struct sk_buff **pskb,
info->cstate = PPTP_CALL_IN_CONF;

/* we expect a GRE connection from PAC to PNS */
seq = ntohl(tcph->seq) + sizeof(struct pptp_pkt_hdr)
+ sizeof(struct PptpControlHeader)
+ ((void *)pcid - (void *)pptpReq);

if (exp_gre(ct, seq, *cid, *pcid) != 0)
printk("ip_conntrack_pptp: error during exp_gre\n");

exp_gre(ct, *cid, *pcid);
break;

case PPTP_CALL_DISCONNECT_NOTIFY:
Expand Down

0 comments on commit 5256f66

Please sign in to comment.