diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2013-02-13 13:49:59 +0100 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-02-13 17:24:03 +0400 |
| commit | 9ab318da7dc76850f7618451056e332f2e7d0107 (patch) | |
| tree | fe777779d98beeb749d4617c99e5d3bd92a8134c | |
| parent | 124a74f8544c8d3d20b6b6e2cec13ddca883d904 (diff) | |
| download | accel-ppp-9ab318da7dc76850f7618451056e332f2e7d0107.tar.gz accel-ppp-9ab318da7dc76850f7618451056e332f2e7d0107.zip | |
l2tp: Fix RFC 2661 and RFC 3931 dictionaries
Fix a few errors in dictionary.rfc2661 and dictionary.rfc3931 (missing
entries, typos, wrong type/flags, etc.) and re-generate attr_defs.h.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
| -rw-r--r-- | accel-pppd/ctrl/l2tp/attr_defs.h | 6 | ||||
| -rw-r--r-- | accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661 | 15 | ||||
| -rw-r--r-- | accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931 | 9 |
3 files changed, 17 insertions, 13 deletions
diff --git a/accel-pppd/ctrl/l2tp/attr_defs.h b/accel-pppd/ctrl/l2tp/attr_defs.h index e799157..3f71376 100644 --- a/accel-pppd/ctrl/l2tp/attr_defs.h +++ b/accel-pppd/ctrl/l2tp/attr_defs.h @@ -55,6 +55,7 @@ #define Message_Type_WAN_Error_Notify 15 #define Message_Type_Set_Link_Info 16 #define Message_Digest 59 +#define Ctrl_Message_Auth_Nonce 73 #define Router_ID 60 #define Assigned_Connection_ID 61 #define Pseudowire_Capabilities 62 @@ -66,8 +67,9 @@ #define Pseudowire_Type 68 #define L2_Specific_Sublayer 69 #define Data_Sequencing 70 -#define TX_Connect_Speeed 74 -#define RX_Connect_Speeed 75 +#define TX_Connect_Speed 74 +#define RX_Connect_Speed 75 #define Circuit_Status 71 +#define Message_Type_Explicit_Ack 20 #endif diff --git a/accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661 b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661 index 3fd9614..8b27cf0 100644 --- a/accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661 +++ b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc2661 @@ -4,15 +4,15 @@ ATTRIBUTE Result-Code 1 octets M=1 H=0 ATTRIBUTE Protocol-Version 2 int16 M=1 H=0 ATTRIBUTE Framing-Capabilities 3 int32 M=1 ATTRIBUTE Bearer-Capabilities 4 int32 M=1 -ATTRIBUTE Tie-Breaker 5 int64 M=0 +ATTRIBUTE Tie-Breaker 5 int64 M=0 H=0 ATTRIBUTE Firmware-Revision 6 int16 M=0 -ATTRIBUTE Host-Name 7 string M=1 +ATTRIBUTE Host-Name 7 string M=1 H=0 ATTRIBUTE Vendor-Name 8 string M=0 ATTRIBUTE Assigned-Tunnel-ID 9 int16 M=1 -ATTRIBUTE Recv-Window-Size 10 int16 M=1 -ATTRIBUTE Challenge 11 octets M=1 +ATTRIBUTE Recv-Window-Size 10 int16 M=1 H=0 +ATTRIBUTE Challenge 11 octets M=1 ATTRIBUTE Challenge-Response 13 octets M=1 -ATTRIBUTE Cause-Code 12 int32 M=1 H=0 +ATTRIBUTE Cause-Code 12 octets M=1 H=0 ATTRIBUTE Assigned-Session-ID 14 int16 M=1 ATTRIBUTE Call-Serial-Number 15 int32 M=1 ATTRIBUTE Minimum-BPS 16 int32 M=1 @@ -23,9 +23,9 @@ ATTRIBUTE Called-Number 21 string M=1 ATTRIBUTE Calling-Number 22 string M=1 ATTRIBUTE Sub-Address 23 string M=1 ATTRIBUTE TX-Speed 24 int32 M=1 -ATTRIBUTE RX-Speed 38 int32 M=1 +ATTRIBUTE RX-Speed 38 int32 M=0 ATTRIBUTE Physical-Channel-ID 25 int32 M=0 -ATTRIBUTE Private-Group-ID 37 int32 M=0 +ATTRIBUTE Private-Group-ID 37 octets M=0 ATTRIBUTE Sequencing-Required 39 none M=1 H=0 ATTRIBUTE Init-Recv-LCP 26 octets M=0 ATTRIBUTE Last-Sent-LCP 27 octets M=0 @@ -52,4 +52,3 @@ VALUE Message-Type Incoming-Call-Connected 12 VALUE Message-Type Call-Disconnect-Notify 14 VALUE Message-Type WAN-Error-Notify 15 VALUE Message-Type Set-Link-Info 16 - diff --git a/accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931 b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931 index d6ad410..bfc8076 100644 --- a/accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931 +++ b/accel-pppd/ctrl/l2tp/dict/dictionary.rfc3931 @@ -1,4 +1,5 @@ -ATTRIBUTE Message-Digest 59 octets M=1 H=0 +ATTRIBUTE Message-Digest 59 octets H=0 +ATTRIBUTE Ctrl-Message-Auth-Nonce 73 octets H=0 ATTRIBUTE Router-ID 60 int32 H=0 ATTRIBUTE Assigned-Connection-ID 61 int32 ATTRIBUTE Pseudowire-Capabilities 62 octets @@ -10,6 +11,8 @@ ATTRIBUTE Remote-End-ID 66 octets ATTRIBUTE Pseudowire-Type 68 int16 ATTRIBUTE L2-Specific-Sublayer 69 int16 ATTRIBUTE Data-Sequencing 70 int16 -ATTRIBUTE TX-Connect-Speeed 74 int64 -ATTRIBUTE RX-Connect-Speeed 75 int64 +ATTRIBUTE TX-Connect-Speed 74 int64 +ATTRIBUTE RX-Connect-Speed 75 int64 ATTRIBUTE Circuit-Status 71 int16 + +VALUE Message-Type Explicit-Ack 20 |