({XIGIT}{2}){16,}|{XIGIT}{2}(:{XIGIT}{2}){15,}|hex:({XIGIT}{2}(:?{XIGIT}{2})*)? {
char *s = yytext;
- struct bytestring *bs;
+ struct adata *bs;
/* Skip 'hex:' prefix */
if (s[0] == 'h' && s[1] == 'e' && s[2] == 'x' && s[3] == ':')
if (len < 0)
cf_error("Invalid hex string");
- bs = cfg_allocz(sizeof(struct bytestring) + len);
+ bs = cfg_allocz(sizeof(struct adata) + len);
bs->length = bstrhextobin(s, bs->data);
ASSERT(bs->length == len);
extern pool *global_root_scope_pool;
extern linpool *global_root_scope_linpool;
-struct bytestring {
- size_t length;
- byte data[];
-};
#define SYM_MAX_LEN 64
struct channel_limit cl;
struct timeformat *tf;
mpls_label_stack *mls;
- const struct bytestring *bs;
+ const struct adata *bs;
}
%token END CLI_MARKER INVALID_TOKEN ELSECOL DDOT
}
static inline int
-bs_same(const struct bytestring *bs1, const struct bytestring *bs2)
+bs_same(const struct adata *bs1, const struct adata *bs2)
{
return (bs1->length == bs2->length) && !memcmp(bs1->data, bs2->data, bs1->length);
}
ip_addr ip;
const net_addr *net;
const char *s;
- const struct bytestring *bs;
+ const struct adata *bs;
const struct f_tree *t;
const struct f_trie *ti;
const struct adata *ad;
if (len < 0)
runtime("Invalid hex string");
- struct bytestring *bs;
- bs = falloc(sizeof(struct bytestring) + len);
+ struct adata *bs;
+ bs = falloc(sizeof(struct adata) + len);
bs->length = bstrhextobin(v1.val.s, bs->data);
ASSERT(bs->length == (size_t) len);
static u8 radv_mult_val; /* Used by radv_mult for second return value */
static inline void
-radv_add_to_custom_list(list *l, int type, const struct bytestring *payload)
+radv_add_to_custom_list(list *l, int type, const struct adata *payload)
{
if (type < 0 || type > 255) cf_error("RA cusom type must be in range 0-255");
struct radv_custom_config *cf = cfg_allocz(sizeof(struct radv_custom_config));
{
node n;
u8 type; /* Identifier of the type of option */
- const struct bytestring *payload; /* Payload of the option */
+ const struct adata *payload; /* Payload of the option */
};
/*