proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 04:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Convert inet_ntoa to %pI4

Browse Source 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2020-10-18 14:21:26 +03:00
parent 84de5a245a
commit af3b34f690
5 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/filter.c
View File

@ -576,14 +576,12 @@ static int filter_show(struct vty *vty, const char *name, afi_t afi)
if (filter->addr_mask.s_addr == 0xffffffff) if (filter->addr_mask.s_addr == 0xffffffff)
vty_out(vty, " any\n"); vty_out(vty, " any\n");
else { else {
vty_out(vty, " %s", vty_out(vty, " %pI4", &filter->addr);
inet_ntoa(filter->addr));
if (filter->addr_mask.s_addr if (filter->addr_mask.s_addr
!= INADDR_ANY) != INADDR_ANY)
vty_out(vty, vty_out(vty,
", wildcard bits %s", ", wildcard bits %pI4",
inet_ntoa( &filter->addr_mask);
filter->addr_mask));
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
} }
@ -625,14 +623,12 @@ static int filter_show(struct vty *vty, const char *name, afi_t afi)
if (filter->addr_mask.s_addr == 0xffffffff) if (filter->addr_mask.s_addr == 0xffffffff)
vty_out(vty, " any\n"); vty_out(vty, " any\n");
else { else {
vty_out(vty, " %s", vty_out(vty, " %pI4", &filter->addr);
inet_ntoa(filter->addr));
if (filter->addr_mask.s_addr if (filter->addr_mask.s_addr
!= INADDR_ANY) != INADDR_ANY)
vty_out(vty, vty_out(vty,
", wildcard bits %s", ", wildcard bits %pI4",
inet_ntoa( &filter->addr_mask);
filter->addr_mask));
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
} }
@ -722,29 +718,28 @@ static void config_write_access_cisco(struct vty *vty, struct filter *mfilter)
if (filter->addr_mask.s_addr == 0xffffffff) if (filter->addr_mask.s_addr == 0xffffffff)
vty_out(vty, " any"); vty_out(vty, " any");
else if (filter->addr_mask.s_addr == INADDR_ANY) else if (filter->addr_mask.s_addr == INADDR_ANY)
vty_out(vty, " host %s", inet_ntoa(filter->addr)); vty_out(vty, " host %pI4", &filter->addr);
else { else {
vty_out(vty, " %s", inet_ntoa(filter->addr)); vty_out(vty, " %pI4", &filter->addr);
vty_out(vty, " %s", inet_ntoa(filter->addr_mask)); vty_out(vty, " %pI4", &filter->addr_mask);
} }
if (filter->mask_mask.s_addr == 0xffffffff) if (filter->mask_mask.s_addr == 0xffffffff)
vty_out(vty, " any"); vty_out(vty, " any");
else if (filter->mask_mask.s_addr == INADDR_ANY) else if (filter->mask_mask.s_addr == INADDR_ANY)
vty_out(vty, " host %s", inet_ntoa(filter->mask)); vty_out(vty, " host %pI4", &filter->mask);
else { else {
vty_out(vty, " %s", inet_ntoa(filter->mask)); vty_out(vty, " %pI4", &filter->mask);
vty_out(vty, " %s", inet_ntoa(filter->mask_mask)); vty_out(vty, " %pI4", &filter->mask_mask);
} }
vty_out(vty, "\n"); vty_out(vty, "\n");
} else { } else {
if (filter->addr_mask.s_addr == 0xffffffff) if (filter->addr_mask.s_addr == 0xffffffff)
vty_out(vty, " any\n"); vty_out(vty, " any\n");
else { else {
vty_out(vty, " %s", inet_ntoa(filter->addr)); vty_out(vty, " %pI4", &filter->addr);
if (filter->addr_mask.s_addr != INADDR_ANY) if (filter->addr_mask.s_addr != INADDR_ANY)
vty_out(vty, " %s", vty_out(vty, " %pI4", &filter->addr_mask);
inet_ntoa(filter->addr_mask));
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
} }

7
lib/if.c
View File

@ -1106,8 +1106,8 @@ ifaddr_ipv4_add (struct in_addr *ifaddr, struct interface *ifp)
if (rn) if (rn)
{ {
route_unlock_node (rn); route_unlock_node (rn);
zlog_info ("ifaddr_ipv4_add(): address %s is already added", zlog_info("ifaddr_ipv4_add(): address %pI4 is already added",
inet_ntoa (*ifaddr)); ifaddr);
return; return;
} }
rn->info = ifp; rn->info = ifp;
@ -1126,8 +1126,7 @@ ifaddr_ipv4_delete (struct in_addr *ifaddr, struct interface *ifp)
rn = route_node_lookup (ifaddr_ipv4_table, (struct prefix *) &p); rn = route_node_lookup (ifaddr_ipv4_table, (struct prefix *) &p);
if (! rn) if (! rn)
{ {
zlog_info ("ifaddr_ipv4_delete(): can't find address %s", zlog_info("%s: can't find address %pI4", __func__, ifaddr);
inet_ntoa (*ifaddr));
return; return;
} }
rn->info = NULL; rn->info = NULL;

8
lib/nexthop.c
View File

@ -431,13 +431,13 @@ const char *nexthop2str(const struct nexthop *nexthop, char *str, int size)
break; break;
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV4_IFINDEX: case NEXTHOP_TYPE_IPV4_IFINDEX:
snprintf(str, size, "%s if %u", inet_ntoa(nexthop->gate.ipv4), snprintfrr(str, size, "%pI4 if %u", &nexthop->gate.ipv4,
nexthop->ifindex); nexthop->ifindex);
break; break;
case NEXTHOP_TYPE_IPV6: case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV6_IFINDEX: case NEXTHOP_TYPE_IPV6_IFINDEX:
snprintf(str, size, "%s if %u", inet6_ntoa(nexthop->gate.ipv6), snprintfrr(str, size, "%pI6 if %u", &nexthop->gate.ipv6,
nexthop->ifindex); nexthop->ifindex);
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
snprintf(str, size, "blackhole"); snprintf(str, size, "blackhole");

20
lib/nexthop_group.c
View File

@ -975,7 +975,6 @@ void nexthop_group_write_nexthop_simple(struct vty *vty,
const struct nexthop *nh, const struct nexthop *nh,
char *altifname) char *altifname)
{ {
char buf[100];
char *ifname; char *ifname;
vty_out(vty, "nexthop "); vty_out(vty, "nexthop ");
@ -990,19 +989,16 @@ void nexthop_group_write_nexthop_simple(struct vty *vty,
vty_out(vty, "%s", ifname); vty_out(vty, "%s", ifname);
break; break;
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:
vty_out(vty, "%s", inet_ntoa(nh->gate.ipv4)); vty_out(vty, "%pI4", &nh->gate.ipv4);
break; break;
case NEXTHOP_TYPE_IPV4_IFINDEX: case NEXTHOP_TYPE_IPV4_IFINDEX:
vty_out(vty, "%s %s", inet_ntoa(nh->gate.ipv4), ifname); vty_out(vty, "%pI4 %s", &nh->gate.ipv4, ifname);
break; break;
case NEXTHOP_TYPE_IPV6: case NEXTHOP_TYPE_IPV6:
vty_out(vty, "%s", vty_out(vty, "%pI6", &nh->gate.ipv6);
inet_ntop(AF_INET6, &nh->gate.ipv6, buf, sizeof(buf)));
break; break;
case NEXTHOP_TYPE_IPV6_IFINDEX: case NEXTHOP_TYPE_IPV6_IFINDEX:
vty_out(vty, "%s %s", vty_out(vty, "%pI6 %s", &nh->gate.ipv6, ifname);
inet_ntop(AF_INET6, &nh->gate.ipv6, buf, sizeof(buf)),
ifname);
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
break; break;
@ -1056,10 +1052,14 @@ void nexthop_group_json_nexthop(json_object *j, const struct nexthop *nh)
ifindex2ifname(nh->ifindex, nh->vrf_id)); ifindex2ifname(nh->ifindex, nh->vrf_id));
break; break;
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:
json_object_string_add(j, "nexthop", inet_ntoa(nh->gate.ipv4)); json_object_string_add(
j, "nexthop",
inet_ntop(AF_INET, &nh->gate.ipv4, buf, sizeof(buf)));
break; break;
case NEXTHOP_TYPE_IPV4_IFINDEX: case NEXTHOP_TYPE_IPV4_IFINDEX:
json_object_string_add(j, "nexthop", inet_ntoa(nh->gate.ipv4)); json_object_string_add(
j, "nexthop",
inet_ntop(AF_INET, &nh->gate.ipv4, buf, sizeof(buf)));
json_object_string_add(j, "vrfId", json_object_string_add(j, "vrfId",
ifindex2ifname(nh->ifindex, nh->vrf_id)); ifindex2ifname(nh->ifindex, nh->vrf_id));
break; break;

12
lib/sockunion.c
View File

@ -587,15 +587,11 @@ static void __attribute__((unused)) sockunion_print(const union sockunion *su)
switch (su->sa.sa_family) { switch (su->sa.sa_family) {
case AF_INET: case AF_INET:
printf("%s\n", inet_ntoa(su->sin.sin_addr)); printf("%pI4\n", &su->sin.sin_addr);
break;
case AF_INET6:
printf("%pI6\n", &su->sin6.sin6_addr);
break; break;
case AF_INET6: {
char buf[SU_ADDRSTRLEN];
printf("%s\n", inet_ntop(AF_INET6, &(su->sin6.sin6_addr), buf,
sizeof(buf)));
} break;
#ifdef AF_LINK #ifdef AF_LINK
case AF_LINK: { case AF_LINK: {
struct sockaddr_dl *sdl; struct sockaddr_dl *sdl;