Merge remote-tracking branch 'mailbox/mailbox-for-next'

[deliverable/linux.git] / drivers / net / ppp / pptp.c

diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index ae0905ed4a32b55183568e95512c6727458a9f96..1951b1085cb8943d85af68a26d0e22dc35ce3a16 100644 (file)
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -37,6 +37,7 @@
 #include <net/icmp.h>
 #include <net/route.h>
 #include <net/gre.h>
+#include <net/pptp.h>
 
 #include <linux/uaccess.h>
 
@@ -53,41 +54,6 @@ static struct proto pptp_sk_proto __read_mostly;
 static const struct ppp_channel_ops pptp_chan_ops;
 static const struct proto_ops pptp_ops;
 
-#define PPP_LCP_ECHOREQ 0x09
-#define PPP_LCP_ECHOREP 0x0A
-#define SC_RCV_BITS    (SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP)
-
-#define MISSING_WINDOW 20
-#define WRAPPED(curseq, lastseq)\
-       ((((curseq) & 0xffffff00) == 0) &&\
-       (((lastseq) & 0xffffff00) == 0xffffff00))
-
-#define PPTP_GRE_PROTO  0x880B
-#define PPTP_GRE_VER    0x1
-
-#define PPTP_GRE_FLAG_C        0x80
-#define PPTP_GRE_FLAG_R        0x40
-#define PPTP_GRE_FLAG_K        0x20
-#define PPTP_GRE_FLAG_S        0x10
-#define PPTP_GRE_FLAG_A        0x80
-
-#define PPTP_GRE_IS_C(f) ((f)&PPTP_GRE_FLAG_C)
-#define PPTP_GRE_IS_R(f) ((f)&PPTP_GRE_FLAG_R)
-#define PPTP_GRE_IS_K(f) ((f)&PPTP_GRE_FLAG_K)
-#define PPTP_GRE_IS_S(f) ((f)&PPTP_GRE_FLAG_S)
-#define PPTP_GRE_IS_A(f) ((f)&PPTP_GRE_FLAG_A)
-
-#define PPTP_HEADER_OVERHEAD (2+sizeof(struct pptp_gre_header))
-struct pptp_gre_header {
-       u8  flags;
-       u8  ver;
-       __be16 protocol;
-       __be16 payload_len;
-       __be16 call_id;
-       __be32 seq;
-       __be32 ack;
-} __packed;
-
 static struct pppox_sock *lookup_chan(u16 call_id, __be32 s_addr)
 {
        struct pppox_sock *sock;
@@ -240,16 +206,14 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
        skb_push(skb, header_len);
        hdr = (struct pptp_gre_header *)(skb->data);
 
-       hdr->flags       = PPTP_GRE_FLAG_K;
-       hdr->ver         = PPTP_GRE_VER;
-       hdr->protocol    = htons(PPTP_GRE_PROTO);
-       hdr->call_id     = htons(opt->dst_addr.call_id);
+       hdr->gre_hd.flags = GRE_KEY | GRE_VERSION_1 | GRE_SEQ;
+       hdr->gre_hd.protocol = GRE_PROTO_PPP;
+       hdr->call_id = htons(opt->dst_addr.call_id);
 
-       hdr->flags      |= PPTP_GRE_FLAG_S;
-       hdr->seq         = htonl(++opt->seq_sent);
+       hdr->seq = htonl(++opt->seq_sent);
        if (opt->ack_sent != seq_recv)  {
                /* send ack with this message */
-               hdr->ver |= PPTP_GRE_FLAG_A;
+               hdr->gre_hd.flags |= GRE_ACK;
                hdr->ack  = htonl(seq_recv);
                opt->ack_sent = seq_recv;
        }
@@ -312,7 +276,7 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb)
        headersize  = sizeof(*header);
 
        /* test if acknowledgement present */
-       if (PPTP_GRE_IS_A(header->ver)) {
+       if (GRE_IS_ACK(header->gre_hd.flags)) {
                __u32 ack;
 
                if (!pskb_may_pull(skb, headersize))
@@ -320,7 +284,7 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb)
                header = (struct pptp_gre_header *)(skb->data);
 
                /* ack in different place if S = 0 */
-               ack = PPTP_GRE_IS_S(header->flags) ? header->ack : header->seq;
+               ack = GRE_IS_SEQ(header->gre_hd.flags) ? header->ack : header->seq;
 
                ack = ntohl(ack);
 
@@ -333,7 +297,7 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb)
                headersize -= sizeof(header->ack);
        }
        /* test if payload present */
-       if (!PPTP_GRE_IS_S(header->flags))
+       if (!GRE_IS_SEQ(header->gre_hd.flags))
                goto drop;
 
        payload_len = ntohs(header->payload_len);
@@ -394,11 +358,11 @@ static int pptp_rcv(struct sk_buff *skb)
 
        header = (struct pptp_gre_header *)skb->data;
 
-       if (ntohs(header->protocol) != PPTP_GRE_PROTO || /* PPTP-GRE protocol for PPTP */
-               PPTP_GRE_IS_C(header->flags) ||                /* flag C should be clear */
-               PPTP_GRE_IS_R(header->flags) ||                /* flag R should be clear */
-               !PPTP_GRE_IS_K(header->flags) ||               /* flag K should be set */
-               (header->flags&0xF) != 0)                      /* routing and recursion ctrl = 0 */
+       if (header->gre_hd.protocol != GRE_PROTO_PPP || /* PPTP-GRE protocol for PPTP */
+               GRE_IS_CSUM(header->gre_hd.flags) ||    /* flag CSUM should be clear */
+               GRE_IS_ROUTING(header->gre_hd.flags) || /* flag ROUTING should be clear */
+               !GRE_IS_KEY(header->gre_hd.flags) ||    /* flag KEY should be set */
+               (header->gre_hd.flags & GRE_FLAGS))     /* flag Recursion Ctrl should be clear */
                /* if invalid, discard this packet */
                goto drop;