aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-radius.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-05-10 01:01:18 +0000
committerGuy Harris <guy@alum.mit.edu>2012-05-10 01:01:18 +0000
commit47cd41dbda948fd105468393a9ec8bc2c28e8b17 (patch)
treea7eec5f585ff8d736f2b7475f56a2e11109a4d71 /epan/dissectors/packet-radius.h
parentdedd0eadd0d56367946a3fe84585f1892fa91dc0 (diff)
Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls. For RADIUS, this means that, for string attributes that are encrypted, we need separate fields for the encrypted and decrypted versions, the former of which is an FT_BYTES (as its value is *NOT* a text string!) and the latter of which is FT_STRING. While we're at it: make some routines static that don't need to be exported; "encrypt=" takes a value between 1 and 3 - get the value from the dictionary and store it, and only do User-Password-style decryption for encrypt=1 attributes; rename "hf64" to "hf_alt", as it's a general "alternate field", used for 64-bit values for integral attributess, IPv6 addresses for "combo IP" attributes, and encrypted values for string fields; give the URL for the FreeRADIUS dictionary file format man page. svn path=/trunk/; revision=42530
Diffstat (limited to 'epan/dissectors/packet-radius.h')
-rw-r--r--epan/dissectors/packet-radius.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-radius.h b/epan/dissectors/packet-radius.h
index 4702913f95..9f14753953 100644
--- a/epan/dissectors/packet-radius.h
+++ b/epan/dissectors/packet-radius.h
@@ -93,14 +93,14 @@ typedef const gchar* (radius_avp_dissector_t)(proto_tree*,tvbuff_t*, packet_info
struct _radius_attr_info_t {
const gchar *name;
guint code;
- gboolean encrypt; /* True if attribute has "encrypt=1" option */
+ guint encrypt; /* 0 or value for "encrypt=" option */
gboolean tagged;
radius_attr_dissector_t* type;
radius_avp_dissector_t* dissector;
const value_string *vs;
gint ett;
int hf;
- int hf64;
+ int hf_alt; /* 64-bit version for integers, encrypted version for strings, IPv6 for radius_combo_ip */
int hf_tag;
int hf_len;
GHashTable* tlvs_by_id;