diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-radius.c | 29 | ||||
| -rw-r--r-- | epan/sminmpec.c | 2 | ||||
| -rw-r--r-- | epan/sminmpec.h | 2 |
4 files changed, 34 insertions, 0 deletions
@@ -2287,6 +2287,7 @@ Mårten Svantesson <f95-msv [AT] f.kth.se> Thomas Boehne <TBoehne [AT] ADwin.de> packet steve <packetsteve [AT] hotmail.com> Olivier Jacques <olivier.jacques [AT] hp.com> +Kestutis Kupciunas <kesha [AT] soften.ktu.lt> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 85d7b454e9..848e484db6 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -2694,6 +2694,33 @@ static const radius_attr_info radius_vendor_3gpp_attrib[] = {0, 0, NULL, NULL, NULL}, }; +static const radius_attr_info radius_vendor_gemtek_systems_attrib[] = +{ + {21, RADIUS_INTEGER4, "Acct-Session-Input-Octets", NULL, NULL}, + {22, RADIUS_INTEGER4, "Acct-Session-Input-Gigawords", NULL, NULL}, + {23, RADIUS_INTEGER4, "Acct-Session-Output-Octets", NULL, NULL}, + {24, RADIUS_INTEGER4, "Acct-Session-Output-Gigawords", NULL, NULL}, + {25, RADIUS_INTEGER4, "Acct-Session-Octets", NULL, NULL}, + {26, RADIUS_INTEGER4, "Acct-Session-Gigawords", NULL, NULL}, + {0, 0, NULL, NULL, NULL}, +}; + +static const radius_attr_info radius_vendor_wifi_alliance_attrib[] = +{ + {1, RADIUS_STRING, "Location-ID", NULL, NULL}, + {2, RADIUS_STRING, "Location-Name", NULL, NULL}, + {3, RADIUS_STRING, "Logoff-URL", NULL, NULL}, + {4, RADIUS_STRING, "Redirection-URL", NULL, NULL}, + {5, RADIUS_INTEGER4, "Bandwidth-Min-Up", NULL, NULL}, + {6, RADIUS_INTEGER4, "Bandwidth-Min-Down", NULL, NULL}, + {7, RADIUS_INTEGER4, "Bandwidth-Max-Up", NULL, NULL}, + {8, RADIUS_INTEGER4, "Bandwidth-Max-Down", NULL, NULL}, + {9, RADIUS_STRING, "Session-Terminate-Time", NULL, NULL}, + {10, RADIUS_INTEGER4, "Session-Terminate-End-Of-Day", NULL, NULL}, + {11, RADIUS_STRING, "Billing-Class-Of-Service", NULL, NULL}, + {0, 0, NULL, NULL, NULL}, +}; + static rd_vsa_table radius_vsa_table[] = { {VENDOR_ACC, radius_vendor_acc_attrib}, @@ -2720,6 +2747,8 @@ static rd_vsa_table radius_vsa_table[] = {VENDOR_COLUBRIS, radius_vendor_colubris_attrib}, {VENDOR_COLUMBIA_UNIVERSITY, radius_vendor_columbia_university_attrib}, {VENDOR_THE3GPP, radius_vendor_3gpp_attrib}, + {VENDOR_GEMTEK_SYSTEMS, radius_vendor_gemtek_systems_attrib}, + {VENDOR_WIFI_ALLIANCE, radius_vendor_wifi_alliance_attrib}, {0, NULL}, }; diff --git a/epan/sminmpec.c b/epan/sminmpec.c index 136be2d3c1..7d153e3cd0 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -74,5 +74,7 @@ const value_string sminmpec_values[] = { {VENDOR_COLUBRIS, "Colubris"}, {VENDOR_COLUMBIA_UNIVERSITY, "Columbia University"}, {VENDOR_THE3GPP, "3GPP"}, + {VENDOR_GEMTEK_SYSTEMS, "Gemtek-Systems"}, + {VENDOR_WIFI_ALLIANCE, "Wi-Fi Alliance"}, {0, NULL} }; diff --git a/epan/sminmpec.h b/epan/sminmpec.h index a7510aa9c0..a0695a0a9e 100644 --- a/epan/sminmpec.h +++ b/epan/sminmpec.h @@ -66,6 +66,8 @@ #define VENDOR_COLUBRIS 8744 #define VENDOR_COLUMBIA_UNIVERSITY 11862 #define VENDOR_THE3GPP 10415 +#define VENDOR_GEMTEK_SYSTEMS 10529 +#define VENDOR_WIFI_ALLIANCE 14122 extern const value_string sminmpec_values[]; |