diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-11-25 23:33:59 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-11-25 23:33:59 +0100 |
| commit | f92ffd893919d6b1e46cded7337bb39c5a3fd84e (patch) | |
| tree | 2f3a2465d9131adf13af4600cc131585f883d77c | |
| parent | d4df4e2ef9972cdab8257302a8e4d97ff3c2a2d4 (diff) | |
| parent | cc122bf0c295207a909061a365eccd49462b1b16 (diff) | |
Merge commit 'cc122bf0' into wireguard-next-tmp7-1
| -rw-r--r-- | filter/f-inst.c | 5 | ||||
| -rw-r--r-- | filter/f-util.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/f-inst.c b/filter/f-inst.c index 17e1e767..44558c43 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -877,10 +877,6 @@ l->attrs[0].u.data = v1.val.i; break; - case EAF_TYPE_OPAQUE: - runtime( "Setting opaque attribute is not allowed" ); - break; - case EAF_TYPE_IP_ADDRESS:; int len = sizeof(ip_addr); struct adata *ad = lp_alloc(fs->pool, sizeof(struct adata) + len); @@ -889,6 +885,7 @@ l->attrs[0].u.ptr = ad; break; + case EAF_TYPE_OPAQUE: case EAF_TYPE_AS_PATH: case EAF_TYPE_INT_SET: case EAF_TYPE_EC_SET: diff --git a/filter/f-util.c b/filter/f-util.c index d589927a..a47a8747 100644 --- a/filter/f-util.c +++ b/filter/f-util.c @@ -294,6 +294,9 @@ ca_lookup(pool *p, const char *name, int f_type) case T_LCLIST: ea_type = EAF_TYPE_LC_SET; break; + case T_BYTESTRING: + ea_type = EAF_TYPE_OPAQUE; + break; default: cf_error("Custom route attribute of unsupported type"); } |