radius: keep vendor & attr numbers in order

2 files changed, 43 insertions, 34 deletions

diff --git a/accel-pppd/ctrl/ipoe/dhcp_attr_defs.h b/accel-pppd/ctrl/ipoe/dhcp_attr_defs.h
index c68111c1..8f2ae55c 100644
--- a/accel-pppd/ctrl/ipoe/dhcp_attr_defs.h
+++ b/accel-pppd/ctrl/ipoe/dhcp_attr_defs.h
@@ -1,4 +1,5 @@
 #define VENDOR_DHCP 54
+
 #define DHCP_Opcode 256
 #define DHCP_Hardware_Type 257
 #define DHCP_Hardware_Address_Length 258
@@ -16,7 +17,12 @@
 #define DHCP_Relay_To_IP_Address 270
 #define DHCP_Relay_Max_Hop_Count 271
 #define DHCP_Relay_IP_Address 272
+
 #define DHCP_Flags_Broadcast 0x8000
+
+#define DHCP_Opcode_Client_Message 1
+#define DHCP_Opcode_Server_Message 2
+
 #define DHCP_Hardware_Type_Ethernet 1
 #define DHCP_Hardware_Type_Experiemental_Ethernet 2
 #define DHCP_Hardware_Type_AX_25 3
@@ -50,6 +56,7 @@
 #define DHCP_Hardware_Type_IPSec_Tunnel 31
 #define DHCP_Hardware_Type_Infiniband 32
 #define DHCP_Hardware_Type_CAI_TIA_102 33
+
 #define DHCP_Subnet_Mask 1
 #define DHCP_Time_Offset 2
 #define DHCP_Router_Address 3
@@ -132,18 +139,6 @@
 #define DHCP_Rapid_Commit 80
 #define DHCP_Client_FQDN 81
 #define DHCP_Relay_Agent_Information 82
-#define DHCP_Agent_Circuit_Id 1
-#define DHCP_Agent_Remote_Id 2
-#define DHCP_Relay_Circuit_Id 1
-#define DHCP_Relay_Remote_Id 2
-#define DHCP_Docsis_Device_Class 4
-#define DHCP_Relay_Link_Selection 5
-#define DHCP_Subscriber_Id 6
-#define DHCP_RADIUS_Attributes 7
-#define DHCP_Authentication_Information 8
-#define DHCP_Vendor_Specific_Information 9
-#define DHCP_Relay_Agent_Flags 10
-#define DHCP_Server_Identifier_Override 11
 #define DHCP_iSNS 83
 #define DHCP_NDS_Servers 85
 #define DHCP_NDS_Tree_Name 86
@@ -181,8 +176,20 @@
 #define DHCP_HTTP_Proxy 135
 #define DHCP_Cisco_TFTP_Server_IP_Addresses 150
 #define DHCP_End_Of_Options 255
-#define DHCP_Opcode_Client_Message 1
-#define DHCP_Opcode_Server_Message 2
+
+#define DHCP_Agent_Circuit_Id 1
+#define DHCP_Agent_Remote_Id 2
+#define DHCP_Relay_Circuit_Id 1
+#define DHCP_Relay_Remote_Id 2
+#define DHCP_Docsis_Device_Class 4
+#define DHCP_Relay_Link_Selection 5
+#define DHCP_Subscriber_Id 6
+#define DHCP_RADIUS_Attributes 7
+#define DHCP_Authentication_Information 8
+#define DHCP_Vendor_Specific_Information 9
+#define DHCP_Relay_Agent_Flags 10
+#define DHCP_Server_Identifier_Override 11
+
 #define DHCP_Message_Type_DHCP_Discover 1
 #define DHCP_Message_Type_DHCP_Offer 2
 #define DHCP_Message_Type_DHCP_Request 3
@@ -192,6 +199,7 @@
 #define DHCP_Message_Type_DHCP_Release 7
 #define DHCP_Message_Type_DHCP_Inform 8
 #define DHCP_Message_Type_DHCP_Force_Renew 9
+
 #define DHCP_Parameter_Request_List_DHCP_Subnet_Mask 1
 #define DHCP_Parameter_Request_List_DHCP_Time_Offset 2
 #define DHCP_Parameter_Request_List_DHCP_Router_Address 3
diff --git a/accel-pppd/ctrl/l2tp/attr_defs.h b/accel-pppd/ctrl/l2tp/attr_defs.h
index 3f713761..d6b9d5de 100644
--- a/accel-pppd/ctrl/l2tp/attr_defs.h
+++ b/accel-pppd/ctrl/l2tp/attr_defs.h
@@ -2,7 +2,6 @@
 #define __ATTR_DEFS_H
 
 #define Message_Type 0
-#define Random_Vector 36
 #define Result_Code 1
 #define Protocol_Version 2
 #define Framing_Capabilities 3
@@ -26,10 +25,7 @@
 #define Calling_Number 22
 #define Sub_Address 23
 #define TX_Speed 24
-#define RX_Speed 38
 #define Physical_Channel_ID 25
-#define Private_Group_ID 37
-#define Sequencing_Required 39
 #define Init_Recv_LCP 26
 #define Last_Sent_LCP 27
 #define Last_Recv_LCP 28
@@ -40,6 +36,27 @@
 #define Proxy_Authen_Response 33
 #define Call_Errors 34
 #define ACCM 35
+#define Random_Vector 36
+#define Private_Group_ID 37
+#define RX_Speed 38
+#define Sequencing_Required 39
+#define Message_Digest 59
+#define Router_ID 60
+#define Assigned_Connection_ID 61
+#define Pseudowire_Capabilities 62
+#define Local_Session_ID 63
+#define Remote_Session_ID 64
+#define Assigned_Cookie 65
+#define Remote_End_ID 66
+#define Pseudowire_Type 68
+#define L2_Specific_Sublayer 69
+#define Data_Sequencing 70
+#define Circuit_Status 71
+#define Prefered_Language 72
+#define Ctrl_Message_Auth_Nonce 73
+#define TX_Connect_Speed 74
+#define RX_Connect_Speed 75
+
 #define Message_Type_Start_Ctrl_Conn_Request 1
 #define Message_Type_Start_Ctrl_Conn_Reply 2
 #define Message_Type_Start_Ctrl_Conn_Connected 3
@@ -54,22 +71,6 @@
 #define Message_Type_Call_Disconnect_Notify 14
 #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
-#define Prefered_Language 72
-#define Local_Session_ID 63
-#define Remote_Session_ID 64
-#define Assigned_Cookie 65
-#define Remote_End_ID 66
-#define Pseudowire_Type 68
-#define L2_Specific_Sublayer 69
-#define Data_Sequencing 70
-#define TX_Connect_Speed 74
-#define RX_Connect_Speed 75
-#define Circuit_Status 71
 #define Message_Type_Explicit_Ack 20
 
 #endif