OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 5... Line 5...
5   5  
Line 6... Line 6...
6 Signed-off-by: Jo-Philipp Wich <jo@mein.io> 6 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
7   7  
8 --- a/pppd/main.c 8 --- a/pppd/main.c
9 +++ b/pppd/main.c 9 +++ b/pppd/main.c
10 @@ -874,14 +874,17 @@ struct protocol_list { 10 @@ -882,14 +882,17 @@ struct protocol_list {
11 const char *name; 11 const char *name;
12 } protocol_list[] = { 12 } protocol_list[] = {
13 { 0x21, "IP" }, 13 { 0x21, "IP" },
Line 23... Line 23...
23 { 0x31, "Bridging PDU" }, 23 { 0x31, "Bridging PDU" },
24 +#if 0 24 +#if 0
25 { 0x33, "Stream Protocol ST-II" }, 25 { 0x33, "Stream Protocol ST-II" },
26 { 0x35, "Banyan Vines" }, 26 { 0x35, "Banyan Vines" },
27 { 0x39, "AppleTalk EDDP" }, 27 { 0x39, "AppleTalk EDDP" },
28 @@ -895,8 +898,11 @@ struct protocol_list { 28 @@ -903,8 +906,11 @@ struct protocol_list {
29 { 0x49, "Serial Data Transport Protocol (PPP-SDTP)" }, 29 { 0x49, "Serial Data Transport Protocol (PPP-SDTP)" },
30 { 0x4b, "SNA over 802.2" }, 30 { 0x4b, "SNA over 802.2" },
31 { 0x4d, "SNA" }, 31 { 0x4d, "SNA" },
32 +#endif 32 +#endif
33 { 0x4f, "IP6 Header Compression" }, 33 { 0x4f, "IP6 Header Compression" },
Line 35... Line 35...
35 { 0x51, "KNX Bridging Data" }, 35 { 0x51, "KNX Bridging Data" },
36 +#endif 36 +#endif
37 { 0x53, "Encryption" }, 37 { 0x53, "Encryption" },
38 { 0x55, "Individual Link Encryption" }, 38 { 0x55, "Individual Link Encryption" },
39 { 0x57, "IPv6" }, 39 { 0x57, "IPv6" },
40 @@ -907,12 +913,15 @@ struct protocol_list { 40 @@ -915,12 +921,15 @@ struct protocol_list {
41 { 0x65, "RTP IPHC Compressed non-TCP" }, 41 { 0x65, "RTP IPHC Compressed non-TCP" },
42 { 0x67, "RTP IPHC Compressed UDP 8" }, 42 { 0x67, "RTP IPHC Compressed UDP 8" },
43 { 0x69, "RTP IPHC Compressed RTP 8" }, 43 { 0x69, "RTP IPHC Compressed RTP 8" },
44 +#if 0 44 +#if 0
45 { 0x6f, "Stampede Bridging" }, 45 { 0x6f, "Stampede Bridging" },
Line 51... Line 51...
51 { 0x0201, "802.1d Hello Packets" }, 51 { 0x0201, "802.1d Hello Packets" },
52 +#if 0 52 +#if 0
53 { 0x0203, "IBM Source Routing BPDU" }, 53 { 0x0203, "IBM Source Routing BPDU" },
54 { 0x0205, "DEC LANBridge100 Spanning Tree" }, 54 { 0x0205, "DEC LANBridge100 Spanning Tree" },
55 { 0x0207, "Cisco Discovery Protocol" }, 55 { 0x0207, "Cisco Discovery Protocol" },
56 @@ -924,15 +933,19 @@ struct protocol_list { 56 @@ -932,15 +941,19 @@ struct protocol_list {
57 { 0x0231, "Luxcom" }, 57 { 0x0231, "Luxcom" },
58 { 0x0233, "Sigma Network Systems" }, 58 { 0x0233, "Sigma Network Systems" },
59 { 0x0235, "Apple Client Server Protocol" }, 59 { 0x0235, "Apple Client Server Protocol" },
60 +#endif 60 +#endif
61 { 0x0281, "MPLS Unicast" }, 61 { 0x0281, "MPLS Unicast" },
Line 71... Line 71...
71 { 0x2069, "RTP IPHC Compressed RTP 16" }, 71 { 0x2069, "RTP IPHC Compressed RTP 16" },
72 +#if 0 72 +#if 0
73 { 0x4001, "Cray Communications Control Protocol" }, 73 { 0x4001, "Cray Communications Control Protocol" },
74 { 0x4003, "CDPD Mobile Network Registration Protocol" }, 74 { 0x4003, "CDPD Mobile Network Registration Protocol" },
75 { 0x4005, "Expand accelerator protocol" }, 75 { 0x4005, "Expand accelerator protocol" },
76 @@ -943,8 +956,10 @@ struct protocol_list { 76 @@ -951,8 +964,10 @@ struct protocol_list {
77 { 0x4023, "RefTek Protocol" }, 77 { 0x4023, "RefTek Protocol" },
78 { 0x4025, "Fibre Channel" }, 78 { 0x4025, "Fibre Channel" },
79 { 0x4027, "EMIT Protocols" }, 79 { 0x4027, "EMIT Protocols" },
80 +#endif 80 +#endif
81 { 0x405b, "Vendor-Specific Protocol (VSP)" }, 81 { 0x405b, "Vendor-Specific Protocol (VSP)" },
82 { 0x8021, "Internet Protocol Control Protocol" }, 82 { 0x8021, "Internet Protocol Control Protocol" },
83 +#if 0 83 +#if 0
84 { 0x8023, "OSI Network Layer Control Protocol" }, 84 { 0x8023, "OSI Network Layer Control Protocol" },
85 { 0x8025, "Xerox NS IDP Control Protocol" }, 85 { 0x8025, "Xerox NS IDP Control Protocol" },
86 { 0x8027, "DECnet Phase IV Control Protocol" }, 86 { 0x8027, "DECnet Phase IV Control Protocol" },
87 @@ -953,7 +968,9 @@ struct protocol_list { 87 @@ -961,7 +976,9 @@ struct protocol_list {
88 { 0x8031, "Bridging NCP" }, 88 { 0x8031, "Bridging NCP" },
89 { 0x8033, "Stream Protocol Control Protocol" }, 89 { 0x8033, "Stream Protocol Control Protocol" },
90 { 0x8035, "Banyan Vines Control Protocol" }, 90 { 0x8035, "Banyan Vines Control Protocol" },
91 +#endif 91 +#endif
92 { 0x803d, "Multi-Link Control Protocol" }, 92 { 0x803d, "Multi-Link Control Protocol" },
93 +#if 0 93 +#if 0
94 { 0x803f, "NETBIOS Framing Control Protocol" }, 94 { 0x803f, "NETBIOS Framing Control Protocol" },
95 { 0x8041, "Cisco Systems Control Protocol" }, 95 { 0x8041, "Cisco Systems Control Protocol" },
96 { 0x8043, "Ascom Timeplex" }, 96 { 0x8043, "Ascom Timeplex" },
97 @@ -962,18 +979,24 @@ struct protocol_list { 97 @@ -970,18 +987,24 @@ struct protocol_list {
98 { 0x8049, "Serial Data Control Protocol (PPP-SDCP)" }, 98 { 0x8049, "Serial Data Control Protocol (PPP-SDCP)" },
99 { 0x804b, "SNA over 802.2 Control Protocol" }, 99 { 0x804b, "SNA over 802.2 Control Protocol" },
100 { 0x804d, "SNA Control Protocol" }, 100 { 0x804d, "SNA Control Protocol" },
101 +#endif 101 +#endif
102 { 0x804f, "IP6 Header Compression Control Protocol" }, 102 { 0x804f, "IP6 Header Compression Control Protocol" },
Line 117... Line 117...
117 { 0x80fd, "Compression Control Protocol" }, 117 { 0x80fd, "Compression Control Protocol" },
118 +#if 0 118 +#if 0
119 { 0x8207, "Cisco Discovery Protocol Control" }, 119 { 0x8207, "Cisco Discovery Protocol Control" },
120 { 0x8209, "Netcs Twin Routing" }, 120 { 0x8209, "Netcs Twin Routing" },
121 { 0x820b, "STP - Control Protocol" }, 121 { 0x820b, "STP - Control Protocol" },
122 @@ -982,24 +1005,29 @@ struct protocol_list { 122 @@ -990,24 +1013,29 @@ struct protocol_list {
123 { 0x8281, "MPLSCP" }, 123 { 0x8281, "MPLSCP" },
124 { 0x8285, "IEEE p1284.4 standard - Protocol Control" }, 124 { 0x8285, "IEEE p1284.4 standard - Protocol Control" },
125 { 0x8287, "ETSI TETRA TNP1 Control Protocol" }, 125 { 0x8287, "ETSI TETRA TNP1 Control Protocol" },
126 +#endif 126 +#endif
127 { 0x8289, "Multichannel Flow Treatment Protocol" }, 127 { 0x8289, "Multichannel Flow Treatment Protocol" },