diff options
author | Bill Meier <wmeier@newsguy.com> | 2011-09-14 18:45:06 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2011-09-14 18:45:06 +0000 |
commit | dbae8e445c2c278fa419731cf3be19ec5ddc4850 (patch) | |
tree | 91c4e81ea5261f3d0b7f98619045c36ff5f857a7 /epan/dissectors/packet-radius.h | |
parent | fae571b3f8e2aa8c4bedf9b71cc321e2ca91ba58 (diff) |
Update based upon latest names "packet-type-codes" list from the IANA:
- Change some type-code names to match IANA list;
- Handle additional type-codes as given in the IANA list;
- Don't consider certain "attribute types" to be valid packet-type codes
See Bug 6335: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6335
- Minor code cleanup.
svn path=/trunk/; revision=38997
Diffstat (limited to 'epan/dissectors/packet-radius.h')
-rw-r--r-- | epan/dissectors/packet-radius.h | 82 |
1 files changed, 52 insertions, 30 deletions
diff --git a/epan/dissectors/packet-radius.h b/epan/dissectors/packet-radius.h index 02d0497024..5d1aa83722 100644 --- a/epan/dissectors/packet-radius.h +++ b/epan/dissectors/packet-radius.h @@ -23,35 +23,57 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define RADIUS_ACCESS_REQUEST 1 -#define RADIUS_ACCESS_ACCEPT 2 -#define RADIUS_ACCESS_REJECT 3 -#define RADIUS_ACCOUNTING_REQUEST 4 -#define RADIUS_ACCOUNTING_RESPONSE 5 -#define RADIUS_ACCOUNTING_STATUS 6 -#define RADIUS_ACCESS_PASSWORD_REQUEST 7 -#define RADIUS_ACCESS_PASSWORD_ACK 8 -#define RADIUS_ACCESS_PASSWORD_REJECT 9 -#define RADIUS_ACCOUNTING_MESSAGE 10 -#define RADIUS_ACCESS_CHALLENGE 11 -#define RADIUS_STATUS_SERVER 12 -#define RADIUS_STATUS_CLIENT 13 - -#define RADIUS_VENDOR_SPECIFIC_CODE 26 -#define RADIUS_ASCEND_ACCESS_NEXT_CODE 29 -#define RADIUS_ASCEND_ACCESS_NEW_PIN 30 -#define RADIUS_ASCEND_PASSWORD_EXPIRED 32 -#define RADIUS_ASCEND_ACCESS_EVENT_REQUEST 33 -#define RADIUS_ASCEND_ACCESS_EVENT_RESPONSE 34 -#define RADIUS_DISCONNECT_REQUEST 40 -#define RADIUS_DISCONNECT_REQUEST_ACK 41 -#define RADIUS_DISCONNECT_REQUEST_NAK 42 -#define RADIUS_CHANGE_FILTER_REQUEST 43 -#define RADIUS_CHANGE_FILTER_REQUEST_ACK 44 -#define RADIUS_CHANGE_FILTER_REQUEST_NAK 45 -#define RADIUS_EAP_MESSAGE_CODE 79 -#define RADIUS_MESSAGE_AUTHENTICATOR 80 -#define RADIUS_RESERVED 255 +/* radius packet-type codes */ +/* 09/12/2011: Updated from IANA: + * http://www.iana.org/assignments/radius-types/radius-types.xml#radius-types-27 + */ +#define RADIUS_PKT_TYPE_ACCESS_REQUEST 1 +#define RADIUS_PKT_TYPE_ACCESS_ACCEPT 2 +#define RADIUS_PKT_TYPE_ACCESS_REJECT 3 +#define RADIUS_PKT_TYPE_ACCOUNTING_REQUEST 4 +#define RADIUS_PKT_TYPE_ACCOUNTING_RESPONSE 5 +#define RADIUS_PKT_TYPE_ACCOUNTING_STATUS 6 +#define RADIUS_PKT_TYPE_PASSWORD_REQUEST 7 +#define RADIUS_PKT_TYPE_PASSWORD_ACK 8 +#define RADIUS_PKT_TYPE_PASSWORD_REJECT 9 +#define RADIUS_PKT_TYPE_ACCOUNTING_MESSAGE 10 +#define RADIUS_PKT_TYPE_ACCESS_CHALLENGE 11 +#define RADIUS_PKT_TYPE_STATUS_SERVER 12 +#define RADIUS_PKT_TYPE_STATUS_CLIENT 13 + +#define RADIUS_PKT_TYPE_RESOURCE_FREE_REQUEST 21 +#define RADIUS_PKT_TYPE_RESOURCE_FREE_RESPONSE 22 +#define RADIUS_PKT_TYPE_RESOURCE_QUERY_REQUEST 23 +#define RADIUS_PKT_TYPE_RESOURCE_QUERY_RESPONSE 24 +#define RADIUS_PKT_TYPE_ALTERNATE_RESOURCE_RECLAIM_REQUEST 25 +#define RADIUS_PKT_TYPE_NAS_REBOOT_REQUEST 26 +#define RADIUS_PKT_TYPE_NAS_REBOOT_RESPONSE 27 + +#define RADIUS_PKT_TYPE_NEXT_PASSCODE 29 +#define RADIUS_PKT_TYPE_NEW_PIN 30 +#define RADIUS_PKT_TYPE_TERMINATE_SESSION 31 +#define RADIUS_PKT_TYPE_PASSWORD_EXPIRED 32 +#define RADIUS_PKT_TYPE_EVENT_REQUEST 33 +#define RADIUS_PKT_TYPE_EVENT_RESPONSE 34 + +#define RADIUS_PKT_TYPE_DISCONNECT_REQUEST 40 +#define RADIUS_PKT_TYPE_DISCONNECT_ACK 41 +#define RADIUS_PKT_TYPE_DISCONNECT_NAK 42 +#define RADIUS_PKT_TYPE_COA_REQUEST 43 +#define RADIUS_PKT_TYPE_COA_ACK 44 +#define RADIUS_PKT_TYPE_COA_NAK 45 + +#define RADIUS_PKT_TYPE_IP_ADDRESS_ALLOCATE 50 +#define RADIUS_PKT_TYPE_IP_ADDRESS_RELEASE 51 + + +/* Radius Attribute Types*/ +/* 09/12/2011: Updated from IANA: + * http://www.iana.org/assignments/radius-types/radius-types.xml#radius-types-1 + */ +#define RADIUS_ATTR_TYPE_VENDOR_SPECIFIC 26 +#define RADIUS_ATTR_TYPE_EAP_MESSAGE 79 + typedef struct _radius_vendor_info_t { const gchar *name; @@ -60,7 +82,7 @@ typedef struct _radius_vendor_info_t { gint ett; guint type_octets; guint length_octets; - gboolean has_flags; + gboolean has_flags; } radius_vendor_info_t; typedef struct _radius_attr_info_t radius_attr_info_t; |