From 328d482c4884a1009c420a8b9b0367f329e1d560 Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Wed, 12 Sep 2012 09:15:19 +0300 Subject: [PATCH] iproute2: GENL: merge GENL_REQUEST and GENL_INITIALIZER Both macros are used together, so better to have single define. Update all requests in ipl2tp.c to use the new macro. Signed-off-by: Julian Anastasov --- include/libgenl.h | 27 +++++++++---------- ip/ipl2tp.c | 68 ++++++++++------------------------------------- lib/libgenl.c | 7 +++-- 3 files changed, 29 insertions(+), 73 deletions(-) diff --git a/include/libgenl.h b/include/libgenl.h index 0b11a892..9db4bafd 100644 --- a/include/libgenl.h +++ b/include/libgenl.h @@ -3,25 +3,22 @@ #include "libnetlink.h" -#define GENL_REQUEST(_req, _hdrsiz, _bufsiz) \ +#define GENL_REQUEST(_req, _bufsiz, _family, _hdrsiz, _ver, _cmd, _flags) \ struct { \ struct nlmsghdr n; \ struct genlmsghdr g; \ char buf[NLMSG_ALIGN(_hdrsiz) + (_bufsiz)]; \ -} _req - -#define GENL_INITIALIZER(_family, _hdrsiz, _ver, _cmd, _flags) \ - { \ - .n = { \ - .nlmsg_type = (_family), \ - .nlmsg_flags = (_flags), \ - .nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN + (_hdrsiz)), \ - }, \ - .g = { \ - .cmd = (_cmd), \ - .version = (_ver), \ - }, \ - } +} _req = { \ + .n = { \ + .nlmsg_type = (_family), \ + .nlmsg_flags = (_flags), \ + .nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN + (_hdrsiz)), \ + }, \ + .g = { \ + .cmd = (_cmd), \ + .version = (_ver), \ + }, \ +} extern int genl_resolve_family(struct rtnl_handle *grth, const char *family); diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c index aaa3d315..f6e264a8 100644 --- a/ip/ipl2tp.c +++ b/ip/ipl2tp.c @@ -96,9 +96,8 @@ static int create_tunnel(struct l2tp_parm *p) uint32_t local_attr = L2TP_ATTR_IP_SADDR; uint32_t peer_attr = L2TP_ATTR_IP_DADDR; - GENL_REQUEST(req, 0, 1024) - = GENL_INITIALIZER(genl_family, NLM_F_REQUEST | NLM_F_ACK, 0, - L2TP_CMD_TUNNEL_CREATE, L2TP_GENL_VERSION); + GENL_REQUEST(req, 1024, genl_family, 0, L2TP_GENL_VERSION, + L2TP_CMD_TUNNEL_CREATE, NLM_F_REQUEST | NLM_F_ACK); addattr32(&req.n, 1024, L2TP_ATTR_CONN_ID, p->tunnel_id); addattr32(&req.n, 1024, L2TP_ATTR_PEER_CONN_ID, p->peer_tunnel_id); @@ -126,9 +125,8 @@ static int create_tunnel(struct l2tp_parm *p) static int delete_tunnel(struct l2tp_parm *p) { - GENL_REQUEST(req, 0, 1024) - = GENL_INITIALIZER(genl_family, NLM_F_REQUEST | NLM_F_ACK, 0, - L2TP_CMD_TUNNEL_DELETE, L2TP_GENL_VERSION); + GENL_REQUEST(req, 128, genl_family, 0, L2TP_GENL_VERSION, + L2TP_CMD_TUNNEL_DELETE, NLM_F_REQUEST | NLM_F_ACK); addattr32(&req.n, 128, L2TP_ATTR_CONN_ID, p->tunnel_id); @@ -140,18 +138,8 @@ static int delete_tunnel(struct l2tp_parm *p) static int create_session(struct l2tp_parm *p) { - struct { - struct nlmsghdr n; - struct genlmsghdr g; - char buf[1024]; - } req; - - memset(&req, 0, sizeof(req)); - req.n.nlmsg_type = genl_family; - req.n.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK; - req.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN); - req.g.cmd = L2TP_CMD_SESSION_CREATE; - req.g.version = L2TP_GENL_VERSION; + GENL_REQUEST(req, 1024, genl_family, 0, L2TP_GENL_VERSION, + L2TP_CMD_SESSION_CREATE, NLM_F_REQUEST | NLM_F_ACK); addattr32(&req.n, 1024, L2TP_ATTR_CONN_ID, p->tunnel_id); addattr32(&req.n, 1024, L2TP_ATTR_PEER_CONN_ID, p->peer_tunnel_id); @@ -182,18 +170,8 @@ static int create_session(struct l2tp_parm *p) static int delete_session(struct l2tp_parm *p) { - struct { - struct nlmsghdr n; - struct genlmsghdr g; - char buf[128]; - } req; - - memset(&req, 0, sizeof(req)); - req.n.nlmsg_type = genl_family; - req.n.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK; - req.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN); - req.g.cmd = L2TP_CMD_SESSION_DELETE; - req.g.version = L2TP_GENL_VERSION; + GENL_REQUEST(req, 1024, genl_family, 0, L2TP_GENL_VERSION, + L2TP_CMD_SESSION_DELETE, NLM_F_REQUEST | NLM_F_ACK); addattr32(&req.n, 1024, L2TP_ATTR_CONN_ID, p->tunnel_id); addattr32(&req.n, 1024, L2TP_ATTR_SESSION_ID, p->session_id); @@ -380,21 +358,12 @@ static int session_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void static int get_session(struct l2tp_data *p) { - struct { - struct nlmsghdr n; - struct genlmsghdr g; - char buf[128]; - } req; + GENL_REQUEST(req, 128, genl_family, 0, L2TP_GENL_VERSION, + L2TP_CMD_SESSION_GET, + NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST); - memset(&req, 0, sizeof(req)); - req.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN); - req.n.nlmsg_type = genl_family; - req.n.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; req.n.nlmsg_seq = genl_rth.dump = ++genl_rth.seq; - req.g.cmd = L2TP_CMD_SESSION_GET; - req.g.version = L2TP_GENL_VERSION; - if (p->config.tunnel_id && p->config.session_id) { addattr32(&req.n, 128, L2TP_ATTR_CONN_ID, p->config.tunnel_id); addattr32(&req.n, 128, L2TP_ATTR_SESSION_ID, p->config.session_id); @@ -423,21 +392,12 @@ static int tunnel_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void static int get_tunnel(struct l2tp_data *p) { - struct { - struct nlmsghdr n; - struct genlmsghdr g; - char buf[1024]; - } req; + GENL_REQUEST(req, 1024, genl_family, 0, L2TP_GENL_VERSION, + L2TP_CMD_TUNNEL_GET, + NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST); - memset(&req, 0, sizeof(req)); - req.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN); - req.n.nlmsg_type = genl_family; - req.n.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; req.n.nlmsg_seq = genl_rth.dump = ++genl_rth.seq; - req.g.cmd = L2TP_CMD_TUNNEL_GET; - req.g.version = L2TP_GENL_VERSION; - if (p->config.tunnel_id) addattr32(&req.n, 1024, L2TP_ATTR_CONN_ID, p->config.tunnel_id); diff --git a/lib/libgenl.c b/lib/libgenl.c index d68e58e4..ef3e5db6 100644 --- a/lib/libgenl.c +++ b/lib/libgenl.c @@ -47,11 +47,10 @@ static int genl_parse_getfamily(struct nlmsghdr *nlh) int genl_resolve_family(struct rtnl_handle *grth, const char *family) { - GENL_REQUEST(req, 0, 1024) - = GENL_INITIALIZER(GENL_ID_CTRL, 0, - 0, CTRL_CMD_GETFAMILY, NLM_F_REQUEST); + GENL_REQUEST(req, 1024, GENL_ID_CTRL, 0, 0, CTRL_CMD_GETFAMILY, + NLM_F_REQUEST); - addattr_l(&req.n, 1024, CTRL_ATTR_FAMILY_NAME, + addattr_l(&req.n, sizeof(req), CTRL_ATTR_FAMILY_NAME, family, strlen(family) + 1); if (rtnl_talk(grth, &req.n, 0, 0, &req.n) < 0) {