Include bsd/string.h only in include/utils.h

[mirror_iproute2.git] / ip / ipxfrm.c

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 8d786d1334df1d80087bcf18b4da6a71dd625f7e..17ab4abef4be5c66875e47e69080f407e0d1cd5d 100644 (file)
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -40,17 +40,6 @@
 #include "ip_common.h"
 
 #define STRBUF_SIZE    (128)
-#define STRBUF_CAT(buf, str) \
-       do { \
-               int rest = sizeof(buf) - 1 - strlen(buf); \
-               if (rest > 0) { \
-                       int len = strlen(str); \
-                       if (len > rest) \
-                               len = rest; \
-                       strncat(buf, str, len); \
-                       buf[sizeof(buf) - 1] = '\0'; \
-               } \
-       } while (0);
 
 struct xfrm_filter filter;
 
@@ -648,6 +637,13 @@ static void xfrm_tmpl_print(struct xfrm_user_tmpl *tmpls, int len,
        }
 }
 
+static void xfrm_output_mark_print(struct rtattr *tb[], FILE *fp)
+{
+       __u32 output_mark = rta_getattr_u32(tb[XFRMA_OUTPUT_MARK]);
+
+       fprintf(fp, "output-mark 0x%x", output_mark);
+}
+
 int xfrm_parse_mark(struct xfrm_mark *mark, int *argcp, char ***argvp)
 {
        int argc = *argcp;
@@ -686,44 +682,52 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
 {
        if (tb[XFRMA_MARK]) {
                struct rtattr *rta = tb[XFRMA_MARK];
-               struct xfrm_mark *m = (struct xfrm_mark *) RTA_DATA(rta);
+               struct xfrm_mark *m = RTA_DATA(rta);
+
+               fprintf(fp, "\tmark %#x/%#x ", m->v, m->m);
+
+               if (tb[XFRMA_OUTPUT_MARK])
+                       xfrm_output_mark_print(tb, fp);
+               fprintf(fp, "%s", _SL_);
+       } else if (tb[XFRMA_OUTPUT_MARK]) {
+               fprintf(fp, "\t");
 
-               fprintf(fp, "\tmark %#x/%#x", m->v, m->m);
+               xfrm_output_mark_print(tb, fp);
                fprintf(fp, "%s", _SL_);
        }
 
        if (tb[XFRMA_ALG_AUTH] && !tb[XFRMA_ALG_AUTH_TRUNC]) {
                struct rtattr *rta = tb[XFRMA_ALG_AUTH];
 
-               xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
+               xfrm_algo_print(RTA_DATA(rta),
                                XFRMA_ALG_AUTH, RTA_PAYLOAD(rta), fp, prefix);
        }
 
        if (tb[XFRMA_ALG_AUTH_TRUNC]) {
                struct rtattr *rta = tb[XFRMA_ALG_AUTH_TRUNC];
 
-               xfrm_auth_trunc_print((struct xfrm_algo_auth *) RTA_DATA(rta),
+               xfrm_auth_trunc_print(RTA_DATA(rta),
                                      RTA_PAYLOAD(rta), fp, prefix);
        }
 
        if (tb[XFRMA_ALG_AEAD]) {
                struct rtattr *rta = tb[XFRMA_ALG_AEAD];
 
-               xfrm_aead_print((struct xfrm_algo_aead *)RTA_DATA(rta),
+               xfrm_aead_print(RTA_DATA(rta),
                                RTA_PAYLOAD(rta), fp, prefix);
        }
 
        if (tb[XFRMA_ALG_CRYPT]) {
                struct rtattr *rta = tb[XFRMA_ALG_CRYPT];
 
-               xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
+               xfrm_algo_print(RTA_DATA(rta),
                                XFRMA_ALG_CRYPT, RTA_PAYLOAD(rta), fp, prefix);
        }
 
        if (tb[XFRMA_ALG_COMP]) {
                struct rtattr *rta = tb[XFRMA_ALG_COMP];
 
-               xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
+               xfrm_algo_print(RTA_DATA(rta),
                                XFRMA_ALG_COMP, RTA_PAYLOAD(rta), fp, prefix);
        }
 
@@ -739,7 +743,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
                        fprintf(fp, "%s", _SL_);
                        return;
                }
-               e = (struct xfrm_encap_tmpl *) RTA_DATA(tb[XFRMA_ENCAP]);
+               e = RTA_DATA(tb[XFRMA_ENCAP]);
 
                fprintf(fp, "type ");
                switch (e->encap_type) {
@@ -764,19 +768,18 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
        if (tb[XFRMA_TMPL]) {
                struct rtattr *rta = tb[XFRMA_TMPL];
 
-               xfrm_tmpl_print((struct xfrm_user_tmpl *) RTA_DATA(rta),
+               xfrm_tmpl_print(RTA_DATA(rta),
                                RTA_PAYLOAD(rta), fp, prefix);
        }
 
        if (tb[XFRMA_COADDR]) {
-               xfrm_address_t *coa;
+               const xfrm_address_t *coa;
 
                if (prefix)
                        fputs(prefix, fp);
                fprintf(fp, "coa ");
 
-               coa = (xfrm_address_t *)RTA_DATA(tb[XFRMA_COADDR]);
-
+               coa = RTA_DATA(tb[XFRMA_COADDR]);
                if (RTA_PAYLOAD(tb[XFRMA_COADDR]) < sizeof(*coa)) {
                        fprintf(fp, "(ERROR truncated)");
                        fprintf(fp, "%s", _SL_);
@@ -820,7 +823,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
                        return;
                }
 
-               replay = (struct xfrm_replay_state *)RTA_DATA(tb[XFRMA_REPLAY_VAL]);
+               replay = RTA_DATA(tb[XFRMA_REPLAY_VAL]);
                fprintf(fp, "seq 0x%x, oseq 0x%x, bitmap 0x%08x",
                        replay->seq, replay->oseq, replay->bitmap);
                fprintf(fp, "%s", _SL_);
@@ -841,7 +844,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
                }
                fprintf(fp, "%s", _SL_);
 
-               replay = (struct xfrm_replay_state_esn *)RTA_DATA(tb[XFRMA_REPLAY_ESN_VAL]);
+               replay = RTA_DATA(tb[XFRMA_REPLAY_ESN_VAL]);
                if (prefix)
                        fputs(prefix, fp);
                fprintf(fp, " seq-hi 0x%x, seq 0x%x, oseq-hi 0x%0x, oseq 0x%0x",
@@ -863,13 +866,30 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
                }
                fprintf(fp, "%s", _SL_);
        }
+       if (tb[XFRMA_OFFLOAD_DEV]) {
+               struct xfrm_user_offload *xuo;
+
+               if (prefix)
+                       fputs(prefix, fp);
+               fprintf(fp, "crypto offload parameters: ");
+
+               if (RTA_PAYLOAD(tb[XFRMA_OFFLOAD_DEV]) < sizeof(*xuo)) {
+                       fprintf(fp, "(ERROR truncated)");
+                       fprintf(fp, "%s", _SL_);
+                       return;
+               }
+
+               xuo = (struct xfrm_user_offload *)
+                       RTA_DATA(tb[XFRMA_OFFLOAD_DEV]);
+               fprintf(fp, "dev %s dir %s", ll_index_to_name(xuo->ifindex),
+                       (xuo->flags & XFRM_OFFLOAD_INBOUND) ? "in" : "out");
+               fprintf(fp, "%s", _SL_);
+       }
 }
 
 static int xfrm_selector_iszero(struct xfrm_selector *s)
 {
-       struct xfrm_selector s0;
-
-       memset(&s0, 0, sizeof(s0));
+       struct xfrm_selector s0 = {};
 
        return (memcmp(&s0, s, sizeof(s0)) == 0);
 }
@@ -878,18 +898,16 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
                            struct rtattr *tb[], FILE *fp, const char *prefix,
                            const char *title)
 {
-       char buf[STRBUF_SIZE];
+       char buf[STRBUF_SIZE] = {};
        int force_spi = xfrm_xfrmproto_is_ipsec(xsinfo->id.proto);
 
-       memset(buf, '\0', sizeof(buf));
-
        xfrm_id_info_print(&xsinfo->saddr, &xsinfo->id, xsinfo->mode,
                           xsinfo->reqid, xsinfo->family, force_spi, fp,
                           prefix, title);
 
        if (prefix)
-               STRBUF_CAT(buf, prefix);
-       STRBUF_CAT(buf, "\t");
+               strlcat(buf, prefix, sizeof(buf));
+       strlcat(buf, "\t", sizeof(buf));
 
        fputs(buf, fp);
        fprintf(fp, "replay-window %u ", xsinfo->replay_window);
@@ -911,7 +929,7 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
                        fprintf(fp, "%x", flags);
        }
        if (show_stats > 0 && tb[XFRMA_SA_EXTRA_FLAGS]) {
-               __u32 extra_flags = *(__u32 *)RTA_DATA(tb[XFRMA_SA_EXTRA_FLAGS]);
+               __u32 extra_flags = rta_getattr_u32(tb[XFRMA_SA_EXTRA_FLAGS]);
 
                fprintf(fp, "extra_flag ");
                XFRM_FLAG_PRINT(fp, extra_flags,
@@ -930,7 +948,7 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
                char sbuf[STRBUF_SIZE];
 
                memcpy(sbuf, buf, sizeof(sbuf));
-               STRBUF_CAT(sbuf, "sel ");
+               strlcat(sbuf, "sel ", sizeof(sbuf));
 
                xfrm_selector_print(&xsinfo->sel, xsinfo->family, fp, sbuf);
        }
@@ -948,7 +966,7 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
                if (RTA_PAYLOAD(tb[XFRMA_SEC_CTX]) < sizeof(*sctx))
                        fprintf(fp, "(ERROR truncated)");
 
-               sctx = (struct xfrm_user_sec_ctx *)RTA_DATA(tb[XFRMA_SEC_CTX]);
+               sctx = RTA_DATA(tb[XFRMA_SEC_CTX]);
 
                fprintf(fp, "%s %s", (char *)(sctx + 1), _SL_);
        }
@@ -959,9 +977,7 @@ void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo,
                            struct rtattr *tb[], FILE *fp, const char *prefix,
                            const char *title)
 {
-       char buf[STRBUF_SIZE];
-
-       memset(buf, '\0', sizeof(buf));
+       char buf[STRBUF_SIZE] = {};
 
        xfrm_selector_print(&xpinfo->sel, preferred_family, fp, title);
 
@@ -973,15 +989,15 @@ void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo,
                if (RTA_PAYLOAD(tb[XFRMA_SEC_CTX]) < sizeof(*sctx))
                        fprintf(fp, "(ERROR truncated)");
 
-               sctx = (struct xfrm_user_sec_ctx *)RTA_DATA(tb[XFRMA_SEC_CTX]);
+               sctx = RTA_DATA(tb[XFRMA_SEC_CTX]);
 
                fprintf(fp, "%s ", (char *)(sctx + 1));
                fprintf(fp, "%s", _SL_);
        }
 
        if (prefix)
-               STRBUF_CAT(buf, prefix);
-       STRBUF_CAT(buf, "\t");
+               strlcat(buf, prefix, sizeof(buf));
+       strlcat(buf, "\t", sizeof(buf));
 
        fputs(buf, fp);
        if (xpinfo->dir >= XFRM_POLICY_MAX) {
@@ -1031,7 +1047,7 @@ void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo,
                if (RTA_PAYLOAD(tb[XFRMA_POLICY_TYPE]) < sizeof(*upt))
                        fprintf(fp, "(ERROR truncated)");
 
-               upt = (struct xfrm_userpolicy_type *)RTA_DATA(tb[XFRMA_POLICY_TYPE]);
+               upt = RTA_DATA(tb[XFRMA_POLICY_TYPE]);
                fprintf(fp, "%s ", strxf_ptype(upt->type));
        }
 
@@ -1062,11 +1078,8 @@ int xfrm_id_parse(xfrm_address_t *saddr, struct xfrm_id *id, __u16 *family,
 {
        int argc = *argcp;
        char **argv = *argvp;
-       inet_prefix dst;
-       inet_prefix src;
-
-       memset(&dst, 0, sizeof(dst));
-       memset(&src, 0, sizeof(src));
+       inet_prefix dst = {};
+       inet_prefix src = {};
 
        while (1) {
                if (strcmp(*argv, "src") == 0) {
@@ -1371,13 +1384,10 @@ int xfrm_selector_parse(struct xfrm_selector *sel, int *argcp, char ***argvp)
 {
        int argc = *argcp;
        char **argv = *argvp;
-       inet_prefix dst;
-       inet_prefix src;
+       inet_prefix dst = {};
+       inet_prefix src = {};
        char *upspecp = NULL;
 
-       memset(&dst, 0, sizeof(dst));
-       memset(&src, 0, sizeof(src));
-
        while (1) {
                if (strcmp(*argv, "src") == 0) {
                        NEXT_ARG();