From: Alan T. DeKok Date: Sun, 29 Apr 2012 07:47:06 +0000 (+0200) Subject: Renamed "extended-flags" to "long-extended" X-Git-Tag: release_3_0_0_beta0~221 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d9782c778b80e2a72178e26939615a186c96dc0;p=thirdparty%2Ffreeradius-server.git Renamed "extended-flags" to "long-extended" To match the latest specifications. --- diff --git a/share/dictionary.extended b/share/dictionary.extended index be785757762..9e5aa9aa9c4 100644 --- a/share/dictionary.extended +++ b/share/dictionary.extended @@ -2,15 +2,15 @@ # Copyright (C) 2011 The FreeRADIUS Server project and contributors # # These attributes are "place-holder". They should NEVER be used -# by name. The "extended" and "extended-flags" and "evs" data types +# by name. The "extended" and "long-extended" and "evs" data types # should NEVER be used in any other dictionary. # -ATTRIBUTE Extended-Attribute-1 241 extended -ATTRIBUTE Extended-Attribute-2 242 extended -ATTRIBUTE Extended-Attribute-3 243 extended -ATTRIBUTE Extended-Attribute-4 244 extended -ATTRIBUTE Extended-Attribute-5 245 extended-flags -ATTRIBUTE Extended-Attribute-6 246 extended-flags +ATTRIBUTE Extended-Type-1 241 extended +ATTRIBUTE Extended-Type-2 242 extended +ATTRIBUTE Extended-Type-3 243 extended +ATTRIBUTE Extended-Type-4 244 extended +ATTRIBUTE Long-Extended-Type-1 245 long-extended +ATTRIBUTE Long-Extended-Type-2 246 long-extended ATTRIBUTE Extended-Vendor-Specific-1 241.26 evs ATTRIBUTE Extended-Vendor-Specific-2 242.26 evs diff --git a/src/include/libradius.h b/src/include/libradius.h index 001195d0a51..802a2ff16c5 100644 --- a/src/include/libradius.h +++ b/src/include/libradius.h @@ -106,7 +106,7 @@ typedef struct attr_flags { unsigned int has_tlv : 1; /* has sub attributes */ unsigned int is_tlv : 1; /* is a sub attribute */ unsigned int extended : 1; /* extended attribute */ - unsigned int extended_flags : 1; /* with flag */ + unsigned int long_extended : 1; /* long format */ unsigned int evs : 1; /* extended VSA */ unsigned int wimax: 1; /* WiMAX format=1,1,c */ diff --git a/src/include/radius.h b/src/include/radius.h index 9160ada1199..67cae4f2bbe 100644 --- a/src/include/radius.h +++ b/src/include/radius.h @@ -22,7 +22,7 @@ #define PW_TYPE_COMBO_IP 13 #define PW_TYPE_TLV 14 #define PW_TYPE_EXTENDED 15 -#define PW_TYPE_EXTENDED_FLAGS 16 +#define PW_TYPE_LONG_EXTENDED 16 #define PW_TYPE_EVS 17 #define PW_TYPE_INTEGER64 18 diff --git a/src/lib/dict.c b/src/lib/dict.c index 9bf637cabce..cb6baf665eb 100644 --- a/src/lib/dict.c +++ b/src/lib/dict.c @@ -100,7 +100,7 @@ const FR_NAME_NUMBER dict_attr_types[] = { { "tlv", PW_TYPE_TLV }, { "signed", PW_TYPE_SIGNED }, { "extended", PW_TYPE_EXTENDED }, - { "extended-flags", PW_TYPE_EXTENDED_FLAGS }, + { "long-extended", PW_TYPE_LONG_EXTENDED }, { "evs", PW_TYPE_EVS }, { "uint8", PW_TYPE_BYTE }, { "uint16", PW_TYPE_SHORT }, @@ -590,7 +590,7 @@ int dict_addattr(const char *name, int attr, unsigned int vendor, int type, /* * Additional checks for extended attributes. */ - if (flags.extended || flags.extended_flags || flags.evs) { + if (flags.extended || flags.long_extended || flags.evs) { if (vendor && (vendor < FR_MAX_VENDOR)) { fr_strerror_printf("dict_addattr: VSAs cannot use the \"extended\" or \"evs\" attribute formats."); return -1; @@ -608,7 +608,7 @@ int dict_addattr(const char *name, int attr, unsigned int vendor, int type, } if (flags.evs) { - if (!(flags.extended || flags.extended_flags)) { + if (!(flags.extended || flags.long_extended)) { fr_strerror_printf("dict_addattr: Attributes of type \"evs\" MUST have a parent of type \"extended\""); return -1; } @@ -698,7 +698,7 @@ int dict_addattr(const char *name, int attr, unsigned int vendor, int type, return -1; } flags.extended = da->flags.extended; - flags.extended_flags = da->flags.extended_flags; + flags.long_extended = da->flags.long_extended; flags.evs = da->flags.evs; } @@ -993,7 +993,7 @@ int dict_str2oid(const char *ptr, unsigned int *pvalue, int vendor, int tlv_dept return 0; } - if (!(da->flags.has_tlv || da->flags.extended || da->flags.extended_flags)) { + if (!(da->flags.has_tlv || da->flags.extended || da->flags.long_extended)) { fr_strerror_printf("Parent attribute %s cannot have sub-tlvs", da->name); return 0; @@ -1126,7 +1126,7 @@ static int process_attribute(const char* fn, const int line, * 241.1 means 241 is of type "extended". * Otherwise, die. */ - if (!(da->flags.has_tlv || da->flags.extended || da->flags.extended_flags)) { + if (!(da->flags.has_tlv || da->flags.extended || da->flags.long_extended)) { fr_strerror_printf("dict_init: %s[%d]: Parent attribute %s cannot contain sub-attributes", fn, line, da->name); return -1; } @@ -1160,7 +1160,7 @@ static int process_attribute(const char* fn, const int line, * Set which type of attribute this is. */ flags.extended = da->flags.extended; - flags.extended_flags = da->flags.extended_flags; + flags.long_extended = da->flags.long_extended; flags.evs = da->flags.evs; if (da->flags.has_tlv) flags.is_tlv = 1; } @@ -1247,13 +1247,13 @@ static int process_attribute(const char* fn, const int line, flags.extended = 1; break; - case PW_TYPE_EXTENDED_FLAGS: + case PW_TYPE_LONG_EXTENDED: if ((vendor != 0) || (value < 241)) { - fr_strerror_printf("dict_init: %s[%d]: Attributes of type \"extended-flags\" MUST be RFC attributes with value >= 241.", fn, line); + fr_strerror_printf("dict_init: %s[%d]: Attributes of type \"long-extended\" MUST be RFC attributes with value >= 241.", fn, line); return -1; } type = PW_TYPE_OCTETS; - flags.extended_flags = 1; + flags.long_extended = 1; break; case PW_TYPE_EVS: @@ -1277,7 +1277,7 @@ static int process_attribute(const char* fn, const int line, /* * Keep it real. */ - if (flags.extended || flags.extended_flags || flags.evs) { + if (flags.extended || flags.long_extended || flags.evs) { fr_strerror_printf("dict_init: %s[%d]: Extended attributes cannot use flags", fn, line); return -1; } diff --git a/src/lib/radius.c b/src/lib/radius.c index 3105f4d6d43..7025573b344 100644 --- a/src/lib/radius.c +++ b/src/lib/radius.c @@ -1095,7 +1095,7 @@ int rad_vp2extended(const RADIUS_PACKET *packet, if (vp->flags.extended) { ptr[2] = (vp->attribute & 0xff00) >> 8; - } else if (vp->flags.extended_flags) { + } else if (vp->flags.long_extended) { if (room < 4) return 0; ptr[1] = 4; @@ -1107,7 +1107,7 @@ int rad_vp2extended(const RADIUS_PACKET *packet, * Only "flagged" attributes can be longer than one * attribute. */ - if (!vp->flags.extended_flags && (room > 255)) { + if (!vp->flags.long_extended && (room > 255)) { room = 255; } @@ -1149,7 +1149,7 @@ int rad_vp2extended(const RADIUS_PACKET *packet, * and copy the existing header over. Set the "M" flag ONLY * after copying the rest of the data. */ - if (vp->flags.extended_flags && (len > (255 - ptr[1]))) { + if (vp->flags.long_extended && (len > (255 - ptr[1]))) { return attr_shift(start, start + room, ptr, 4, len, 3, 0); } @@ -1160,7 +1160,7 @@ int rad_vp2extended(const RADIUS_PACKET *packet, int jump = 3; fprintf(fr_log_fp, "\t\t%02x %02x ", ptr[0], ptr[1]); - if (!vp->flags.extended_flags) { + if (!vp->flags.long_extended) { fprintf(fr_log_fp, "%02x ", ptr[2]); } else { @@ -1687,7 +1687,7 @@ int rad_encode(RADIUS_PACKET *packet, const RADIUS_PACKET *original, */ if ((reply->vendor == 0) && ((reply->attribute & 0xFFFF) >= 256) && - !reply->flags.extended && !reply->flags.extended_flags) { + !reply->flags.extended && !reply->flags.long_extended) { #ifndef NDEBUG /* * Permit the admin to send BADLY formatted @@ -3681,7 +3681,7 @@ ssize_t rad_attr2vp_extended(const RADIUS_PACKET *packet, da = dict_attrbyvalue(data[0], vendor); if (!da || - (!da->flags.extended && !da->flags.extended_flags)) { + (!da->flags.extended && !da->flags.long_extended)) { fr_strerror_printf("rad_attr2vp_extended: Attribute is not extended format"); return -1; } @@ -3722,7 +3722,7 @@ ssize_t rad_attr2vp_extended(const RADIUS_PACKET *packet, * a raw attribute. If the flag is set, it's supposed to * be continued. */ - if (da->flags.extended_flags) { + if (da->flags.long_extended) { if (data_len == 0) goto raw; continued = ((data[0] & 0x80) != 0); diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c index 82c87e47b31..f67d5e8ff0a 100644 --- a/src/lib/valuepair.c +++ b/src/lib/valuepair.c @@ -1400,7 +1400,7 @@ static VALUE_PAIR *pairmake_any(const char *attribute, const char *value, } if ((attr != PW_VENDOR_SPECIFIC) && - !(da->flags.extended || da->flags.extended_flags)) { + !(da->flags.extended || da->flags.long_extended)) { fr_strerror_printf("Standard attributes cannot use OIDs"); return NULL; } diff --git a/src/main/radattr.c b/src/main/radattr.c index 0ef20487e0c..3ccecaf12a8 100644 --- a/src/main/radattr.c +++ b/src/main/radattr.c @@ -374,7 +374,7 @@ static int encode_extended(char *buffer, return length + 1; } -static int encode_extended_flags(char *buffer, +static int encode_long_extended(char *buffer, uint8_t *output, size_t outlen) { int attr; @@ -460,7 +460,7 @@ static int encode_rfc(char *buffer, uint8_t *output, size_t outlen) /* * Not like the others! */ - return encode_extended_flags(p + 1, output, outlen); + return encode_long_extended(p + 1, output, outlen); } } if (sublen == 0) return 0;