From 28b8bcf042e3db412777424b03537ccaa99d9113 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 21 Aug 2024 14:58:14 +0000 Subject: [PATCH] Mechanically change inet_aton to inet_pton. OK claudio, deraadt --- usr.sbin/ripd/interface.c | 6 +++--- usr.sbin/ripd/message.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ripd/interface.c b/usr.sbin/ripd/interface.c index 3d1dfd611bc..019e2c33c1c 100644 --- a/usr.sbin/ripd/interface.c +++ b/usr.sbin/ripd/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.16 2021/01/19 10:09:59 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.17 2024/08/21 14:58:14 florian Exp $ */ /* * Copyright (c) 2006 Michele Marchetto @@ -192,7 +192,7 @@ if_act_start(struct iface *iface) switch (iface->type) { case IF_TYPE_POINTOPOINT: case IF_TYPE_BROADCAST: - inet_aton(ALL_RIP_ROUTERS, &addr); + inet_pton(AF_INET, ALL_RIP_ROUTERS, &addr); if (if_join_group(iface, &addr)) { log_warn("if_act_start: error joining group %s, " "interface %s", inet_ntoa(addr), iface->name); @@ -220,7 +220,7 @@ if_act_reset(struct iface *iface) switch (iface->type) { case IF_TYPE_POINTOPOINT: case IF_TYPE_BROADCAST: - inet_aton(ALL_RIP_ROUTERS, &addr); + inet_pton(AF_INET, ALL_RIP_ROUTERS, &addr); if (if_leave_group(iface, &addr)) { log_warn("if_act_reset: error leaving group %s, " "interface %s", inet_ntoa(addr), iface->name); diff --git a/usr.sbin/ripd/message.c b/usr.sbin/ripd/message.c index 423ef0ff460..21cf3f59e23 100644 --- a/usr.sbin/ripd/message.c +++ b/usr.sbin/ripd/message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: message.c,v 1.17 2023/07/03 10:34:08 claudio Exp $ */ +/* $OpenBSD: message.c,v 1.18 2024/08/21 14:58:14 florian Exp $ */ /* * Copyright (c) 2006 Michele Marchetto @@ -107,7 +107,7 @@ send_triggered_update(struct iface *iface, struct rip_route *rr) if (iface->passive) return (0); - inet_aton(ALL_RIP_ROUTERS, &dst.sin_addr); + inet_pton(AF_INET, ALL_RIP_ROUTERS, &dst.sin_addr); dst.sin_port = htons(RIP_PORT); dst.sin_family = AF_INET; @@ -161,7 +161,7 @@ send_request(struct packet_head *r_list, struct iface *i, struct nbr *nbr) } else { /* multicast on interface */ iface = i; - inet_aton(ALL_RIP_ROUTERS, &dst.sin_addr); + inet_pton(AF_INET, ALL_RIP_ROUTERS, &dst.sin_addr); port = htons(RIP_PORT); } @@ -237,7 +237,7 @@ send_response(struct packet_head *r_list, struct iface *i, struct nbr *nbr) } else { /* multicast on interface */ iface = i; - inet_aton(ALL_RIP_ROUTERS, &dst.sin_addr); + inet_pton(AF_INET, ALL_RIP_ROUTERS, &dst.sin_addr); port = htons(RIP_PORT); } -- 2.20.1