summaryrefslogtreecommitdiff
path: root/epan/radius_dict.l
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2011-05-26 14:15:51 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2011-05-26 14:15:51 +0000
commitd8bdc80709d8758a44041cb8d20d01901fbe0832 (patch)
treeee0bd8f37a779f86afdade9c0e315d19f4a2fa2e /epan/radius_dict.l
parent8ce306faa0cfac44b8e57689057c9003f1bff0bd (diff)
downloadwireshark-d8bdc80709d8758a44041cb8d20d01901fbe0832.tar.gz
Escape the '.' in radius dictionary ATTRIBUTE names. This may fix the OSX-10.5 builds too.
svn path=/trunk/; revision=37408
Diffstat (limited to 'epan/radius_dict.l')
-rw-r--r--epan/radius_dict.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 2818147420..e900b61d9b 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -194,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; }
@@ -313,13 +313,13 @@ void add_vendor(const gchar* name, guint32 vendor_id, guint vendor_type_octets,
v->ett = -1;
v->name = NULL;
}
- /* Assume that the dictionary knows the 'ground truth' about the
+ /* Assume that the dictionary knows the 'ground truth' about the
* type/length/has_flags information and thus allow the dictionary to
* overwrite these values even for vendors that have already been loaded.
*/
v->type_octets = vendor_type_octets;
v->length_octets = vendor_length_octets;
- v->has_flags = vendor_has_flags;
+ v->has_flags = vendor_has_flags;
if (v->name)
g_free((gpointer) v->name);
@@ -411,7 +411,7 @@ void add_tlv(const gchar* name, const gchar* codestr, radius_attr_dissector_t t
}
code=strtol(codestr, NULL, 10);
-
+
s = g_hash_table_lookup(a->tlvs_by_id, GUINT_TO_POINTER(code));
if (!s) {