History

pptp: Refactor the struct and macros of PPTP codes

1. Use struct gre_base_hdr directly in pptp_gre_header instead of duplicated members; 2. Use existing macros like GRE_KEY, GRE_SEQ, and so on instead of duplicated macros defined by PPTP; 3. Add new macros like GRE_IS_ACK/SEQ and so on instead of PPTP_GRE_IS_A/S and so on;

Gao Feng committed 10 years ago

Commit 03459341 parent cfad65c3 files · +24 −35Browse files

Unified · Split

3 files
  1. drivers/net/ppp/pptp.c +13 −15
  2. include/net/pptp.h +1 −18
  3. include/uapi/linux/if_tunnel.h +10 −2
drivers/net/ppp/pptp.c+13−15
@@ -206,16 +206,14 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) · 205 unmodified lines
206 skb_push(skb, header_len);206 skb_push(skb, header_len);
207 hdr = (struct pptp_gre_header *)(skb->data);207 hdr = (struct pptp_gre_header *)(skb->data);
208 208
209 hdr->flags = PPTP_GRE_FLAG_K;209 hdr->gre_hd.flags = GRE_KEY | GRE_VERSION_1 | GRE_SEQ;
210 hdr->ver = PPTP_GRE_VER;210 hdr->gre_hd.protocol = GRE_PROTO_PPP;
211 hdr->protocol = htons(PPTP_GRE_PROTO);211 hdr->call_id = htons(opt->dst_addr.call_id);
212 hdr->call_id = htons(opt->dst_addr.call_id);
213 212
214 hdr->flags |= PPTP_GRE_FLAG_S;213 hdr->seq = htonl(++opt->seq_sent);
215 hdr->seq = htonl(++opt->seq_sent);
216 if (opt->ack_sent != seq_recv) {214 if (opt->ack_sent != seq_recv) {
217 /* send ack with this message */215 /* send ack with this message */
218 hdr->ver |= PPTP_GRE_FLAG_A;216 hdr->gre_hd.flags |= GRE_ACK;
219 hdr->ack = htonl(seq_recv);217 hdr->ack = htonl(seq_recv);
220 opt->ack_sent = seq_recv;218 opt->ack_sent = seq_recv;
221 }219 }
@@ -278,7 +276,7 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb) · 56 unmodified lines
278 headersize = sizeof(*header);276 headersize = sizeof(*header);
279 277
280 /* test if acknowledgement present */278 /* test if acknowledgement present */
281 if (PPTP_GRE_IS_A(header->ver)) {279 if (GRE_IS_ACK(header->gre_hd.flags)) {
282 __u32 ack;280 __u32 ack;
283 281
284 if (!pskb_may_pull(skb, headersize))282 if (!pskb_may_pull(skb, headersize))
@@ -286,7 +284,7 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb) · 1 unmodified line
286 header = (struct pptp_gre_header *)(skb->data);284 header = (struct pptp_gre_header *)(skb->data);
287 285
288 /* ack in different place if S = 0 */286 /* ack in different place if S = 0 */
289 ack = PPTP_GRE_IS_S(header->flags) ? header->ack : header->seq;287 ack = GRE_IS_SEQ(header->gre_hd.flags) ? header->ack : header->seq;
290 288
291 ack = ntohl(ack);289 ack = ntohl(ack);
292 290
@@ -299,7 +297,7 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb) · 6 unmodified lines
299 headersize -= sizeof(header->ack);297 headersize -= sizeof(header->ack);
300 }298 }
301 /* test if payload present */299 /* test if payload present */
302 if (!PPTP_GRE_IS_S(header->flags))300 if (!GRE_IS_SEQ(header->gre_hd.flags))
303 goto drop;301 goto drop;
304 302
305 payload_len = ntohs(header->payload_len);303 payload_len = ntohs(header->payload_len);
@@ -360,11 +358,11 @@ static int pptp_rcv(struct sk_buff *skb) · 54 unmodified lines
360 358
361 header = (struct pptp_gre_header *)skb->data;359 header = (struct pptp_gre_header *)skb->data;
362 360
363 if (ntohs(header->protocol) != PPTP_GRE_PROTO || /* PPTP-GRE protocol for PPTP */361 if (header->gre_hd.protocol != GRE_PROTO_PPP || /* PPTP-GRE protocol for PPTP */
364 PPTP_GRE_IS_C(header->flags) || /* flag C should be clear */362 GRE_IS_CSUM(header->gre_hd.flags) || /* flag CSUM should be clear */
365 PPTP_GRE_IS_R(header->flags) || /* flag R should be clear */363 GRE_IS_ROUTING(header->gre_hd.flags) || /* flag ROUTING should be clear */
366 !PPTP_GRE_IS_K(header->flags) || /* flag K should be set */364 !GRE_IS_KEY(header->gre_hd.flags) || /* flag KEY should be set */
367 (header->flags&0xF) != 0) /* routing and recursion ctrl = 0 */365 (header->gre_hd.flags & GRE_FLAGS)) /* flag Recursion Ctrl should be clear */
368 /* if invalid, discard this packet */366 /* if invalid, discard this packet */
369 goto drop;367 goto drop;
370 368
include/net/pptp.h+1−18
@@ -10,26 +10,9 @@ · 9 unmodified lines
10 ((((curseq) & 0xffffff00) == 0) &&\10 ((((curseq) & 0xffffff00) == 0) &&\
11 (((lastseq) & 0xffffff00) == 0xffffff00))11 (((lastseq) & 0xffffff00) == 0xffffff00))
12 12
13#define PPTP_GRE_PROTO 0x880B
14#define PPTP_GRE_VER 0x1
15
16#define PPTP_GRE_FLAG_C 0x80
17#define PPTP_GRE_FLAG_R 0x40
18#define PPTP_GRE_FLAG_K 0x20
19#define PPTP_GRE_FLAG_S 0x10
20#define PPTP_GRE_FLAG_A 0x80
21
22#define PPTP_GRE_IS_C(f) ((f)&PPTP_GRE_FLAG_C)
23#define PPTP_GRE_IS_R(f) ((f)&PPTP_GRE_FLAG_R)
24#define PPTP_GRE_IS_K(f) ((f)&PPTP_GRE_FLAG_K)
25#define PPTP_GRE_IS_S(f) ((f)&PPTP_GRE_FLAG_S)
26#define PPTP_GRE_IS_A(f) ((f)&PPTP_GRE_FLAG_A)
27
28#define PPTP_HEADER_OVERHEAD (2+sizeof(struct pptp_gre_header))13#define PPTP_HEADER_OVERHEAD (2+sizeof(struct pptp_gre_header))
29struct pptp_gre_header {14struct pptp_gre_header {
30 u8 flags;15 struct gre_base_hdr gre_hd;
31 u8 ver;
32 __be16 protocol;
33 __be16 payload_len;16 __be16 payload_len;
34 __be16 call_id;17 __be16 call_id;
35 __be32 seq;18 __be32 seq;
include/uapi/linux/if_tunnel.h+10−2
@@ -28,8 +28,16 @@ · 27 unmodified lines
28#define GRE_FLAGS __cpu_to_be16(0x0078)28#define GRE_FLAGS __cpu_to_be16(0x0078)
29#define GRE_VERSION __cpu_to_be16(0x0007)29#define GRE_VERSION __cpu_to_be16(0x0007)
30 30
31#define GRE_VERSION_1 __cpu_to_be16(0x0001)31#define GRE_IS_CSUM(f) ((f) & GRE_CSUM)
32#define GRE_PROTO_PPP __cpu_to_be16(0x880b)32#define GRE_IS_ROUTING(f) ((f) & GRE_ROUTING)
33#define GRE_IS_KEY(f) ((f) & GRE_KEY)
34#define GRE_IS_SEQ(f) ((f) & GRE_SEQ)
35#define GRE_IS_STRICT(f) ((f) & GRE_STRICT)
36#define GRE_IS_REC(f) ((f) & GRE_REC)
37#define GRE_IS_ACK(f) ((f) & GRE_ACK)
38
39#define GRE_VERSION_1 __cpu_to_be16(0x0001)
40#define GRE_PROTO_PPP __cpu_to_be16(0x880b)
33#define GRE_PPTP_KEY_MASK __cpu_to_be32(0xffff)41#define GRE_PPTP_KEY_MASK __cpu_to_be32(0xffff)
34 42
35struct ip_tunnel_parm {43struct ip_tunnel_parm {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t