diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 16:48:17 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 16:48:17 +0200 |
| commit | b7e2edd4419fecb09b8690f8731e172f0c24789c (patch) | |
| tree | 41c80ab4b0d524ff34e207bf15e8d79191276a2c /proto/rip/rip.c | |
| parent | d7bec897ab772cdccce10b296d4efd48d9181297 (diff) | |
| parent | 1d309c4ce6e95b68c64a8f007f6dd2f1830a5707 (diff) | |
Merge commit '1d309c4ce6e95b68c64a8f007f6dd2f1830a5707' into haugesund
Diffstat (limited to 'proto/rip/rip.c')
| -rw-r--r-- | proto/rip/rip.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/proto/rip/rip.c b/proto/rip/rip.c index e263172c..b21a416b 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -195,26 +195,14 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en) struct { ea_list l; - eattr e[3]; + eattr a[3]; struct rip_iface_adata riad; } ea_block = { - .l = { .count = 3, }, - .e = { - { - .id = EA_RIP_METRIC, - .type = T_INT, - .u.data = rt_metric, - }, - { - .id = EA_RIP_TAG, - .type = T_INT, - .u.data = rt_tag, - }, - { - .id = EA_RIP_FROM, - .type = T_IFACE, - .u.ptr = &ea_block.riad.ad, - } + .l.count = 3, + .a = { + EA_LITERAL_EMBEDDED(EA_RIP_METRIC, T_INT, 0, rt_metric), + EA_LITERAL_EMBEDDED(EA_RIP_TAG, T_INT, 0, rt_tag), + EA_LITERAL_DIRECT_ADATA(EA_RIP_FROM, T_IFACE, 0, &ea_block.riad.ad), }, .riad = { .ad = { .length = sizeof(struct rip_iface_adata) - sizeof(struct adata) }, |