From 6099b3b56956322567323c11fd698b2328c6826b Mon Sep 17 00:00:00 2001 From: ajs Date: Sat, 20 Nov 2004 02:06:59 +0000 Subject: 2004-11-19 Andrew J. Schorr * global: Replace strerror with safe_strerror. And vtysh/vtysh.c needs to include "log.h" to pick up the declaration. --- ospf6d/ospf6_lsa.c | 4 ++-- ospf6d/ospf6_network.c | 16 ++++++++-------- ospf6d/ospf6_zebra.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ospf6d') diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index d6356c72..48f79afa 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -179,7 +179,7 @@ ospf6_lsa_age_set (struct ospf6_lsa *lsa) if (gettimeofday (&now, (struct timezone *)NULL) < 0) zlog_warn ("LSA: gettimeofday failed, may fail LSA AGEs: %s", - strerror (errno)); + safe_strerror (errno)); lsa->birth.tv_sec = now.tv_sec - ntohs (lsa->header->age); lsa->birth.tv_usec = now.tv_usec; @@ -202,7 +202,7 @@ ospf6_lsa_age_current (struct ospf6_lsa *lsa) /* current time */ if (gettimeofday (&now, (struct timezone *)NULL) < 0) zlog_warn ("LSA: gettimeofday failed, may fail LSA AGEs: %s", - strerror (errno)); + safe_strerror (errno)); /* calculate age */ ulage = now.tv_sec - lsa->birth.tv_sec; diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c index de0c3f38..382310f8 100644 --- a/ospf6d/ospf6_network.c +++ b/ospf6d/ospf6_network.c @@ -43,7 +43,7 @@ ospf6_set_reuseaddr () u_int on = 0; if (setsockopt (ospf6_sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (u_int)) < 0) - zlog_warn ("Network: set SO_REUSEADDR failed: %s", strerror (errno)); + zlog_warn ("Network: set SO_REUSEADDR failed: %s", safe_strerror (errno)); } /* setsockopt MulticastLoop to off */ @@ -54,7 +54,7 @@ ospf6_reset_mcastloop () if (setsockopt (ospf6_sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &off, sizeof (u_int)) < 0) zlog_warn ("Network: reset IPV6_MULTICAST_LOOP failed: %s", - strerror (errno)); + safe_strerror (errno)); } void @@ -70,7 +70,7 @@ ospf6_set_checksum () #ifndef DISABLE_IPV6_CHECKSUM if (setsockopt (ospf6_sock, IPPROTO_IPV6, IPV6_CHECKSUM, &offset, sizeof (offset)) < 0) - zlog_warn ("Network: set IPV6_CHECKSUM failed: %s", strerror (errno)); + zlog_warn ("Network: set IPV6_CHECKSUM failed: %s", safe_strerror (errno)); #else zlog_warn ("Network: Don't set IPV6_CHECKSUM"); #endif /* DISABLE_IPV6_CHECKSUM */ @@ -127,7 +127,7 @@ ospf6_join_allspfrouters (u_int ifindex) if (retval < 0) zlog_err ("Network: Join AllSPFRouters on ifindex %d failed: %s", - ifindex, strerror (errno)); + ifindex, safe_strerror (errno)); #if 0 else zlog_info ("Network: Join AllSPFRouters on ifindex %d", ifindex); @@ -147,7 +147,7 @@ ospf6_leave_allspfrouters (u_int ifindex) if (setsockopt (ospf6_sock, IPPROTO_IPV6, IPV6_LEAVE_GROUP, &mreq6, sizeof (mreq6)) < 0) zlog_warn ("Network: Leave AllSPFRouters on ifindex %d Failed: %s", - ifindex, strerror (errno)); + ifindex, safe_strerror (errno)); #if 0 else zlog_info ("Network: Leave AllSPFRouters on ifindex %d", ifindex); @@ -167,7 +167,7 @@ ospf6_join_alldrouters (u_int ifindex) if (setsockopt (ospf6_sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6, sizeof (mreq6)) < 0) zlog_warn ("Network: Join AllDRouters on ifindex %d Failed: %s", - ifindex, strerror (errno)); + ifindex, safe_strerror (errno)); #if 0 else zlog_info ("Network: Join AllDRouters on ifindex %d", ifindex); @@ -264,7 +264,7 @@ ospf6_sendmsg (struct in6_addr *src, struct in6_addr *dst, retval = sendmsg (ospf6_sock, &smsghdr, 0); if (retval != iov_totallen (message)) zlog_warn ("sendmsg failed: ifindex: %d: %s (%d)", - *ifindex, strerror (errno), errno); + *ifindex, safe_strerror (errno), errno); return retval; } @@ -300,7 +300,7 @@ ospf6_recvmsg (struct in6_addr *src, struct in6_addr *dst, retval = recvmsg (ospf6_sock, &rmsghdr, 0); if (retval < 0) - zlog_warn ("recvmsg failed: %s", strerror (errno)); + zlog_warn ("recvmsg failed: %s", safe_strerror (errno)); else if (retval == iov_totallen (message)) zlog_warn ("recvmsg read full buffer size: %d", retval); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 0baaaea9..2b21567f 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -461,7 +461,7 @@ ospf6_zebra_route_update (int type, struct ospf6_route *request) if (ret < 0) zlog_err ("zapi_ipv6_route() %s failed: %s", - (type == REM ? "delete" : "add"), strerror (errno)); + (type == REM ? "delete" : "add"), safe_strerror (errno)); XFREE (MTYPE_OSPF6_OTHER, nexthops); XFREE (MTYPE_OSPF6_OTHER, ifindexes); -- cgit v1.2.1