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 8ec9a48b00d05e45a5aa2c93d45cbfcf3421773c..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,23 +682,31 @@ 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);
 
-               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");
+
+               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);
        }
 
@@ -716,14 +720,14 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family,
        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,7 +768,7 @@ 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);
        }
 
@@ -862,6 +866,25 @@ 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)
@@ -883,8 +906,8 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,
                           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);
@@ -925,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);
        }
@@ -973,8 +996,8 @@ void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo,
        }
 
        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) {