proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 01:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eigrpd: Convert to use LIB_ERR_XXX for zlog_err

Browse Source 
Convert, where appropriate, to using LIB_ERR_XXX for zlog_ferr

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-06-18 10:58:43 -04:00 committed by Quentin Young
parent ad9921dbd8
commit 6ae7ed45ff
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
eigrpd/eigrp_network.c
View File

@ -37,6 +37,7 @@
#include "privs.h" #include "privs.h"
#include "table.h" #include "table.h"
#include "vty.h" #include "vty.h"
#include "lib_errors.h"
#include "eigrpd/eigrp_structs.h" #include "eigrpd/eigrp_structs.h"
#include "eigrpd/eigrpd.h" #include "eigrpd/eigrpd.h"
@ -61,8 +62,9 @@ int eigrp_sock_init(void)
#endif #endif
if (eigrpd_privs.change(ZPRIVS_RAISE)) if (eigrpd_privs.change(ZPRIVS_RAISE))
zlog_err("eigrp_sock_init: could not raise privs, %s", zlog_ferr(LIB_ERR_PRIVILEGES,
safe_strerror(errno)); "eigrp_sock_init: could not raise privs, %s",
safe_strerror(errno));
eigrp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_EIGRPIGP); eigrp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_EIGRPIGP);
if (eigrp_sock < 0) { if (eigrp_sock < 0) {
@ -70,8 +72,8 @@ int eigrp_sock_init(void)
if (eigrpd_privs.change(ZPRIVS_LOWER)) if (eigrpd_privs.change(ZPRIVS_LOWER))
zlog_err("eigrp_sock_init: could not lower privs, %s", zlog_err("eigrp_sock_init: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));
zlog_err("eigrp_read_sock_init: socket: %s", zlog_ferr(LIB_ERR_SOCKET, "eigrp_read_sock_init: socket: %s",
safe_strerror(save_errno)); safe_strerror(save_errno));
exit(1); exit(1);
} }
@ -82,8 +84,9 @@ int eigrp_sock_init(void)
if (ret < 0) { if (ret < 0) {
int save_errno = errno; int save_errno = errno;
if (eigrpd_privs.change(ZPRIVS_LOWER)) if (eigrpd_privs.change(ZPRIVS_LOWER))
zlog_err("eigrp_sock_init: could not lower privs, %s", zlog_ferr(LIB_ERR_PRIVILEGES,
safe_strerror(errno)); "eigrp_sock_init: could not lower privs, %s",
safe_strerror(errno));
zlog_warn("Can't set IP_HDRINCL option for fd %d: %s", zlog_warn("Can't set IP_HDRINCL option for fd %d: %s",
eigrp_sock, safe_strerror(save_errno)); eigrp_sock, safe_strerror(save_errno));
} }
@ -94,8 +97,9 @@ int eigrp_sock_init(void)
if (ret < 0) { if (ret < 0) {
int save_errno = errno; int save_errno = errno;
if (eigrpd_privs.change(ZPRIVS_LOWER)) if (eigrpd_privs.change(ZPRIVS_LOWER))
zlog_err("eigrpd_sock_init: could not lower privs, %s", zlog_ferr(LIB_ERR_PRIVILEGES,
safe_strerror(errno)); "eigrpd_sock_init: could not lower privs, %s",
safe_strerror(errno));
zlog_warn("can't set sockopt IP_TOS %d to socket %d: %s", tos, zlog_warn("can't set sockopt IP_TOS %d to socket %d: %s", tos,
eigrp_sock, safe_strerror(save_errno)); eigrp_sock, safe_strerror(save_errno));
close(eigrp_sock); /* Prevent sd leak. */ close(eigrp_sock); /* Prevent sd leak. */
@ -112,8 +116,9 @@ int eigrp_sock_init(void)
zlog_warn("Can't set pktinfo option for fd %d", eigrp_sock); zlog_warn("Can't set pktinfo option for fd %d", eigrp_sock);
if (eigrpd_privs.change(ZPRIVS_LOWER)) { if (eigrpd_privs.change(ZPRIVS_LOWER)) {
zlog_err("eigrp_sock_init: could not lower privs, %s", zlog_ferr(LIB_ERR_PRIVILEGES,
safe_strerror(errno)); "eigrp_sock_init: could not lower privs, %s",
safe_strerror(errno));
} }
return eigrp_sock; return eigrp_sock;
@ -126,8 +131,8 @@ void eigrp_adjust_sndbuflen(struct eigrp *eigrp, unsigned int buflen)
if (eigrp->maxsndbuflen >= buflen) if (eigrp->maxsndbuflen >= buflen)
return; return;
if (eigrpd_privs.change(ZPRIVS_RAISE)) if (eigrpd_privs.change(ZPRIVS_RAISE))
zlog_err("%s: could not raise privs, %s", __func__, zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
safe_strerror(errno)); __func__, safe_strerror(errno));
/* Now we try to set SO_SNDBUF to what our caller has requested /* Now we try to set SO_SNDBUF to what our caller has requested
* (the MTU of a newly added interface). However, if the OS has * (the MTU of a newly added interface). However, if the OS has
@ -146,8 +151,8 @@ void eigrp_adjust_sndbuflen(struct eigrp *eigrp, unsigned int buflen)
else else
zlog_warn("%s: failed to get SO_SNDBUF", __func__); zlog_warn("%s: failed to get SO_SNDBUF", __func__);
if (eigrpd_privs.change(ZPRIVS_LOWER)) if (eigrpd_privs.change(ZPRIVS_LOWER))
zlog_err("%s: could not lower privs, %s", __func__, zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
safe_strerror(errno)); __func__, safe_strerror(errno));
} }
int eigrp_if_ipmulticast(struct eigrp *top, struct prefix *p, int eigrp_if_ipmulticast(struct eigrp *top, struct prefix *p,

6
eigrpd/eigrp_packet.c
View File

@ -42,6 +42,7 @@
#include "checksum.h" #include "checksum.h"
#include "md5.h" #include "md5.h"
#include "sha256.h" #include "sha256.h"
#include "lib_errors.h"
#include "eigrpd/eigrp_structs.h" #include "eigrpd/eigrp_structs.h"
#include "eigrpd/eigrpd.h" #include "eigrpd/eigrpd.h"
@ -1210,8 +1211,9 @@ uint16_t eigrp_add_internalTLV_to_stream(struct stream *s,
stream_putw(s, length); stream_putw(s, length);
break; break;
default: default:
zlog_err("%s: Unexpected prefix length: %d", zlog_ferr(LIB_ERR_DEVELOPMENT,
__PRETTY_FUNCTION__, pe->destination->prefixlen); "%s: Unexpected prefix length: %d",
__PRETTY_FUNCTION__, pe->destination->prefixlen);
return 0; return 0;
} }
stream_putl(s, 0x00000000); stream_putl(s, 0x00000000);

4
eigrpd/eigrp_topology.c
View File

@ -37,6 +37,7 @@
#include "log.h" #include "log.h"
#include "linklist.h" #include "linklist.h"
#include "vty.h" #include "vty.h"
#include "lib_errors.h"
#include "eigrpd/eigrp_structs.h" #include "eigrpd/eigrp_structs.h"
#include "eigrpd/eigrpd.h" #include "eigrpd/eigrpd.h"
@ -411,7 +412,8 @@ eigrp_topology_update_distance(struct eigrp_fsm_action_message *msg)
} }
break; break;
default: default:
zlog_err("%s: Please implement handler", __PRETTY_FUNCTION__); zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: Please implement handler",
__PRETTY_FUNCTION__);
break; break;
} }
distance_done: distance_done:

7
eigrpd/eigrpd.c
View File

@ -170,12 +170,7 @@ static struct eigrp *eigrp_new(const char *AS)
eigrp->fd = eigrp_socket; eigrp->fd = eigrp_socket;
eigrp->maxsndbuflen = getsockopt_so_sendbuf(eigrp->fd); eigrp->maxsndbuflen = getsockopt_so_sendbuf(eigrp->fd);
if ((eigrp->ibuf = stream_new(EIGRP_PACKET_MAX_LEN + 1)) == NULL) { eigrp->ibuf = stream_new(EIGRP_PACKET_MAX_LEN + 1);
zlog_err(
"eigrp_new: fatal error: stream_new (%u) failed allocating ibuf",
EIGRP_PACKET_MAX_LEN + 1);
exit(1);
}
eigrp->t_read = NULL; eigrp->t_read = NULL;
thread_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); thread_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read);