Add the "concat" flag

For EAP-Message, and RFC 5904 attributes.  It means that the
encoder/decoder takes care of splitting / concatenating
the attributes

Author: alandekok

share/dictionary.rfc2869

@@ -20,7 +20,7 @@ ATTRIBUTE	Password-Retry				75	integer
 ATTRIBUTE	Prompt					76	integer
 ATTRIBUTE	Connect-Info				77	string
 ATTRIBUTE	Configuration-Token			78	string
-ATTRIBUTE	EAP-Message				79	octets
+ATTRIBUTE	EAP-Message				79	octets concat
 ATTRIBUTE	Message-Authenticator			80	octets
 
 ATTRIBUTE	ARAP-Challenge-Response			84	octets[8]

share/dictionary.rfc5904

@@ -7,9 +7,9 @@
 #	$Id$
 #
 
-# The next two attributes are continued, like EAP-Message/
-ATTRIBUTE	PKM-SS-Cert				137	octets
-ATTRIBUTE	PKM-CA-Cert				138	octets
+# The next two attributes are continued, like EAP-Message
+ATTRIBUTE	PKM-SS-Cert				137	octets concat
+ATTRIBUTE	PKM-CA-Cert				138	octets concat
 
 # 28 bytes of data, 7 integers
 ATTRIBUTE	PKM-Config-Settings			139	octets

src/include/libradius.h

@@ -112,6 +112,8 @@ typedef struct attr_flags {
 	unsigned int	evs : 1;		//!< Extended VSA.
 	unsigned int	wimax: 1;		//!< WiMAX format=1,1,c.
 
+	unsigned int	concat : 1;		//!< concatenate multiple instances
+
 	uint8_t		encrypt;      		//!< Ecryption method.
 	uint8_t		length;
 } ATTR_FLAGS;

src/lib/dict.c

@@ -684,6 +684,17 @@ int dict_addattr(char const *name, int attr, unsigned int vendor, int type,
 		return -1;
 	}
 
+	if (vendor && flags.concat) {
+		fr_strerror_printf("VSAs cannot have the \"concat\" flag set.");
+		return -1;
+	}
+
+	if (flags.concat && (flags.has_tag || flags.array || flags.is_tlv || flags.has_tlv ||
+			     flags.length || flags.evs || flags.extended || flags.long_extended)) {
+		fr_strerror_printf("Only the \"concat\" flag can be set.");
+		return -1;
+	}
+
 	if ((vendor & (FR_MAX_VENDOR -1)) != 0) {
 		DICT_VENDOR *dv;
 		static DICT_VENDOR *last_vendor = NULL;
@@ -1480,6 +1491,15 @@ static int process_attribute(char const* fn, int const line,
 						return -1;
 				}
 
+			} else if (strncmp(key, "concat", 6) == 0) {
+				flags.concat = 1;
+
+				if (type != PW_TYPE_OCTETS) {
+						fr_strerror_printf( "dict_init: %s[%d] Only \"octets\" type can have the \"concat\" flag set.",
+							    fn, line);
+						return -1;
+				}
+
 				/*
 				 *	The only thing is the vendor name,
 				 *	and it's a known name: allow it.