forked from osmocom/wireshark
Escape the '.' in radius dictionary ATTRIBUTE names. This may fix the OSX-10.5 builds too.
svn path=/trunk/; revision=37408
This commit is contained in:
parent
8ce306faa0
commit
d8bdc80709
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue