[PATCH 1/2] style: require comma after __ADD() macro
Thomas Haller
thaller at redhat.com
Sat Jul 26 06:06:59 PDT 2014
$ sed -i 's/^\([\t ]\+\<__ADD\> \?([^)]\+)\) *$/\1,/' `git grep -w -l __ADD`
Signed-off-by: Thomas Haller <thaller at redhat.com>
---
include/netlink-private/netlink.h | 2 +-
lib/addr.c | 76 +++++-----
lib/genl/family.c | 8 +-
lib/idiag/idiag.c | 84 +++++------
lib/msg.c | 8 +-
lib/netfilter/ct_obj.c | 94 ++++++------
lib/netfilter/exp_obj.c | 64 ++++----
lib/netfilter/log_obj.c | 22 +--
lib/netfilter/netfilter.c | 22 +--
lib/netfilter/queue_msg_obj.c | 28 ++--
lib/netfilter/queue_obj.c | 14 +-
lib/route/addr.c | 40 ++---
lib/route/cls/ematch/meta.c | 94 ++++++------
lib/route/cls/police.c | 10 +-
lib/route/link.c | 238 +++++++++++++++---------------
lib/route/link/bridge.c | 8 +-
lib/route/link/can.c | 10 +-
lib/route/link/inet.c | 56 +++----
lib/route/link/inet6.c | 68 ++++-----
lib/route/link/macvlan.c | 10 +-
lib/route/link/vlan.c | 2 +-
lib/route/neigh.c | 40 ++---
lib/route/nexthop.c | 6 +-
lib/route/qdisc/cbq.c | 10 +-
lib/route/qdisc/prio.c | 12 +-
lib/route/route_obj.c | 36 ++---
lib/route/route_utils.c | 26 ++--
lib/route/rtnl.c | 34 ++---
lib/route/rule.c | 26 ++--
lib/utils.c | 302 +++++++++++++++++++-------------------
lib/xfrm/ae.c | 38 ++---
lib/xfrm/sa.c | 80 +++++-----
lib/xfrm/sp.c | 58 ++++----
lib/xfrm/template.c | 10 +-
34 files changed, 818 insertions(+), 818 deletions(-)
diff --git a/include/netlink-private/netlink.h b/include/netlink-private/netlink.h
index 990b99d..39f4dff 100644
--- a/include/netlink-private/netlink.h
+++ b/include/netlink-private/netlink.h
@@ -75,7 +75,7 @@ struct trans_tbl {
const char *a;
};
-#define __ADD(id, name) { .i = id, .a = #name },
+#define __ADD(id, name) { .i = id, .a = #name }
struct trans_list {
int i;
diff --git a/lib/addr.c b/lib/addr.c
index 54d2b1d..d275948 100644
--- a/lib/addr.c
+++ b/lib/addr.c
@@ -1003,65 +1003,65 @@ prefix:
*/
static const struct trans_tbl afs[] = {
- __ADD(AF_UNSPEC,unspec)
- __ADD(AF_UNIX,unix)
- __ADD(AF_INET,inet)
- __ADD(AF_AX25,ax25)
- __ADD(AF_IPX,ipx)
- __ADD(AF_APPLETALK,appletalk)
- __ADD(AF_NETROM,netrom)
- __ADD(AF_BRIDGE,bridge)
- __ADD(AF_ATMPVC,atmpvc)
- __ADD(AF_X25,x25)
- __ADD(AF_INET6,inet6)
- __ADD(AF_ROSE,rose)
- __ADD(AF_DECnet,decnet)
- __ADD(AF_NETBEUI,netbeui)
- __ADD(AF_SECURITY,security)
- __ADD(AF_KEY,key)
- __ADD(AF_NETLINK,netlink)
- __ADD(AF_PACKET,packet)
- __ADD(AF_ASH,ash)
- __ADD(AF_ECONET,econet)
- __ADD(AF_ATMSVC,atmsvc)
+ __ADD(AF_UNSPEC,unspec),
+ __ADD(AF_UNIX,unix),
+ __ADD(AF_INET,inet),
+ __ADD(AF_AX25,ax25),
+ __ADD(AF_IPX,ipx),
+ __ADD(AF_APPLETALK,appletalk),
+ __ADD(AF_NETROM,netrom),
+ __ADD(AF_BRIDGE,bridge),
+ __ADD(AF_ATMPVC,atmpvc),
+ __ADD(AF_X25,x25),
+ __ADD(AF_INET6,inet6),
+ __ADD(AF_ROSE,rose),
+ __ADD(AF_DECnet,decnet),
+ __ADD(AF_NETBEUI,netbeui),
+ __ADD(AF_SECURITY,security),
+ __ADD(AF_KEY,key),
+ __ADD(AF_NETLINK,netlink),
+ __ADD(AF_PACKET,packet),
+ __ADD(AF_ASH,ash),
+ __ADD(AF_ECONET,econet),
+ __ADD(AF_ATMSVC,atmsvc),
#ifdef AF_RDS
- __ADD(AF_RDS,rds)
+ __ADD(AF_RDS,rds),
#endif
- __ADD(AF_SNA,sna)
- __ADD(AF_IRDA,irda)
- __ADD(AF_PPPOX,pppox)
- __ADD(AF_WANPIPE,wanpipe)
- __ADD(AF_LLC,llc)
+ __ADD(AF_SNA,sna),
+ __ADD(AF_IRDA,irda),
+ __ADD(AF_PPPOX,pppox),
+ __ADD(AF_WANPIPE,wanpipe),
+ __ADD(AF_LLC,llc),
#ifdef AF_CAN
- __ADD(AF_CAN,can)
+ __ADD(AF_CAN,can),
#endif
#ifdef AF_TIPC
- __ADD(AF_TIPC,tipc)
+ __ADD(AF_TIPC,tipc),
#endif
- __ADD(AF_BLUETOOTH,bluetooth)
+ __ADD(AF_BLUETOOTH,bluetooth),
#ifdef AF_IUCV
- __ADD(AF_IUCV,iucv)
+ __ADD(AF_IUCV,iucv),
#endif
#ifdef AF_RXRPC
- __ADD(AF_RXRPC,rxrpc)
+ __ADD(AF_RXRPC,rxrpc),
#endif
#ifdef AF_ISDN
- __ADD(AF_ISDN,isdn)
+ __ADD(AF_ISDN,isdn),
#endif
#ifdef AF_PHONET
- __ADD(AF_PHONET,phonet)
+ __ADD(AF_PHONET,phonet),
#endif
#ifdef AF_IEEE802154
- __ADD(AF_IEEE802154,ieee802154)
+ __ADD(AF_IEEE802154,ieee802154),
#endif
#ifdef AF_CAIF
- __ADD(AF_CAIF,caif)
+ __ADD(AF_CAIF,caif),
#endif
#ifdef AF_ALG
- __ADD(AF_ALG,alg)
+ __ADD(AF_ALG,alg),
#endif
#ifdef AF_NFC
- __ADD(AF_NFC,nfc)
+ __ADD(AF_NFC,nfc),
#endif
};
diff --git a/lib/genl/family.c b/lib/genl/family.c
index 897c809..9155c8f 100644
--- a/lib/genl/family.c
+++ b/lib/genl/family.c
@@ -96,10 +96,10 @@ static void family_dump_line(struct nl_object *obj, struct nl_dump_params *p)
}
static const struct trans_tbl ops_flags[] = {
- __ADD(GENL_ADMIN_PERM, admin_perm)
- __ADD(GENL_CMD_CAP_DO, has_doit)
- __ADD(GENL_CMD_CAP_DUMP, has_dump)
- __ADD(GENL_CMD_CAP_HASPOL, has_policy)
+ __ADD(GENL_ADMIN_PERM, admin_perm),
+ __ADD(GENL_CMD_CAP_DO, has_doit),
+ __ADD(GENL_CMD_CAP_DUMP, has_dump),
+ __ADD(GENL_CMD_CAP_HASPOL, has_policy),
};
static char *ops_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/idiag/idiag.c b/lib/idiag/idiag.c
index 81d73db..15d6239 100644
--- a/lib/idiag/idiag.c
+++ b/lib/idiag/idiag.c
@@ -82,19 +82,19 @@ int idiagnl_send_simple(struct nl_sock *sk, int flags, uint8_t family,
*/
static const struct trans_tbl idiag_states[] = {
- __ADD(IDIAG_SS_UNKNOWN, unknown)
- __ADD(IDIAG_SS_ESTABLISHED, established)
- __ADD(IDIAG_SS_SYN_SENT, syn_sent)
- __ADD(IDIAG_SS_SYN_RECV, syn_recv)
- __ADD(IDIAG_SS_FIN_WAIT1, fin_wait)
- __ADD(IDIAG_SS_FIN_WAIT2, fin_wait2)
- __ADD(IDIAG_SS_TIME_WAIT, time_wait)
- __ADD(IDIAG_SS_CLOSE, close)
- __ADD(IDIAG_SS_CLOSE_WAIT, close_wait)
- __ADD(IDIAG_SS_LAST_ACK, last_ack)
- __ADD(IDIAG_SS_LISTEN, listen)
- __ADD(IDIAG_SS_CLOSING, closing)
- __ADD(IDIAG_SS_MAX, max)
+ __ADD(IDIAG_SS_UNKNOWN, unknown),
+ __ADD(IDIAG_SS_ESTABLISHED, established),
+ __ADD(IDIAG_SS_SYN_SENT, syn_sent),
+ __ADD(IDIAG_SS_SYN_RECV, syn_recv),
+ __ADD(IDIAG_SS_FIN_WAIT1, fin_wait),
+ __ADD(IDIAG_SS_FIN_WAIT2, fin_wait2),
+ __ADD(IDIAG_SS_TIME_WAIT, time_wait),
+ __ADD(IDIAG_SS_CLOSE, close),
+ __ADD(IDIAG_SS_CLOSE_WAIT, close_wait),
+ __ADD(IDIAG_SS_LAST_ACK, last_ack),
+ __ADD(IDIAG_SS_LISTEN, listen),
+ __ADD(IDIAG_SS_CLOSING, closing),
+ __ADD(IDIAG_SS_MAX, max),
{ ((1<<IDIAG_SS_MAX)-1), "all" }
};
@@ -126,12 +126,12 @@ int idiagnl_str2state(const char *name)
}
static const struct trans_tbl idiag_timers[] = {
- __ADD(IDIAG_TIMER_OFF, off)
- __ADD(IDIAG_TIMER_ON, on)
- __ADD(IDIAG_TIMER_KEEPALIVE, keepalive)
- __ADD(IDIAG_TIMER_TIMEWAIT, timewait)
- __ADD(IDIAG_TIMER_PERSIST, persist)
- __ADD(IDIAG_TIMER_UNKNOWN, unknown)
+ __ADD(IDIAG_TIMER_OFF, off),
+ __ADD(IDIAG_TIMER_ON, on),
+ __ADD(IDIAG_TIMER_KEEPALIVE, keepalive),
+ __ADD(IDIAG_TIMER_TIMEWAIT, timewait),
+ __ADD(IDIAG_TIMER_PERSIST, persist),
+ __ADD(IDIAG_TIMER_UNKNOWN, unknown),
};
/**
@@ -160,13 +160,13 @@ int idiagnl_str2timer(const char *name)
}
static const struct trans_tbl idiag_attrs[] = {
- __ADD(IDIAG_ATTR_NONE, none)
- __ADD(IDIAG_ATTR_MEMINFO, meminfo)
- __ADD(IDIAG_ATTR_INFO, info)
- __ADD(IDIAG_ATTR_VEGASINFO, vegasinfo)
- __ADD(IDIAG_ATTR_CONG, congestion)
- __ADD(IDIAG_ATTR_TOS, tos)
- __ADD(IDIAG_ATTR_TCLASS, tclass)
+ __ADD(IDIAG_ATTR_NONE, none),
+ __ADD(IDIAG_ATTR_MEMINFO, meminfo),
+ __ADD(IDIAG_ATTR_INFO, info),
+ __ADD(IDIAG_ATTR_VEGASINFO, vegasinfo),
+ __ADD(IDIAG_ATTR_CONG, congestion),
+ __ADD(IDIAG_ATTR_TOS, tos),
+ __ADD(IDIAG_ATTR_TCLASS, tclass),
};
/**
@@ -183,11 +183,11 @@ char *idiagnl_attrs2str(int attrs, char *buf, size_t len)
}
static const struct trans_tbl idiagnl_tcpstates[] = {
- __ADD(TCP_CA_Open, open)
- __ADD(TCP_CA_Disorder, disorder)
- __ADD(TCP_CA_CWR, cwr)
- __ADD(TCP_CA_Recovery, recovery)
- __ADD(TCP_CA_Loss, loss)
+ __ADD(TCP_CA_Open, open),
+ __ADD(TCP_CA_Disorder, disorder),
+ __ADD(TCP_CA_CWR, cwr),
+ __ADD(TCP_CA_Recovery, recovery),
+ __ADD(TCP_CA_Loss, loss),
};
/**
@@ -203,10 +203,10 @@ char *idiagnl_tcpstate2str(uint8_t state, char *buf, size_t len)
}
static const struct trans_tbl idiagnl_tcpopt_attrs[] = {
- __ADD(TCPI_OPT_TIMESTAMPS, timestamps)
- __ADD(TCPI_OPT_SACK, sACK)
- __ADD(TCPI_OPT_WSCALE, wscale)
- __ADD(TCPI_OPT_ECN, ecn)
+ __ADD(TCPI_OPT_TIMESTAMPS, timestamps),
+ __ADD(TCPI_OPT_SACK, sACK),
+ __ADD(TCPI_OPT_WSCALE, wscale),
+ __ADD(TCPI_OPT_ECN, ecn),
};
/**
@@ -249,13 +249,13 @@ char * idiagnl_shutdown2str(uint8_t shutdown, char *buf, size_t len)
}
static const struct trans_tbl idiag_exts[] = {
- __ADD(IDIAG_ATTR_NONE, none)
- __ADD(IDIAG_ATTR_MEMINFO, meminfo)
- __ADD(IDIAG_ATTR_INFO, info)
- __ADD(IDIAG_ATTR_VEGASINFO, vegasinfo)
- __ADD(IDIAG_ATTR_CONG, congestion)
- __ADD(IDIAG_ATTR_TOS, tos)
- __ADD(IDIAG_ATTR_TCLASS, tclass)
+ __ADD(IDIAG_ATTR_NONE, none),
+ __ADD(IDIAG_ATTR_MEMINFO, meminfo),
+ __ADD(IDIAG_ATTR_INFO, info),
+ __ADD(IDIAG_ATTR_VEGASINFO, vegasinfo),
+ __ADD(IDIAG_ATTR_CONG, congestion),
+ __ADD(IDIAG_ATTR_TOS, tos),
+ __ADD(IDIAG_ATTR_TCLASS, tclass),
};
/**
diff --git a/lib/msg.c b/lib/msg.c
index bcf1aa8..e8a7e99 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -637,10 +637,10 @@ struct ucred *nlmsg_get_creds(struct nl_msg *msg)
*/
static const struct trans_tbl nl_msgtypes[] = {
- __ADD(NLMSG_NOOP,NOOP)
- __ADD(NLMSG_ERROR,ERROR)
- __ADD(NLMSG_DONE,DONE)
- __ADD(NLMSG_OVERRUN,OVERRUN)
+ __ADD(NLMSG_NOOP,NOOP),
+ __ADD(NLMSG_ERROR,ERROR),
+ __ADD(NLMSG_DONE,DONE),
+ __ADD(NLMSG_OVERRUN,OVERRUN),
};
char *nl_nlmsgtype2str(int type, char *buf, size_t size)
diff --git a/lib/netfilter/ct_obj.c b/lib/netfilter/ct_obj.c
index 61b6a31..c8af870 100644
--- a/lib/netfilter/ct_obj.c
+++ b/lib/netfilter/ct_obj.c
@@ -351,32 +351,32 @@ static int ct_compare(struct nl_object *_a, struct nl_object *_b,
}
static const struct trans_tbl ct_attrs[] = {
- __ADD(CT_ATTR_FAMILY, family)
- __ADD(CT_ATTR_PROTO, proto)
- __ADD(CT_ATTR_TCP_STATE, tcpstate)
- __ADD(CT_ATTR_STATUS, status)
- __ADD(CT_ATTR_TIMEOUT, timeout)
- __ADD(CT_ATTR_MARK, mark)
- __ADD(CT_ATTR_USE, use)
- __ADD(CT_ATTR_ID, id)
- __ADD(CT_ATTR_ORIG_SRC, origsrc)
- __ADD(CT_ATTR_ORIG_DST, origdst)
- __ADD(CT_ATTR_ORIG_SRC_PORT, origsrcport)
- __ADD(CT_ATTR_ORIG_DST_PORT, origdstport)
- __ADD(CT_ATTR_ORIG_ICMP_ID, origicmpid)
- __ADD(CT_ATTR_ORIG_ICMP_TYPE, origicmptype)
- __ADD(CT_ATTR_ORIG_ICMP_CODE, origicmpcode)
- __ADD(CT_ATTR_ORIG_PACKETS, origpackets)
- __ADD(CT_ATTR_ORIG_BYTES, origbytes)
- __ADD(CT_ATTR_REPL_SRC, replysrc)
- __ADD(CT_ATTR_REPL_DST, replydst)
- __ADD(CT_ATTR_REPL_SRC_PORT, replysrcport)
- __ADD(CT_ATTR_REPL_DST_PORT, replydstport)
- __ADD(CT_ATTR_REPL_ICMP_ID, replyicmpid)
- __ADD(CT_ATTR_REPL_ICMP_TYPE, replyicmptype)
- __ADD(CT_ATTR_REPL_ICMP_CODE, replyicmpcode)
- __ADD(CT_ATTR_REPL_PACKETS, replypackets)
- __ADD(CT_ATTR_REPL_BYTES, replybytes)
+ __ADD(CT_ATTR_FAMILY, family),
+ __ADD(CT_ATTR_PROTO, proto),
+ __ADD(CT_ATTR_TCP_STATE, tcpstate),
+ __ADD(CT_ATTR_STATUS, status),
+ __ADD(CT_ATTR_TIMEOUT, timeout),
+ __ADD(CT_ATTR_MARK, mark),
+ __ADD(CT_ATTR_USE, use),
+ __ADD(CT_ATTR_ID, id),
+ __ADD(CT_ATTR_ORIG_SRC, origsrc),
+ __ADD(CT_ATTR_ORIG_DST, origdst),
+ __ADD(CT_ATTR_ORIG_SRC_PORT, origsrcport),
+ __ADD(CT_ATTR_ORIG_DST_PORT, origdstport),
+ __ADD(CT_ATTR_ORIG_ICMP_ID, origicmpid),
+ __ADD(CT_ATTR_ORIG_ICMP_TYPE, origicmptype),
+ __ADD(CT_ATTR_ORIG_ICMP_CODE, origicmpcode),
+ __ADD(CT_ATTR_ORIG_PACKETS, origpackets),
+ __ADD(CT_ATTR_ORIG_BYTES, origbytes),
+ __ADD(CT_ATTR_REPL_SRC, replysrc),
+ __ADD(CT_ATTR_REPL_DST, replydst),
+ __ADD(CT_ATTR_REPL_SRC_PORT, replysrcport),
+ __ADD(CT_ATTR_REPL_DST_PORT, replydstport),
+ __ADD(CT_ATTR_REPL_ICMP_ID, replyicmpid),
+ __ADD(CT_ATTR_REPL_ICMP_TYPE, replyicmptype),
+ __ADD(CT_ATTR_REPL_ICMP_CODE, replyicmpcode),
+ __ADD(CT_ATTR_REPL_PACKETS, replypackets),
+ __ADD(CT_ATTR_REPL_BYTES, replybytes),
};
static char *ct_attrs2str(int attrs, char *buf, size_t len)
@@ -458,16 +458,16 @@ uint8_t nfnl_ct_get_tcp_state(const struct nfnl_ct *ct)
}
static const struct trans_tbl tcp_states[] = {
- __ADD(TCP_CONNTRACK_NONE,NONE)
- __ADD(TCP_CONNTRACK_SYN_SENT,SYN_SENT)
- __ADD(TCP_CONNTRACK_SYN_RECV,SYN_RECV)
- __ADD(TCP_CONNTRACK_ESTABLISHED,ESTABLISHED)
- __ADD(TCP_CONNTRACK_FIN_WAIT,FIN_WAIT)
- __ADD(TCP_CONNTRACK_CLOSE_WAIT,CLOSE_WAIT)
- __ADD(TCP_CONNTRACK_LAST_ACK,LAST_ACK)
- __ADD(TCP_CONNTRACK_TIME_WAIT,TIME_WAIT)
- __ADD(TCP_CONNTRACK_CLOSE,CLOSE)
- __ADD(TCP_CONNTRACK_LISTEN,LISTEN)
+ __ADD(TCP_CONNTRACK_NONE,NONE),
+ __ADD(TCP_CONNTRACK_SYN_SENT,SYN_SENT),
+ __ADD(TCP_CONNTRACK_SYN_RECV,SYN_RECV),
+ __ADD(TCP_CONNTRACK_ESTABLISHED,ESTABLISHED),
+ __ADD(TCP_CONNTRACK_FIN_WAIT,FIN_WAIT),
+ __ADD(TCP_CONNTRACK_CLOSE_WAIT,CLOSE_WAIT),
+ __ADD(TCP_CONNTRACK_LAST_ACK,LAST_ACK),
+ __ADD(TCP_CONNTRACK_TIME_WAIT,TIME_WAIT),
+ __ADD(TCP_CONNTRACK_CLOSE,CLOSE),
+ __ADD(TCP_CONNTRACK_LISTEN,LISTEN),
};
char *nfnl_ct_tcp_state2str(uint8_t state, char *buf, size_t len)
@@ -505,17 +505,17 @@ uint32_t nfnl_ct_get_status(const struct nfnl_ct *ct)
}
static const struct trans_tbl status_flags[] = {
- __ADD(IPS_EXPECTED, expected)
- __ADD(IPS_SEEN_REPLY, seen_reply)
- __ADD(IPS_ASSURED, assured)
- __ADD(IPS_CONFIRMED, confirmed)
- __ADD(IPS_SRC_NAT, snat)
- __ADD(IPS_DST_NAT, dnat)
- __ADD(IPS_SEQ_ADJUST, seqadjust)
- __ADD(IPS_SRC_NAT_DONE, snat_done)
- __ADD(IPS_DST_NAT_DONE, dnat_done)
- __ADD(IPS_DYING, dying)
- __ADD(IPS_FIXED_TIMEOUT, fixed_timeout)
+ __ADD(IPS_EXPECTED, expected),
+ __ADD(IPS_SEEN_REPLY, seen_reply),
+ __ADD(IPS_ASSURED, assured),
+ __ADD(IPS_CONFIRMED, confirmed),
+ __ADD(IPS_SRC_NAT, snat),
+ __ADD(IPS_DST_NAT, dnat),
+ __ADD(IPS_SEQ_ADJUST, seqadjust),
+ __ADD(IPS_SRC_NAT_DONE, snat_done),
+ __ADD(IPS_DST_NAT_DONE, dnat_done),
+ __ADD(IPS_DYING, dying),
+ __ADD(IPS_FIXED_TIMEOUT, fixed_timeout),
};
char * nfnl_ct_status2str(int flags, char *buf, size_t len)
diff --git a/lib/netfilter/exp_obj.c b/lib/netfilter/exp_obj.c
index 69b4dd3..591cf45 100644
--- a/lib/netfilter/exp_obj.c
+++ b/lib/netfilter/exp_obj.c
@@ -367,35 +367,35 @@ static int exp_compare(struct nl_object *_a, struct nl_object *_b,
// CLI arguments?
static const struct trans_tbl exp_attrs[] = {
- __ADD(EXP_ATTR_FAMILY, family)
- __ADD(EXP_ATTR_TIMEOUT, timeout)
- __ADD(EXP_ATTR_ID, id)
- __ADD(EXP_ATTR_HELPER_NAME, helpername)
- __ADD(EXP_ATTR_ZONE, zone)
- __ADD(EXP_ATTR_CLASS, class)
- __ADD(EXP_ATTR_FLAGS, flags)
- __ADD(EXP_ATTR_FN, function)
- __ADD(EXP_ATTR_EXPECT_IP_SRC, expectipsrc)
- __ADD(EXP_ATTR_EXPECT_IP_DST, expectipdst)
- __ADD(EXP_ATTR_EXPECT_L4PROTO_NUM, expectprotonum)
- __ADD(EXP_ATTR_EXPECT_L4PROTO_PORTS, expectports)
- __ADD(EXP_ATTR_EXPECT_L4PROTO_ICMP, expecticmp)
- __ADD(EXP_ATTR_MASTER_IP_SRC, masteripsrc)
- __ADD(EXP_ATTR_MASTER_IP_DST, masteripdst)
- __ADD(EXP_ATTR_MASTER_L4PROTO_NUM, masterprotonum)
- __ADD(EXP_ATTR_MASTER_L4PROTO_PORTS, masterports)
- __ADD(EXP_ATTR_MASTER_L4PROTO_ICMP, mastericmp)
- __ADD(EXP_ATTR_MASK_IP_SRC, maskipsrc)
- __ADD(EXP_ATTR_MASK_IP_DST, maskipdst)
- __ADD(EXP_ATTR_MASK_L4PROTO_NUM, maskprotonum)
- __ADD(EXP_ATTR_MASK_L4PROTO_PORTS, maskports)
- __ADD(EXP_ATTR_MASK_L4PROTO_ICMP, maskicmp)
- __ADD(EXP_ATTR_NAT_IP_SRC, natipsrc)
- __ADD(EXP_ATTR_NAT_IP_DST, natipdst)
- __ADD(EXP_ATTR_NAT_L4PROTO_NUM, natprotonum)
- __ADD(EXP_ATTR_NAT_L4PROTO_PORTS, natports)
- __ADD(EXP_ATTR_NAT_L4PROTO_ICMP, naticmp)
- __ADD(EXP_ATTR_NAT_DIR, natdir)
+ __ADD(EXP_ATTR_FAMILY, family),
+ __ADD(EXP_ATTR_TIMEOUT, timeout),
+ __ADD(EXP_ATTR_ID, id),
+ __ADD(EXP_ATTR_HELPER_NAME, helpername),
+ __ADD(EXP_ATTR_ZONE, zone),
+ __ADD(EXP_ATTR_CLASS, class),
+ __ADD(EXP_ATTR_FLAGS, flags),
+ __ADD(EXP_ATTR_FN, function),
+ __ADD(EXP_ATTR_EXPECT_IP_SRC, expectipsrc),
+ __ADD(EXP_ATTR_EXPECT_IP_DST, expectipdst),
+ __ADD(EXP_ATTR_EXPECT_L4PROTO_NUM, expectprotonum),
+ __ADD(EXP_ATTR_EXPECT_L4PROTO_PORTS, expectports),
+ __ADD(EXP_ATTR_EXPECT_L4PROTO_ICMP, expecticmp),
+ __ADD(EXP_ATTR_MASTER_IP_SRC, masteripsrc),
+ __ADD(EXP_ATTR_MASTER_IP_DST, masteripdst),
+ __ADD(EXP_ATTR_MASTER_L4PROTO_NUM, masterprotonum),
+ __ADD(EXP_ATTR_MASTER_L4PROTO_PORTS, masterports),
+ __ADD(EXP_ATTR_MASTER_L4PROTO_ICMP, mastericmp),
+ __ADD(EXP_ATTR_MASK_IP_SRC, maskipsrc),
+ __ADD(EXP_ATTR_MASK_IP_DST, maskipdst),
+ __ADD(EXP_ATTR_MASK_L4PROTO_NUM, maskprotonum),
+ __ADD(EXP_ATTR_MASK_L4PROTO_PORTS, maskports),
+ __ADD(EXP_ATTR_MASK_L4PROTO_ICMP, maskicmp),
+ __ADD(EXP_ATTR_NAT_IP_SRC, natipsrc),
+ __ADD(EXP_ATTR_NAT_IP_DST, natipdst),
+ __ADD(EXP_ATTR_NAT_L4PROTO_NUM, natprotonum),
+ __ADD(EXP_ATTR_NAT_L4PROTO_PORTS, natports),
+ __ADD(EXP_ATTR_NAT_L4PROTO_ICMP, naticmp),
+ __ADD(EXP_ATTR_NAT_DIR, natdir),
};
static char *exp_attrs2str(int attrs, char *buf, size_t len)
@@ -467,9 +467,9 @@ uint32_t nfnl_exp_get_flags(const struct nfnl_exp *exp)
}
static const struct trans_tbl flag_table[] = {
- __ADD(IPS_EXPECTED, expected)
- __ADD(IPS_SEEN_REPLY, seen_reply)
- __ADD(IPS_ASSURED, assured)
+ __ADD(IPS_EXPECTED, expected),
+ __ADD(IPS_SEEN_REPLY, seen_reply),
+ __ADD(IPS_ASSURED, assured),
};
char * nfnl_exp_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/netfilter/log_obj.c b/lib/netfilter/log_obj.c
index 2b11414..5e1bf9e 100644
--- a/lib/netfilter/log_obj.c
+++ b/lib/netfilter/log_obj.c
@@ -57,9 +57,9 @@ static void nfnl_log_dump(struct nl_object *a, struct nl_dump_params *p)
}
static const struct trans_tbl copy_modes[] = {
- __ADD(NFNL_LOG_COPY_NONE, none)
- __ADD(NFNL_LOG_COPY_META, meta)
- __ADD(NFNL_LOG_COPY_PACKET, packet)
+ __ADD(NFNL_LOG_COPY_NONE, none),
+ __ADD(NFNL_LOG_COPY_META, meta),
+ __ADD(NFNL_LOG_COPY_PACKET, packet),
};
char *nfnl_log_copy_mode2str(enum nfnl_log_copy_mode copy_mode, char *buf,
@@ -215,8 +215,8 @@ void nfnl_log_unset_flags(struct nfnl_log *log, unsigned int flags)
}
static const struct trans_tbl log_flags[] = {
- __ADD(NFNL_LOG_FLAG_SEQ, seq)
- __ADD(NFNL_LOG_FLAG_SEQ_GLOBAL, seq_global)
+ __ADD(NFNL_LOG_FLAG_SEQ, seq),
+ __ADD(NFNL_LOG_FLAG_SEQ_GLOBAL, seq_global),
};
char *nfnl_log_flags2str(unsigned int flags, char *buf, size_t len)
@@ -255,12 +255,12 @@ static int nfnl_log_compare(struct nl_object *_a, struct nl_object *_b,
}
static const struct trans_tbl nfnl_log_attrs[] = {
- __ADD(LOG_ATTR_GROUP, group)
- __ADD(LOG_ATTR_COPY_MODE, copy_mode)
- __ADD(LOG_ATTR_COPY_RANGE, copy_range)
- __ADD(LOG_ATTR_FLUSH_TIMEOUT, flush_timeout)
- __ADD(LOG_ATTR_ALLOC_SIZE, alloc_size)
- __ADD(LOG_ATTR_QUEUE_THRESHOLD, queue_threshold)
+ __ADD(LOG_ATTR_GROUP, group),
+ __ADD(LOG_ATTR_COPY_MODE, copy_mode),
+ __ADD(LOG_ATTR_COPY_RANGE, copy_range),
+ __ADD(LOG_ATTR_FLUSH_TIMEOUT, flush_timeout),
+ __ADD(LOG_ATTR_ALLOC_SIZE, alloc_size),
+ __ADD(LOG_ATTR_QUEUE_THRESHOLD, queue_threshold),
};
static char *nfnl_log_attrs2str(int attrs, char *buf, size_t len)
diff --git a/lib/netfilter/netfilter.c b/lib/netfilter/netfilter.c
index 0062994..7403b5b 100644
--- a/lib/netfilter/netfilter.c
+++ b/lib/netfilter/netfilter.c
@@ -14,12 +14,12 @@
#include <linux/netfilter.h>
static const struct trans_tbl nfnl_verdicts[] = {
- __ADD(NF_DROP, NF_DROP)
- __ADD(NF_ACCEPT, NF_ACCEPT)
- __ADD(NF_STOLEN, NF_STOLEN)
- __ADD(NF_QUEUE, NF_QUEUE)
- __ADD(NF_REPEAT, NF_REPEAT)
- __ADD(NF_STOP, NF_STOP)
+ __ADD(NF_DROP, NF_DROP),
+ __ADD(NF_ACCEPT, NF_ACCEPT),
+ __ADD(NF_STOLEN, NF_STOLEN),
+ __ADD(NF_QUEUE, NF_QUEUE),
+ __ADD(NF_REPEAT, NF_REPEAT),
+ __ADD(NF_STOP, NF_STOP),
};
char *nfnl_verdict2str(unsigned int verdict, char *buf, size_t len)
@@ -34,11 +34,11 @@ unsigned int nfnl_str2verdict(const char *name)
}
static const struct trans_tbl nfnl_inet_hooks[] = {
- __ADD(NF_INET_PRE_ROUTING, NF_INET_PREROUTING)
- __ADD(NF_INET_LOCAL_IN, NF_INET_LOCAL_IN)
- __ADD(NF_INET_FORWARD, NF_INET_FORWARD)
- __ADD(NF_INET_LOCAL_OUT, NF_INET_LOCAL_OUT)
- __ADD(NF_INET_POST_ROUTING, NF_INET_POST_ROUTING)
+ __ADD(NF_INET_PRE_ROUTING, NF_INET_PREROUTING),
+ __ADD(NF_INET_LOCAL_IN, NF_INET_LOCAL_IN),
+ __ADD(NF_INET_FORWARD, NF_INET_FORWARD),
+ __ADD(NF_INET_LOCAL_OUT, NF_INET_LOCAL_OUT),
+ __ADD(NF_INET_POST_ROUTING, NF_INET_POST_ROUTING),
};
char *nfnl_inet_hook2str(unsigned int hook, char *buf, size_t len)
diff --git a/lib/netfilter/queue_msg_obj.c b/lib/netfilter/queue_msg_obj.c
index 8085f1b..b3b49ef 100644
--- a/lib/netfilter/queue_msg_obj.c
+++ b/lib/netfilter/queue_msg_obj.c
@@ -455,20 +455,20 @@ unsigned int nfnl_queue_msg_get_verdict(const struct nfnl_queue_msg *msg)
}
static const struct trans_tbl nfnl_queue_msg_attrs[] = {
- __ADD(QUEUE_MSG_ATTR_GROUP, group)
- __ADD(QUEUE_MSG_ATTR_FAMILY, family)
- __ADD(QUEUE_MSG_ATTR_PACKETID, packetid)
- __ADD(QUEUE_MSG_ATTR_HWPROTO, hwproto)
- __ADD(QUEUE_MSG_ATTR_HOOK, hook)
- __ADD(QUEUE_MSG_ATTR_MARK, mark)
- __ADD(QUEUE_MSG_ATTR_TIMESTAMP, timestamp)
- __ADD(QUEUE_MSG_ATTR_INDEV, indev)
- __ADD(QUEUE_MSG_ATTR_OUTDEV, outdev)
- __ADD(QUEUE_MSG_ATTR_PHYSINDEV, physindev)
- __ADD(QUEUE_MSG_ATTR_PHYSOUTDEV, physoutdev)
- __ADD(QUEUE_MSG_ATTR_HWADDR, hwaddr)
- __ADD(QUEUE_MSG_ATTR_PAYLOAD, payload)
- __ADD(QUEUE_MSG_ATTR_VERDICT, verdict)
+ __ADD(QUEUE_MSG_ATTR_GROUP, group),
+ __ADD(QUEUE_MSG_ATTR_FAMILY, family),
+ __ADD(QUEUE_MSG_ATTR_PACKETID, packetid),
+ __ADD(QUEUE_MSG_ATTR_HWPROTO, hwproto),
+ __ADD(QUEUE_MSG_ATTR_HOOK, hook),
+ __ADD(QUEUE_MSG_ATTR_MARK, mark),
+ __ADD(QUEUE_MSG_ATTR_TIMESTAMP, timestamp),
+ __ADD(QUEUE_MSG_ATTR_INDEV, indev),
+ __ADD(QUEUE_MSG_ATTR_OUTDEV, outdev),
+ __ADD(QUEUE_MSG_ATTR_PHYSINDEV, physindev),
+ __ADD(QUEUE_MSG_ATTR_PHYSOUTDEV, physoutdev),
+ __ADD(QUEUE_MSG_ATTR_HWADDR, hwaddr),
+ __ADD(QUEUE_MSG_ATTR_PAYLOAD, payload),
+ __ADD(QUEUE_MSG_ATTR_VERDICT, verdict),
};
static char *nfnl_queue_msg_attrs2str(int attrs, char *buf, size_t len)
diff --git a/lib/netfilter/queue_obj.c b/lib/netfilter/queue_obj.c
index 5edcc68..b51f5ec 100644
--- a/lib/netfilter/queue_obj.c
+++ b/lib/netfilter/queue_obj.c
@@ -53,9 +53,9 @@ static void nfnl_queue_dump(struct nl_object *a, struct nl_dump_params *p)
}
static const struct trans_tbl copy_modes[] = {
- __ADD(NFNL_QUEUE_COPY_NONE, none)
- __ADD(NFNL_QUEUE_COPY_META, meta)
- __ADD(NFNL_QUEUE_COPY_PACKET, packet)
+ __ADD(NFNL_QUEUE_COPY_NONE, none),
+ __ADD(NFNL_QUEUE_COPY_META, meta),
+ __ADD(NFNL_QUEUE_COPY_PACKET, packet),
};
char *nfnl_queue_copy_mode2str(enum nfnl_queue_copy_mode copy_mode, char *buf,
@@ -185,10 +185,10 @@ static int nfnl_queue_compare(struct nl_object *_a, struct nl_object *_b,
}
static const struct trans_tbl nfnl_queue_attrs[] = {
- __ADD(QUEUE_ATTR_GROUP, group)
- __ADD(QUEUE_ATTR_MAXLEN, maxlen)
- __ADD(QUEUE_ATTR_COPY_MODE, copy_mode)
- __ADD(QUEUE_ATTR_COPY_RANGE, copy_range)
+ __ADD(QUEUE_ATTR_GROUP, group),
+ __ADD(QUEUE_ATTR_MAXLEN, maxlen),
+ __ADD(QUEUE_ATTR_COPY_MODE, copy_mode),
+ __ADD(QUEUE_ATTR_COPY_RANGE, copy_range),
};
static char *nfnl_queue_attrs2str(int attrs, char *buf, size_t len)
diff --git a/lib/route/addr.c b/lib/route/addr.c
index e6e91d2..426b4dc 100644
--- a/lib/route/addr.c
+++ b/lib/route/addr.c
@@ -461,17 +461,17 @@ static int addr_compare(struct nl_object *_a, struct nl_object *_b,
}
static const struct trans_tbl addr_attrs[] = {
- __ADD(ADDR_ATTR_FAMILY, family)
- __ADD(ADDR_ATTR_PREFIXLEN, prefixlen)
- __ADD(ADDR_ATTR_FLAGS, flags)
- __ADD(ADDR_ATTR_SCOPE, scope)
- __ADD(ADDR_ATTR_IFINDEX, ifindex)
- __ADD(ADDR_ATTR_LABEL, label)
- __ADD(ADDR_ATTR_CACHEINFO, cacheinfo)
- __ADD(ADDR_ATTR_PEER, peer)
- __ADD(ADDR_ATTR_LOCAL, local)
- __ADD(ADDR_ATTR_BROADCAST, broadcast)
- __ADD(ADDR_ATTR_MULTICAST, multicast)
+ __ADD(ADDR_ATTR_FAMILY, family),
+ __ADD(ADDR_ATTR_PREFIXLEN, prefixlen),
+ __ADD(ADDR_ATTR_FLAGS, flags),
+ __ADD(ADDR_ATTR_SCOPE, scope),
+ __ADD(ADDR_ATTR_IFINDEX, ifindex),
+ __ADD(ADDR_ATTR_LABEL, label),
+ __ADD(ADDR_ATTR_CACHEINFO, cacheinfo),
+ __ADD(ADDR_ATTR_PEER, peer),
+ __ADD(ADDR_ATTR_LOCAL, local),
+ __ADD(ADDR_ATTR_BROADCAST, broadcast),
+ __ADD(ADDR_ATTR_MULTICAST, multicast),
};
static char *addr_attrs2str(int attrs, char *buf, size_t len)
@@ -1061,15 +1061,15 @@ uint32_t rtnl_addr_get_last_update_time(struct rtnl_addr *addr)
*/
static const struct trans_tbl addr_flags[] = {
- __ADD(IFA_F_SECONDARY, secondary)
- __ADD(IFA_F_NODAD, nodad)
- __ADD(IFA_F_OPTIMISTIC, optimistic)
- __ADD(IFA_F_HOMEADDRESS, homeaddress)
- __ADD(IFA_F_DEPRECATED, deprecated)
- __ADD(IFA_F_TENTATIVE, tentative)
- __ADD(IFA_F_PERMANENT, permanent)
- __ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr)
- __ADD(IFA_F_NOPREFIXROUTE, noprefixroute)
+ __ADD(IFA_F_SECONDARY, secondary),
+ __ADD(IFA_F_NODAD, nodad),
+ __ADD(IFA_F_OPTIMISTIC, optimistic),
+ __ADD(IFA_F_HOMEADDRESS, homeaddress),
+ __ADD(IFA_F_DEPRECATED, deprecated),
+ __ADD(IFA_F_TENTATIVE, tentative),
+ __ADD(IFA_F_PERMANENT, permanent),
+ __ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr),
+ __ADD(IFA_F_NOPREFIXROUTE, noprefixroute),
};
char *rtnl_addr_flags2str(int flags, char *buf, size_t size)
diff --git a/lib/route/cls/ematch/meta.c b/lib/route/cls/ematch/meta.c
index 44f11b9..6249bb1 100644
--- a/lib/route/cls/ematch/meta.c
+++ b/lib/route/cls/ematch/meta.c
@@ -165,51 +165,51 @@ static int meta_parse(struct rtnl_ematch *e, void *data, size_t len)
}
static const struct trans_tbl meta_int[] = {
- __ADD(TCF_META_ID_RANDOM, random)
- __ADD(TCF_META_ID_LOADAVG_0, loadavg_0)
- __ADD(TCF_META_ID_LOADAVG_1, loadavg_1)
- __ADD(TCF_META_ID_LOADAVG_2, loadavg_2)
- __ADD(TCF_META_ID_DEV, dev)
- __ADD(TCF_META_ID_PRIORITY, prio)
- __ADD(TCF_META_ID_PROTOCOL, proto)
- __ADD(TCF_META_ID_PKTTYPE, pkttype)
- __ADD(TCF_META_ID_PKTLEN, pktlen)
- __ADD(TCF_META_ID_DATALEN, datalen)
- __ADD(TCF_META_ID_MACLEN, maclen)
- __ADD(TCF_META_ID_NFMARK, mark)
- __ADD(TCF_META_ID_TCINDEX, tcindex)
- __ADD(TCF_META_ID_RTCLASSID, rtclassid)
- __ADD(TCF_META_ID_RTIIF, rtiif)
- __ADD(TCF_META_ID_SK_FAMILY, sk_family)
- __ADD(TCF_META_ID_SK_STATE, sk_state)
- __ADD(TCF_META_ID_SK_REUSE, sk_reuse)
- __ADD(TCF_META_ID_SK_REFCNT, sk_refcnt)
- __ADD(TCF_META_ID_SK_RCVBUF, sk_rcvbuf)
- __ADD(TCF_META_ID_SK_SNDBUF, sk_sndbuf)
- __ADD(TCF_META_ID_SK_SHUTDOWN, sk_sutdown)
- __ADD(TCF_META_ID_SK_PROTO, sk_proto)
- __ADD(TCF_META_ID_SK_TYPE, sk_type)
- __ADD(TCF_META_ID_SK_RMEM_ALLOC, sk_rmem_alloc)
- __ADD(TCF_META_ID_SK_WMEM_ALLOC, sk_wmem_alloc)
- __ADD(TCF_META_ID_SK_WMEM_QUEUED, sk_wmem_queued)
- __ADD(TCF_META_ID_SK_RCV_QLEN, sk_rcv_qlen)
- __ADD(TCF_META_ID_SK_SND_QLEN, sk_snd_qlen)
- __ADD(TCF_META_ID_SK_ERR_QLEN, sk_err_qlen)
- __ADD(TCF_META_ID_SK_FORWARD_ALLOCS, sk_forward_allocs)
- __ADD(TCF_META_ID_SK_ALLOCS, sk_allocs)
- __ADD(TCF_META_ID_SK_ROUTE_CAPS, sk_route_caps)
- __ADD(TCF_META_ID_SK_HASH, sk_hash)
- __ADD(TCF_META_ID_SK_LINGERTIME, sk_lingertime)
- __ADD(TCF_META_ID_SK_ACK_BACKLOG, sk_ack_backlog)
- __ADD(TCF_META_ID_SK_MAX_ACK_BACKLOG, sk_max_ack_backlog)
- __ADD(TCF_META_ID_SK_PRIO, sk_prio)
- __ADD(TCF_META_ID_SK_RCVLOWAT, sk_rcvlowat)
- __ADD(TCF_META_ID_SK_RCVTIMEO, sk_rcvtimeo)
- __ADD(TCF_META_ID_SK_SNDTIMEO, sk_sndtimeo)
- __ADD(TCF_META_ID_SK_SENDMSG_OFF, sk_sendmsg_off)
- __ADD(TCF_META_ID_SK_WRITE_PENDING, sk_write_pending)
- __ADD(TCF_META_ID_VLAN_TAG, vlan)
- __ADD(TCF_META_ID_RXHASH, rxhash)
+ __ADD(TCF_META_ID_RANDOM, random),
+ __ADD(TCF_META_ID_LOADAVG_0, loadavg_0),
+ __ADD(TCF_META_ID_LOADAVG_1, loadavg_1),
+ __ADD(TCF_META_ID_LOADAVG_2, loadavg_2),
+ __ADD(TCF_META_ID_DEV, dev),
+ __ADD(TCF_META_ID_PRIORITY, prio),
+ __ADD(TCF_META_ID_PROTOCOL, proto),
+ __ADD(TCF_META_ID_PKTTYPE, pkttype),
+ __ADD(TCF_META_ID_PKTLEN, pktlen),
+ __ADD(TCF_META_ID_DATALEN, datalen),
+ __ADD(TCF_META_ID_MACLEN, maclen),
+ __ADD(TCF_META_ID_NFMARK, mark),
+ __ADD(TCF_META_ID_TCINDEX, tcindex),
+ __ADD(TCF_META_ID_RTCLASSID, rtclassid),
+ __ADD(TCF_META_ID_RTIIF, rtiif),
+ __ADD(TCF_META_ID_SK_FAMILY, sk_family),
+ __ADD(TCF_META_ID_SK_STATE, sk_state),
+ __ADD(TCF_META_ID_SK_REUSE, sk_reuse),
+ __ADD(TCF_META_ID_SK_REFCNT, sk_refcnt),
+ __ADD(TCF_META_ID_SK_RCVBUF, sk_rcvbuf),
+ __ADD(TCF_META_ID_SK_SNDBUF, sk_sndbuf),
+ __ADD(TCF_META_ID_SK_SHUTDOWN, sk_sutdown),
+ __ADD(TCF_META_ID_SK_PROTO, sk_proto),
+ __ADD(TCF_META_ID_SK_TYPE, sk_type),
+ __ADD(TCF_META_ID_SK_RMEM_ALLOC, sk_rmem_alloc),
+ __ADD(TCF_META_ID_SK_WMEM_ALLOC, sk_wmem_alloc),
+ __ADD(TCF_META_ID_SK_WMEM_QUEUED, sk_wmem_queued),
+ __ADD(TCF_META_ID_SK_RCV_QLEN, sk_rcv_qlen),
+ __ADD(TCF_META_ID_SK_SND_QLEN, sk_snd_qlen),
+ __ADD(TCF_META_ID_SK_ERR_QLEN, sk_err_qlen),
+ __ADD(TCF_META_ID_SK_FORWARD_ALLOCS, sk_forward_allocs),
+ __ADD(TCF_META_ID_SK_ALLOCS, sk_allocs),
+ __ADD(TCF_META_ID_SK_ROUTE_CAPS, sk_route_caps),
+ __ADD(TCF_META_ID_SK_HASH, sk_hash),
+ __ADD(TCF_META_ID_SK_LINGERTIME, sk_lingertime),
+ __ADD(TCF_META_ID_SK_ACK_BACKLOG, sk_ack_backlog),
+ __ADD(TCF_META_ID_SK_MAX_ACK_BACKLOG, sk_max_ack_backlog),
+ __ADD(TCF_META_ID_SK_PRIO, sk_prio),
+ __ADD(TCF_META_ID_SK_RCVLOWAT, sk_rcvlowat),
+ __ADD(TCF_META_ID_SK_RCVTIMEO, sk_rcvtimeo),
+ __ADD(TCF_META_ID_SK_SNDTIMEO, sk_sndtimeo),
+ __ADD(TCF_META_ID_SK_SENDMSG_OFF, sk_sendmsg_off),
+ __ADD(TCF_META_ID_SK_WRITE_PENDING, sk_write_pending),
+ __ADD(TCF_META_ID_VLAN_TAG, vlan),
+ __ADD(TCF_META_ID_RXHASH, rxhash),
};
static char *int_id2str(int id, char *buf, size_t size)
@@ -218,8 +218,8 @@ static char *int_id2str(int id, char *buf, size_t size)
}
static const struct trans_tbl meta_var[] = {
- __ADD(TCF_META_ID_DEV,devname)
- __ADD(TCF_META_ID_SK_BOUND_IF,sk_bound_if)
+ __ADD(TCF_META_ID_DEV,devname),
+ __ADD(TCF_META_ID_SK_BOUND_IF,sk_bound_if),
};
static char *var_id2str(int id, char *buf, size_t size)
diff --git a/lib/route/cls/police.c b/lib/route/cls/police.c
index 1f5d284..14b5608 100644
--- a/lib/route/cls/police.c
+++ b/lib/route/cls/police.c
@@ -23,12 +23,12 @@
*/
static const struct trans_tbl police_types[] = {
- __ADD(TC_POLICE_UNSPEC,unspec)
- __ADD(TC_POLICE_OK,ok)
- __ADD(TC_POLICE_RECLASSIFY,reclassify)
- __ADD(TC_POLICE_SHOT,shot)
+ __ADD(TC_POLICE_UNSPEC,unspec),
+ __ADD(TC_POLICE_OK,ok),
+ __ADD(TC_POLICE_RECLASSIFY,reclassify),
+ __ADD(TC_POLICE_SHOT,shot),
#ifdef TC_POLICE_PIPE
- __ADD(TC_POLICE_PIPE,pipe)
+ __ADD(TC_POLICE_PIPE,pipe),
#endif
};
diff --git a/lib/route/link.c b/lib/route/link.c
index 3d31ffc..7a53532 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -951,32 +951,32 @@ protinfo_mismatch:
}
static const struct trans_tbl link_attrs[] = {
- __ADD(LINK_ATTR_MTU, mtu)
- __ADD(LINK_ATTR_LINK, link)
- __ADD(LINK_ATTR_TXQLEN, txqlen)
- __ADD(LINK_ATTR_WEIGHT, weight)
- __ADD(LINK_ATTR_MASTER, master)
- __ADD(LINK_ATTR_QDISC, qdisc)
- __ADD(LINK_ATTR_MAP, map)
- __ADD(LINK_ATTR_ADDR, address)
- __ADD(LINK_ATTR_BRD, broadcast)
- __ADD(LINK_ATTR_FLAGS, flags)
- __ADD(LINK_ATTR_IFNAME, name)
- __ADD(LINK_ATTR_IFINDEX, ifindex)
- __ADD(LINK_ATTR_FAMILY, family)
- __ADD(LINK_ATTR_ARPTYPE, arptype)
- __ADD(LINK_ATTR_STATS, stats)
- __ADD(LINK_ATTR_CHANGE, change)
- __ADD(LINK_ATTR_OPERSTATE, operstate)
- __ADD(LINK_ATTR_LINKMODE, linkmode)
- __ADD(LINK_ATTR_IFALIAS, ifalias)
- __ADD(LINK_ATTR_NUM_VF, num_vf)
- __ADD(LINK_ATTR_PROMISCUITY, promiscuity)
- __ADD(LINK_ATTR_NUM_TX_QUEUES, num_tx_queues)
- __ADD(LINK_ATTR_NUM_RX_QUEUES, num_rx_queues)
- __ADD(LINK_ATTR_GROUP, group)
- __ADD(LINK_ATTR_CARRIER, carrier)
- __ADD(LINK_ATTR_PHYS_PORT_ID, phys_port_id)
+ __ADD(LINK_ATTR_MTU, mtu),
+ __ADD(LINK_ATTR_LINK, link),
+ __ADD(LINK_ATTR_TXQLEN, txqlen),
+ __ADD(LINK_ATTR_WEIGHT, weight),
+ __ADD(LINK_ATTR_MASTER, master),
+ __ADD(LINK_ATTR_QDISC, qdisc),
+ __ADD(LINK_ATTR_MAP, map),
+ __ADD(LINK_ATTR_ADDR, address),
+ __ADD(LINK_ATTR_BRD, broadcast),
+ __ADD(LINK_ATTR_FLAGS, flags),
+ __ADD(LINK_ATTR_IFNAME, name),
+ __ADD(LINK_ATTR_IFINDEX, ifindex),
+ __ADD(LINK_ATTR_FAMILY, family),
+ __ADD(LINK_ATTR_ARPTYPE, arptype),
+ __ADD(LINK_ATTR_STATS, stats),
+ __ADD(LINK_ATTR_CHANGE, change),
+ __ADD(LINK_ATTR_OPERSTATE, operstate),
+ __ADD(LINK_ATTR_LINKMODE, linkmode),
+ __ADD(LINK_ATTR_IFALIAS, ifalias),
+ __ADD(LINK_ATTR_NUM_VF, num_vf),
+ __ADD(LINK_ATTR_PROMISCUITY, promiscuity),
+ __ADD(LINK_ATTR_NUM_TX_QUEUES, num_tx_queues),
+ __ADD(LINK_ATTR_NUM_RX_QUEUES, num_rx_queues),
+ __ADD(LINK_ATTR_GROUP, group),
+ __ADD(LINK_ATTR_CARRIER, carrier),
+ __ADD(LINK_ATTR_PHYS_PORT_ID, phys_port_id),
};
static char *link_attrs2str(int attrs, char *buf, size_t len)
@@ -2511,25 +2511,25 @@ int rtnl_link_release(struct nl_sock *sock, struct rtnl_link *slave)
*/
static const struct trans_tbl link_flags[] = {
- __ADD(IFF_LOOPBACK, loopback)
- __ADD(IFF_BROADCAST, broadcast)
- __ADD(IFF_POINTOPOINT, pointopoint)
- __ADD(IFF_MULTICAST, multicast)
- __ADD(IFF_NOARP, noarp)
- __ADD(IFF_ALLMULTI, allmulti)
- __ADD(IFF_PROMISC, promisc)
- __ADD(IFF_MASTER, master)
- __ADD(IFF_SLAVE, slave)
- __ADD(IFF_DEBUG, debug)
- __ADD(IFF_DYNAMIC, dynamic)
- __ADD(IFF_AUTOMEDIA, automedia)
- __ADD(IFF_PORTSEL, portsel)
- __ADD(IFF_NOTRAILERS, notrailers)
- __ADD(IFF_UP, up)
- __ADD(IFF_RUNNING, running)
- __ADD(IFF_LOWER_UP, lowerup)
- __ADD(IFF_DORMANT, dormant)
- __ADD(IFF_ECHO, echo)
+ __ADD(IFF_LOOPBACK, loopback),
+ __ADD(IFF_BROADCAST, broadcast),
+ __ADD(IFF_POINTOPOINT, pointopoint),
+ __ADD(IFF_MULTICAST, multicast),
+ __ADD(IFF_NOARP, noarp),
+ __ADD(IFF_ALLMULTI, allmulti),
+ __ADD(IFF_PROMISC, promisc),
+ __ADD(IFF_MASTER, master),
+ __ADD(IFF_SLAVE, slave),
+ __ADD(IFF_DEBUG, debug),
+ __ADD(IFF_DYNAMIC, dynamic),
+ __ADD(IFF_AUTOMEDIA, automedia),
+ __ADD(IFF_PORTSEL, portsel),
+ __ADD(IFF_NOTRAILERS, notrailers),
+ __ADD(IFF_UP, up),
+ __ADD(IFF_RUNNING, running),
+ __ADD(IFF_LOWER_UP, lowerup),
+ __ADD(IFF_DORMANT, dormant),
+ __ADD(IFF_ECHO, echo),
};
char *rtnl_link_flags2str(int flags, char *buf, size_t len)
@@ -2544,69 +2544,69 @@ int rtnl_link_str2flags(const char *name)
}
static const struct trans_tbl link_stats[] = {
- __ADD(RTNL_LINK_RX_PACKETS, rx_packets)
- __ADD(RTNL_LINK_TX_PACKETS, tx_packets)
- __ADD(RTNL_LINK_RX_BYTES, rx_bytes)
- __ADD(RTNL_LINK_TX_BYTES, tx_bytes)
- __ADD(RTNL_LINK_RX_ERRORS, rx_errors)
- __ADD(RTNL_LINK_TX_ERRORS, tx_errors)
- __ADD(RTNL_LINK_RX_DROPPED, rx_dropped)
- __ADD(RTNL_LINK_TX_DROPPED, tx_dropped)
- __ADD(RTNL_LINK_RX_COMPRESSED, rx_compressed)
- __ADD(RTNL_LINK_TX_COMPRESSED, tx_compressed)
- __ADD(RTNL_LINK_RX_FIFO_ERR, rx_fifo_err)
- __ADD(RTNL_LINK_TX_FIFO_ERR, tx_fifo_err)
- __ADD(RTNL_LINK_RX_LEN_ERR, rx_len_err)
- __ADD(RTNL_LINK_RX_OVER_ERR, rx_over_err)
- __ADD(RTNL_LINK_RX_CRC_ERR, rx_crc_err)
- __ADD(RTNL_LINK_RX_FRAME_ERR, rx_frame_err)
- __ADD(RTNL_LINK_RX_MISSED_ERR, rx_missed_err)
- __ADD(RTNL_LINK_TX_ABORT_ERR, tx_abort_err)
- __ADD(RTNL_LINK_TX_CARRIER_ERR, tx_carrier_err)
- __ADD(RTNL_LINK_TX_HBEAT_ERR, tx_hbeat_err)
- __ADD(RTNL_LINK_TX_WIN_ERR, tx_win_err)
- __ADD(RTNL_LINK_COLLISIONS, collisions)
- __ADD(RTNL_LINK_MULTICAST, multicast)
- __ADD(RTNL_LINK_IP6_INPKTS, Ip6InReceives)
- __ADD(RTNL_LINK_IP6_INHDRERRORS, Ip6InHdrErrors)
- __ADD(RTNL_LINK_IP6_INTOOBIGERRORS, Ip6InTooBigErrors)
- __ADD(RTNL_LINK_IP6_INNOROUTES, Ip6InNoRoutes)
- __ADD(RTNL_LINK_IP6_INADDRERRORS, Ip6InAddrErrors)
- __ADD(RTNL_LINK_IP6_INUNKNOWNPROTOS, Ip6InUnknownProtos)
- __ADD(RTNL_LINK_IP6_INTRUNCATEDPKTS, Ip6InTruncatedPkts)
- __ADD(RTNL_LINK_IP6_INDISCARDS, Ip6InDiscards)
- __ADD(RTNL_LINK_IP6_INDELIVERS, Ip6InDelivers)
- __ADD(RTNL_LINK_IP6_OUTFORWDATAGRAMS, Ip6OutForwDatagrams)
- __ADD(RTNL_LINK_IP6_OUTPKTS, Ip6OutRequests)
- __ADD(RTNL_LINK_IP6_OUTDISCARDS, Ip6OutDiscards)
- __ADD(RTNL_LINK_IP6_OUTNOROUTES, Ip6OutNoRoutes)
- __ADD(RTNL_LINK_IP6_REASMTIMEOUT, Ip6ReasmTimeout)
- __ADD(RTNL_LINK_IP6_REASMREQDS, Ip6ReasmReqds)
- __ADD(RTNL_LINK_IP6_REASMOKS, Ip6ReasmOKs)
- __ADD(RTNL_LINK_IP6_REASMFAILS, Ip6ReasmFails)
- __ADD(RTNL_LINK_IP6_FRAGOKS, Ip6FragOKs)
- __ADD(RTNL_LINK_IP6_FRAGFAILS, Ip6FragFails)
- __ADD(RTNL_LINK_IP6_FRAGCREATES, Ip6FragCreates)
- __ADD(RTNL_LINK_IP6_INMCASTPKTS, Ip6InMcastPkts)
- __ADD(RTNL_LINK_IP6_OUTMCASTPKTS, Ip6OutMcastPkts)
- __ADD(RTNL_LINK_IP6_INBCASTPKTS, Ip6InBcastPkts)
- __ADD(RTNL_LINK_IP6_OUTBCASTPKTS, Ip6OutBcastPkts)
- __ADD(RTNL_LINK_IP6_INOCTETS, Ip6InOctets)
- __ADD(RTNL_LINK_IP6_OUTOCTETS, Ip6OutOctets)
- __ADD(RTNL_LINK_IP6_INMCASTOCTETS, Ip6InMcastOctets)
- __ADD(RTNL_LINK_IP6_OUTMCASTOCTETS, Ip6OutMcastOctets)
- __ADD(RTNL_LINK_IP6_INBCASTOCTETS, Ip6InBcastOctets)
- __ADD(RTNL_LINK_IP6_OUTBCASTOCTETS, Ip6OutBcastOctets)
- __ADD(RTNL_LINK_ICMP6_INMSGS, ICMP6_InMsgs)
- __ADD(RTNL_LINK_ICMP6_INERRORS, ICMP6_InErrors)
- __ADD(RTNL_LINK_ICMP6_OUTMSGS, ICMP6_OutMsgs)
- __ADD(RTNL_LINK_ICMP6_OUTERRORS, ICMP6_OutErrors)
- __ADD(RTNL_LINK_ICMP6_CSUMERRORS, ICMP6_InCsumErrors)
- __ADD(RTNL_LINK_IP6_CSUMERRORS, Ip6_InCsumErrors)
- __ADD(RTNL_LINK_IP6_NOECTPKTS, Ip6_InNoECTPkts)
- __ADD(RTNL_LINK_IP6_ECT1PKTS, Ip6_InECT1Pkts)
- __ADD(RTNL_LINK_IP6_ECT0PKTS, Ip6_InECT0Pkts)
- __ADD(RTNL_LINK_IP6_CEPKTS, Ip6_InCEPkts)
+ __ADD(RTNL_LINK_RX_PACKETS, rx_packets),
+ __ADD(RTNL_LINK_TX_PACKETS, tx_packets),
+ __ADD(RTNL_LINK_RX_BYTES, rx_bytes),
+ __ADD(RTNL_LINK_TX_BYTES, tx_bytes),
+ __ADD(RTNL_LINK_RX_ERRORS, rx_errors),
+ __ADD(RTNL_LINK_TX_ERRORS, tx_errors),
+ __ADD(RTNL_LINK_RX_DROPPED, rx_dropped),
+ __ADD(RTNL_LINK_TX_DROPPED, tx_dropped),
+ __ADD(RTNL_LINK_RX_COMPRESSED, rx_compressed),
+ __ADD(RTNL_LINK_TX_COMPRESSED, tx_compressed),
+ __ADD(RTNL_LINK_RX_FIFO_ERR, rx_fifo_err),
+ __ADD(RTNL_LINK_TX_FIFO_ERR, tx_fifo_err),
+ __ADD(RTNL_LINK_RX_LEN_ERR, rx_len_err),
+ __ADD(RTNL_LINK_RX_OVER_ERR, rx_over_err),
+ __ADD(RTNL_LINK_RX_CRC_ERR, rx_crc_err),
+ __ADD(RTNL_LINK_RX_FRAME_ERR, rx_frame_err),
+ __ADD(RTNL_LINK_RX_MISSED_ERR, rx_missed_err),
+ __ADD(RTNL_LINK_TX_ABORT_ERR, tx_abort_err),
+ __ADD(RTNL_LINK_TX_CARRIER_ERR, tx_carrier_err),
+ __ADD(RTNL_LINK_TX_HBEAT_ERR, tx_hbeat_err),
+ __ADD(RTNL_LINK_TX_WIN_ERR, tx_win_err),
+ __ADD(RTNL_LINK_COLLISIONS, collisions),
+ __ADD(RTNL_LINK_MULTICAST, multicast),
+ __ADD(RTNL_LINK_IP6_INPKTS, Ip6InReceives),
+ __ADD(RTNL_LINK_IP6_INHDRERRORS, Ip6InHdrErrors),
+ __ADD(RTNL_LINK_IP6_INTOOBIGERRORS, Ip6InTooBigErrors),
+ __ADD(RTNL_LINK_IP6_INNOROUTES, Ip6InNoRoutes),
+ __ADD(RTNL_LINK_IP6_INADDRERRORS, Ip6InAddrErrors),
+ __ADD(RTNL_LINK_IP6_INUNKNOWNPROTOS, Ip6InUnknownProtos),
+ __ADD(RTNL_LINK_IP6_INTRUNCATEDPKTS, Ip6InTruncatedPkts),
+ __ADD(RTNL_LINK_IP6_INDISCARDS, Ip6InDiscards),
+ __ADD(RTNL_LINK_IP6_INDELIVERS, Ip6InDelivers),
+ __ADD(RTNL_LINK_IP6_OUTFORWDATAGRAMS, Ip6OutForwDatagrams),
+ __ADD(RTNL_LINK_IP6_OUTPKTS, Ip6OutRequests),
+ __ADD(RTNL_LINK_IP6_OUTDISCARDS, Ip6OutDiscards),
+ __ADD(RTNL_LINK_IP6_OUTNOROUTES, Ip6OutNoRoutes),
+ __ADD(RTNL_LINK_IP6_REASMTIMEOUT, Ip6ReasmTimeout),
+ __ADD(RTNL_LINK_IP6_REASMREQDS, Ip6ReasmReqds),
+ __ADD(RTNL_LINK_IP6_REASMOKS, Ip6ReasmOKs),
+ __ADD(RTNL_LINK_IP6_REASMFAILS, Ip6ReasmFails),
+ __ADD(RTNL_LINK_IP6_FRAGOKS, Ip6FragOKs),
+ __ADD(RTNL_LINK_IP6_FRAGFAILS, Ip6FragFails),
+ __ADD(RTNL_LINK_IP6_FRAGCREATES, Ip6FragCreates),
+ __ADD(RTNL_LINK_IP6_INMCASTPKTS, Ip6InMcastPkts),
+ __ADD(RTNL_LINK_IP6_OUTMCASTPKTS, Ip6OutMcastPkts),
+ __ADD(RTNL_LINK_IP6_INBCASTPKTS, Ip6InBcastPkts),
+ __ADD(RTNL_LINK_IP6_OUTBCASTPKTS, Ip6OutBcastPkts),
+ __ADD(RTNL_LINK_IP6_INOCTETS, Ip6InOctets),
+ __ADD(RTNL_LINK_IP6_OUTOCTETS, Ip6OutOctets),
+ __ADD(RTNL_LINK_IP6_INMCASTOCTETS, Ip6InMcastOctets),
+ __ADD(RTNL_LINK_IP6_OUTMCASTOCTETS, Ip6OutMcastOctets),
+ __ADD(RTNL_LINK_IP6_INBCASTOCTETS, Ip6InBcastOctets),
+ __ADD(RTNL_LINK_IP6_OUTBCASTOCTETS, Ip6OutBcastOctets),
+ __ADD(RTNL_LINK_ICMP6_INMSGS, ICMP6_InMsgs),
+ __ADD(RTNL_LINK_ICMP6_INERRORS, ICMP6_InErrors),
+ __ADD(RTNL_LINK_ICMP6_OUTMSGS, ICMP6_OutMsgs),
+ __ADD(RTNL_LINK_ICMP6_OUTERRORS, ICMP6_OutErrors),
+ __ADD(RTNL_LINK_ICMP6_CSUMERRORS, ICMP6_InCsumErrors),
+ __ADD(RTNL_LINK_IP6_CSUMERRORS, Ip6_InCsumErrors),
+ __ADD(RTNL_LINK_IP6_NOECTPKTS, Ip6_InNoECTPkts),
+ __ADD(RTNL_LINK_IP6_ECT1PKTS, Ip6_InECT1Pkts),
+ __ADD(RTNL_LINK_IP6_ECT0PKTS, Ip6_InECT0Pkts),
+ __ADD(RTNL_LINK_IP6_CEPKTS, Ip6_InCEPkts),
};
char *rtnl_link_stat2str(int st, char *buf, size_t len)
@@ -2620,13 +2620,13 @@ int rtnl_link_str2stat(const char *name)
}
static const struct trans_tbl link_operstates[] = {
- __ADD(IF_OPER_UNKNOWN, unknown)
- __ADD(IF_OPER_NOTPRESENT, notpresent)
- __ADD(IF_OPER_DOWN, down)
- __ADD(IF_OPER_LOWERLAYERDOWN, lowerlayerdown)
- __ADD(IF_OPER_TESTING, testing)
- __ADD(IF_OPER_DORMANT, dormant)
- __ADD(IF_OPER_UP, up)
+ __ADD(IF_OPER_UNKNOWN, unknown),
+ __ADD(IF_OPER_NOTPRESENT, notpresent),
+ __ADD(IF_OPER_DOWN, down),
+ __ADD(IF_OPER_LOWERLAYERDOWN, lowerlayerdown),
+ __ADD(IF_OPER_TESTING, testing),
+ __ADD(IF_OPER_DORMANT, dormant),
+ __ADD(IF_OPER_UP, up),
};
char *rtnl_link_operstate2str(uint8_t st, char *buf, size_t len)
@@ -2642,13 +2642,13 @@ int rtnl_link_str2operstate(const char *name)
}
static const struct trans_tbl link_modes[] = {
- __ADD(IF_LINK_MODE_DEFAULT, default)
- __ADD(IF_LINK_MODE_DORMANT, dormant)
+ __ADD(IF_LINK_MODE_DEFAULT, default),
+ __ADD(IF_LINK_MODE_DORMANT, dormant),
};
static const struct trans_tbl carrier_states[] = {
- __ADD(IF_CARRIER_DOWN, down)
- __ADD(IF_CARRIER_UP, up)
+ __ADD(IF_CARRIER_DOWN, down),
+ __ADD(IF_CARRIER_UP, up),
};
char *rtnl_link_mode2str(uint8_t st, char *buf, size_t len)
diff --git a/lib/route/link/bridge.c b/lib/route/link/bridge.c
index 4ca5f6e..544f02c 100644
--- a/lib/route/link/bridge.c
+++ b/lib/route/link/bridge.c
@@ -480,10 +480,10 @@ int rtnl_link_bridge_get_flags(struct rtnl_link *link)
}
static const struct trans_tbl bridge_flags[] = {
- __ADD(RTNL_BRIDGE_HAIRPIN_MODE, hairpin_mode)
- __ADD(RTNL_BRIDGE_BPDU_GUARD, bpdu_guard)
- __ADD(RTNL_BRIDGE_ROOT_BLOCK, root_block)
- __ADD(RTNL_BRIDGE_FAST_LEAVE, fast_leave)
+ __ADD(RTNL_BRIDGE_HAIRPIN_MODE, hairpin_mode),
+ __ADD(RTNL_BRIDGE_BPDU_GUARD, bpdu_guard),
+ __ADD(RTNL_BRIDGE_ROOT_BLOCK, root_block),
+ __ADD(RTNL_BRIDGE_FAST_LEAVE, fast_leave),
};
/**
diff --git a/lib/route/link/can.c b/lib/route/link/can.c
index 60da42d..489119d 100644
--- a/lib/route/link/can.c
+++ b/lib/route/link/can.c
@@ -751,11 +751,11 @@ int rtnl_link_can_unset_ctrlmode(struct rtnl_link *link, uint32_t ctrlmode)
*/
static const struct trans_tbl can_ctrlmode[] = {
- __ADD(CAN_CTRLMODE_LOOPBACK, loopback)
- __ADD(CAN_CTRLMODE_LISTENONLY, listen-only)
- __ADD(CAN_CTRLMODE_3_SAMPLES, triple-sampling)
- __ADD(CAN_CTRLMODE_ONE_SHOT, one-shot)
- __ADD(CAN_CTRLMODE_BERR_REPORTING, berr-reporting)
+ __ADD(CAN_CTRLMODE_LOOPBACK, loopback),
+ __ADD(CAN_CTRLMODE_LISTENONLY, listen-only),
+ __ADD(CAN_CTRLMODE_3_SAMPLES, triple-sampling),
+ __ADD(CAN_CTRLMODE_ONE_SHOT, one-shot),
+ __ADD(CAN_CTRLMODE_BERR_REPORTING, berr-reporting),
};
char *rtnl_link_can_ctrlmode2str(int ctrlmode, char *buf, size_t len)
diff --git a/lib/route/link/inet.c b/lib/route/link/inet.c
index e94342f..f166755 100644
--- a/lib/route/link/inet.c
+++ b/lib/route/link/inet.c
@@ -141,34 +141,34 @@ nla_put_failure:
}
static const struct trans_tbl inet_devconf[] = {
- __ADD(IPV4_DEVCONF_FORWARDING, forwarding)
- __ADD(IPV4_DEVCONF_MC_FORWARDING, mc_forwarding)
- __ADD(IPV4_DEVCONF_PROXY_ARP, proxy_arp)
- __ADD(IPV4_DEVCONF_ACCEPT_REDIRECTS, accept_redirects)
- __ADD(IPV4_DEVCONF_SECURE_REDIRECTS, secure_redirects)
- __ADD(IPV4_DEVCONF_SEND_REDIRECTS, send_redirects)
- __ADD(IPV4_DEVCONF_SHARED_MEDIA, shared_media)
- __ADD(IPV4_DEVCONF_RP_FILTER, rp_filter)
- __ADD(IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route)
- __ADD(IPV4_DEVCONF_BOOTP_RELAY, bootp_relay)
- __ADD(IPV4_DEVCONF_LOG_MARTIANS, log_martians)
- __ADD(IPV4_DEVCONF_TAG, tag)
- __ADD(IPV4_DEVCONF_ARPFILTER, arpfilter)
- __ADD(IPV4_DEVCONF_MEDIUM_ID, medium_id)
- __ADD(IPV4_DEVCONF_NOXFRM, noxfrm)
- __ADD(IPV4_DEVCONF_NOPOLICY, nopolicy)
- __ADD(IPV4_DEVCONF_FORCE_IGMP_VERSION, force_igmp_version)
- __ADD(IPV4_DEVCONF_ARP_ANNOUNCE, arp_announce)
- __ADD(IPV4_DEVCONF_ARP_IGNORE, arp_ignore)
- __ADD(IPV4_DEVCONF_PROMOTE_SECONDARIES, promote_secondaries)
- __ADD(IPV4_DEVCONF_ARP_ACCEPT, arp_accept)
- __ADD(IPV4_DEVCONF_ARP_NOTIFY, arp_notify)
- __ADD(IPV4_DEVCONF_ACCEPT_LOCAL, accept_local)
- __ADD(IPV4_DEVCONF_SRC_VMARK, src_vmark)
- __ADD(IPV4_DEVCONF_PROXY_ARP_PVLAN, proxy_arp_pvlan)
- __ADD(IPV4_DEVCONF_ROUTE_LOCALNET, route_localnet)
- __ADD(IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL, igmpv2_unsolicited_report_interval)
- __ADD(IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL, igmpv3_unsolicited_report_interval)
+ __ADD(IPV4_DEVCONF_FORWARDING, forwarding),
+ __ADD(IPV4_DEVCONF_MC_FORWARDING, mc_forwarding),
+ __ADD(IPV4_DEVCONF_PROXY_ARP, proxy_arp),
+ __ADD(IPV4_DEVCONF_ACCEPT_REDIRECTS, accept_redirects),
+ __ADD(IPV4_DEVCONF_SECURE_REDIRECTS, secure_redirects),
+ __ADD(IPV4_DEVCONF_SEND_REDIRECTS, send_redirects),
+ __ADD(IPV4_DEVCONF_SHARED_MEDIA, shared_media),
+ __ADD(IPV4_DEVCONF_RP_FILTER, rp_filter),
+ __ADD(IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route),
+ __ADD(IPV4_DEVCONF_BOOTP_RELAY, bootp_relay),
+ __ADD(IPV4_DEVCONF_LOG_MARTIANS, log_martians),
+ __ADD(IPV4_DEVCONF_TAG, tag),
+ __ADD(IPV4_DEVCONF_ARPFILTER, arpfilter),
+ __ADD(IPV4_DEVCONF_MEDIUM_ID, medium_id),
+ __ADD(IPV4_DEVCONF_NOXFRM, noxfrm),
+ __ADD(IPV4_DEVCONF_NOPOLICY, nopolicy),
+ __ADD(IPV4_DEVCONF_FORCE_IGMP_VERSION, force_igmp_version),
+ __ADD(IPV4_DEVCONF_ARP_ANNOUNCE, arp_announce),
+ __ADD(IPV4_DEVCONF_ARP_IGNORE, arp_ignore),
+ __ADD(IPV4_DEVCONF_PROMOTE_SECONDARIES, promote_secondaries),
+ __ADD(IPV4_DEVCONF_ARP_ACCEPT, arp_accept),
+ __ADD(IPV4_DEVCONF_ARP_NOTIFY, arp_notify),
+ __ADD(IPV4_DEVCONF_ACCEPT_LOCAL, accept_local),
+ __ADD(IPV4_DEVCONF_SRC_VMARK, src_vmark),
+ __ADD(IPV4_DEVCONF_PROXY_ARP_PVLAN, proxy_arp_pvlan),
+ __ADD(IPV4_DEVCONF_ROUTE_LOCALNET, route_localnet),
+ __ADD(IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL, igmpv2_unsolicited_report_interval),
+ __ADD(IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL, igmpv3_unsolicited_report_interval),
};
const char *rtnl_link_inet_devconf2str(int type, char *buf, size_t len)
diff --git a/lib/route/link/inet6.c b/lib/route/link/inet6.c
index 6fa2741..feb0226 100644
--- a/lib/route/link/inet6.c
+++ b/lib/route/link/inet6.c
@@ -208,11 +208,11 @@ static int inet6_parse_protinfo(struct rtnl_link *link, struct nlattr *attr,
#define IF_READY 0x80000000
static const struct trans_tbl inet6_flags[] = {
- __ADD(IF_RA_OTHERCONF, ra_otherconf)
- __ADD(IF_RA_MANAGED, ra_managed)
- __ADD(IF_RA_RCVD, ra_rcvd)
- __ADD(IF_RS_SENT, rs_sent)
- __ADD(IF_READY, ready)
+ __ADD(IF_RA_OTHERCONF, ra_otherconf),
+ __ADD(IF_RA_MANAGED, ra_managed),
+ __ADD(IF_RA_RCVD, ra_rcvd),
+ __ADD(IF_RS_SENT, rs_sent),
+ __ADD(IF_READY, ready),
};
static char *inet6_flags2str(int flags, char *buf, size_t len)
@@ -222,35 +222,35 @@ static char *inet6_flags2str(int flags, char *buf, size_t len)
}
static const struct trans_tbl inet6_devconf[] = {
- __ADD(DEVCONF_FORWARDING, forwarding)
- __ADD(DEVCONF_HOPLIMIT, hoplimit)
- __ADD(DEVCONF_MTU6, mtu6)
- __ADD(DEVCONF_ACCEPT_RA, accept_ra)
- __ADD(DEVCONF_ACCEPT_REDIRECTS, accept_redirects)
- __ADD(DEVCONF_AUTOCONF, autoconf)
- __ADD(DEVCONF_DAD_TRANSMITS, dad_transmits)
- __ADD(DEVCONF_RTR_SOLICITS, rtr_solicits)
- __ADD(DEVCONF_RTR_SOLICIT_INTERVAL, rtr_solicit_interval)
- __ADD(DEVCONF_RTR_SOLICIT_DELAY, rtr_solicit_delay)
- __ADD(DEVCONF_USE_TEMPADDR, use_tempaddr)
- __ADD(DEVCONF_TEMP_VALID_LFT, temp_valid_lft)
- __ADD(DEVCONF_TEMP_PREFERED_LFT, temp_prefered_lft)
- __ADD(DEVCONF_REGEN_MAX_RETRY, regen_max_retry)
- __ADD(DEVCONF_MAX_DESYNC_FACTOR, max_desync_factor)
- __ADD(DEVCONF_MAX_ADDRESSES, max_addresses)
- __ADD(DEVCONF_FORCE_MLD_VERSION, force_mld_version)
- __ADD(DEVCONF_ACCEPT_RA_DEFRTR, accept_ra_defrtr)
- __ADD(DEVCONF_ACCEPT_RA_PINFO, accept_ra_pinfo)
- __ADD(DEVCONF_ACCEPT_RA_RTR_PREF, accept_ra_rtr_pref)
- __ADD(DEVCONF_RTR_PROBE_INTERVAL, rtr_probe_interval)
- __ADD(DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN, accept_ra_rt_info)
- __ADD(DEVCONF_PROXY_NDP, proxy_ndp)
- __ADD(DEVCONF_OPTIMISTIC_DAD, optimistic_dad)
- __ADD(DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route)
- __ADD(DEVCONF_MC_FORWARDING, mc_forwarding)
- __ADD(DEVCONF_DISABLE_IPV6, disable_ipv6)
- __ADD(DEVCONF_ACCEPT_DAD, accept_dad)
- __ADD(DEVCONF_FORCE_TLLAO, force_tllao)
+ __ADD(DEVCONF_FORWARDING, forwarding),
+ __ADD(DEVCONF_HOPLIMIT, hoplimit),
+ __ADD(DEVCONF_MTU6, mtu6),
+ __ADD(DEVCONF_ACCEPT_RA, accept_ra),
+ __ADD(DEVCONF_ACCEPT_REDIRECTS, accept_redirects),
+ __ADD(DEVCONF_AUTOCONF, autoconf),
+ __ADD(DEVCONF_DAD_TRANSMITS, dad_transmits),
+ __ADD(DEVCONF_RTR_SOLICITS, rtr_solicits),
+ __ADD(DEVCONF_RTR_SOLICIT_INTERVAL, rtr_solicit_interval),
+ __ADD(DEVCONF_RTR_SOLICIT_DELAY, rtr_solicit_delay),
+ __ADD(DEVCONF_USE_TEMPADDR, use_tempaddr),
+ __ADD(DEVCONF_TEMP_VALID_LFT, temp_valid_lft),
+ __ADD(DEVCONF_TEMP_PREFERED_LFT, temp_prefered_lft),
+ __ADD(DEVCONF_REGEN_MAX_RETRY, regen_max_retry),
+ __ADD(DEVCONF_MAX_DESYNC_FACTOR, max_desync_factor),
+ __ADD(DEVCONF_MAX_ADDRESSES, max_addresses),
+ __ADD(DEVCONF_FORCE_MLD_VERSION, force_mld_version),
+ __ADD(DEVCONF_ACCEPT_RA_DEFRTR, accept_ra_defrtr),
+ __ADD(DEVCONF_ACCEPT_RA_PINFO, accept_ra_pinfo),
+ __ADD(DEVCONF_ACCEPT_RA_RTR_PREF, accept_ra_rtr_pref),
+ __ADD(DEVCONF_RTR_PROBE_INTERVAL, rtr_probe_interval),
+ __ADD(DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN, accept_ra_rt_info),
+ __ADD(DEVCONF_PROXY_NDP, proxy_ndp),
+ __ADD(DEVCONF_OPTIMISTIC_DAD, optimistic_dad),
+ __ADD(DEVCONF_ACCEPT_SOURCE_ROUTE, accept_source_route),
+ __ADD(DEVCONF_MC_FORWARDING, mc_forwarding),
+ __ADD(DEVCONF_DISABLE_IPV6, disable_ipv6),
+ __ADD(DEVCONF_ACCEPT_DAD, accept_dad),
+ __ADD(DEVCONF_FORCE_TLLAO, force_tllao),
};
static char *inet6_devconf2str(int type, char *buf, size_t len)
diff --git a/lib/route/link/macvlan.c b/lib/route/link/macvlan.c
index 2340903..c3eeb3f 100644
--- a/lib/route/link/macvlan.c
+++ b/lib/route/link/macvlan.c
@@ -310,14 +310,14 @@ uint16_t rtnl_link_macvlan_get_flags(struct rtnl_link *link)
/** @} */
static const struct trans_tbl macvlan_flags[] = {
- __ADD(MACVLAN_FLAG_NOPROMISC, nopromisc)
+ __ADD(MACVLAN_FLAG_NOPROMISC, nopromisc),
};
static const struct trans_tbl macvlan_modes[] = {
- __ADD(MACVLAN_MODE_PRIVATE, private)
- __ADD(MACVLAN_MODE_VEPA, vepa)
- __ADD(MACVLAN_MODE_BRIDGE, bridge)
- __ADD(MACVLAN_MODE_PASSTHRU, passthru)
+ __ADD(MACVLAN_MODE_PRIVATE, private),
+ __ADD(MACVLAN_MODE_VEPA, vepa),
+ __ADD(MACVLAN_MODE_BRIDGE, bridge),
+ __ADD(MACVLAN_MODE_PASSTHRU, passthru),
};
/**
diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c
index b9f0c66..f977bc4 100644
--- a/lib/route/link/vlan.c
+++ b/lib/route/link/vlan.c
@@ -603,7 +603,7 @@ struct vlan_map *rtnl_link_vlan_get_egress_map(struct rtnl_link *link,
/** @} */
static const struct trans_tbl vlan_flags[] = {
- __ADD(VLAN_FLAG_REORDER_HDR, reorder_hdr)
+ __ADD(VLAN_FLAG_REORDER_HDR, reorder_hdr),
};
/**
diff --git a/lib/route/neigh.c b/lib/route/neigh.c
index ad26b4d..0caf6dd 100644
--- a/lib/route/neigh.c
+++ b/lib/route/neigh.c
@@ -285,15 +285,15 @@ static int neigh_compare(struct nl_object *_a, struct nl_object *_b,
}
static const struct trans_tbl neigh_attrs[] = {
- __ADD(NEIGH_ATTR_FLAGS, flags)
- __ADD(NEIGH_ATTR_STATE, state)
- __ADD(NEIGH_ATTR_LLADDR, lladdr)
- __ADD(NEIGH_ATTR_DST, dst)
- __ADD(NEIGH_ATTR_CACHEINFO, cacheinfo)
- __ADD(NEIGH_ATTR_IFINDEX, ifindex)
- __ADD(NEIGH_ATTR_FAMILY, family)
- __ADD(NEIGH_ATTR_TYPE, type)
- __ADD(NEIGH_ATTR_PROBES, probes)
+ __ADD(NEIGH_ATTR_FLAGS, flags),
+ __ADD(NEIGH_ATTR_STATE, state),
+ __ADD(NEIGH_ATTR_LLADDR, lladdr),
+ __ADD(NEIGH_ATTR_DST, dst),
+ __ADD(NEIGH_ATTR_CACHEINFO, cacheinfo),
+ __ADD(NEIGH_ATTR_IFINDEX, ifindex),
+ __ADD(NEIGH_ATTR_FAMILY, family),
+ __ADD(NEIGH_ATTR_TYPE, type),
+ __ADD(NEIGH_ATTR_PROBES, probes),
};
static char *neigh_attrs2str(int attrs, char *buf, size_t len)
@@ -728,14 +728,14 @@ int rtnl_neigh_delete(struct nl_sock *sk, struct rtnl_neigh *neigh,
*/
static const struct trans_tbl neigh_states[] = {
- __ADD(NUD_INCOMPLETE, incomplete)
- __ADD(NUD_REACHABLE, reachable)
- __ADD(NUD_STALE, stale)
- __ADD(NUD_DELAY, delay)
- __ADD(NUD_PROBE, probe)
- __ADD(NUD_FAILED, failed)
- __ADD(NUD_NOARP, norarp)
- __ADD(NUD_PERMANENT, permanent)
+ __ADD(NUD_INCOMPLETE, incomplete),
+ __ADD(NUD_REACHABLE, reachable),
+ __ADD(NUD_STALE, stale),
+ __ADD(NUD_DELAY, delay),
+ __ADD(NUD_PROBE, probe),
+ __ADD(NUD_FAILED, failed),
+ __ADD(NUD_NOARP, norarp),
+ __ADD(NUD_PERMANENT, permanent),
};
char * rtnl_neigh_state2str(int state, char *buf, size_t len)
@@ -757,9 +757,9 @@ int rtnl_neigh_str2state(const char *name)
*/
static const struct trans_tbl neigh_flags[] = {
- __ADD(NTF_USE, use)
- __ADD(NTF_PROXY, proxy)
- __ADD(NTF_ROUTER, router)
+ __ADD(NTF_USE, use),
+ __ADD(NTF_PROXY, proxy),
+ __ADD(NTF_ROUTER, router),
};
char * rtnl_neigh_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c
index d3ca499..a7cda90 100644
--- a/lib/route/nexthop.c
+++ b/lib/route/nexthop.c
@@ -277,9 +277,9 @@ uint32_t rtnl_route_nh_get_realms(struct rtnl_nexthop *nh)
*/
static const struct trans_tbl nh_flags[] = {
- __ADD(RTNH_F_DEAD, dead)
- __ADD(RTNH_F_PERVASIVE, pervasive)
- __ADD(RTNH_F_ONLINK, onlink)
+ __ADD(RTNH_F_DEAD, dead),
+ __ADD(RTNH_F_PERVASIVE, pervasive),
+ __ADD(RTNH_F_ONLINK, onlink),
};
char *rtnl_route_nh_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/route/qdisc/cbq.c b/lib/route/qdisc/cbq.c
index 95f1761..118f893 100644
--- a/lib/route/qdisc/cbq.c
+++ b/lib/route/qdisc/cbq.c
@@ -28,11 +28,11 @@
*/
static const struct trans_tbl ovl_strategies[] = {
- __ADD(TC_CBQ_OVL_CLASSIC,classic)
- __ADD(TC_CBQ_OVL_DELAY,delay)
- __ADD(TC_CBQ_OVL_LOWPRIO,lowprio)
- __ADD(TC_CBQ_OVL_DROP,drop)
- __ADD(TC_CBQ_OVL_RCLASSIC,rclassic)
+ __ADD(TC_CBQ_OVL_CLASSIC,classic),
+ __ADD(TC_CBQ_OVL_DELAY,delay),
+ __ADD(TC_CBQ_OVL_LOWPRIO,lowprio),
+ __ADD(TC_CBQ_OVL_DROP,drop),
+ __ADD(TC_CBQ_OVL_RCLASSIC,rclassic),
};
/**
diff --git a/lib/route/qdisc/prio.c b/lib/route/qdisc/prio.c
index 54a46f0..5a21729 100644
--- a/lib/route/qdisc/prio.c
+++ b/lib/route/qdisc/prio.c
@@ -215,12 +215,12 @@ uint8_t *rtnl_qdisc_prio_get_priomap(struct rtnl_qdisc *qdisc)
*/
static const struct trans_tbl prios[] = {
- __ADD(TC_PRIO_BESTEFFORT,besteffort)
- __ADD(TC_PRIO_FILLER,filler)
- __ADD(TC_PRIO_BULK,bulk)
- __ADD(TC_PRIO_INTERACTIVE_BULK,interactive_bulk)
- __ADD(TC_PRIO_INTERACTIVE,interactive)
- __ADD(TC_PRIO_CONTROL,control)
+ __ADD(TC_PRIO_BESTEFFORT,besteffort),
+ __ADD(TC_PRIO_FILLER,filler),
+ __ADD(TC_PRIO_BULK,bulk),
+ __ADD(TC_PRIO_INTERACTIVE_BULK,interactive_bulk),
+ __ADD(TC_PRIO_INTERACTIVE,interactive),
+ __ADD(TC_PRIO_CONTROL,control),
};
/**
diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index dd4bf49..4063c6f 100644
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -544,24 +544,24 @@ static int route_update(struct nl_object *old_obj, struct nl_object *new_obj)
}
static const struct trans_tbl route_attrs[] = {
- __ADD(ROUTE_ATTR_FAMILY, family)
- __ADD(ROUTE_ATTR_TOS, tos)
- __ADD(ROUTE_ATTR_TABLE, table)
- __ADD(ROUTE_ATTR_PROTOCOL, protocol)
- __ADD(ROUTE_ATTR_SCOPE, scope)
- __ADD(ROUTE_ATTR_TYPE, type)
- __ADD(ROUTE_ATTR_FLAGS, flags)
- __ADD(ROUTE_ATTR_DST, dst)
- __ADD(ROUTE_ATTR_SRC, src)
- __ADD(ROUTE_ATTR_IIF, iif)
- __ADD(ROUTE_ATTR_OIF, oif)
- __ADD(ROUTE_ATTR_GATEWAY, gateway)
- __ADD(ROUTE_ATTR_PRIO, prio)
- __ADD(ROUTE_ATTR_PREF_SRC, pref_src)
- __ADD(ROUTE_ATTR_METRICS, metrics)
- __ADD(ROUTE_ATTR_MULTIPATH, multipath)
- __ADD(ROUTE_ATTR_REALMS, realms)
- __ADD(ROUTE_ATTR_CACHEINFO, cacheinfo)
+ __ADD(ROUTE_ATTR_FAMILY, family),
+ __ADD(ROUTE_ATTR_TOS, tos),
+ __ADD(ROUTE_ATTR_TABLE, table),
+ __ADD(ROUTE_ATTR_PROTOCOL, protocol),
+ __ADD(ROUTE_ATTR_SCOPE, scope),
+ __ADD(ROUTE_ATTR_TYPE, type),
+ __ADD(ROUTE_ATTR_FLAGS, flags),
+ __ADD(ROUTE_ATTR_DST, dst),
+ __ADD(ROUTE_ATTR_SRC, src),
+ __ADD(ROUTE_ATTR_IIF, iif),
+ __ADD(ROUTE_ATTR_OIF, oif),
+ __ADD(ROUTE_ATTR_GATEWAY, gateway),
+ __ADD(ROUTE_ATTR_PRIO, prio),
+ __ADD(ROUTE_ATTR_PREF_SRC, pref_src),
+ __ADD(ROUTE_ATTR_METRICS, metrics),
+ __ADD(ROUTE_ATTR_MULTIPATH, multipath),
+ __ADD(ROUTE_ATTR_REALMS, realms),
+ __ADD(ROUTE_ATTR_CACHEINFO, cacheinfo),
};
static char *route_attrs2str(int attrs, char *buf, size_t len)
diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
index a5b3966..9cd326f 100644
--- a/lib/route/route_utils.c
+++ b/lib/route/route_utils.c
@@ -140,19 +140,19 @@ int rtnl_route_str2proto(const char *name)
*/
static const struct trans_tbl route_metrices[] = {
- __ADD(RTAX_UNSPEC, unspec)
- __ADD(RTAX_LOCK, lock)
- __ADD(RTAX_MTU, mtu)
- __ADD(RTAX_WINDOW, window)
- __ADD(RTAX_RTT, rtt)
- __ADD(RTAX_RTTVAR, rttvar)
- __ADD(RTAX_SSTHRESH, ssthresh)
- __ADD(RTAX_CWND, cwnd)
- __ADD(RTAX_ADVMSS, advmss)
- __ADD(RTAX_REORDERING, reordering)
- __ADD(RTAX_HOPLIMIT, hoplimit)
- __ADD(RTAX_INITCWND, initcwnd)
- __ADD(RTAX_FEATURES, features)
+ __ADD(RTAX_UNSPEC, unspec),
+ __ADD(RTAX_LOCK, lock),
+ __ADD(RTAX_MTU, mtu),
+ __ADD(RTAX_WINDOW, window),
+ __ADD(RTAX_RTT, rtt),
+ __ADD(RTAX_RTTVAR, rttvar),
+ __ADD(RTAX_SSTHRESH, ssthresh),
+ __ADD(RTAX_CWND, cwnd),
+ __ADD(RTAX_ADVMSS, advmss),
+ __ADD(RTAX_REORDERING, reordering),
+ __ADD(RTAX_HOPLIMIT, hoplimit),
+ __ADD(RTAX_INITCWND, initcwnd),
+ __ADD(RTAX_FEATURES, features),
};
char *rtnl_route_metric2str(int metric, char *buf, size_t size)
diff --git a/lib/route/rtnl.c b/lib/route/rtnl.c
index 6a55ca1..242e2a8 100644
--- a/lib/route/rtnl.c
+++ b/lib/route/rtnl.c
@@ -58,18 +58,18 @@ int nl_rtgen_request(struct nl_sock *sk, int type, int family, int flags)
*/
static const struct trans_tbl rtntypes[] = {
- __ADD(RTN_UNSPEC,unspec)
- __ADD(RTN_UNICAST,unicast)
- __ADD(RTN_LOCAL,local)
- __ADD(RTN_BROADCAST,broadcast)
- __ADD(RTN_ANYCAST,anycast)
- __ADD(RTN_MULTICAST,multicast)
- __ADD(RTN_BLACKHOLE,blackhole)
- __ADD(RTN_UNREACHABLE,unreachable)
- __ADD(RTN_PROHIBIT,prohibit)
- __ADD(RTN_THROW,throw)
- __ADD(RTN_NAT,nat)
- __ADD(RTN_XRESOLVE,xresolve)
+ __ADD(RTN_UNSPEC,unspec),
+ __ADD(RTN_UNICAST,unicast),
+ __ADD(RTN_LOCAL,local),
+ __ADD(RTN_BROADCAST,broadcast),
+ __ADD(RTN_ANYCAST,anycast),
+ __ADD(RTN_MULTICAST,multicast),
+ __ADD(RTN_BLACKHOLE,blackhole),
+ __ADD(RTN_UNREACHABLE,unreachable),
+ __ADD(RTN_PROHIBIT,prohibit),
+ __ADD(RTN_THROW,throw),
+ __ADD(RTN_NAT,nat),
+ __ADD(RTN_XRESOLVE,xresolve),
};
char *nl_rtntype2str(int type, char *buf, size_t size)
@@ -90,11 +90,11 @@ int nl_str2rtntype(const char *name)
*/
static const struct trans_tbl scopes[] = {
- __ADD(255,nowhere)
- __ADD(254,host)
- __ADD(253,link)
- __ADD(200,site)
- __ADD(0,global)
+ __ADD(255,nowhere),
+ __ADD(254,host),
+ __ADD(253,link),
+ __ADD(200,site),
+ __ADD(0,global),
};
char *rtnl_scope2str(int scope, char *buf, size_t size)
diff --git a/lib/route/rule.c b/lib/route/rule.c
index b2161a2..357cb1b 100644
--- a/lib/route/rule.c
+++ b/lib/route/rule.c
@@ -274,19 +274,19 @@ static int rule_compare(struct nl_object *_a, struct nl_object *_b,
}
static const struct trans_tbl rule_attrs[] = {
- __ADD(RULE_ATTR_FAMILY, family)
- __ADD(RULE_ATTR_TABLE, table)
- __ADD(RULE_ATTR_ACTION, action)
- __ADD(RULE_ATTR_IIFNAME, iifname)
- __ADD(RULE_ATTR_OIFNAME, oifname)
- __ADD(RULE_ATTR_PRIO, prio)
- __ADD(RULE_ATTR_MARK, mark)
- __ADD(RULE_ATTR_MASK, mask)
- __ADD(RULE_ATTR_GOTO, goto)
- __ADD(RULE_ATTR_SRC, src)
- __ADD(RULE_ATTR_DST, dst)
- __ADD(RULE_ATTR_DSFIELD, dsfield)
- __ADD(RULE_ATTR_FLOW, flow)
+ __ADD(RULE_ATTR_FAMILY, family),
+ __ADD(RULE_ATTR_TABLE, table),
+ __ADD(RULE_ATTR_ACTION, action),
+ __ADD(RULE_ATTR_IIFNAME, iifname),
+ __ADD(RULE_ATTR_OIFNAME, oifname),
+ __ADD(RULE_ATTR_PRIO, prio),
+ __ADD(RULE_ATTR_MARK, mark),
+ __ADD(RULE_ATTR_MASK, mask),
+ __ADD(RULE_ATTR_GOTO, goto),
+ __ADD(RULE_ATTR_SRC, src),
+ __ADD(RULE_ATTR_DST, dst),
+ __ADD(RULE_ATTR_DSFIELD, dsfield),
+ __ADD(RULE_ATTR_FLOW, flow),
};
static char *rule_attrs2str(int attrs, char *buf, size_t len)
diff --git a/lib/utils.c b/lib/utils.c
index 5cc9e94..67612bd 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -585,24 +585,24 @@ char * nl_msec2str(uint64_t msec, char *buf, size_t len)
*/
static const struct trans_tbl nlfamilies[] = {
- __ADD(NETLINK_ROUTE,route)
- __ADD(NETLINK_USERSOCK,usersock)
- __ADD(NETLINK_FIREWALL,firewall)
- __ADD(NETLINK_INET_DIAG,inetdiag)
- __ADD(NETLINK_NFLOG,nflog)
- __ADD(NETLINK_XFRM,xfrm)
- __ADD(NETLINK_SELINUX,selinux)
- __ADD(NETLINK_ISCSI,iscsi)
- __ADD(NETLINK_AUDIT,audit)
- __ADD(NETLINK_FIB_LOOKUP,fib_lookup)
- __ADD(NETLINK_CONNECTOR,connector)
- __ADD(NETLINK_NETFILTER,netfilter)
- __ADD(NETLINK_IP6_FW,ip6_fw)
- __ADD(NETLINK_DNRTMSG,dnrtmsg)
- __ADD(NETLINK_KOBJECT_UEVENT,kobject_uevent)
- __ADD(NETLINK_GENERIC,generic)
- __ADD(NETLINK_SCSITRANSPORT,scsitransport)
- __ADD(NETLINK_ECRYPTFS,ecryptfs)
+ __ADD(NETLINK_ROUTE,route),
+ __ADD(NETLINK_USERSOCK,usersock),
+ __ADD(NETLINK_FIREWALL,firewall),
+ __ADD(NETLINK_INET_DIAG,inetdiag),
+ __ADD(NETLINK_NFLOG,nflog),
+ __ADD(NETLINK_XFRM,xfrm),
+ __ADD(NETLINK_SELINUX,selinux),
+ __ADD(NETLINK_ISCSI,iscsi),
+ __ADD(NETLINK_AUDIT,audit),
+ __ADD(NETLINK_FIB_LOOKUP,fib_lookup),
+ __ADD(NETLINK_CONNECTOR,connector),
+ __ADD(NETLINK_NETFILTER,netfilter),
+ __ADD(NETLINK_IP6_FW,ip6_fw),
+ __ADD(NETLINK_DNRTMSG,dnrtmsg),
+ __ADD(NETLINK_KOBJECT_UEVENT,kobject_uevent),
+ __ADD(NETLINK_GENERIC,generic),
+ __ADD(NETLINK_SCSITRANSPORT,scsitransport),
+ __ADD(NETLINK_ECRYPTFS,ecryptfs),
};
char * nl_nlfamily2str(int family, char *buf, size_t size)
@@ -627,85 +627,85 @@ int nl_str2nlfamily(const char *name)
static const struct trans_tbl llprotos[] = {
{0, "generic"},
- __ADD(ARPHRD_ETHER,ether)
- __ADD(ARPHRD_EETHER,eether)
- __ADD(ARPHRD_AX25,ax25)
- __ADD(ARPHRD_PRONET,pronet)
- __ADD(ARPHRD_CHAOS,chaos)
- __ADD(ARPHRD_IEEE802,ieee802)
- __ADD(ARPHRD_ARCNET,arcnet)
- __ADD(ARPHRD_APPLETLK,atalk)
- __ADD(ARPHRD_DLCI,dlci)
- __ADD(ARPHRD_ATM,atm)
- __ADD(ARPHRD_METRICOM,metricom)
- __ADD(ARPHRD_IEEE1394,ieee1394)
+ __ADD(ARPHRD_ETHER,ether),
+ __ADD(ARPHRD_EETHER,eether),
+ __ADD(ARPHRD_AX25,ax25),
+ __ADD(ARPHRD_PRONET,pronet),
+ __ADD(ARPHRD_CHAOS,chaos),
+ __ADD(ARPHRD_IEEE802,ieee802),
+ __ADD(ARPHRD_ARCNET,arcnet),
+ __ADD(ARPHRD_APPLETLK,atalk),
+ __ADD(ARPHRD_DLCI,dlci),
+ __ADD(ARPHRD_ATM,atm),
+ __ADD(ARPHRD_METRICOM,metricom),
+ __ADD(ARPHRD_IEEE1394,ieee1394),
#ifdef ARPHRD_EUI64
- __ADD(ARPHRD_EUI64,eui64)
+ __ADD(ARPHRD_EUI64,eui64),
#endif
- __ADD(ARPHRD_INFINIBAND,infiniband)
- __ADD(ARPHRD_SLIP,slip)
- __ADD(ARPHRD_CSLIP,cslip)
- __ADD(ARPHRD_SLIP6,slip6)
- __ADD(ARPHRD_CSLIP6,cslip6)
- __ADD(ARPHRD_RSRVD,rsrvd)
- __ADD(ARPHRD_ADAPT,adapt)
- __ADD(ARPHRD_ROSE,rose)
- __ADD(ARPHRD_X25,x25)
+ __ADD(ARPHRD_INFINIBAND,infiniband),
+ __ADD(ARPHRD_SLIP,slip),
+ __ADD(ARPHRD_CSLIP,cslip),
+ __ADD(ARPHRD_SLIP6,slip6),
+ __ADD(ARPHRD_CSLIP6,cslip6),
+ __ADD(ARPHRD_RSRVD,rsrvd),
+ __ADD(ARPHRD_ADAPT,adapt),
+ __ADD(ARPHRD_ROSE,rose),
+ __ADD(ARPHRD_X25,x25),
#ifdef ARPHRD_HWX25
- __ADD(ARPHRD_HWX25,hwx25)
+ __ADD(ARPHRD_HWX25,hwx25),
#endif
- __ADD(ARPHRD_CAN,can)
- __ADD(ARPHRD_PPP,ppp)
- __ADD(ARPHRD_HDLC,hdlc)
- __ADD(ARPHRD_LAPB,lapb)
- __ADD(ARPHRD_DDCMP,ddcmp)
- __ADD(ARPHRD_RAWHDLC,rawhdlc)
- __ADD(ARPHRD_TUNNEL,ipip)
- __ADD(ARPHRD_TUNNEL6,tunnel6)
- __ADD(ARPHRD_FRAD,frad)
- __ADD(ARPHRD_SKIP,skip)
- __ADD(ARPHRD_LOOPBACK,loopback)
- __ADD(ARPHRD_LOCALTLK,localtlk)
- __ADD(ARPHRD_FDDI,fddi)
- __ADD(ARPHRD_BIF,bif)
- __ADD(ARPHRD_SIT,sit)
- __ADD(ARPHRD_IPDDP,ip/ddp)
- __ADD(ARPHRD_IPGRE,gre)
- __ADD(ARPHRD_PIMREG,pimreg)
- __ADD(ARPHRD_HIPPI,hippi)
- __ADD(ARPHRD_ASH,ash)
- __ADD(ARPHRD_ECONET,econet)
- __ADD(ARPHRD_IRDA,irda)
- __ADD(ARPHRD_FCPP,fcpp)
- __ADD(ARPHRD_FCAL,fcal)
- __ADD(ARPHRD_FCPL,fcpl)
- __ADD(ARPHRD_FCFABRIC,fcfb_0)
- __ADD(ARPHRD_FCFABRIC+1,fcfb_1)
- __ADD(ARPHRD_FCFABRIC+2,fcfb_2)
- __ADD(ARPHRD_FCFABRIC+3,fcfb_3)
- __ADD(ARPHRD_FCFABRIC+4,fcfb_4)
- __ADD(ARPHRD_FCFABRIC+5,fcfb_5)
- __ADD(ARPHRD_FCFABRIC+6,fcfb_6)
- __ADD(ARPHRD_FCFABRIC+7,fcfb_7)
- __ADD(ARPHRD_FCFABRIC+8,fcfb_8)
- __ADD(ARPHRD_FCFABRIC+9,fcfb_9)
- __ADD(ARPHRD_FCFABRIC+10,fcfb_10)
- __ADD(ARPHRD_FCFABRIC+11,fcfb_11)
- __ADD(ARPHRD_FCFABRIC+12,fcfb_12)
- __ADD(ARPHRD_IEEE802_TR,tr)
- __ADD(ARPHRD_IEEE80211,ieee802.11)
- __ADD(ARPHRD_PHONET,phonet)
+ __ADD(ARPHRD_CAN,can),
+ __ADD(ARPHRD_PPP,ppp),
+ __ADD(ARPHRD_HDLC,hdlc),
+ __ADD(ARPHRD_LAPB,lapb),
+ __ADD(ARPHRD_DDCMP,ddcmp),
+ __ADD(ARPHRD_RAWHDLC,rawhdlc),
+ __ADD(ARPHRD_TUNNEL,ipip),
+ __ADD(ARPHRD_TUNNEL6,tunnel6),
+ __ADD(ARPHRD_FRAD,frad),
+ __ADD(ARPHRD_SKIP,skip),
+ __ADD(ARPHRD_LOOPBACK,loopback),
+ __ADD(ARPHRD_LOCALTLK,localtlk),
+ __ADD(ARPHRD_FDDI,fddi),
+ __ADD(ARPHRD_BIF,bif),
+ __ADD(ARPHRD_SIT,sit),
+ __ADD(ARPHRD_IPDDP,ip/ddp),
+ __ADD(ARPHRD_IPGRE,gre),
+ __ADD(ARPHRD_PIMREG,pimreg),
+ __ADD(ARPHRD_HIPPI,hippi),
+ __ADD(ARPHRD_ASH,ash),
+ __ADD(ARPHRD_ECONET,econet),
+ __ADD(ARPHRD_IRDA,irda),
+ __ADD(ARPHRD_FCPP,fcpp),
+ __ADD(ARPHRD_FCAL,fcal),
+ __ADD(ARPHRD_FCPL,fcpl),
+ __ADD(ARPHRD_FCFABRIC,fcfb_0),
+ __ADD(ARPHRD_FCFABRIC+1,fcfb_1),
+ __ADD(ARPHRD_FCFABRIC+2,fcfb_2),
+ __ADD(ARPHRD_FCFABRIC+3,fcfb_3),
+ __ADD(ARPHRD_FCFABRIC+4,fcfb_4),
+ __ADD(ARPHRD_FCFABRIC+5,fcfb_5),
+ __ADD(ARPHRD_FCFABRIC+6,fcfb_6),
+ __ADD(ARPHRD_FCFABRIC+7,fcfb_7),
+ __ADD(ARPHRD_FCFABRIC+8,fcfb_8),
+ __ADD(ARPHRD_FCFABRIC+9,fcfb_9),
+ __ADD(ARPHRD_FCFABRIC+10,fcfb_10),
+ __ADD(ARPHRD_FCFABRIC+11,fcfb_11),
+ __ADD(ARPHRD_FCFABRIC+12,fcfb_12),
+ __ADD(ARPHRD_IEEE802_TR,tr),
+ __ADD(ARPHRD_IEEE80211,ieee802.11),
+ __ADD(ARPHRD_PHONET,phonet),
#ifdef ARPHRD_CAIF
- __ADD(ARPHRD_CAIF, caif)
+ __ADD(ARPHRD_CAIF, caif),
#endif
#ifdef ARPHRD_IEEE80211_PRISM
- __ADD(ARPHRD_IEEE80211_PRISM, ieee802.11_prism)
+ __ADD(ARPHRD_IEEE80211_PRISM, ieee802.11_prism),
#endif
#ifdef ARPHRD_VOID
- __ADD(ARPHRD_VOID,void)
+ __ADD(ARPHRD_VOID,void),
#endif
#ifdef ARPHRD_NONE
- __ADD(ARPHRD_NONE,nohdr)
+ __ADD(ARPHRD_NONE,nohdr),
#endif
};
@@ -728,75 +728,75 @@ int nl_str2llproto(const char *name)
*/
static const struct trans_tbl ether_protos[] = {
- __ADD(ETH_P_LOOP,loop)
- __ADD(ETH_P_PUP,pup)
- __ADD(ETH_P_PUPAT,pupat)
- __ADD(ETH_P_IP,ip)
- __ADD(ETH_P_X25,x25)
- __ADD(ETH_P_ARP,arp)
- __ADD(ETH_P_BPQ,bpq)
- __ADD(ETH_P_IEEEPUP,ieeepup)
- __ADD(ETH_P_IEEEPUPAT,ieeepupat)
- __ADD(ETH_P_DEC,dec)
- __ADD(ETH_P_DNA_DL,dna_dl)
- __ADD(ETH_P_DNA_RC,dna_rc)
- __ADD(ETH_P_DNA_RT,dna_rt)
- __ADD(ETH_P_LAT,lat)
- __ADD(ETH_P_DIAG,diag)
- __ADD(ETH_P_CUST,cust)
- __ADD(ETH_P_SCA,sca)
- __ADD(ETH_P_TEB,teb)
- __ADD(ETH_P_RARP,rarp)
- __ADD(ETH_P_ATALK,atalk)
- __ADD(ETH_P_AARP,aarp)
+ __ADD(ETH_P_LOOP,loop),
+ __ADD(ETH_P_PUP,pup),
+ __ADD(ETH_P_PUPAT,pupat),
+ __ADD(ETH_P_IP,ip),
+ __ADD(ETH_P_X25,x25),
+ __ADD(ETH_P_ARP,arp),
+ __ADD(ETH_P_BPQ,bpq),
+ __ADD(ETH_P_IEEEPUP,ieeepup),
+ __ADD(ETH_P_IEEEPUPAT,ieeepupat),
+ __ADD(ETH_P_DEC,dec),
+ __ADD(ETH_P_DNA_DL,dna_dl),
+ __ADD(ETH_P_DNA_RC,dna_rc),
+ __ADD(ETH_P_DNA_RT,dna_rt),
+ __ADD(ETH_P_LAT,lat),
+ __ADD(ETH_P_DIAG,diag),
+ __ADD(ETH_P_CUST,cust),
+ __ADD(ETH_P_SCA,sca),
+ __ADD(ETH_P_TEB,teb),
+ __ADD(ETH_P_RARP,rarp),
+ __ADD(ETH_P_ATALK,atalk),
+ __ADD(ETH_P_AARP,aarp),
#ifdef ETH_P_8021Q
- __ADD(ETH_P_8021Q,802.1q)
+ __ADD(ETH_P_8021Q,802.1q),
#endif
- __ADD(ETH_P_IPX,ipx)
- __ADD(ETH_P_IPV6,ipv6)
- __ADD(ETH_P_PAUSE,pause)
- __ADD(ETH_P_SLOW,slow)
+ __ADD(ETH_P_IPX,ipx),
+ __ADD(ETH_P_IPV6,ipv6),
+ __ADD(ETH_P_PAUSE,pause),
+ __ADD(ETH_P_SLOW,slow),
#ifdef ETH_P_WCCP
- __ADD(ETH_P_WCCP,wccp)
+ __ADD(ETH_P_WCCP,wccp),
#endif
- __ADD(ETH_P_PPP_DISC,ppp_disc)
- __ADD(ETH_P_PPP_SES,ppp_ses)
- __ADD(ETH_P_MPLS_UC,mpls_uc)
- __ADD(ETH_P_MPLS_MC,mpls_mc)
- __ADD(ETH_P_ATMMPOA,atmmpoa)
- __ADD(ETH_P_LINK_CTL,link_ctl)
- __ADD(ETH_P_ATMFATE,atmfate)
- __ADD(ETH_P_PAE,pae)
- __ADD(ETH_P_AOE,aoe)
- __ADD(ETH_P_TIPC,tipc)
- __ADD(ETH_P_1588,ieee1588)
- __ADD(ETH_P_FCOE,fcoe)
- __ADD(ETH_P_FIP,fip)
- __ADD(ETH_P_EDSA,edsa)
- __ADD(ETH_P_EDP2,edp2)
- __ADD(ETH_P_802_3,802.3)
- __ADD(ETH_P_AX25,ax25)
- __ADD(ETH_P_ALL,all)
- __ADD(ETH_P_802_2,802.2)
- __ADD(ETH_P_SNAP,snap)
- __ADD(ETH_P_DDCMP,ddcmp)
- __ADD(ETH_P_WAN_PPP,wan_ppp)
- __ADD(ETH_P_PPP_MP,ppp_mp)
- __ADD(ETH_P_LOCALTALK,localtalk)
- __ADD(ETH_P_CAN,can)
- __ADD(ETH_P_PPPTALK,ppptalk)
- __ADD(ETH_P_TR_802_2,tr_802.2)
- __ADD(ETH_P_MOBITEX,mobitex)
- __ADD(ETH_P_CONTROL,control)
- __ADD(ETH_P_IRDA,irda)
- __ADD(ETH_P_ECONET,econet)
- __ADD(ETH_P_HDLC,hdlc)
- __ADD(ETH_P_ARCNET,arcnet)
- __ADD(ETH_P_DSA,dsa)
- __ADD(ETH_P_TRAILER,trailer)
- __ADD(ETH_P_PHONET,phonet)
- __ADD(ETH_P_IEEE802154,ieee802154)
- __ADD(ETH_P_CAIF,caif)
+ __ADD(ETH_P_PPP_DISC,ppp_disc),
+ __ADD(ETH_P_PPP_SES,ppp_ses),
+ __ADD(ETH_P_MPLS_UC,mpls_uc),
+ __ADD(ETH_P_MPLS_MC,mpls_mc),
+ __ADD(ETH_P_ATMMPOA,atmmpoa),
+ __ADD(ETH_P_LINK_CTL,link_ctl),
+ __ADD(ETH_P_ATMFATE,atmfate),
+ __ADD(ETH_P_PAE,pae),
+ __ADD(ETH_P_AOE,aoe),
+ __ADD(ETH_P_TIPC,tipc),
+ __ADD(ETH_P_1588,ieee1588),
+ __ADD(ETH_P_FCOE,fcoe),
+ __ADD(ETH_P_FIP,fip),
+ __ADD(ETH_P_EDSA,edsa),
+ __ADD(ETH_P_EDP2,edp2),
+ __ADD(ETH_P_802_3,802.3),
+ __ADD(ETH_P_AX25,ax25),
+ __ADD(ETH_P_ALL,all),
+ __ADD(ETH_P_802_2,802.2),
+ __ADD(ETH_P_SNAP,snap),
+ __ADD(ETH_P_DDCMP,ddcmp),
+ __ADD(ETH_P_WAN_PPP,wan_ppp),
+ __ADD(ETH_P_PPP_MP,ppp_mp),
+ __ADD(ETH_P_LOCALTALK,localtalk),
+ __ADD(ETH_P_CAN,can),
+ __ADD(ETH_P_PPPTALK,ppptalk),
+ __ADD(ETH_P_TR_802_2,tr_802.2),
+ __ADD(ETH_P_MOBITEX,mobitex),
+ __ADD(ETH_P_CONTROL,control),
+ __ADD(ETH_P_IRDA,irda),
+ __ADD(ETH_P_ECONET,econet),
+ __ADD(ETH_P_HDLC,hdlc),
+ __ADD(ETH_P_ARCNET,arcnet),
+ __ADD(ETH_P_DSA,dsa),
+ __ADD(ETH_P_TRAILER,trailer),
+ __ADD(ETH_P_PHONET,phonet),
+ __ADD(ETH_P_IEEE802154,ieee802154),
+ __ADD(ETH_P_CAIF,caif),
};
char *nl_ether_proto2str(int eproto, char *buf, size_t len)
diff --git a/lib/xfrm/ae.c b/lib/xfrm/ae.c
index 79091d6..a4db300 100644
--- a/lib/xfrm/ae.c
+++ b/lib/xfrm/ae.c
@@ -238,17 +238,17 @@ static int xfrm_ae_compare(struct nl_object *_a, struct nl_object *_b, uint32_t
*/
static const struct trans_tbl ae_attrs[] =
{
- __ADD(XFRM_AE_ATTR_DADDR, daddr)
- __ADD(XFRM_AE_ATTR_SPI, spi)
- __ADD(XFRM_AE_ATTR_PROTO, protocol)
- __ADD(XFRM_AE_ATTR_SADDR, saddr)
- __ADD(XFRM_AE_ATTR_FLAGS, flags)
- __ADD(XFRM_AE_ATTR_REQID, reqid)
- __ADD(XFRM_AE_ATTR_MARK, mark)
- __ADD(XFRM_AE_ATTR_LIFETIME, cur_lifetime)
- __ADD(XFRM_AE_ATTR_REPLAY_MAXAGE, replay_maxage)
- __ADD(XFRM_AE_ATTR_REPLAY_MAXDIFF, replay_maxdiff)
- __ADD(XFRM_AE_ATTR_REPLAY_STATE, replay_state)
+ __ADD(XFRM_AE_ATTR_DADDR, daddr),
+ __ADD(XFRM_AE_ATTR_SPI, spi),
+ __ADD(XFRM_AE_ATTR_PROTO, protocol),
+ __ADD(XFRM_AE_ATTR_SADDR, saddr),
+ __ADD(XFRM_AE_ATTR_FLAGS, flags),
+ __ADD(XFRM_AE_ATTR_REQID, reqid),
+ __ADD(XFRM_AE_ATTR_MARK, mark),
+ __ADD(XFRM_AE_ATTR_LIFETIME, cur_lifetime),
+ __ADD(XFRM_AE_ATTR_REPLAY_MAXAGE, replay_maxage),
+ __ADD(XFRM_AE_ATTR_REPLAY_MAXDIFF, replay_maxdiff),
+ __ADD(XFRM_AE_ATTR_REPLAY_STATE, replay_state),
};
static char* xfrm_ae_attrs2str (int attrs, char *buf, size_t len)
@@ -263,14 +263,14 @@ static char* xfrm_ae_attrs2str (int attrs, char *buf, size_t len)
*/
static const struct trans_tbl ae_flags[] = {
- __ADD(XFRM_AE_UNSPEC, unspecified)
- __ADD(XFRM_AE_RTHR, replay threshold)
- __ADD(XFRM_AE_RVAL, replay value)
- __ADD(XFRM_AE_LVAL, lifetime value)
- __ADD(XFRM_AE_ETHR, expiry time threshold)
- __ADD(XFRM_AE_CR, replay update event)
- __ADD(XFRM_AE_CE, timer expiry event)
- __ADD(XFRM_AE_CU, policy update event)
+ __ADD(XFRM_AE_UNSPEC, unspecified),
+ __ADD(XFRM_AE_RTHR, replay threshold),
+ __ADD(XFRM_AE_RVAL, replay value),
+ __ADD(XFRM_AE_LVAL, lifetime value),
+ __ADD(XFRM_AE_ETHR, expiry time threshold),
+ __ADD(XFRM_AE_CR, replay update event),
+ __ADD(XFRM_AE_CE, timer expiry event),
+ __ADD(XFRM_AE_CU, policy update event),
};
char* xfrmnl_ae_flags2str(int flags, char *buf, size_t len)
diff --git a/lib/xfrm/sa.c b/lib/xfrm/sa.c
index dc887a0..07633e5 100644
--- a/lib/xfrm/sa.c
+++ b/lib/xfrm/sa.c
@@ -299,33 +299,33 @@ static int xfrm_sa_compare(struct nl_object *_a, struct nl_object *_b, uint32_t
* @{
*/
static const struct trans_tbl sa_attrs[] = {
- __ADD(XFRM_SA_ATTR_SEL, selector)
- __ADD(XFRM_SA_ATTR_DADDR, daddr)
- __ADD(XFRM_SA_ATTR_SPI, spi)
- __ADD(XFRM_SA_ATTR_PROTO, proto)
- __ADD(XFRM_SA_ATTR_SADDR, saddr)
- __ADD(XFRM_SA_ATTR_LTIME_CFG, lifetime_cfg)
- __ADD(XFRM_SA_ATTR_LTIME_CUR, lifetime_cur)
- __ADD(XFRM_SA_ATTR_STATS, stats)
- __ADD(XFRM_SA_ATTR_SEQ, seqnum)
- __ADD(XFRM_SA_ATTR_REQID, reqid)
- __ADD(XFRM_SA_ATTR_FAMILY, family)
- __ADD(XFRM_SA_ATTR_MODE, mode)
- __ADD(XFRM_SA_ATTR_REPLAY_WIN, replay_window)
- __ADD(XFRM_SA_ATTR_FLAGS, flags)
- __ADD(XFRM_SA_ATTR_ALG_AEAD, alg_aead)
- __ADD(XFRM_SA_ATTR_ALG_AUTH, alg_auth)
- __ADD(XFRM_SA_ATTR_ALG_CRYPT, alg_crypto)
- __ADD(XFRM_SA_ATTR_ALG_COMP, alg_comp)
- __ADD(XFRM_SA_ATTR_ENCAP, encap)
- __ADD(XFRM_SA_ATTR_TFCPAD, tfcpad)
- __ADD(XFRM_SA_ATTR_COADDR, coaddr)
- __ADD(XFRM_SA_ATTR_MARK, mark)
- __ADD(XFRM_SA_ATTR_SECCTX, sec_ctx)
- __ADD(XFRM_SA_ATTR_REPLAY_MAXAGE, replay_maxage)
- __ADD(XFRM_SA_ATTR_REPLAY_MAXDIFF, replay_maxdiff)
- __ADD(XFRM_SA_ATTR_REPLAY_STATE, replay_state)
- __ADD(XFRM_SA_ATTR_EXPIRE, expire)
+ __ADD(XFRM_SA_ATTR_SEL, selector),
+ __ADD(XFRM_SA_ATTR_DADDR, daddr),
+ __ADD(XFRM_SA_ATTR_SPI, spi),
+ __ADD(XFRM_SA_ATTR_PROTO, proto),
+ __ADD(XFRM_SA_ATTR_SADDR, saddr),
+ __ADD(XFRM_SA_ATTR_LTIME_CFG, lifetime_cfg),
+ __ADD(XFRM_SA_ATTR_LTIME_CUR, lifetime_cur),
+ __ADD(XFRM_SA_ATTR_STATS, stats),
+ __ADD(XFRM_SA_ATTR_SEQ, seqnum),
+ __ADD(XFRM_SA_ATTR_REQID, reqid),
+ __ADD(XFRM_SA_ATTR_FAMILY, family),
+ __ADD(XFRM_SA_ATTR_MODE, mode),
+ __ADD(XFRM_SA_ATTR_REPLAY_WIN, replay_window),
+ __ADD(XFRM_SA_ATTR_FLAGS, flags),
+ __ADD(XFRM_SA_ATTR_ALG_AEAD, alg_aead),
+ __ADD(XFRM_SA_ATTR_ALG_AUTH, alg_auth),
+ __ADD(XFRM_SA_ATTR_ALG_CRYPT, alg_crypto),
+ __ADD(XFRM_SA_ATTR_ALG_COMP, alg_comp),
+ __ADD(XFRM_SA_ATTR_ENCAP, encap),
+ __ADD(XFRM_SA_ATTR_TFCPAD, tfcpad),
+ __ADD(XFRM_SA_ATTR_COADDR, coaddr),
+ __ADD(XFRM_SA_ATTR_MARK, mark),
+ __ADD(XFRM_SA_ATTR_SECCTX, sec_ctx),
+ __ADD(XFRM_SA_ATTR_REPLAY_MAXAGE, replay_maxage),
+ __ADD(XFRM_SA_ATTR_REPLAY_MAXDIFF, replay_maxdiff),
+ __ADD(XFRM_SA_ATTR_REPLAY_STATE, replay_state),
+ __ADD(XFRM_SA_ATTR_EXPIRE, expire),
};
static char* xfrm_sa_attrs2str(int attrs, char *buf, size_t len)
@@ -339,14 +339,14 @@ static char* xfrm_sa_attrs2str(int attrs, char *buf, size_t len)
* @{
*/
static const struct trans_tbl sa_flags[] = {
- __ADD(XFRM_STATE_NOECN, no ecn)
- __ADD(XFRM_STATE_DECAP_DSCP, decap dscp)
- __ADD(XFRM_STATE_NOPMTUDISC, no pmtu discovery)
- __ADD(XFRM_STATE_WILDRECV, wild receive)
- __ADD(XFRM_STATE_ICMP, icmp)
- __ADD(XFRM_STATE_AF_UNSPEC, unspecified)
- __ADD(XFRM_STATE_ALIGN4, align4)
- __ADD(XFRM_STATE_ESN, esn)
+ __ADD(XFRM_STATE_NOECN, no ecn),
+ __ADD(XFRM_STATE_DECAP_DSCP, decap dscp),
+ __ADD(XFRM_STATE_NOPMTUDISC, no pmtu discovery),
+ __ADD(XFRM_STATE_WILDRECV, wild receive),
+ __ADD(XFRM_STATE_ICMP, icmp),
+ __ADD(XFRM_STATE_AF_UNSPEC, unspecified),
+ __ADD(XFRM_STATE_ALIGN4, align4),
+ __ADD(XFRM_STATE_ESN, esn),
};
char* xfrmnl_sa_flags2str(int flags, char *buf, size_t len)
@@ -365,11 +365,11 @@ int xfrmnl_sa_str2flag(const char *name)
* @{
*/
static const struct trans_tbl sa_modes[] = {
- __ADD(XFRM_MODE_TRANSPORT, transport)
- __ADD(XFRM_MODE_TUNNEL, tunnel)
- __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization)
- __ADD(XFRM_MODE_IN_TRIGGER, in trigger)
- __ADD(XFRM_MODE_BEET, beet)
+ __ADD(XFRM_MODE_TRANSPORT, transport),
+ __ADD(XFRM_MODE_TUNNEL, tunnel),
+ __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization),
+ __ADD(XFRM_MODE_IN_TRIGGER, in trigger),
+ __ADD(XFRM_MODE_BEET, beet),
};
char* xfrmnl_sa_mode2str(int mode, char *buf, size_t len)
diff --git a/lib/xfrm/sp.c b/lib/xfrm/sp.c
index e66924b..cf16297 100644
--- a/lib/xfrm/sp.c
+++ b/lib/xfrm/sp.c
@@ -180,19 +180,19 @@ static int xfrm_sp_compare(struct nl_object *_a, struct nl_object *_b, uint32_t
* @{
*/
static const struct trans_tbl sp_attrs[] = {
- __ADD(XFRM_SP_ATTR_SEL, selector)
- __ADD(XFRM_SP_ATTR_LTIME_CFG, lifetime_cfg)
- __ADD(XFRM_SP_ATTR_LTIME_CUR, lifetime_cur)
- __ADD(XFRM_SP_ATTR_PRIO, priority)
- __ADD(XFRM_SP_ATTR_INDEX, index)
- __ADD(XFRM_SP_ATTR_DIR, direction)
- __ADD(XFRM_SP_ATTR_ACTION, action)
- __ADD(XFRM_SP_ATTR_FLAGS, flags)
- __ADD(XFRM_SP_ATTR_SHARE, share)
- __ADD(XFRM_SP_ATTR_POLTYPE, policy_type)
- __ADD(XFRM_SP_ATTR_SECCTX, security_context)
- __ADD(XFRM_SP_ATTR_TMPL, user_template)
- __ADD(XFRM_SP_ATTR_MARK, mark)
+ __ADD(XFRM_SP_ATTR_SEL, selector),
+ __ADD(XFRM_SP_ATTR_LTIME_CFG, lifetime_cfg),
+ __ADD(XFRM_SP_ATTR_LTIME_CUR, lifetime_cur),
+ __ADD(XFRM_SP_ATTR_PRIO, priority),
+ __ADD(XFRM_SP_ATTR_INDEX, index),
+ __ADD(XFRM_SP_ATTR_DIR, direction),
+ __ADD(XFRM_SP_ATTR_ACTION, action),
+ __ADD(XFRM_SP_ATTR_FLAGS, flags),
+ __ADD(XFRM_SP_ATTR_SHARE, share),
+ __ADD(XFRM_SP_ATTR_POLTYPE, policy_type),
+ __ADD(XFRM_SP_ATTR_SECCTX, security_context),
+ __ADD(XFRM_SP_ATTR_TMPL, user_template),
+ __ADD(XFRM_SP_ATTR_MARK, mark),
};
static char* xfrm_sp_attrs2str(int attrs, char *buf, size_t len)
@@ -206,8 +206,8 @@ static char* xfrm_sp_attrs2str(int attrs, char *buf, size_t len)
* @{
*/
static const struct trans_tbl sa_actions[] = {
- __ADD(XFRM_POLICY_ALLOW, allow)
- __ADD(XFRM_POLICY_BLOCK, block)
+ __ADD(XFRM_POLICY_ALLOW, allow),
+ __ADD(XFRM_POLICY_BLOCK, block),
};
char* xfrmnl_sp_action2str(int action, char *buf, size_t len)
@@ -226,8 +226,8 @@ int xfrmnl_sp_str2action(const char *name)
* @{
*/
static const struct trans_tbl sp_flags[] = {
- __ADD(XFRM_POLICY_LOCALOK, allow policy override by user)
- __ADD(XFRM_POLICY_ICMP, auto include ICMP in policy)
+ __ADD(XFRM_POLICY_LOCALOK, allow policy override by user),
+ __ADD(XFRM_POLICY_ICMP, auto include ICMP in policy),
};
char* xfrmnl_sp_flags2str(int flags, char *buf, size_t len)
@@ -246,10 +246,10 @@ int xfrmnl_sp_str2flag(const char *name)
* @{
*/
static const struct trans_tbl sp_types[] = {
- __ADD(XFRM_POLICY_TYPE_MAIN, main)
- __ADD(XFRM_POLICY_TYPE_SUB, sub)
- __ADD(XFRM_POLICY_TYPE_MAX, max)
- __ADD(XFRM_POLICY_TYPE_ANY, any)
+ __ADD(XFRM_POLICY_TYPE_MAIN, main),
+ __ADD(XFRM_POLICY_TYPE_SUB, sub),
+ __ADD(XFRM_POLICY_TYPE_MAX, max),
+ __ADD(XFRM_POLICY_TYPE_ANY, any),
};
char* xfrmnl_sp_type2str(int type, char *buf, size_t len)
@@ -268,10 +268,10 @@ int xfrmnl_sp_str2type(const char *name)
* @{
*/
static const struct trans_tbl sp_dir[] = {
- __ADD(XFRM_POLICY_IN, in)
- __ADD(XFRM_POLICY_OUT, out)
- __ADD(XFRM_POLICY_FWD, fwd)
- __ADD(XFRM_POLICY_MASK, mask)
+ __ADD(XFRM_POLICY_IN, in),
+ __ADD(XFRM_POLICY_OUT, out),
+ __ADD(XFRM_POLICY_FWD, fwd),
+ __ADD(XFRM_POLICY_MASK, mask),
};
char* xfrmnl_sp_dir2str(int dir, char *buf, size_t len)
@@ -295,10 +295,10 @@ int xfrmnl_sp_index2dir (unsigned int index)
* @{
*/
static const struct trans_tbl sp_share[] = {
- __ADD(XFRM_SHARE_ANY, any)
- __ADD(XFRM_SHARE_SESSION, session)
- __ADD(XFRM_SHARE_USER, user)
- __ADD(XFRM_SHARE_UNIQUE, unique)
+ __ADD(XFRM_SHARE_ANY, any),
+ __ADD(XFRM_SHARE_SESSION, session),
+ __ADD(XFRM_SHARE_USER, user),
+ __ADD(XFRM_SHARE_UNIQUE, unique),
};
char* xfrmnl_sp_share2str(int share, char *buf, size_t len)
diff --git a/lib/xfrm/template.c b/lib/xfrm/template.c
index 6ab8fb5..5d6d8c9 100644
--- a/lib/xfrm/template.c
+++ b/lib/xfrm/template.c
@@ -107,11 +107,11 @@ struct xfrmnl_user_tmpl* xfrmnl_user_tmpl_clone(struct xfrmnl_user_tmpl* utmpl)
* @{
*/
static const struct trans_tbl tmpl_modes[] = {
- __ADD(XFRM_MODE_TRANSPORT, transport)
- __ADD(XFRM_MODE_TUNNEL, tunnel)
- __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization)
- __ADD(XFRM_MODE_IN_TRIGGER, in trigger)
- __ADD(XFRM_MODE_BEET, beet)
+ __ADD(XFRM_MODE_TRANSPORT, transport),
+ __ADD(XFRM_MODE_TUNNEL, tunnel),
+ __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization),
+ __ADD(XFRM_MODE_IN_TRIGGER, in trigger),
+ __ADD(XFRM_MODE_BEET, beet),
};
char* xfrmnl_user_tmpl_mode2str(int mode, char *buf, size_t len)
--
1.9.3
More information about the libnl
mailing list