[net-next,1/8] iproute2: Add a source addres length parameter to rt_addr_n2a

Message ID	873858spba.fsf@x220.int.ebiederm.org
State	Changes Requested, archived
Delegated to:	stephen hemminger
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: ebiederm@xmission.com (Eric W. Biederman) To: Stephen Hemminger <shemming@brocade.com> Cc: <netdev@vger.kernel.org> References: <87bnjwspek.fsf@x220.int.ebiederm.org> Date: Fri, 13 Mar 2015 13:52:09 -0500 In-Reply-To: <87bnjwspek.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Fri, 13 Mar 2015 13:50:11 -0500") Message-ID: <873858spba.fsf@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain BODY: Lots of long strings of numbers * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa05 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_02 5+ unique symbols in subject * 0.0 T_TooManySym_01 4+ unique symbols in subject parse: 1.37 (0.1%), extract_message_metadata: 22 (2.4%), get_uri_detail_list: 7 (0.8%), tests_pri_-1000: 7 (0.7%), tests_pri_-950: 1.45 (0.2%), tests_pri_-900: 1.19 (0.1%), tests_pri_-400: 41 (4.4%), check_bayes: 39 (4.3%), b_tokenize: 22 (2.4%), b_tok_get_all: 9 (1.0%), b_comp_prob: 2.6 (0.3%), b_tok_touch_all: 3.4 (0.4%), b_finish: 0.65 (0.1%), tests_pri_0: 837 (90.9%), tests_pri_500: 3.8 (0.4%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH net-next 1/8] iproute2: Add a source addres length parameter to rt_addr_n2a Sender: netdev-owner@vger.kernel.org Precedence: bulk

diff --git a/include/utils.h b/include/utils.h index fec9ef4f2f4b..e1dd3f69165f 100644 --- a/include/utils.h +++ b/include/utils.h @@ -103,7 +103,7 @@ extern __u8* hexstring_a2n(const char *str, __u8 *buf, int blen); extern const char *format_host(int af, int len, const void *addr, char *buf, int buflen); -extern const char *rt_addr_n2a(int af, const void *addr, +extern const char *rt_addr_n2a(int af, int len, const void *addr, char *buf, int buflen); void missarg(const char *) __attribute__((noreturn)); diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c index 3009ec912e23..a573f92b03a0 100644 --- a/ip/iplink_bond.c +++ b/ip/iplink_bond.c @@ -415,6 +415,7 @@ static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (iptb[i]) fprintf(f, "%s", rt_addr_n2a(AF_INET, + RTA_PAYLOAD(iptb[i]), RTA_DATA(iptb[i]), buf, INET_ADDRSTRLEN)); diff --git a/ip/ipmroute.c b/ip/ipmroute.c index b4ed9f15fda5..13ac892512d0 100644 --- a/ip/ipmroute.c +++ b/ip/ipmroute.c @@ -116,6 +116,7 @@ int print_mroute(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[RTA_SRC]) len = snprintf(obuf, sizeof(obuf), "(%s, ", rt_addr_n2a(family, + RTA_PAYLOAD(tb[RTA_SRC]), RTA_DATA(tb[RTA_SRC]), abuf, sizeof(abuf))); else @@ -123,6 +124,7 @@ int print_mroute(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[RTA_DST]) snprintf(obuf + len, sizeof(obuf) - len, "%s)", rt_addr_n2a(family, + RTA_PAYLOAD(tb[RTA_DST]), RTA_DATA(tb[RTA_DST]), abuf, sizeof(abuf))); else diff --git a/ip/ipprefix.c b/ip/ipprefix.c index 02c0efce6836..26b596151217 100644 --- a/ip/ipprefix.c +++ b/ip/ipprefix.c @@ -80,7 +80,9 @@ int print_prefix(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) pfx = (struct in6_addr *)RTA_DATA(tb[PREFIX_ADDRESS]); memset(abuf, '\0', sizeof(abuf)); - fprintf(fp, "%s", rt_addr_n2a(family, pfx, + fprintf(fp, "%s", rt_addr_n2a(family, + RTA_PAYLOAD(tb[PREFIX_ADDRESS]), + pfx, abuf, sizeof(abuf))); } fprintf(fp, "/%u ", prefix->prefix_len); diff --git a/ip/iproute.c b/ip/iproute.c index 76d8e36ccc2b..201eb98a23ad 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -353,8 +353,9 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[RTA_DST]) { if (r->rtm_dst_len != host_len) { fprintf(fp, "%s/%u ", rt_addr_n2a(r->rtm_family, - RTA_DATA(tb[RTA_DST]), - abuf, sizeof(abuf)), + RTA_PAYLOAD(tb[RTA_DST]), + RTA_DATA(tb[RTA_DST]), + abuf, sizeof(abuf)), r->rtm_dst_len ); } else { @@ -372,8 +373,9 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[RTA_SRC]) { if (r->rtm_src_len != host_len) { fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family, - RTA_DATA(tb[RTA_SRC]), - abuf, sizeof(abuf)), + RTA_PAYLOAD(tb[RTA_SRC]), + RTA_DATA(tb[RTA_SRC]), + abuf, sizeof(abuf)), r->rtm_src_len ); } else { @@ -415,6 +417,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) */ fprintf(fp, " src %s ", rt_addr_n2a(r->rtm_family, + RTA_PAYLOAD(tb[RTA_PREFSRC]), RTA_DATA(tb[RTA_PREFSRC]), abuf, sizeof(abuf))); } diff --git a/ip/iprule.c b/ip/iprule.c index 366878e90f84..0b1ad698177c 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -89,8 +89,9 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[FRA_SRC]) { if (r->rtm_src_len != host_len) { fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family, - RTA_DATA(tb[FRA_SRC]), - abuf, sizeof(abuf)), + RTA_PAYLOAD(tb[FRA_SRC]), + RTA_DATA(tb[FRA_SRC]), + abuf, sizeof(abuf)), r->rtm_src_len ); } else { @@ -109,8 +110,9 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (tb[FRA_DST]) { if (r->rtm_dst_len != host_len) { fprintf(fp, "to %s/%u ", rt_addr_n2a(r->rtm_family, - RTA_DATA(tb[FRA_DST]), - abuf, sizeof(abuf)), + RTA_PAYLOAD(tb[FRA_DST]), + RTA_DATA(tb[FRA_DST]), + abuf, sizeof(abuf)), r->rtm_dst_len ); } else { diff --git a/ip/iptunnel.c b/ip/iptunnel.c index caf8a28e62e8..29188c450370 100644 --- a/ip/iptunnel.c +++ b/ip/iptunnel.c @@ -343,7 +343,7 @@ static void print_tunnel(struct ip_tunnel_parm *p) p->name, tnl_strproto(p->iph.protocol), p->iph.daddr ? format_host(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1)) : "any", - p->iph.saddr ? rt_addr_n2a(AF_INET, &p->iph.saddr, s2, sizeof(s2)) : "any"); + p->iph.saddr ? rt_addr_n2a(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2)) : "any"); if (p->iph.protocol == IPPROTO_IPV6 && (p->i_flags & SIT_ISATAP)) { struct ip_tunnel_prl prl[16]; diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index 659fa6b64579..eacefd907f46 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -288,10 +288,10 @@ void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id, fputs(title, fp); memset(abuf, '\0', sizeof(abuf)); - fprintf(fp, "src %s ", rt_addr_n2a(family, + fprintf(fp, "src %s ", rt_addr_n2a(family, sizeof(*saddr), saddr, abuf, sizeof(abuf))); memset(abuf, '\0', sizeof(abuf)); - fprintf(fp, "dst %s", rt_addr_n2a(family, + fprintf(fp, "dst %s", rt_addr_n2a(family, sizeof(id->daddr), &id->daddr, abuf, sizeof(abuf))); fprintf(fp, "%s", _SL_); @@ -455,11 +455,15 @@ void xfrm_selector_print(struct xfrm_selector *sel, __u16 family, fputs(prefix, fp); memset(abuf, '\0', sizeof(abuf)); - fprintf(fp, "src %s/%u ", rt_addr_n2a(f, &sel->saddr, abuf, sizeof(abuf)), + fprintf(fp, "src %s/%u ", + rt_addr_n2a(f, sizeof(sel->saddr), &sel->saddr, + abuf, sizeof(abuf)), sel->prefixlen_s); memset(abuf, '\0', sizeof(abuf)); - fprintf(fp, "dst %s/%u ", rt_addr_n2a(f, &sel->daddr, abuf, sizeof(abuf)), + fprintf(fp, "dst %s/%u ", + rt_addr_n2a(f, sizeof(sel->daddr), &sel->daddr, + abuf, sizeof(abuf)), sel->prefixlen_d); if (sel->proto) @@ -754,7 +758,8 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, memset(abuf, '\0', sizeof(abuf)); fprintf(fp, "addr %s", - rt_addr_n2a(family, &e->encap_oa, abuf, sizeof(abuf))); + rt_addr_n2a(family, sizeof(e->encap_oa), &e->encap_oa, + abuf, sizeof(abuf))); fprintf(fp, "%s", _SL_); } @@ -782,7 +787,7 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, memset(abuf, '\0', sizeof(abuf)); fprintf(fp, "%s", - rt_addr_n2a(family, coa, + rt_addr_n2a(family, sizeof(*coa), coa, abuf, sizeof(abuf))); fprintf(fp, "%s", _SL_); } diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c index 5ed3d5a23fb5..cf59a9338f57 100644 --- a/ip/link_ip6tnl.c +++ b/ip/link_ip6tnl.c @@ -285,6 +285,7 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb if (tb[IFLA_IPTUN_REMOTE]) { fprintf(f, "remote %s ", rt_addr_n2a(AF_INET6, + RTA_PAYLOAD(tb[IFLA_IPTUN_REMOTE]), RTA_DATA(tb[IFLA_IPTUN_REMOTE]), s1, sizeof(s1))); } @@ -292,6 +293,7 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb if (tb[IFLA_IPTUN_LOCAL]) { fprintf(f, "local %s ", rt_addr_n2a(AF_INET6, + RTA_PAYLOAD(tb[IFLA_IPTUN_LOCAL]), RTA_DATA(tb[IFLA_IPTUN_LOCAL]), s1, sizeof(s1))); } diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c index 50116a7b5433..b2b2d6e27a45 100644 --- a/ip/xfrm_monitor.c +++ b/ip/xfrm_monitor.c @@ -227,7 +227,8 @@ static void xfrm_usersa_print(const struct xfrm_usersa_id *sa_id, __u32 reqid, F buf[0] = 0; fprintf(fp, "dst %s ", - rt_addr_n2a(sa_id->family, &sa_id->daddr, buf, sizeof(buf))); + rt_addr_n2a(sa_id->family, sizeof(sa_id->daddr), &sa_id->daddr, + buf, sizeof(buf))); fprintf(fp, " reqid 0x%x", reqid); @@ -246,7 +247,8 @@ static int xfrm_ae_print(const struct sockaddr_nl *who, xfrm_ae_flags_print(id->flags, arg); fprintf(fp,"\n\t"); memset(abuf, '\0', sizeof(abuf)); - fprintf(fp, "src %s ", rt_addr_n2a(id->sa_id.family, &id->saddr, + fprintf(fp, "src %s ", rt_addr_n2a(id->sa_id.family, + sizeof(id->saddr), &id->saddr, abuf, sizeof(abuf))); xfrm_usersa_print(&id->sa_id, id->reqid, fp); @@ -262,7 +264,7 @@ static void xfrm_print_addr(FILE *fp, int family, xfrm_address_t *a) char buf[256]; buf[0] = 0; - fprintf(fp, "%s", rt_addr_n2a(family, a, buf, sizeof(buf))); + fprintf(fp, "%s", rt_addr_n2a(family, sizeof(*a), a, buf, sizeof(buf))); } static int xfrm_mapping_print(const struct sockaddr_nl *who, diff --git a/lib/utils.c b/lib/utils.c index e2b05bc0edcc..a97eae9d5148 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -624,7 +624,7 @@ int __get_user_hz(void) return sysconf(_SC_CLK_TCK); } -const char *rt_addr_n2a(int af, const void *addr, char *buf, int buflen) +const char *rt_addr_n2a(int af, int len, const void *addr, char *buf, int buflen) { switch (af) { case AF_INET: @@ -731,7 +731,7 @@ const char *format_host(int af, int len, const void *addr, return n; } #endif - return rt_addr_n2a(af, addr, buf, buflen); + return rt_addr_n2a(af, len, addr, buf, buflen); }

[net-next,1/8] iproute2: Add a source addres length parameter to rt_addr_n2a

Commit Message

Patch