osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Allow the character '.' in radius dictionary ATTRIBUTE names; 

Fixes issue caused by dictionary.foundry having ATTRIBUTE names containing
 a '.' (e.g., Foundry-MAC-Authent-needs-802.1x).

So: Revert SVN #37386 which temporarily changed the '.' to '-'.

svn path=/trunk/; revision=37405
This commit is contained in:
Bill Meier 2011-05-26 02:59:25 +00:00
parent b2120849b1
commit 224206b1a3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/radius_dict.l
View File

@ -103,6 +103,11 @@
%}
/* Note: FreeRadius allows VENDOR, ATTRIBUTE and VALUE names to contain any non-blank character.
* Using [^[:blank:]] below for those names fails for some reason so for now the patterns for each
* include those characters found in the the corresponding names in the FreeRadius dictionaries.
*/
%START WS_OUT VENDOR VENDOR_W_NAME ATTR ATTR_W_NAME ATTR_W_ID ATTR_W_TYPE ATTR_W_VENDOR VALUE VALUE_W_ATTR VALUE_W_NAME INCLUDE JUNK BEGIN_VENDOR END_VENDOR VENDOR_W_ID VENDOR_W_FORMAT VENDOR_W_TYPE_OCTETS VENDOR_W_LENGTH_OCTETS VENDOR_W_CONTINUATION BEGIN_TLV END_TLV
%%
[:blank:] ;
@ -189,7 +194,7 @@
BEGIN WS_OUT;
}
<ATTR>[0-9a-z_/-]+ { attr_name = g_strdup(yytext); encrypted = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
<ATTR>[0-9a-z_/.-]+ { attr_name = g_strdup(yytext); encrypted = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
<ATTR_W_NAME>[0-9]+ { attr_id = g_strdup(yytext); BEGIN ATTR_W_ID;}
<ATTR_W_NAME>0x[0-9a-f]+ { attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
<ATTR_W_ID>integer { attr_type = radius_integer; BEGIN ATTR_W_TYPE; }

6
radius/dictionary.foundry
View File

@ -16,10 +16,8 @@ ATTRIBUTE Foundry-Command-String 2 string
ATTRIBUTE Foundry-Command-Exception-Flag 3 integer
ATTRIBUTE Foundry-INM-Privilege 4 integer
ATTRIBUTE Foundry-Access-List 5 string
##ATTRIBUTE Foundry-MAC-Authent-needs-802.1x 6 integer ## 802.1x causes access violation ??
##ATTRIBUTE Foundry-802.1x-Valid-Lookup 7 integer ## 802.1x causes access violation ??
ATTRIBUTE Foundry-MAC-Authent-needs-802-1x 6 integer ## use 802-1x until issue resolved
ATTRIBUTE Foundry-802-1x-Valid-Lookup 7 integer ## use 802-1x until issue resolved
ATTRIBUTE Foundry-MAC-Authent-needs-802.1x 6 integer
ATTRIBUTE Foundry-802.1x-Valid-Lookup 7 integer
ATTRIBUTE Foundry-MAC-Based-Vlan-QoS 8 integer
ATTRIBUTE Foundry-INM-Role-Aor-List 9 string