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

*: rename zlog_fer -> flog_err

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-08-03 18:03:29 +00:00
parent fa8b3ca66a
commit af4c27286d
132 changed files with 734 additions and 734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
babeld/babel_interface.c
View File

@ -169,7 +169,7 @@ babel_interface_address_add (int cmd, struct zclient *client,
if (babel_ifp->ipv4 == NULL) { if (babel_ifp->ipv4 == NULL) {
babel_ifp->ipv4 = malloc(4); babel_ifp->ipv4 = malloc(4);
if (babel_ifp->ipv4 == NULL) { if (babel_ifp->ipv4 == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "not enough memory"); flog_err(BABEL_ERR_MEMORY, "not enough memory");
} else { } else {
memcpy(babel_ifp->ipv4, &prefix->u.prefix4, 4); memcpy(babel_ifp->ipv4, &prefix->u.prefix4, 4);
} }
@ -709,7 +709,7 @@ interface_recalculate(struct interface *ifp)
tmp = babel_ifp->sendbuf; tmp = babel_ifp->sendbuf;
babel_ifp->sendbuf = realloc(babel_ifp->sendbuf, babel_ifp->bufsize); babel_ifp->sendbuf = realloc(babel_ifp->sendbuf, babel_ifp->bufsize);
if(babel_ifp->sendbuf == NULL) { if(babel_ifp->sendbuf == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't reallocate sendbuf."); flog_err(BABEL_ERR_MEMORY, "Couldn't reallocate sendbuf.");
free(tmp); free(tmp);
babel_ifp->bufsize = 0; babel_ifp->bufsize = 0;
return -1; return -1;
@ -729,7 +729,7 @@ interface_recalculate(struct interface *ifp)
rc = setsockopt(protocol_socket, IPPROTO_IPV6, IPV6_JOIN_GROUP, rc = setsockopt(protocol_socket, IPPROTO_IPV6, IPV6_JOIN_GROUP,
(char*)&mreq, sizeof(mreq)); (char*)&mreq, sizeof(mreq));
if(rc < 0) { if(rc < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"setsockopt(IPV6_JOIN_GROUP) on interface '%s': %s", "setsockopt(IPV6_JOIN_GROUP) on interface '%s': %s",
ifp->name, safe_strerror(errno)); ifp->name, safe_strerror(errno));
/* This is probably due to a missing link-local address, /* This is probably due to a missing link-local address,
@ -793,7 +793,7 @@ interface_reset(struct interface *ifp)
rc = setsockopt(protocol_socket, IPPROTO_IPV6, IPV6_LEAVE_GROUP, rc = setsockopt(protocol_socket, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
(char*)&mreq, sizeof(mreq)); (char*)&mreq, sizeof(mreq));
if(rc < 0) if(rc < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"setsockopt(IPV6_LEAVE_GROUP) on interface '%s': %s", "setsockopt(IPV6_LEAVE_GROUP) on interface '%s': %s",
ifp->name, safe_strerror(errno)); ifp->name, safe_strerror(errno));
} }
@ -1060,7 +1060,7 @@ DEFUN (show_babel_route,
} }
route_stream_done(routes); route_stream_done(routes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
xroutes = xroute_stream(); xroutes = xroute_stream();
if(xroutes) { if(xroutes) {
@ -1072,7 +1072,7 @@ DEFUN (show_babel_route,
} }
xroute_stream_done(xroutes); xroute_stream_done(xroutes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1107,7 +1107,7 @@ DEFUN (show_babel_route_prefix,
} }
route_stream_done(routes); route_stream_done(routes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
xroutes = xroute_stream(); xroutes = xroute_stream();
if(xroutes) { if(xroutes) {
@ -1119,7 +1119,7 @@ DEFUN (show_babel_route_prefix,
} }
xroute_stream_done(xroutes); xroute_stream_done(xroutes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1165,7 +1165,7 @@ DEFUN (show_babel_route_addr,
} }
route_stream_done(routes); route_stream_done(routes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
xroutes = xroute_stream(); xroutes = xroute_stream();
if(xroutes) { if(xroutes) {
@ -1177,7 +1177,7 @@ DEFUN (show_babel_route_addr,
} }
xroute_stream_done(xroutes); xroute_stream_done(xroutes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1224,7 +1224,7 @@ DEFUN (show_babel_route_addr6,
} }
route_stream_done(routes); route_stream_done(routes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
xroutes = xroute_stream(); xroutes = xroute_stream();
if(xroutes) { if(xroutes) {
@ -1236,7 +1236,7 @@ DEFUN (show_babel_route_addr6,
} }
xroute_stream_done(xroutes); xroute_stream_done(xroutes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }

24
babeld/babel_main.c
View File

@ -225,7 +225,7 @@ babel_init_random(void)
rc = read_random_bytes(&seed, sizeof(seed)); rc = read_random_bytes(&seed, sizeof(seed));
if(rc < 0) { if(rc < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, "read(random): %s", flog_err(LIB_ERR_SYSTEM_CALL, "read(random): %s",
safe_strerror(errno)); safe_strerror(errno));
seed = 42; seed = 42;
} }
@ -246,13 +246,13 @@ babel_replace_by_null(int fd)
fd_null = open("/dev/null", O_RDONLY); fd_null = open("/dev/null", O_RDONLY);
if(fd_null < 0) { if(fd_null < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, "open(null): %s", safe_strerror(errno)); flog_err(LIB_ERR_SYSTEM_CALL, "open(null): %s", safe_strerror(errno));
exit(1); exit(1);
} }
rc = dup2(fd_null, fd); rc = dup2(fd_null, fd);
if(rc < 0) { if(rc < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, "dup2(null, 0): %s", flog_err(LIB_ERR_SYSTEM_CALL, "dup2(null, 0): %s",
safe_strerror(errno)); safe_strerror(errno));
exit(1); exit(1);
} }
@ -272,11 +272,11 @@ babel_load_state_file(void)
fd = open(state_file, O_RDONLY); fd = open(state_file, O_RDONLY);
if(fd < 0 && errno != ENOENT) if(fd < 0 && errno != ENOENT)
zlog_ferr(LIB_ERR_SYSTEM_CALL, "open(babel-state: %s)", flog_err(LIB_ERR_SYSTEM_CALL, "open(babel-state: %s)",
safe_strerror(errno)); safe_strerror(errno));
rc = unlink(state_file); rc = unlink(state_file);
if(fd >= 0 && rc < 0) { if(fd >= 0 && rc < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, "unlink(babel-state): %s", flog_err(LIB_ERR_SYSTEM_CALL, "unlink(babel-state): %s",
safe_strerror(errno)); safe_strerror(errno));
/* If we couldn't unlink it, it's probably stale. */ /* If we couldn't unlink it, it's probably stale. */
goto fini; goto fini;
@ -288,7 +288,7 @@ babel_load_state_file(void)
long t; long t;
rc = read(fd, buf, 99); rc = read(fd, buf, 99);
if(rc < 0) { if(rc < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, "read(babel-state): %s", flog_err(LIB_ERR_SYSTEM_CALL, "read(babel-state): %s",
safe_strerror(errno)); safe_strerror(errno));
} else { } else {
buf[rc] = '\0'; buf[rc] = '\0';
@ -297,7 +297,7 @@ babel_load_state_file(void)
unsigned char sid[8]; unsigned char sid[8];
rc = parse_eui64(buf2, sid); rc = parse_eui64(buf2, sid);
if(rc < 0) { if(rc < 0) {
zlog_ferr(BABEL_ERR_CONFIG, "Couldn't parse babel-state."); flog_err(BABEL_ERR_CONFIG, "Couldn't parse babel-state.");
} else { } else {
struct timeval realnow; struct timeval realnow;
debugf(BABEL_DEBUG_COMMON, debugf(BABEL_DEBUG_COMMON,
@ -307,13 +307,13 @@ babel_load_state_file(void)
if(memcmp(sid, myid, 8) == 0) if(memcmp(sid, myid, 8) == 0)
myseqno = seqno_plus(s, 1); myseqno = seqno_plus(s, 1);
else else
zlog_ferr(BABEL_ERR_CONFIG, flog_err(BABEL_ERR_CONFIG,
"ID mismatch in babel-state. id=%s; old=%s", "ID mismatch in babel-state. id=%s; old=%s",
format_eui64(myid), format_eui64(myid),
format_eui64(sid)); format_eui64(sid));
} }
} else { } else {
zlog_ferr(BABEL_ERR_CONFIG, "Couldn't parse babel-state."); flog_err(BABEL_ERR_CONFIG, "Couldn't parse babel-state.");
} }
} }
goto fini; goto fini;
@ -353,7 +353,7 @@ babel_save_state_file(void)
debugf(BABEL_DEBUG_COMMON, "Save state file."); debugf(BABEL_DEBUG_COMMON, "Save state file.");
fd = open(state_file, O_WRONLY | O_TRUNC | O_CREAT, 0644); fd = open(state_file, O_WRONLY | O_TRUNC | O_CREAT, 0644);
if(fd < 0) { if(fd < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, "creat(babel-state): %s", flog_err(LIB_ERR_SYSTEM_CALL, "creat(babel-state): %s",
safe_strerror(errno)); safe_strerror(errno));
unlink(state_file); unlink(state_file);
} else { } else {
@ -364,12 +364,12 @@ babel_save_state_file(void)
format_eui64(myid), (int)myseqno, format_eui64(myid), (int)myseqno,
(long)realnow.tv_sec); (long)realnow.tv_sec);
if(rc < 0 || rc >= 100) { if(rc < 0 || rc >= 100) {
zlog_ferr(BABEL_ERR_CONFIG, "write(babel-state): overflow."); flog_err(BABEL_ERR_CONFIG, "write(babel-state): overflow.");
unlink(state_file); unlink(state_file);
} else { } else {
rc = write(fd, buf, rc); rc = write(fd, buf, rc);
if(rc < 0) { if(rc < 0) {
zlog_ferr(BABEL_ERR_CONFIG, "write(babel-state): %s", flog_err(BABEL_ERR_CONFIG, "write(babel-state): %s",
safe_strerror(errno)); safe_strerror(errno));
unlink(state_file); unlink(state_file);
} }

12
babeld/babeld.c
View File

@ -145,7 +145,7 @@ babel_create_routing_process (void)
/* Make socket for Babel protocol. */ /* Make socket for Babel protocol. */
protocol_socket = babel_socket(protocol_port); protocol_socket = babel_socket(protocol_port);
if (protocol_socket < 0) { if (protocol_socket < 0) {
zlog_ferr(LIB_ERR_SOCKET, "Couldn't create link local socket: %s", flog_err(LIB_ERR_SOCKET, "Couldn't create link local socket: %s",
safe_strerror(errno)); safe_strerror(errno));
goto fail; goto fail;
} }
@ -179,7 +179,7 @@ babel_read_protocol (struct thread *thread)
(struct sockaddr*)&sin6, sizeof(sin6)); (struct sockaddr*)&sin6, sizeof(sin6));
if(rc < 0) { if(rc < 0) {
if(errno != EAGAIN && errno != EINTR) { if(errno != EAGAIN && errno != EINTR) {
zlog_ferr(LIB_ERR_SOCKET, "recv: %s", safe_strerror(errno)); flog_err(LIB_ERR_SOCKET, "recv: %s", safe_strerror(errno));
} }
} else { } else {
FOR_ALL_INTERFACES(vrf, ifp) { FOR_ALL_INTERFACES(vrf, ifp) {
@ -255,12 +255,12 @@ babel_get_myid(void)
return; return;
} }
zlog_ferr(BABEL_ERR_CONFIG, flog_err(BABEL_ERR_CONFIG,
"Warning: couldn't find router id -- using random value."); "Warning: couldn't find router id -- using random value.");
rc = read_random_bytes(myid, 8); rc = read_random_bytes(myid, 8);
if(rc < 0) { if(rc < 0) {
zlog_ferr(BABEL_ERR_CONFIG, "read(random): %s (cannot assign an ID)", flog_err(BABEL_ERR_CONFIG, "read(random): %s (cannot assign an ID)",
safe_strerror(errno)); safe_strerror(errno));
exit(1); exit(1);
} }
@ -519,7 +519,7 @@ resize_receive_buffer(int size)
if(receive_buffer == NULL) { if(receive_buffer == NULL) {
receive_buffer = malloc(size); receive_buffer = malloc(size);
if(receive_buffer == NULL) { if(receive_buffer == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "malloc(receive_buffer): %s", flog_err(BABEL_ERR_MEMORY, "malloc(receive_buffer): %s",
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }
@ -528,7 +528,7 @@ resize_receive_buffer(int size)
unsigned char *new; unsigned char *new;
new = realloc(receive_buffer, size); new = realloc(receive_buffer, size);
if(new == NULL) { if(new == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "realloc(receive_buffer): %s", flog_err(BABEL_ERR_MEMORY, "realloc(receive_buffer): %s",
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }

52
babeld/message.c
View File

@ -141,12 +141,12 @@ parse_update_subtlv(const unsigned char *a, int alen,
} }
if(i + 1 > alen) { if(i + 1 > alen) {
zlog_ferr(BABEL_ERR_PACKET, "Received truncated attributes."); flog_err(BABEL_ERR_PACKET, "Received truncated attributes.");
return; return;
} }
len = a[i + 1]; len = a[i + 1];
if(i + len > alen) { if(i + len > alen) {
zlog_ferr(BABEL_ERR_PACKET, "Received truncated attributes."); flog_err(BABEL_ERR_PACKET, "Received truncated attributes.");
return; return;
} }
@ -154,14 +154,14 @@ parse_update_subtlv(const unsigned char *a, int alen,
/* Nothing. */ /* Nothing. */
} else if(type == SUBTLV_DIVERSITY) { } else if(type == SUBTLV_DIVERSITY) {
if(len > DIVERSITY_HOPS) { if(len > DIVERSITY_HOPS) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received overlong channel information (%d > %d).n", "Received overlong channel information (%d > %d).n",
len, DIVERSITY_HOPS); len, DIVERSITY_HOPS);
len = DIVERSITY_HOPS; len = DIVERSITY_HOPS;
} }
if(memchr(a + i + 2, 0, len) != NULL) { if(memchr(a + i + 2, 0, len) != NULL) {
/* 0 is reserved. */ /* 0 is reserved. */
zlog_ferr(BABEL_ERR_PACKET, "Channel information contains 0!"); flog_err(BABEL_ERR_PACKET, "Channel information contains 0!");
return; return;
} }
memset(channels, 0, DIVERSITY_HOPS); memset(channels, 0, DIVERSITY_HOPS);
@ -189,13 +189,13 @@ parse_hello_subtlv(const unsigned char *a, int alen,
} }
if(i + 1 > alen) { if(i + 1 > alen) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received truncated sub-TLV on Hello message."); "Received truncated sub-TLV on Hello message.");
return -1; return -1;
} }
len = a[i + 1]; len = a[i + 1];
if(i + len > alen) { if(i + len > alen) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received truncated sub-TLV on Hello message."); "Received truncated sub-TLV on Hello message.");
return -1; return -1;
} }
@ -207,7 +207,7 @@ parse_hello_subtlv(const unsigned char *a, int alen,
DO_NTOHL(*hello_send_us, a + i + 2); DO_NTOHL(*hello_send_us, a + i + 2);
ret = 1; ret = 1;
} else { } else {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received incorrect RTT sub-TLV on Hello message."); "Received incorrect RTT sub-TLV on Hello message.");
} }
} else { } else {
@ -235,13 +235,13 @@ parse_ihu_subtlv(const unsigned char *a, int alen,
} }
if(i + 1 > alen) { if(i + 1 > alen) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received truncated sub-TLV on IHU message."); "Received truncated sub-TLV on IHU message.");
return -1; return -1;
} }
len = a[i + 1]; len = a[i + 1];
if(i + len > alen) { if(i + len > alen) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received truncated sub-TLV on IHU message."); "Received truncated sub-TLV on IHU message.");
return -1; return -1;
} }
@ -255,7 +255,7 @@ parse_ihu_subtlv(const unsigned char *a, int alen,
ret = 1; ret = 1;
} }
else { else {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received incorrect RTT sub-TLV on IHU message."); "Received incorrect RTT sub-TLV on IHU message.");
} }
} else { } else {
@ -345,14 +345,14 @@ parse_packet(const unsigned char *from, struct interface *ifp,
} }
if(!linklocal(from)) { if(!linklocal(from)) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received packet from non-local address %s.", "Received packet from non-local address %s.",
format_address(from)); format_address(from));
return; return;
} }
if (babel_packet_examin (packet, packetlen)) { if (babel_packet_examin (packet, packetlen)) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received malformed packet on %s from %s.", "Received malformed packet on %s from %s.",
ifp->name, format_address(from)); ifp->name, format_address(from));
return; return;
@ -360,14 +360,14 @@ parse_packet(const unsigned char *from, struct interface *ifp,
neigh = find_neighbour(from, ifp); neigh = find_neighbour(from, ifp);
if(neigh == NULL) { if(neigh == NULL) {
zlog_ferr(BABEL_ERR_PACKET, "Couldn't allocate neighbour."); flog_err(BABEL_ERR_PACKET, "Couldn't allocate neighbour.");
return; return;
} }
DO_NTOHS(bodylen, packet + 2); DO_NTOHS(bodylen, packet + 2);
if(bodylen + 4 > packetlen) { if(bodylen + 4 > packetlen) {
zlog_ferr(BABEL_ERR_PACKET, "Received truncated packet (%d + 4 > %d).", flog_err(BABEL_ERR_PACKET, "Received truncated packet (%d + 4 > %d).",
bodylen, packetlen); bodylen, packetlen);
bodylen = packetlen - 4; bodylen = packetlen - 4;
} }
@ -516,7 +516,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
have_router_id = 1; have_router_id = 1;
} }
if(!have_router_id && message[2] != 0) { if(!have_router_id && message[2] != 0) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received prefix with no router id."); "Received prefix with no router id.");
goto fail; goto fail;
} }
@ -528,7 +528,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
if(message[2] == 0) { if(message[2] == 0) {
if(metric < 0xFFFF) { if(metric < 0xFFFF) {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Received wildcard update with finite metric."); "Received wildcard update with finite metric.");
goto done; goto done;
} }
@ -621,7 +621,7 @@ parse_packet(const unsigned char *from, struct interface *ifp,
continue; continue;
fail: fail:
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Couldn't parse packet (%d, %d) from %s on %s.", "Couldn't parse packet (%d, %d) from %s on %s.",
message[0], message[1], format_address(from), ifp->name); message[0], message[1], format_address(from), ifp->name);
goto done; goto done;
@ -710,7 +710,7 @@ fill_rtt_message(struct interface *ifp)
DO_HTONL(babel_ifp->sendbuf + babel_ifp->buffered_hello + 10, time); DO_HTONL(babel_ifp->sendbuf + babel_ifp->buffered_hello + 10, time);
return 1; return 1;
} else { } else {
zlog_ferr(BABEL_ERR_PACKET, "No space left for timestamp sub-TLV " flog_err(BABEL_ERR_PACKET, "No space left for timestamp sub-TLV "
"(this shouldn't happen)"); "(this shouldn't happen)");
return -1; return -1;
} }
@ -745,9 +745,9 @@ flushbuf(struct interface *ifp)
babel_ifp->sendbuf, babel_ifp->buffered, babel_ifp->sendbuf, babel_ifp->buffered,
(struct sockaddr*)&sin6, sizeof(sin6)); (struct sockaddr*)&sin6, sizeof(sin6));
if(rc < 0) if(rc < 0)
zlog_ferr(BABEL_ERR_PACKET, "send: %s", safe_strerror(errno)); flog_err(BABEL_ERR_PACKET, "send: %s", safe_strerror(errno));
} else { } else {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Warning: bucket full, dropping packet to %s.", "Warning: bucket full, dropping packet to %s.",
ifp->name); ifp->name);
} }
@ -870,7 +870,7 @@ start_unicast_message(struct neighbour *neigh, int type, int len)
if(!unicast_buffer) if(!unicast_buffer)
unicast_buffer = malloc(UNICAST_BUFSIZE); unicast_buffer = malloc(UNICAST_BUFSIZE);
if(!unicast_buffer) { if(!unicast_buffer) {
zlog_ferr(BABEL_ERR_MEMORY, "malloc(unicast_buffer): %s", flog_err(BABEL_ERR_MEMORY, "malloc(unicast_buffer): %s",
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }
@ -1007,10 +1007,10 @@ flush_unicast(int dofree)
unicast_buffer, unicast_buffered, unicast_buffer, unicast_buffered,
(struct sockaddr*)&sin6, sizeof(sin6)); (struct sockaddr*)&sin6, sizeof(sin6));
if(rc < 0) if(rc < 0)
zlog_ferr(BABEL_ERR_PACKET, "send(unicast): %s", flog_err(BABEL_ERR_PACKET, "send(unicast): %s",
safe_strerror(errno)); safe_strerror(errno));
} else { } else {
zlog_ferr(BABEL_ERR_PACKET, flog_err(BABEL_ERR_PACKET,
"Warning: bucket full, dropping unicast packet to %s if %s.", "Warning: bucket full, dropping unicast packet to %s if %s.",
format_address(unicast_neighbour->address), format_address(unicast_neighbour->address),
unicast_neighbour->ifp->name); unicast_neighbour->ifp->name);
@ -1318,7 +1318,7 @@ buffer_update(struct interface *ifp,
again: again:
babel_ifp->buffered_updates = malloc(n *sizeof(struct buffered_update)); babel_ifp->buffered_updates = malloc(n *sizeof(struct buffered_update));
if(babel_ifp->buffered_updates == NULL) { if(babel_ifp->buffered_updates == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "malloc(buffered_updates): %s", flog_err(BABEL_ERR_MEMORY, "malloc(buffered_updates): %s",
safe_strerror(errno)); safe_strerror(errno));
if(n > 4) { if(n > 4) {
/* Try again with a tiny buffer. */ /* Try again with a tiny buffer. */
@ -1382,7 +1382,7 @@ send_update(struct interface *ifp, int urgent,
} }
route_stream_done(routes); route_stream_done(routes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate route stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate route stream.");
} }
set_timeout(&babel_ifp->update_timeout, babel_ifp->update_interval); set_timeout(&babel_ifp->update_timeout, babel_ifp->update_interval);
babel_ifp->last_update_time = babel_now.tv_sec; babel_ifp->last_update_time = babel_now.tv_sec;
@ -1460,7 +1460,7 @@ send_self_update(struct interface *ifp)
} }
xroute_stream_done(xroutes); xroute_stream_done(xroutes);
} else { } else {
zlog_ferr(BABEL_ERR_MEMORY, "Couldn't allocate xroute stream."); flog_err(BABEL_ERR_MEMORY, "Couldn't allocate xroute stream.");
} }
} }

2
babeld/neighbour.c
View File

@ -90,7 +90,7 @@ find_neighbour(const unsigned char *address, struct interface *ifp)
neigh = malloc(sizeof(struct neighbour)); neigh = malloc(sizeof(struct neighbour));
if(neigh == NULL) { if(neigh == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "malloc(neighbour): %s", flog_err(BABEL_ERR_MEMORY, "malloc(neighbour): %s",
safe_strerror(errno)); safe_strerror(errno));
return NULL; return NULL;
} }

18
babeld/route.c
View File

@ -399,14 +399,14 @@ install_route(struct babel_route *route)
return; return;
if(!route_feasible(route)) if(!route_feasible(route))
zlog_ferr(BABEL_ERR_ROUTE, "WARNING: installing unfeasible route " flog_err(BABEL_ERR_ROUTE, "WARNING: installing unfeasible route "
"(this shouldn't happen)."); "(this shouldn't happen).");
i = find_route_slot(route->src->prefix, route->src->plen, NULL); i = find_route_slot(route->src->prefix, route->src->plen, NULL);
assert(i >= 0 && i < route_slots); assert(i >= 0 && i < route_slots);
if(routes[i] != route && routes[i]->installed) { if(routes[i] != route && routes[i]->installed) {
zlog_ferr(BABEL_ERR_ROUTE, flog_err(BABEL_ERR_ROUTE,
"WARNING: attempting to install duplicate route " "WARNING: attempting to install duplicate route "
"(this shouldn't happen)."); "(this shouldn't happen).");
return; return;
@ -418,7 +418,7 @@ install_route(struct babel_route *route)
metric_to_kernel(route_metric(route)), NULL, 0, 0); metric_to_kernel(route_metric(route)), NULL, 0, 0);
if(rc < 0) { if(rc < 0) {
int save = errno; int save = errno;
zlog_ferr(BABEL_ERR_ROUTE, "kernel_route(ADD): %s", flog_err(BABEL_ERR_ROUTE, "kernel_route(ADD): %s",
safe_strerror(errno)); safe_strerror(errno));
if(save != EEXIST) if(save != EEXIST)
return; return;
@ -441,7 +441,7 @@ uninstall_route(struct babel_route *route)
route->neigh->ifp->ifindex, route->neigh->ifp->ifindex,
metric_to_kernel(route_metric(route)), NULL, 0, 0); metric_to_kernel(route_metric(route)), NULL, 0, 0);
if(rc < 0) if(rc < 0)
zlog_ferr(BABEL_ERR_ROUTE, "kernel_route(FLUSH): %s", flog_err(BABEL_ERR_ROUTE, "kernel_route(FLUSH): %s",
safe_strerror(errno)); safe_strerror(errno));
route->installed = 0; route->installed = 0;
@ -465,7 +465,7 @@ switch_routes(struct babel_route *old, struct babel_route *new)
return; return;
if(!route_feasible(new)) if(!route_feasible(new))
zlog_ferr(BABEL_ERR_ROUTE, "WARNING: switching to unfeasible route " flog_err(BABEL_ERR_ROUTE, "WARNING: switching to unfeasible route "
"(this shouldn't happen)."); "(this shouldn't happen).");
rc = kernel_route(ROUTE_MODIFY, old->src->prefix, old->src->plen, rc = kernel_route(ROUTE_MODIFY, old->src->prefix, old->src->plen,
@ -474,7 +474,7 @@ switch_routes(struct babel_route *old, struct babel_route *new)
new->nexthop, new->neigh->ifp->ifindex, new->nexthop, new->neigh->ifp->ifindex,
metric_to_kernel(route_metric(new))); metric_to_kernel(route_metric(new)));
if(rc < 0) { if(rc < 0) {
zlog_ferr(BABEL_ERR_ROUTE, "kernel_route(MODIFY): %s", flog_err(BABEL_ERR_ROUTE, "kernel_route(MODIFY): %s",
safe_strerror(errno)); safe_strerror(errno));
return; return;
} }
@ -503,7 +503,7 @@ change_route_metric(struct babel_route *route,
route->nexthop, route->neigh->ifp->ifindex, route->nexthop, route->neigh->ifp->ifindex,
new); new);
if(rc < 0) { if(rc < 0) {
zlog_ferr(BABEL_ERR_ROUTE, "kernel_route(MODIFY metric): %s", flog_err(BABEL_ERR_ROUTE, "kernel_route(MODIFY metric): %s",
safe_strerror(errno)); safe_strerror(errno));
return; return;
} }
@ -798,7 +798,7 @@ update_route(const unsigned char *router_id,
return NULL; return NULL;
if(martian_prefix(prefix, plen)) { if(martian_prefix(prefix, plen)) {
zlog_ferr(BABEL_ERR_ROUTE, "Rejecting martian route to %s through %s.", flog_err(BABEL_ERR_ROUTE, "Rejecting martian route to %s through %s.",
format_prefix(prefix, plen), format_address(nexthop)); format_prefix(prefix, plen), format_address(nexthop));
return NULL; return NULL;
} }
@ -906,7 +906,7 @@ update_route(const unsigned char *router_id,
route->next = NULL; route->next = NULL;
new_route = insert_route(route); new_route = insert_route(route);
if(new_route == NULL) { if(new_route == NULL) {
zlog_ferr(BABEL_ERR_ROUTE, "Couldn't insert route."); flog_err(BABEL_ERR_ROUTE, "Couldn't insert route.");
free(route); free(route);
return NULL; return NULL;
} }

2
babeld/source.c
View File

@ -59,7 +59,7 @@ find_source(const unsigned char *id, const unsigned char *p, unsigned char plen,
src = malloc(sizeof(struct source)); src = malloc(sizeof(struct source));
if(src == NULL) { if(src == NULL) {
zlog_ferr(BABEL_ERR_MEMORY, "malloc(source): %s", safe_strerror(errno)); flog_err(BABEL_ERR_MEMORY, "malloc(source): %s", safe_strerror(errno));
return NULL; return NULL;
} }

54
bgpd/bgp_attr.c
View File

@ -997,7 +997,7 @@ bgp_attr_flags_diagnose(struct bgp_attr_parser_args *args,
for (i = 0; i <= 2; i++) /* O,T,P, but not E */ for (i = 0; i <= 2; i++) /* O,T,P, but not E */
if (CHECK_FLAG(desired_flags, attr_flag_str[i].key) if (CHECK_FLAG(desired_flags, attr_flag_str[i].key)
!= CHECK_FLAG(real_flags, attr_flag_str[i].key)) { != CHECK_FLAG(real_flags, attr_flag_str[i].key)) {
zlog_ferr( flog_err(
BGP_ERR_ATTR_FLAG, BGP_ERR_ATTR_FLAG,
"%s attribute must%s be flagged as \"%s\"", "%s attribute must%s be flagged as \"%s\"",
lookup_msg(attr_str, attr_code, NULL), lookup_msg(attr_str, attr_code, NULL),
@ -1062,7 +1062,7 @@ static int bgp_attr_flag_invalid(struct bgp_attr_parser_args *args)
*/ */
if (!CHECK_FLAG(BGP_ATTR_FLAG_OPTIONAL, flags) if (!CHECK_FLAG(BGP_ATTR_FLAG_OPTIONAL, flags)
&& !CHECK_FLAG(BGP_ATTR_FLAG_TRANS, flags)) { && !CHECK_FLAG(BGP_ATTR_FLAG_TRANS, flags)) {
zlog_ferr( flog_err(
BGP_ERR_ATTR_FLAG, BGP_ERR_ATTR_FLAG,
"%s well-known attributes must have transitive flag set (%x)", "%s well-known attributes must have transitive flag set (%x)",
lookup_msg(attr_str, attr_code, NULL), flags); lookup_msg(attr_str, attr_code, NULL), flags);
@ -1075,7 +1075,7 @@ static int bgp_attr_flag_invalid(struct bgp_attr_parser_args *args)
*/ */
if (CHECK_FLAG(flags, BGP_ATTR_FLAG_PARTIAL)) { if (CHECK_FLAG(flags, BGP_ATTR_FLAG_PARTIAL)) {
if (!CHECK_FLAG(flags, BGP_ATTR_FLAG_OPTIONAL)) { if (!CHECK_FLAG(flags, BGP_ATTR_FLAG_OPTIONAL)) {
zlog_ferr(BGP_ERR_ATTR_FLAG, flog_err(BGP_ERR_ATTR_FLAG,
"%s well-known attribute " "%s well-known attribute "
"must NOT have the partial flag set (%x)", "must NOT have the partial flag set (%x)",
lookup_msg(attr_str, attr_code, NULL), flags); lookup_msg(attr_str, attr_code, NULL), flags);
@ -1083,7 +1083,7 @@ static int bgp_attr_flag_invalid(struct bgp_attr_parser_args *args)
} }
if (CHECK_FLAG(flags, BGP_ATTR_FLAG_OPTIONAL) if (CHECK_FLAG(flags, BGP_ATTR_FLAG_OPTIONAL)
&& !CHECK_FLAG(flags, BGP_ATTR_FLAG_TRANS)) { && !CHECK_FLAG(flags, BGP_ATTR_FLAG_TRANS)) {
zlog_ferr(BGP_ERR_ATTR_FLAG, flog_err(BGP_ERR_ATTR_FLAG,
"%s optional + transitive attribute " "%s optional + transitive attribute "
"must NOT have the partial flag set (%x)", "must NOT have the partial flag set (%x)",
lookup_msg(attr_str, attr_code, NULL), flags); lookup_msg(attr_str, attr_code, NULL), flags);
@ -1118,7 +1118,7 @@ static bgp_attr_parse_ret_t bgp_attr_origin(struct bgp_attr_parser_args *args)
field contains the erroneous attribute (type, length and field contains the erroneous attribute (type, length and
value). */ value). */
if (length != 1) { if (length != 1) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"Origin attribute length is not one %d", length); "Origin attribute length is not one %d", length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
args->total); args->total);
@ -1132,7 +1132,7 @@ static bgp_attr_parse_ret_t bgp_attr_origin(struct bgp_attr_parser_args *args)
contains the unrecognized attribute (type, length and value). */ contains the unrecognized attribute (type, length and value). */
if ((attr->origin != BGP_ORIGIN_IGP) && (attr->origin != BGP_ORIGIN_EGP) if ((attr->origin != BGP_ORIGIN_IGP) && (attr->origin != BGP_ORIGIN_EGP)
&& (attr->origin != BGP_ORIGIN_INCOMPLETE)) { && (attr->origin != BGP_ORIGIN_INCOMPLETE)) {
zlog_ferr(BGP_ERR_ATTR_ORIGIN, flog_err(BGP_ERR_ATTR_ORIGIN,
"Origin attribute value is invalid %d", attr->origin); "Origin attribute value is invalid %d", attr->origin);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_INVAL_ORIGIN, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_INVAL_ORIGIN,
args->total); args->total);
@ -1161,7 +1161,7 @@ static int bgp_attr_aspath(struct bgp_attr_parser_args *args)
/* In case of IBGP, length will be zero. */ /* In case of IBGP, length will be zero. */
if (!attr->aspath) { if (!attr->aspath) {
zlog_ferr(BGP_ERR_ATTR_MAL_AS_PATH, flog_err(BGP_ERR_ATTR_MAL_AS_PATH,
"Malformed AS path from %s, length is %d", peer->host, "Malformed AS path from %s, length is %d", peer->host,
length); length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_AS_PATH, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_AS_PATH,
@ -1191,7 +1191,7 @@ static bgp_attr_parse_ret_t bgp_attr_aspath_check(struct peer *const peer,
&& !aspath_left_confed_check(attr->aspath)) && !aspath_left_confed_check(attr->aspath))
|| (peer->sort == BGP_PEER_EBGP || (peer->sort == BGP_PEER_EBGP
&& aspath_confed_check(attr->aspath))) { && aspath_confed_check(attr->aspath))) {
zlog_ferr(BGP_ERR_ATTR_MAL_AS_PATH, "Malformed AS path from %s", flog_err(BGP_ERR_ATTR_MAL_AS_PATH, "Malformed AS path from %s",
peer->host); peer->host);
bgp_notify_send(peer, BGP_NOTIFY_UPDATE_ERR, bgp_notify_send(peer, BGP_NOTIFY_UPDATE_ERR,
BGP_NOTIFY_UPDATE_MAL_AS_PATH); BGP_NOTIFY_UPDATE_MAL_AS_PATH);
@ -1202,7 +1202,7 @@ static bgp_attr_parse_ret_t bgp_attr_aspath_check(struct peer *const peer,
if (CHECK_FLAG(peer->flags, PEER_FLAG_ENFORCE_FIRST_AS)) { if (CHECK_FLAG(peer->flags, PEER_FLAG_ENFORCE_FIRST_AS)) {
if (peer->sort == BGP_PEER_EBGP if (peer->sort == BGP_PEER_EBGP
&& !aspath_firstas_check(attr->aspath, peer->as)) { && !aspath_firstas_check(attr->aspath, peer->as)) {
zlog_ferr(BGP_ERR_ATTR_FIRST_AS, flog_err(BGP_ERR_ATTR_FIRST_AS,
"%s incorrect first AS (must be %u)", "%s incorrect first AS (must be %u)",
peer->host, peer->as); peer->host, peer->as);
bgp_notify_send(peer, BGP_NOTIFY_UPDATE_ERR, bgp_notify_send(peer, BGP_NOTIFY_UPDATE_ERR,
@ -1236,7 +1236,7 @@ static int bgp_attr_as4_path(struct bgp_attr_parser_args *args,
/* In case of IBGP, length will be zero. */ /* In case of IBGP, length will be zero. */
if (!*as4_path) { if (!*as4_path) {
zlog_ferr(BGP_ERR_ATTR_MAL_AS_PATH, flog_err(BGP_ERR_ATTR_MAL_AS_PATH,
"Malformed AS4 path from %s, length is %d", "Malformed AS4 path from %s, length is %d",
peer->host, length); peer->host, length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_AS_PATH, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_AS_PATH,
@ -1260,7 +1260,7 @@ static bgp_attr_parse_ret_t bgp_attr_nexthop(struct bgp_attr_parser_args *args)
/* Check nexthop attribute length. */ /* Check nexthop attribute length. */
if (length != 4) { if (length != 4) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"Nexthop attribute length isn't four [%d]", length); "Nexthop attribute length isn't four [%d]", length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@ -1285,7 +1285,7 @@ static bgp_attr_parse_ret_t bgp_attr_nexthop(struct bgp_attr_parser_args *args)
{ {
char buf[INET_ADDRSTRLEN]; char buf[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &nexthop_n, buf, INET_ADDRSTRLEN); inet_ntop(AF_INET, &nexthop_n, buf, INET_ADDRSTRLEN);
zlog_ferr(BGP_ERR_ATTR_MARTIAN_NH, "Martian nexthop %s", buf); flog_err(BGP_ERR_ATTR_MARTIAN_NH, "Martian nexthop %s", buf);
return bgp_attr_malformed( return bgp_attr_malformed(
args, BGP_NOTIFY_UPDATE_INVAL_NEXT_HOP, args->total); args, BGP_NOTIFY_UPDATE_INVAL_NEXT_HOP, args->total);
} }
@ -1305,7 +1305,7 @@ static bgp_attr_parse_ret_t bgp_attr_med(struct bgp_attr_parser_args *args)
/* Length check. */ /* Length check. */
if (length != 4) { if (length != 4) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"MED attribute length isn't four [%d]", length); "MED attribute length isn't four [%d]", length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@ -1329,7 +1329,7 @@ bgp_attr_local_pref(struct bgp_attr_parser_args *args)
/* Length check. */ /* Length check. */
if (length != 4) { if (length != 4) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"LOCAL_PREF attribute length isn't 4 [%u]", length); "LOCAL_PREF attribute length isn't 4 [%u]", length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
args->total); args->total);
@ -1359,7 +1359,7 @@ static int bgp_attr_atomic(struct bgp_attr_parser_args *args)
/* Length check. */ /* Length check. */
if (length != 0) { if (length != 0) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"ATOMIC_AGGREGATE attribute length isn't 0 [%u]", "ATOMIC_AGGREGATE attribute length isn't 0 [%u]",
length); length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@ -1386,7 +1386,7 @@ static int bgp_attr_aggregator(struct bgp_attr_parser_args *args)
wantedlen = 8; wantedlen = 8;
if (length != wantedlen) { if (length != wantedlen) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"AGGREGATOR attribute length isn't %u [%u]", "AGGREGATOR attribute length isn't %u [%u]",
wantedlen, length); wantedlen, length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@ -1416,7 +1416,7 @@ bgp_attr_as4_aggregator(struct bgp_attr_parser_args *args,
const bgp_size_t length = args->length; const bgp_size_t length = args->length;
if (length != 8) { if (length != 8) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"New Aggregator length is not 8 [%d]", length); "New Aggregator length is not 8 [%d]", length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
0); 0);
@ -1576,7 +1576,7 @@ bgp_attr_originator_id(struct bgp_attr_parser_args *args)
/* Length check. */ /* Length check. */
if (length != 4) { if (length != 4) {
zlog_ferr(BGP_ERR_ATTR_LEN, "Bad originator ID length %d", flog_err(BGP_ERR_ATTR_LEN, "Bad originator ID length %d",
length); length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@ -1600,7 +1600,7 @@ bgp_attr_cluster_list(struct bgp_attr_parser_args *args)
/* Check length. */ /* Check length. */
if (length % 4) { if (length % 4) {
zlog_ferr(BGP_ERR_ATTR_LEN, "Bad cluster list length %d", flog_err(BGP_ERR_ATTR_LEN, "Bad cluster list length %d",
length); length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@ -2070,7 +2070,7 @@ static bgp_attr_parse_ret_t bgp_attr_psid_sub(int32_t type,
if (type == BGP_PREFIX_SID_LABEL_INDEX) { if (type == BGP_PREFIX_SID_LABEL_INDEX) {
if (length != BGP_PREFIX_SID_LABEL_INDEX_LENGTH) { if (length != BGP_PREFIX_SID_LABEL_INDEX_LENGTH) {
zlog_ferr( flog_err(
BGP_ERR_ATTR_LEN, BGP_ERR_ATTR_LEN,
"Prefix SID label index length is %d instead of %d", "Prefix SID label index length is %d instead of %d",
length, BGP_PREFIX_SID_LABEL_INDEX_LENGTH); length, BGP_PREFIX_SID_LABEL_INDEX_LENGTH);
@ -2106,7 +2106,7 @@ static bgp_attr_parse_ret_t bgp_attr_psid_sub(int32_t type,
/* Placeholder code for the IPv6 SID type */ /* Placeholder code for the IPv6 SID type */
else if (type == BGP_PREFIX_SID_IPV6) { else if (type == BGP_PREFIX_SID_IPV6) {
if (length != BGP_PREFIX_SID_IPV6_LENGTH) { if (length != BGP_PREFIX_SID_IPV6_LENGTH) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"Prefix SID IPv6 length is %d instead of %d", "Prefix SID IPv6 length is %d instead of %d",
length, BGP_PREFIX_SID_IPV6_LENGTH); length, BGP_PREFIX_SID_IPV6_LENGTH);
return bgp_attr_malformed(args, return bgp_attr_malformed(args,
@ -2129,7 +2129,7 @@ static bgp_attr_parse_ret_t bgp_attr_psid_sub(int32_t type,
length -= 2; length -= 2;
if (length % BGP_PREFIX_SID_ORIGINATOR_SRGB_LENGTH) { if (length % BGP_PREFIX_SID_ORIGINATOR_SRGB_LENGTH) {
zlog_ferr( flog_err(
BGP_ERR_ATTR_LEN, BGP_ERR_ATTR_LEN,
"Prefix SID Originator SRGB length is %d, it must be a multiple of %d ", "Prefix SID Originator SRGB length is %d, it must be a multiple of %d ",
length, BGP_PREFIX_SID_ORIGINATOR_SRGB_LENGTH); length, BGP_PREFIX_SID_ORIGINATOR_SRGB_LENGTH);
@ -2179,7 +2179,7 @@ bgp_attr_prefix_sid(int32_t tlength, struct bgp_attr_parser_args *args,
tlength -= length + 3; tlength -= length + 3;
if (tlength < 0) { if (tlength < 0) {
zlog_ferr( flog_err(
BGP_ERR_ATTR_LEN, BGP_ERR_ATTR_LEN,
"Prefix SID internal length %d causes us to read beyond the total Prefix SID length", "Prefix SID internal length %d causes us to read beyond the total Prefix SID length",
length); length);
@ -2207,7 +2207,7 @@ bgp_attr_pmsi_tunnel(struct bgp_attr_parser_args *args)
* can only support that. * can only support that.
*/ */
if (length < 2) { if (length < 2) {
zlog_ferr(BGP_ERR_ATTR_LEN, flog_err(BGP_ERR_ATTR_LEN,
"Bad PMSI tunnel attribute length %d", length); "Bad PMSI tunnel attribute length %d", length);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
args->total); args->total);
@ -2215,14 +2215,14 @@ bgp_attr_pmsi_tunnel(struct bgp_attr_parser_args *args)
stream_getc(peer->curr); /* Flags */ stream_getc(peer->curr); /* Flags */
tnl_type = stream_getc(peer->curr); tnl_type = stream_getc(peer->curr);
if (tnl_type > PMSI_TNLTYPE_MAX) { if (tnl_type > PMSI_TNLTYPE_MAX) {
zlog_ferr(BGP_ERR_ATTR_PMSI_TYPE, flog_err(BGP_ERR_ATTR_PMSI_TYPE,
"Invalid PMSI tunnel attribute type %d", tnl_type); "Invalid PMSI tunnel attribute type %d", tnl_type);
return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_OPT_ATTR_ERR, return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_OPT_ATTR_ERR,
args->total); args->total);
} }
if (tnl_type == PMSI_TNLTYPE_INGR_REPL) { if (tnl_type == PMSI_TNLTYPE_INGR_REPL) {
if (length != 9) { if (length != 9) {
zlog_ferr(BGP_ERR_ATTR_PMSI_LEN, flog_err(BGP_ERR_ATTR_PMSI_LEN,
"Bad PMSI tunnel attribute length %d for IR", "Bad PMSI tunnel attribute length %d for IR",
length); length);
return bgp_attr_malformed( return bgp_attr_malformed(
@ -2824,7 +2824,7 @@ size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi,
break; break;
default: default:
if (safi != SAFI_FLOWSPEC) if (safi != SAFI_FLOWSPEC)
zlog_ferr( flog_err(
BGP_ERR_ATTR_NH_SEND_LEN, BGP_ERR_ATTR_NH_SEND_LEN,
"Bad nexthop when sending to %s, AFI %u SAFI %u nhlen %d", "Bad nexthop when sending to %s, AFI %u SAFI %u nhlen %d",
peer->host, afi, safi, attr->mp_nexthop_len); peer->host, afi, safi, attr->mp_nexthop_len);

82
bgpd/bgp_evpn.c
View File

@ -173,7 +173,7 @@ static struct vrf_irt_node *vrf_import_rt_new(struct ecommunity_val *rt)
bgp_def = bgp_get_default(); bgp_def = bgp_get_default();
if (!bgp_def) { if (!bgp_def) {
zlog_ferr(BGP_ERR_NO_DFLT, flog_err(BGP_ERR_NO_DFLT,
"vrf import rt new - def instance not created yet"); "vrf import rt new - def instance not created yet");
return NULL; return NULL;
} }
@ -204,7 +204,7 @@ static void vrf_import_rt_free(struct vrf_irt_node *irt)
bgp_def = bgp_get_default(); bgp_def = bgp_get_default();
if (!bgp_def) { if (!bgp_def) {
zlog_ferr(BGP_ERR_NO_DFLT, flog_err(BGP_ERR_NO_DFLT,
"vrf import rt free - def instance not created yet"); "vrf import rt free - def instance not created yet");
return; return;
} }
@ -226,7 +226,7 @@ static struct vrf_irt_node *lookup_vrf_import_rt(struct ecommunity_val *rt)
bgp_def = bgp_get_default(); bgp_def = bgp_get_default();
if (!bgp_def) { if (!bgp_def) {
zlog_ferr( flog_err(
BGP_ERR_NO_DFLT, BGP_ERR_NO_DFLT,
"vrf import rt lookup - def instance not created yet"); "vrf import rt lookup - def instance not created yet");
return NULL; return NULL;
@ -624,7 +624,7 @@ static int bgp_zebra_send_remote_vtep(struct bgp *bgp, struct bgpevpn *vpn,
if (is_evpn_prefix_ipaddr_v4(p)) if (is_evpn_prefix_ipaddr_v4(p))
stream_put_in_addr(s, &p->prefix.imet_addr.ip.ipaddr_v4); stream_put_in_addr(s, &p->prefix.imet_addr.ip.ipaddr_v4);
else if (is_evpn_prefix_ipaddr_v6(p)) { else if (is_evpn_prefix_ipaddr_v6(p)) {
zlog_ferr( flog_err(
BGP_ERR_VTEP_INVALID, BGP_ERR_VTEP_INVALID,
"Bad remote IP when trying to %s remote VTEP for VNI %u", "Bad remote IP when trying to %s remote VTEP for VNI %u",
add ? "ADD" : "DEL", vpn->vni); add ? "ADD" : "DEL", vpn->vni);
@ -1295,7 +1295,7 @@ static int update_evpn_type4_route_entry(struct bgp *bgp,
* We shouldn't see the same route from any other vtep. * We shouldn't see the same route from any other vtep.
*/ */
if (remote_ri) { if (remote_ri) {
zlog_ferr( flog_err(
BGP_ERR_ES_INVALID, BGP_ERR_ES_INVALID,
"%u ERROR: local es route for ESI: %s Vtep %s also learnt from remote", "%u ERROR: local es route for ESI: %s Vtep %s also learnt from remote",
bgp->vrf_id, bgp->vrf_id,
@ -1383,7 +1383,7 @@ static int update_evpn_type4_route(struct bgp *bgp,
&attr, 1, &ri, &attr, 1, &ri,
&route_changed); &route_changed);
if (ret != 0) { if (ret != 0) {
zlog_ferr( flog_err(
BGP_ERR_ES_INVALID, BGP_ERR_ES_INVALID,
"%u ERROR: Failed to updated ES route ESI: %s VTEP %s", "%u ERROR: Failed to updated ES route ESI: %s VTEP %s",
bgp->vrf_id, bgp->vrf_id,
@ -2225,7 +2225,7 @@ static int delete_routes_for_es(struct bgp *bgp, struct evpnes *es)
build_evpn_type4_prefix(&p, &es->esi, es->originator_ip.ipaddr_v4); build_evpn_type4_prefix(&p, &es->esi, es->originator_ip.ipaddr_v4);
ret = delete_evpn_type4_route(bgp, es, &p); ret = delete_evpn_type4_route(bgp, es, &p);
if (ret) { if (ret) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_DELETE, flog_err(BGP_ERR_EVPN_ROUTE_DELETE,
"%u failed to delete type-4 route for ESI %s", "%u failed to delete type-4 route for ESI %s",
bgp->vrf_id, esi_to_str(&es->esi, buf, sizeof(buf))); bgp->vrf_id, esi_to_str(&es->esi, buf, sizeof(buf)));
} }
@ -2884,7 +2884,7 @@ static int install_uninstall_routes_for_es(struct bgp *bgp,
bgp, es, evp, ri); bgp, es, evp, ri);
if (ret) { if (ret) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_FAIL, BGP_ERR_EVPN_FAIL,
"Failed to %s EVPN %s route in ESI %s", "Failed to %s EVPN %s route in ESI %s",
install ? "install" install ? "install"
@ -2964,7 +2964,7 @@ static int install_uninstall_routes_for_vrf(struct bgp *bgp_vrf, int install)
bgp_vrf, evp, ri); bgp_vrf, evp, ri);
if (ret) { if (ret) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_FAIL, BGP_ERR_EVPN_FAIL,
"Failed to %s EVPN %s route in VRF %s", "Failed to %s EVPN %s route in VRF %s",
install ? "install" install ? "install"
@ -3038,7 +3038,7 @@ static int install_uninstall_routes_for_vni(struct bgp *bgp,
bgp, vpn, evp, ri); bgp, vpn, evp, ri);
if (ret) { if (ret) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_FAIL, BGP_ERR_EVPN_FAIL,
"%u: Failed to %s EVPN %s route in VNI %u", "%u: Failed to %s EVPN %s route in VNI %u",
bgp->vrf_id, bgp->vrf_id,
@ -3141,7 +3141,7 @@ static int install_uninstall_route_in_es(struct bgp *bgp, struct evpnes *es,
ret = uninstall_evpn_route_entry_in_es(bgp, es, evp, ri); ret = uninstall_evpn_route_entry_in_es(bgp, es, evp, ri);
if (ret) { if (ret) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_FAIL, BGP_ERR_EVPN_FAIL,
"%u: Failed to %s EVPN %s route in ESI %s", bgp->vrf_id, "%u: Failed to %s EVPN %s route in ESI %s", bgp->vrf_id,
install ? "install" : "uninstall", "ES", install ? "install" : "uninstall", "ES",
@ -3184,7 +3184,7 @@ static int install_uninstall_route_in_vrfs(struct bgp *bgp_def, afi_t afi,
ri); ri);
if (ret) { if (ret) {
zlog_ferr(BGP_ERR_EVPN_FAIL, flog_err(BGP_ERR_EVPN_FAIL,
"%u: Failed to %s prefix %s in VRF %s", "%u: Failed to %s prefix %s in VRF %s",
bgp_def->vrf_id, bgp_def->vrf_id,
install ? "install" : "uninstall", install ? "install" : "uninstall",
@ -3220,7 +3220,7 @@ static int install_uninstall_route_in_vnis(struct bgp *bgp, afi_t afi,
ret = uninstall_evpn_route_entry(bgp, vpn, evp, ri); ret = uninstall_evpn_route_entry(bgp, vpn, evp, ri);
if (ret) { if (ret) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_FAIL, BGP_ERR_EVPN_FAIL,
"%u: Failed to %s EVPN %s route in VNI %u", "%u: Failed to %s EVPN %s route in VNI %u",
bgp->vrf_id, install ? "install" : "uninstall", bgp->vrf_id, install ? "install" : "uninstall",
@ -3606,7 +3606,7 @@ static int process_type2_route(struct peer *peer, afi_t afi, safi_t safi,
*/ */
if (psize != 33 && psize != 37 && psize != 49 && psize != 36 if (psize != 33 && psize != 37 && psize != 49 && psize != 36
&& psize != 40 && psize != 52) { && psize != 40 && psize != 52) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_INVALID, flog_err(BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-2 NLRI with invalid length %d", "%u:%s - Rx EVPN Type-2 NLRI with invalid length %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
return -1; return -1;
@ -3643,7 +3643,7 @@ static int process_type2_route(struct peer *peer, afi_t afi, safi_t safi,
memcpy(&p.prefix.macip_addr.mac.octet, pfx, ETH_ALEN); memcpy(&p.prefix.macip_addr.mac.octet, pfx, ETH_ALEN);
pfx += ETH_ALEN; pfx += ETH_ALEN;
} else { } else {
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_INVALID, BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-2 NLRI with unsupported MAC address length %d", "%u:%s - Rx EVPN Type-2 NLRI with unsupported MAC address length %d",
peer->bgp->vrf_id, peer->host, macaddr_len); peer->bgp->vrf_id, peer->host, macaddr_len);
@ -3655,7 +3655,7 @@ static int process_type2_route(struct peer *peer, afi_t afi, safi_t safi,
ipaddr_len = *pfx++; ipaddr_len = *pfx++;
if (ipaddr_len != 0 && ipaddr_len != IPV4_MAX_BITLEN if (ipaddr_len != 0 && ipaddr_len != IPV4_MAX_BITLEN
&& ipaddr_len != IPV6_MAX_BITLEN) { && ipaddr_len != IPV6_MAX_BITLEN) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_INVALID, BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-2 NLRI with unsupported IP address length %d", "%u:%s - Rx EVPN Type-2 NLRI with unsupported IP address length %d",
peer->bgp->vrf_id, peer->host, ipaddr_len); peer->bgp->vrf_id, peer->host, ipaddr_len);
@ -3717,7 +3717,7 @@ static int process_type3_route(struct peer *peer, afi_t afi, safi_t safi,
* IP len (1) and IP (4 or 16). * IP len (1) and IP (4 or 16).
*/ */
if (psize != 17 && psize != 29) { if (psize != 17 && psize != 29) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_INVALID, flog_err(BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-3 NLRI with invalid length %d", "%u:%s - Rx EVPN Type-3 NLRI with invalid length %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
return -1; return -1;
@ -3759,7 +3759,7 @@ static int process_type3_route(struct peer *peer, afi_t afi, safi_t safi,
p.prefix.imet_addr.ip.ipa_type = IPADDR_V4; p.prefix.imet_addr.ip.ipa_type = IPADDR_V4;
memcpy(&p.prefix.imet_addr.ip.ip.addr, pfx, IPV4_MAX_BYTELEN); memcpy(&p.prefix.imet_addr.ip.ip.addr, pfx, IPV4_MAX_BYTELEN);
} else { } else {
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_INVALID, BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-3 NLRI with unsupported IP address length %d", "%u:%s - Rx EVPN Type-3 NLRI with unsupported IP address length %d",
peer->bgp->vrf_id, peer->host, ipaddr_len); peer->bgp->vrf_id, peer->host, ipaddr_len);
@ -3796,7 +3796,7 @@ static int process_type4_route(struct peer *peer, afi_t afi, safi_t safi,
* RD (8), ESI (10), ip-len (1), ip (4 or 16) * RD (8), ESI (10), ip-len (1), ip (4 or 16)
*/ */
if (psize != 23 && psize != 35) { if (psize != 23 && psize != 35) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_INVALID, flog_err(BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-4 NLRI with invalid length %d", "%u:%s - Rx EVPN Type-4 NLRI with invalid length %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
return -1; return -1;
@ -3818,7 +3818,7 @@ static int process_type4_route(struct peer *peer, afi_t afi, safi_t safi,
if (ipaddr_len == IPV4_MAX_BITLEN) { if (ipaddr_len == IPV4_MAX_BITLEN) {
memcpy(&vtep_ip, pfx, IPV4_MAX_BYTELEN); memcpy(&vtep_ip, pfx, IPV4_MAX_BYTELEN);
} else { } else {
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_INVALID, BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-4 NLRI with unsupported IP address length %d", "%u:%s - Rx EVPN Type-4 NLRI with unsupported IP address length %d",
peer->bgp->vrf_id, peer->host, ipaddr_len); peer->bgp->vrf_id, peer->host, ipaddr_len);
@ -3861,7 +3861,7 @@ static int process_type5_route(struct peer *peer, afi_t afi, safi_t safi,
* Note that the IP and GW should both be IPv4 or both IPv6. * Note that the IP and GW should both be IPv4 or both IPv6.
*/ */
if (psize != 34 && psize != 58) { if (psize != 34 && psize != 58) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_INVALID, flog_err(BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-5 NLRI with invalid length %d", "%u:%s - Rx EVPN Type-5 NLRI with invalid length %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
return -1; return -1;
@ -3894,7 +3894,7 @@ static int process_type5_route(struct peer *peer, afi_t afi, safi_t safi,
/* Fetch IP prefix length. */ /* Fetch IP prefix length. */
ippfx_len = *pfx++; ippfx_len = *pfx++;
if (ippfx_len > IPV6_MAX_BITLEN) { if (ippfx_len > IPV6_MAX_BITLEN) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_INVALID, BGP_ERR_EVPN_ROUTE_INVALID,
"%u:%s - Rx EVPN Type-5 NLRI with invalid IP Prefix length %d", "%u:%s - Rx EVPN Type-5 NLRI with invalid IP Prefix length %d",
peer->bgp->vrf_id, peer->host, ippfx_len); peer->bgp->vrf_id, peer->host, ippfx_len);
@ -4127,7 +4127,7 @@ void bgp_evpn_withdraw_type5_route(struct bgp *bgp_vrf, struct prefix *p,
build_type5_prefix_from_ip_prefix(&evp, p); build_type5_prefix_from_ip_prefix(&evp, p);
ret = delete_evpn_type5_route(bgp_vrf, &evp); ret = delete_evpn_type5_route(bgp_vrf, &evp);
if (ret) { if (ret) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_DELETE, BGP_ERR_EVPN_ROUTE_DELETE,
"%u failed to delete type-5 route for prefix %s in vrf %s", "%u failed to delete type-5 route for prefix %s in vrf %s",
bgp_vrf->vrf_id, prefix2str(p, buf, sizeof(buf)), bgp_vrf->vrf_id, prefix2str(p, buf, sizeof(buf)),
@ -4174,7 +4174,7 @@ void bgp_evpn_advertise_type5_route(struct bgp *bgp_vrf, struct prefix *p,
build_type5_prefix_from_ip_prefix(&evp, p); build_type5_prefix_from_ip_prefix(&evp, p);
ret = update_evpn_type5_route(bgp_vrf, &evp, src_attr); ret = update_evpn_type5_route(bgp_vrf, &evp, src_attr);
if (ret) if (ret)
zlog_ferr(BGP_ERR_EVPN_ROUTE_CREATE, flog_err(BGP_ERR_EVPN_ROUTE_CREATE,
"%u: Failed to create type-5 route for prefix %s", "%u: Failed to create type-5 route for prefix %s",
bgp_vrf->vrf_id, prefix2str(p, buf, sizeof(buf))); bgp_vrf->vrf_id, prefix2str(p, buf, sizeof(buf)));
} }
@ -4734,7 +4734,7 @@ int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
if (process_type2_route(peer, afi, safi, if (process_type2_route(peer, afi, safi,
withdraw ? NULL : attr, pnt, withdraw ? NULL : attr, pnt,
psize, addpath_id)) { psize, addpath_id)) {
zlog_ferr( flog_err(
BGP_ERR_EVPN_FAIL, BGP_ERR_EVPN_FAIL,
"%u:%s - Error in processing EVPN type-2 NLRI size %d", "%u:%s - Error in processing EVPN type-2 NLRI size %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
@ -4746,7 +4746,7 @@ int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
if (process_type3_route(peer, afi, safi, if (process_type3_route(peer, afi, safi,
withdraw ? NULL : attr, pnt, withdraw ? NULL : attr, pnt,
psize, addpath_id)) { psize, addpath_id)) {
zlog_ferr( flog_err(
BGP_ERR_PKT_PROCESS, BGP_ERR_PKT_PROCESS,
"%u:%s - Error in processing EVPN type-3 NLRI size %d", "%u:%s - Error in processing EVPN type-3 NLRI size %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
@ -4758,7 +4758,7 @@ int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
if (process_type4_route(peer, afi, safi, if (process_type4_route(peer, afi, safi,
withdraw ? NULL : attr, pnt, withdraw ? NULL : attr, pnt,
psize, addpath_id)) { psize, addpath_id)) {
zlog_ferr( flog_err(
BGP_ERR_PKT_PROCESS, BGP_ERR_PKT_PROCESS,
"%u:%s - Error in processing EVPN type-4 NLRI size %d", "%u:%s - Error in processing EVPN type-4 NLRI size %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
@ -4769,7 +4769,7 @@ int bgp_nlri_parse_evpn(struct peer *peer, struct attr *attr,
case BGP_EVPN_IP_PREFIX_ROUTE: case BGP_EVPN_IP_PREFIX_ROUTE:
if (process_type5_route(peer, afi, safi, attr, pnt, if (process_type5_route(peer, afi, safi, attr, pnt,
psize, addpath_id, withdraw)) { psize, addpath_id, withdraw)) {
zlog_ferr( flog_err(
BGP_ERR_PKT_PROCESS, BGP_ERR_PKT_PROCESS,
"%u:%s - Error in processing EVPN type-5 NLRI size %d", "%u:%s - Error in processing EVPN type-5 NLRI size %d",
peer->bgp->vrf_id, peer->host, psize); peer->bgp->vrf_id, peer->host, psize);
@ -5233,7 +5233,7 @@ int bgp_evpn_local_macip_add(struct bgp *bgp, vni_t vni, struct ethaddr *mac,
char buf[ETHER_ADDR_STRLEN]; char buf[ETHER_ADDR_STRLEN];
char buf2[INET6_ADDRSTRLEN]; char buf2[INET6_ADDRSTRLEN];
zlog_ferr( flog_err(
BGP_ERR_EVPN_ROUTE_CREATE, BGP_ERR_EVPN_ROUTE_CREATE,
"%u:Failed to create Type-2 route, VNI %u %s MAC %s IP %s (flags: 0x%x)", "%u:Failed to create Type-2 route, VNI %u %s MAC %s IP %s (flags: 0x%x)",
bgp->vrf_id, vpn->vni, bgp->vrf_id, vpn->vni,
@ -5276,7 +5276,7 @@ int bgp_evpn_local_l3vni_add(vni_t l3vni, vrf_id_t vrf_id, struct ethaddr *rmac,
*/ */
bgp_def = bgp_get_default(); bgp_def = bgp_get_default();
if (!bgp_def) { if (!bgp_def) {
zlog_ferr( flog_err(
BGP_ERR_NO_DFLT, BGP_ERR_NO_DFLT,
"Cannot process L3VNI %u ADD - default BGP instance not yet created", "Cannot process L3VNI %u ADD - default BGP instance not yet created",
l3vni); l3vni);
@ -5294,15 +5294,15 @@ int bgp_evpn_local_l3vni_add(vni_t l3vni, vrf_id_t vrf_id, struct ethaddr *rmac,
BGP_INSTANCE_TYPE_VRF); BGP_INSTANCE_TYPE_VRF);
switch (ret) { switch (ret) {
case BGP_ERR_MULTIPLE_INSTANCE_NOT_SET: case BGP_ERR_MULTIPLE_INSTANCE_NOT_SET:
zlog_ferr(BGP_ERR_MULTI_INSTANCE, flog_err(BGP_ERR_MULTI_INSTANCE,
"'bgp multiple-instance' not present\n"); "'bgp multiple-instance' not present\n");
return -1; return -1;
case BGP_ERR_AS_MISMATCH: case BGP_ERR_AS_MISMATCH:
zlog_ferr(BGP_ERR_EVPN_AS_MISMATCH, flog_err(BGP_ERR_EVPN_AS_MISMATCH,
"BGP is already running; AS is %u\n", as); "BGP is already running; AS is %u\n", as);
return -1; return -1;
case BGP_ERR_INSTANCE_MISMATCH: case BGP_ERR_INSTANCE_MISMATCH:
zlog_ferr(BGP_ERR_EVPN_INSTANCE_MISMATCH, flog_err(BGP_ERR_EVPN_INSTANCE_MISMATCH,
"BGP instance name and AS number mismatch\n"); "BGP instance name and AS number mismatch\n");
return -1; return -1;
} }
@ -5364,7 +5364,7 @@ int bgp_evpn_local_l3vni_del(vni_t l3vni, vrf_id_t vrf_id)
bgp_vrf = bgp_lookup_by_vrf_id(vrf_id); bgp_vrf = bgp_lookup_by_vrf_id(vrf_id);
if (!bgp_vrf) { if (!bgp_vrf) {
zlog_ferr( flog_err(
BGP_ERR_NO_DFLT, BGP_ERR_NO_DFLT,
"Cannot process L3VNI %u Del - Could not find BGP instance", "Cannot process L3VNI %u Del - Could not find BGP instance",
l3vni); l3vni);
@ -5373,7 +5373,7 @@ int bgp_evpn_local_l3vni_del(vni_t l3vni, vrf_id_t vrf_id)
bgp_def = bgp_get_default(); bgp_def = bgp_get_default();
if (!bgp_def) { if (!bgp_def) {
zlog_ferr( flog_err(
BGP_ERR_NO_DFLT, BGP_ERR_NO_DFLT,
"Cannot process L3VNI %u Del - Could not find default BGP instance", "Cannot process L3VNI %u Del - Could not find default BGP instance",
l3vni); l3vni);
@ -5504,7 +5504,7 @@ int bgp_evpn_local_vni_add(struct bgp *bgp, vni_t vni,
if (!vpn) { if (!vpn) {
vpn = bgp_evpn_new(bgp, vni, originator_ip, tenant_vrf_id); vpn = bgp_evpn_new(bgp, vni, originator_ip, tenant_vrf_id);
if (!vpn) { if (!vpn) {
zlog_ferr( flog_err(
BGP_ERR_VNI, BGP_ERR_VNI,
"%u: Failed to allocate VNI entry for VNI %u - at Add", "%u: Failed to allocate VNI entry for VNI %u - at Add",
bgp->vrf_id, vni); bgp->vrf_id, vni);
@ -5528,7 +5528,7 @@ int bgp_evpn_local_vni_add(struct bgp *bgp, vni_t vni,
/* Create EVPN type-3 route and schedule for processing. */ /* Create EVPN type-3 route and schedule for processing. */
build_evpn_type3_prefix(&p, vpn->originator_ip); build_evpn_type3_prefix(&p, vpn->originator_ip);
if (update_evpn_route(bgp, vpn, &p, 0)) { if (update_evpn_route(bgp, vpn, &p, 0)) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_CREATE, flog_err(BGP_ERR_EVPN_ROUTE_CREATE,
"%u: Type3 route creation failure for VNI %u", "%u: Type3 route creation failure for VNI %u",
bgp->vrf_id, vni); bgp->vrf_id, vni);
return -1; return -1;
@ -5558,7 +5558,7 @@ int bgp_evpn_local_es_del(struct bgp *bgp,
struct evpnes *es = NULL; struct evpnes *es = NULL;
if (!bgp->esihash) { if (!bgp->esihash) {
zlog_ferr(BGP_ERR_ES_CREATE, "%u: ESI hash not yet created", flog_err(BGP_ERR_ES_CREATE, "%u: ESI hash not yet created",
bgp->vrf_id); bgp->vrf_id);
return -1; return -1;
} }
@ -5595,7 +5595,7 @@ int bgp_evpn_local_es_add(struct bgp *bgp,
struct prefix_evpn p; struct prefix_evpn p;
if (!bgp->esihash) { if (!bgp->esihash) {
zlog_ferr(BGP_ERR_ES_CREATE, "%u: ESI hash not yet created", flog_err(BGP_ERR_ES_CREATE, "%u: ESI hash not yet created",
bgp->vrf_id); bgp->vrf_id);
return -1; return -1;
} }
@ -5605,7 +5605,7 @@ int bgp_evpn_local_es_add(struct bgp *bgp,
if (!es) { if (!es) {
es = bgp_evpn_es_new(bgp, esi, originator_ip); es = bgp_evpn_es_new(bgp, esi, originator_ip);
if (!es) { if (!es) {
zlog_ferr( flog_err(
BGP_ERR_ES_CREATE, BGP_ERR_ES_CREATE,
"%u: Failed to allocate ES entry for ESI %s - at Local ES Add", "%u: Failed to allocate ES entry for ESI %s - at Local ES Add",
bgp->vrf_id, esi_to_str(esi, buf, sizeof(buf))); bgp->vrf_id, esi_to_str(esi, buf, sizeof(buf)));
@ -5617,7 +5617,7 @@ int bgp_evpn_local_es_add(struct bgp *bgp,
build_evpn_type4_prefix(&p, esi, originator_ip->ipaddr_v4); build_evpn_type4_prefix(&p, esi, originator_ip->ipaddr_v4);
if (update_evpn_type4_route(bgp, es, &p)) { if (update_evpn_type4_route(bgp, es, &p)) {
zlog_ferr(BGP_ERR_EVPN_ROUTE_CREATE, flog_err(BGP_ERR_EVPN_ROUTE_CREATE,
"%u: Type4 route creation failure for ESI %s", "%u: Type4 route creation failure for ESI %s",
bgp->vrf_id, esi_to_str(esi, buf, sizeof(buf))); bgp->vrf_id, esi_to_str(esi, buf, sizeof(buf)));
return -1; return -1;

2
bgpd/bgp_evpn_vty.c
View File

@ -1893,7 +1893,7 @@ static struct bgpevpn *evpn_create_update_vni(struct bgp *bgp, vni_t vni)
*/ */
vpn = bgp_evpn_new(bgp, vni, bgp->router_id, 0); vpn = bgp_evpn_new(bgp, vni, bgp->router_id, 0);
if (!vpn) { if (!vpn) {
zlog_ferr( flog_err(
BGP_ERR_VNI, BGP_ERR_VNI,
"%u: Failed to allocate VNI entry for VNI %u - at Config", "%u: Failed to allocate VNI entry for VNI %u - at Config",
bgp->vrf_id, vni); bgp->vrf_id, vni);

10
bgpd/bgp_flowspec.c
View File

@ -104,13 +104,13 @@ int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
safi = packet->safi; safi = packet->safi;
if (afi == AFI_IP6) { if (afi == AFI_IP6) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"BGP flowspec IPv6 not supported"); "BGP flowspec IPv6 not supported");
return -1; return -1;
} }
if (packet->length >= FLOWSPEC_NLRI_SIZELIMIT) { if (packet->length >= FLOWSPEC_NLRI_SIZELIMIT) {
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"BGP flowspec nlri length maximum reached (%u)", "BGP flowspec nlri length maximum reached (%u)",
packet->length); packet->length);
return -1; return -1;
@ -128,13 +128,13 @@ int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
/* When packet overflow occur return immediately. */ /* When packet overflow occur return immediately. */
if (pnt + psize > lim) { if (pnt + psize > lim) {
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"Flowspec NLRI length inconsistent ( size %u seen)", "Flowspec NLRI length inconsistent ( size %u seen)",
psize); psize);
return -1; return -1;
} }
if (bgp_fs_nlri_validate(pnt, psize) < 0) { if (bgp_fs_nlri_validate(pnt, psize) < 0) {
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"Bad flowspec format or NLRI options not supported"); "Bad flowspec format or NLRI options not supported");
return -1; return -1;
} }
@ -188,7 +188,7 @@ int bgp_nlri_parse_flowspec(struct peer *peer, struct attr *attr,
ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL, ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL,
NULL, NULL, 0, NULL); NULL, NULL, 0, NULL);
if (ret) { if (ret) {
zlog_ferr(BGP_ERR_FLOWSPEC_INSTALLATION, flog_err(BGP_ERR_FLOWSPEC_INSTALLATION,
"Flowspec NLRI failed to be %s.", "Flowspec NLRI failed to be %s.",
attr ? "added" : "withdrawn"); attr ? "added" : "withdrawn");
return -1; return -1;

10
bgpd/bgp_flowspec_util.c
View File

@ -68,7 +68,7 @@ static int bgp_flowspec_call_non_opaque_decode(uint8_t *nlri_content, int len,
len, len,
mval, error); mval, error);
if (*error < 0) if (*error < 0)
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"%s: flowspec_op_decode error %d", "%s: flowspec_op_decode error %d",
__func__, *error); __func__, *error);
else else
@ -447,7 +447,7 @@ int bgp_flowspec_match_rules_fill(uint8_t *nlri_content, int len,
len - offset, len - offset,
prefix, &error); prefix, &error);
if (error < 0) if (error < 0)
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"%s: flowspec_ip_address error %d", "%s: flowspec_ip_address error %d",
__func__, error); __func__, error);
else else
@ -542,7 +542,7 @@ int bgp_flowspec_match_rules_fill(uint8_t *nlri_content, int len,
len - offset, len - offset,
&bpem->tcpflags, &error); &bpem->tcpflags, &error);
if (error < 0) if (error < 0)
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"%s: flowspec_tcpflags_decode error %d", "%s: flowspec_tcpflags_decode error %d",
__func__, error); __func__, error);
else else
@ -557,7 +557,7 @@ int bgp_flowspec_match_rules_fill(uint8_t *nlri_content, int len,
len - offset, &bpem->fragment, len - offset, &bpem->fragment,
&error); &error);
if (error < 0) if (error < 0)
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"%s: flowspec_fragment_type_decode error %d", "%s: flowspec_fragment_type_decode error %d",
__func__, error); __func__, error);
else else
@ -565,7 +565,7 @@ int bgp_flowspec_match_rules_fill(uint8_t *nlri_content, int len,
offset += ret; offset += ret;
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: unknown type %d\n", flog_err(LIB_ERR_DEVELOPMENT, "%s: unknown type %d\n",
__func__, type); __func__, type);
} }
} }

26
bgpd/bgp_fsm.c
View File

@ -166,7 +166,7 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
* runs in our pthread. * runs in our pthread.
*/ */
if (peer->curr) { if (peer->curr) {
zlog_ferr( flog_err(
BGP_ERR_PKT_PROCESS, BGP_ERR_PKT_PROCESS,
"[%s] Dropping pending packet on connection transfer:", "[%s] Dropping pending packet on connection transfer:",
peer->host); peer->host);
@ -245,7 +245,7 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
} }
if (bgp_getsockname(peer) < 0) { if (bgp_getsockname(peer) < 0) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%%bgp_getsockname() failed for %s peer %s fd %d (from_peer fd %d)", "%%bgp_getsockname() failed for %s peer %s fd %d (from_peer fd %d)",
(CHECK_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER) (CHECK_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER)
@ -258,7 +258,7 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
} }
if (from_peer->status > Active) { if (from_peer->status > Active) {
if (bgp_getsockname(from_peer) < 0) { if (bgp_getsockname(from_peer) < 0) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%%bgp_getsockname() failed for %s from_peer %s fd %d (peer fd %d)", "%%bgp_getsockname() failed for %s from_peer %s fd %d (peer fd %d)",
@ -1286,7 +1286,7 @@ static int bgp_connect_check(struct thread *thread)
static int bgp_connect_success(struct peer *peer) static int bgp_connect_success(struct peer *peer)
{ {
if (peer->fd < 0) { if (peer->fd < 0) {
zlog_ferr(BGP_ERR_CONNECT, flog_err(BGP_ERR_CONNECT,
"bgp_connect_success peer's fd is negative value %d", "bgp_connect_success peer's fd is negative value %d",
peer->fd); peer->fd);
bgp_stop(peer); bgp_stop(peer);
@ -1294,7 +1294,7 @@ static int bgp_connect_success(struct peer *peer)
} }
if (bgp_getsockname(peer) < 0) { if (bgp_getsockname(peer) < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: bgp_getsockname(): failed for peer %s, fd %d", "%s: bgp_getsockname(): failed for peer %s, fd %d",
__FUNCTION__, peer->host, peer->fd); __FUNCTION__, peer->host, peer->fd);
bgp_notify_send(peer, BGP_NOTIFY_FSM_ERR, bgp_notify_send(peer, BGP_NOTIFY_FSM_ERR,
@ -1354,7 +1354,7 @@ int bgp_start(struct peer *peer)
if (BGP_PEER_START_SUPPRESSED(peer)) { if (BGP_PEER_START_SUPPRESSED(peer)) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_ferr(BGP_ERR_FSM, flog_err(BGP_ERR_FSM,
"%s [FSM] Trying to start suppressed peer" "%s [FSM] Trying to start suppressed peer"
" - this is never supposed to happen!", " - this is never supposed to happen!",
peer->host); peer->host);
@ -1389,7 +1389,7 @@ int bgp_start(struct peer *peer)
if (peer->bgp->vrf_id == VRF_UNKNOWN) { if (peer->bgp->vrf_id == VRF_UNKNOWN) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_ferr( flog_err(
BGP_ERR_FSM, BGP_ERR_FSM,
"%s [FSM] In a VRF that is not initialised yet", "%s [FSM] In a VRF that is not initialised yet",
peer->host); peer->host);
@ -1444,7 +1444,7 @@ int bgp_start(struct peer *peer)
"%s [FSM] Non blocking connect waiting result, fd %d", "%s [FSM] Non blocking connect waiting result, fd %d",
peer->host, peer->fd); peer->host, peer->fd);
if (peer->fd < 0) { if (peer->fd < 0) {
zlog_ferr(BGP_ERR_FSM, flog_err(BGP_ERR_FSM,
"bgp_start peer's fd is negative value %d", "bgp_start peer's fd is negative value %d",
peer->fd); peer->fd);
return -1; return -1;
@ -1492,7 +1492,7 @@ static int bgp_fsm_open(struct peer *peer)
peer and change to Idle status. */ peer and change to Idle status. */
static int bgp_fsm_event_error(struct peer *peer) static int bgp_fsm_event_error(struct peer *peer)
{ {
zlog_ferr(BGP_ERR_FSM, flog_err(BGP_ERR_FSM,
"%s [FSM] unexpected packet received in state %s", peer->host, "%s [FSM] unexpected packet received in state %s", peer->host,
lookup_msg(bgp_status_msg, peer->status, NULL)); lookup_msg(bgp_status_msg, peer->status, NULL));
@ -1526,7 +1526,7 @@ static int bgp_establish(struct peer *peer)
other = peer->doppelganger; other = peer->doppelganger;
peer = peer_xfer_conn(peer); peer = peer_xfer_conn(peer);
if (!peer) { if (!peer) {
zlog_ferr(BGP_ERR_CONNECT, "%%Neighbor failed in xfer_conn"); flog_err(BGP_ERR_CONNECT, "%%Neighbor failed in xfer_conn");
return -1; return -1;
} }
@ -1685,7 +1685,7 @@ static int bgp_fsm_update(struct peer *peer)
/* This is empty event. */ /* This is empty event. */
static int bgp_ignore(struct peer *peer) static int bgp_ignore(struct peer *peer)
{ {
zlog_ferr( flog_err(
BGP_ERR_FSM, BGP_ERR_FSM,
"%s [FSM] Ignoring event %s in state %s, prior events %s, %s, fd %d", "%s [FSM] Ignoring event %s in state %s, prior events %s, %s, fd %d",
peer->host, bgp_event_str[peer->cur_event], peer->host, bgp_event_str[peer->cur_event],
@ -1698,7 +1698,7 @@ static int bgp_ignore(struct peer *peer)
/* This is to handle unexpected events.. */ /* This is to handle unexpected events.. */
static int bgp_fsm_exeption(struct peer *peer) static int bgp_fsm_exeption(struct peer *peer)
{ {
zlog_ferr( flog_err(
BGP_ERR_FSM, BGP_ERR_FSM,
"%s [FSM] Unexpected event %s in state %s, prior events %s, %s, fd %d", "%s [FSM] Unexpected event %s in state %s, prior events %s, %s, fd %d",
peer->host, bgp_event_str[peer->cur_event], peer->host, bgp_event_str[peer->cur_event],
@ -1973,7 +1973,7 @@ int bgp_event_update(struct peer *peer, int event)
* code. * code.
*/ */
if (!dyn_nbr && !passive_conn && peer->bgp) { if (!dyn_nbr && !passive_conn && peer->bgp) {
zlog_ferr( flog_err(
BGP_ERR_FSM, BGP_ERR_FSM,
"%s [FSM] Failure handling event %s in state %s, " "%s [FSM] Failure handling event %s in state %s, "
"prior events %s, %s, fd %d", "prior events %s, %s, fd %d",

2
bgpd/bgp_io.c
View File

@ -402,7 +402,7 @@ static uint16_t bgp_read(struct peer *peer)
SET_FLAG(status, BGP_IO_TRANS_ERR); SET_FLAG(status, BGP_IO_TRANS_ERR);
/* Fatal error; tear down session */ /* Fatal error; tear down session */
} else if (nbytes < 0) { } else if (nbytes < 0) {
zlog_ferr(BGP_ERR_UPDATE_RCV, flog_err(BGP_ERR_UPDATE_RCV,
"%s [Error] bgp_read_packet error: %s", peer->host, "%s [Error] bgp_read_packet error: %s", peer->host,
safe_strerror(errno)); safe_strerror(errno));

12
bgpd/bgp_label.c
View File

@ -245,7 +245,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr,
/* sanity check against packet data */ /* sanity check against packet data */
if ((pnt + psize) > lim) { if ((pnt + psize) > lim) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / L-U (prefix length %d exceeds packet size %u)", "%s [Error] Update packet error / L-U (prefix length %d exceeds packet size %u)",
peer->host, prefixlen, (uint)(lim - pnt)); peer->host, prefixlen, (uint)(lim - pnt));
@ -258,7 +258,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr,
/* There needs to be at least one label */ /* There needs to be at least one label */
if (prefixlen < 24) { if (prefixlen < 24) {
zlog_ferr(BGP_ERR_UPDATE_RCV, flog_err(BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error" "%s [Error] Update packet error"
" (wrong label length %d)", " (wrong label length %d)",
peer->host, prefixlen); peer->host, prefixlen);
@ -286,7 +286,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr,
* be logged locally, and the prefix SHOULD be * be logged locally, and the prefix SHOULD be
* ignored. * ignored.
*/ */
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: IPv4 labeled-unicast NLRI is multicast address %s, ignoring", "%s: IPv4 labeled-unicast NLRI is multicast address %s, ignoring",
peer->host, inet_ntoa(p.u.prefix4)); peer->host, inet_ntoa(p.u.prefix4));
@ -299,7 +299,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr,
if (IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)) { if (IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)) {
char buf[BUFSIZ]; char buf[BUFSIZ];
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: IPv6 labeled-unicast NLRI is link-local address %s, ignoring", "%s: IPv6 labeled-unicast NLRI is link-local address %s, ignoring",
peer->host, peer->host,
@ -312,7 +312,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr,
if (IN6_IS_ADDR_MULTICAST(&p.u.prefix6)) { if (IN6_IS_ADDR_MULTICAST(&p.u.prefix6)) {
char buf[BUFSIZ]; char buf[BUFSIZ];
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: IPv6 unicast NLRI is multicast address %s, ignoring", "%s: IPv6 unicast NLRI is multicast address %s, ignoring",
peer->host, peer->host,
@ -336,7 +336,7 @@ int bgp_nlri_parse_label(struct peer *peer, struct attr *attr,
/* Packet length consistency check. */ /* Packet length consistency check. */
if (pnt != lim) { if (pnt != lim) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / L-U (%zu data remaining after parsing)", "%s [Error] Update packet error / L-U (%zu data remaining after parsing)",
peer->host, lim - pnt); peer->host, lim - pnt);

6
bgpd/bgp_labelpool.c
View File

@ -127,7 +127,7 @@ static wq_item_status lp_cbq_docallback(struct work_queue *wq, void *data)
if (lcbq->label == MPLS_LABEL_NONE) { if (lcbq->label == MPLS_LABEL_NONE) {
/* shouldn't happen */ /* shouldn't happen */
zlog_ferr(BGP_ERR_LABEL, "%s: error: label==MPLS_LABEL_NONE", flog_err(BGP_ERR_LABEL, "%s: error: label==MPLS_LABEL_NONE",
__func__); __func__);
return WQ_SUCCESS; return WQ_SUCCESS;
} }
@ -338,7 +338,7 @@ void bgp_lp_get(
if (rc) { if (rc) {
/* shouldn't happen */ /* shouldn't happen */
zlog_ferr(BGP_ERR_LABEL, flog_err(BGP_ERR_LABEL,
"%s: can't insert new LCB into ledger list", "%s: can't insert new LCB into ledger list",
__func__); __func__);
XFREE(MTYPE_BGP_LABEL_CB, lcb); XFREE(MTYPE_BGP_LABEL_CB, lcb);
@ -427,7 +427,7 @@ void bgp_lp_event_chunk(uint8_t keep, uint32_t first, uint32_t last)
struct lp_fifo *lf; struct lp_fifo *lf;
if (last < first) { if (last < first) {
zlog_ferr(BGP_ERR_LABEL, flog_err(BGP_ERR_LABEL,
"%s: zebra label chunk invalid: first=%u, last=%u", "%s: zebra label chunk invalid: first=%u, last=%u",
__func__, first, last); __func__, first, last);
return; return;

2
bgpd/bgp_main.c
View File

@ -386,7 +386,7 @@ int main(int argc, char **argv)
multipath_num = atoi(optarg); multipath_num = atoi(optarg);
if (multipath_num > MULTIPATH_NUM if (multipath_num > MULTIPATH_NUM
|| multipath_num <= 0) { || multipath_num <= 0) {
zlog_ferr( flog_err(
BGP_ERR_MULTIPATH, BGP_ERR_MULTIPATH,
"Multipath Number specified must be less than %d and greater than 0", "Multipath Number specified must be less than %d and greater than 0",
MULTIPATH_NUM); MULTIPATH_NUM);

14
bgpd/bgp_mplsvpn.c
View File

@ -151,7 +151,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr,
psize = PSIZE(prefixlen); psize = PSIZE(prefixlen);
if (prefixlen < VPN_PREFIXLEN_MIN_BYTES * 8) { if (prefixlen < VPN_PREFIXLEN_MIN_BYTES * 8) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / VPN (prefix length %d less than VPN min length)", "%s [Error] Update packet error / VPN (prefix length %d less than VPN min length)",
peer->host, prefixlen); peer->host, prefixlen);
@ -160,7 +160,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr,
/* sanity check against packet data */ /* sanity check against packet data */
if ((pnt + psize) > lim) { if ((pnt + psize) > lim) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / VPN (prefix length %d exceeds packet size %u)", "%s [Error] Update packet error / VPN (prefix length %d exceeds packet size %u)",
peer->host, prefixlen, (uint)(lim - pnt)); peer->host, prefixlen, (uint)(lim - pnt));
@ -169,7 +169,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr,
/* sanity check against storage for the IP address portion */ /* sanity check against storage for the IP address portion */
if ((psize - VPN_PREFIXLEN_MIN_BYTES) > (ssize_t)sizeof(p.u)) { if ((psize - VPN_PREFIXLEN_MIN_BYTES) > (ssize_t)sizeof(p.u)) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / VPN (psize %d exceeds storage size %zu)", "%s [Error] Update packet error / VPN (psize %d exceeds storage size %zu)",
peer->host, peer->host,
@ -180,7 +180,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr,
/* Sanity check against max bitlen of the address family */ /* Sanity check against max bitlen of the address family */
if ((psize - VPN_PREFIXLEN_MIN_BYTES) > prefix_blen(&p)) { if ((psize - VPN_PREFIXLEN_MIN_BYTES) > prefix_blen(&p)) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / VPN (psize %d exceeds family (%u) max byte len %u)", "%s [Error] Update packet error / VPN (psize %d exceeds family (%u) max byte len %u)",
peer->host, peer->host,
@ -218,7 +218,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr,
#endif #endif
default: default:
zlog_ferr(BGP_ERR_UPDATE_RCV, "Unknown RD type %d", flog_err(BGP_ERR_UPDATE_RCV, "Unknown RD type %d",
type); type);
break; /* just report */ break; /* just report */
} }
@ -241,7 +241,7 @@ int bgp_nlri_parse_vpn(struct peer *peer, struct attr *attr,
} }
/* Packet length consistency check. */ /* Packet length consistency check. */
if (pnt != lim) { if (pnt != lim) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error / VPN (%zu data remaining after parsing)", "%s [Error] Update packet error / VPN (%zu data remaining after parsing)",
peer->host, lim - pnt); peer->host, lim - pnt);
@ -366,7 +366,7 @@ int vpn_leak_label_callback(
return 0; return 0;
} }
/* Shouldn't happen: different label allocation */ /* Shouldn't happen: different label allocation */
zlog_ferr(BGP_ERR_LABEL, flog_err(BGP_ERR_LABEL,
"%s: %s had label %u but got new assignment %u", "%s: %s had label %u but got new assignment %u",
__func__, vp->bgp->name_pretty, vp->tovpn_label, __func__, vp->bgp->name_pretty, vp->tovpn_label,
label); label);

54
bgpd/bgp_network.c
View File

@ -98,7 +98,7 @@ static int bgp_md5_set_connect(int socket, union sockunion *su,
#if HAVE_DECL_TCP_MD5SIG #if HAVE_DECL_TCP_MD5SIG
if (bgpd_privs.change(ZPRIVS_RAISE)) { if (bgpd_privs.change(ZPRIVS_RAISE)) {
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs",
__func__); __func__);
return ret; return ret;
} }
@ -106,7 +106,7 @@ static int bgp_md5_set_connect(int socket, union sockunion *su,
ret = bgp_md5_set_socket(socket, su, password); ret = bgp_md5_set_socket(socket, su, password);
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs",
__func__); __func__);
#endif /* HAVE_TCP_MD5SIG */ #endif /* HAVE_TCP_MD5SIG */
@ -120,7 +120,7 @@ static int bgp_md5_set_password(struct peer *peer, const char *password)
struct bgp_listener *listener; struct bgp_listener *listener;
if (bgpd_privs.change(ZPRIVS_RAISE)) { if (bgpd_privs.change(ZPRIVS_RAISE)) {
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs",
__func__); __func__);
return -1; return -1;
} }
@ -137,7 +137,7 @@ static int bgp_md5_set_password(struct peer *peer, const char *password)
} }
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs",
__func__); __func__);
return ret; return ret;
@ -164,7 +164,7 @@ int bgp_set_socket_ttl(struct peer *peer, int bgp_sock)
if (!peer->gtsm_hops && (peer_sort(peer) == BGP_PEER_EBGP)) { if (!peer->gtsm_hops && (peer_sort(peer) == BGP_PEER_EBGP)) {
ret = sockopt_ttl(peer->su.sa.sa_family, bgp_sock, peer->ttl); ret = sockopt_ttl(peer->su.sa.sa_family, bgp_sock, peer->ttl);
if (ret) { if (ret) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s: Can't set TxTTL on peer (rtrid %s) socket, err = %d", "%s: Can't set TxTTL on peer (rtrid %s) socket, err = %d",
__func__, __func__,
@ -180,7 +180,7 @@ int bgp_set_socket_ttl(struct peer *peer, int bgp_sock)
*/ */
ret = sockopt_ttl(peer->su.sa.sa_family, bgp_sock, MAXTTL); ret = sockopt_ttl(peer->su.sa.sa_family, bgp_sock, MAXTTL);
if (ret) { if (ret) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s: Can't set TxTTL on peer (rtrid %s) socket, err = %d", "%s: Can't set TxTTL on peer (rtrid %s) socket, err = %d",
__func__, __func__,
@ -192,7 +192,7 @@ int bgp_set_socket_ttl(struct peer *peer, int bgp_sock)
ret = sockopt_minttl(peer->su.sa.sa_family, bgp_sock, ret = sockopt_minttl(peer->su.sa.sa_family, bgp_sock,
MAXTTL + 1 - peer->gtsm_hops); MAXTTL + 1 - peer->gtsm_hops);
if (ret) { if (ret) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s: Can't set MinTTL on peer (rtrid %s) socket, err = %d", "%s: Can't set MinTTL on peer (rtrid %s) socket, err = %d",
__func__, __func__,
@ -238,7 +238,7 @@ static int bgp_get_instance_for_inc_conn(int sock, struct bgp **bgp_inst)
rc = getsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, name, &name_len); rc = getsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, name, &name_len);
if (rc != 0) { if (rc != 0) {
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"[Error] BGP SO_BINDTODEVICE get failed (%s), sock %d", "[Error] BGP SO_BINDTODEVICE get failed (%s), sock %d",
safe_strerror(errno), sock); safe_strerror(errno), sock);
@ -296,7 +296,7 @@ static int bgp_accept(struct thread *thread)
/* Register accept thread. */ /* Register accept thread. */
accept_sock = THREAD_FD(thread); accept_sock = THREAD_FD(thread);
if (accept_sock < 0) { if (accept_sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, "accept_sock is nevative value %d", flog_err(LIB_ERR_SOCKET, "accept_sock is nevative value %d",
accept_sock); accept_sock);
return -1; return -1;
} }
@ -308,7 +308,7 @@ static int bgp_accept(struct thread *thread)
/* Accept client connection. */ /* Accept client connection. */
bgp_sock = sockunion_accept(accept_sock, &su); bgp_sock = sockunion_accept(accept_sock, &su);
if (bgp_sock < 0) { if (bgp_sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"[Error] BGP socket accept failed (%s)", "[Error] BGP socket accept failed (%s)",
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
@ -560,12 +560,12 @@ int bgp_connect(struct peer *peer)
return 0; return 0;
} }
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges"); flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges");
/* Make socket for the peer. */ /* Make socket for the peer. */
peer->fd = vrf_sockunion_socket(&peer->su, peer->bgp->vrf_id, peer->fd = vrf_sockunion_socket(&peer->su, peer->bgp->vrf_id,
bgp_get_bound_name(peer)); bgp_get_bound_name(peer));
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges"); flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
if (peer->fd < 0) if (peer->fd < 0)
return -1; return -1;
@ -585,14 +585,14 @@ int bgp_connect(struct peer *peer)
#ifdef IPTOS_PREC_INTERNETCONTROL #ifdef IPTOS_PREC_INTERNETCONTROL
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs",
__func__); __func__);
if (sockunion_family(&peer->su) == AF_INET) if (sockunion_family(&peer->su) == AF_INET)
setsockopt_ipv4_tos(peer->fd, IPTOS_PREC_INTERNETCONTROL); setsockopt_ipv4_tos(peer->fd, IPTOS_PREC_INTERNETCONTROL);
else if (sockunion_family(&peer->su) == AF_INET6) else if (sockunion_family(&peer->su) == AF_INET6)
setsockopt_ipv6_tclass(peer->fd, IPTOS_PREC_INTERNETCONTROL); setsockopt_ipv6_tclass(peer->fd, IPTOS_PREC_INTERNETCONTROL);
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs",
__func__); __func__);
#endif #endif
@ -641,7 +641,7 @@ int bgp_getsockname(struct peer *peer)
if (bgp_nexthop_set(peer->su_local, peer->su_remote, &peer->nexthop, if (bgp_nexthop_set(peer->su_local, peer->su_remote, &peer->nexthop,
peer)) { peer)) {
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
zlog_ferr( flog_err(
BGP_ERR_NH_UPD, BGP_ERR_NH_UPD,
"%s: nexthop_set failed, resetting connection - intf %p", "%s: nexthop_set failed, resetting connection - intf %p",
peer->host, peer->nexthop.ifp); peer->host, peer->nexthop.ifp);
@ -662,7 +662,7 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen,
sockopt_reuseport(sock); sockopt_reuseport(sock);
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs",
__func__); __func__);
#ifdef IPTOS_PREC_INTERNETCONTROL #ifdef IPTOS_PREC_INTERNETCONTROL
@ -677,17 +677,17 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen,
ret = bind(sock, sa, salen); ret = bind(sock, sa, salen);
en = errno; en = errno;
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs",
__func__); __func__);
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, "bind: %s", safe_strerror(en)); flog_err(LIB_ERR_SOCKET, "bind: %s", safe_strerror(en));
return ret; return ret;
} }
ret = listen(sock, SOMAXCONN); ret = listen(sock, SOMAXCONN);
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, "listen: %s", safe_strerror(errno)); flog_err(LIB_ERR_SOCKET, "listen: %s", safe_strerror(errno));
return ret; return ret;
} }
@ -724,13 +724,13 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
port_str[sizeof(port_str) - 1] = '\0'; port_str[sizeof(port_str) - 1] = '\0';
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges"); flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges");
ret = vrf_getaddrinfo(address, port_str, &req, &ainfo_save, ret = vrf_getaddrinfo(address, port_str, &req, &ainfo_save,
bgp->vrf_id); bgp->vrf_id);
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges"); flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
if (ret != 0) { if (ret != 0) {
zlog_ferr(LIB_ERR_SOCKET, "getaddrinfo: %s", gai_strerror(ret)); flog_err(LIB_ERR_SOCKET, "getaddrinfo: %s", gai_strerror(ret));
return -1; return -1;
} }
@ -742,15 +742,15 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
continue; continue;
if (bgpd_privs.change(ZPRIVS_RAISE)) if (bgpd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "Can't raise privileges"); flog_err(LIB_ERR_PRIVILEGES, "Can't raise privileges");
sock = vrf_socket(ainfo->ai_family, ainfo->ai_socktype, sock = vrf_socket(ainfo->ai_family, ainfo->ai_socktype,
ainfo->ai_protocol, bgp->vrf_id, ainfo->ai_protocol, bgp->vrf_id,
(bgp->inst_type == BGP_INSTANCE_TYPE_VRF ? (bgp->inst_type == BGP_INSTANCE_TYPE_VRF ?
bgp->name : NULL)); bgp->name : NULL));
if (bgpd_privs.change(ZPRIVS_LOWER)) if (bgpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "Can't lower privileges"); flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
if (sock < 0) { if (sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, "socket: %s", flog_err(LIB_ERR_SOCKET, "socket: %s",
safe_strerror(errno)); safe_strerror(errno));
continue; continue;
} }
@ -768,11 +768,11 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
} }
freeaddrinfo(ainfo_save); freeaddrinfo(ainfo_save);
if (count == 0 && bgp->inst_type != BGP_INSTANCE_TYPE_VRF) { if (count == 0 && bgp->inst_type != BGP_INSTANCE_TYPE_VRF) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s: no usable addresses please check other programs usage of specified port %d", "%s: no usable addresses please check other programs usage of specified port %d",
__func__, port); __func__, port);
zlog_ferr(LIB_ERR_SOCKET, "%s: Program cannot continue", flog_err(LIB_ERR_SOCKET, "%s: Program cannot continue",
__func__); __func__);
exit(-1); exit(-1);
} }

2
bgpd/bgp_nht.c
View File

@ -344,7 +344,7 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
bgp = bgp_lookup_by_vrf_id(vrf_id); bgp = bgp_lookup_by_vrf_id(vrf_id);
if (!bgp) { if (!bgp) {
zlog_ferr( flog_err(
BGP_ERR_NH_UPD, BGP_ERR_NH_UPD,
"parse nexthop update: instance not found for vrf_id %u", "parse nexthop update: instance not found for vrf_id %u",
vrf_id); vrf_id);

4
bgpd/bgp_open.c
View File

@ -521,7 +521,7 @@ static as_t bgp_capability_as4(struct peer *peer, struct capability_header *hdr)
SET_FLAG(peer->cap, PEER_CAP_AS4_RCV); SET_FLAG(peer->cap, PEER_CAP_AS4_RCV);
if (hdr->length != CAPABILITY_CODE_AS4_LEN) { if (hdr->length != CAPABILITY_CODE_AS4_LEN) {
zlog_ferr(BGP_ERR_PKT_OPEN, flog_err(BGP_ERR_PKT_OPEN,
"%s AS4 capability has incorrect data length %d", "%s AS4 capability has incorrect data length %d",
peer->host, hdr->length); peer->host, hdr->length);
return 0; return 0;
@ -1186,7 +1186,7 @@ int bgp_open_option_parse(struct peer *peer, uint8_t length, int *mp_capability)
&& !peer->afc_nego[AFI_IP6][SAFI_ENCAP] && !peer->afc_nego[AFI_IP6][SAFI_ENCAP]
&& !peer->afc_nego[AFI_IP6][SAFI_FLOWSPEC] && !peer->afc_nego[AFI_IP6][SAFI_FLOWSPEC]
&& !peer->afc_nego[AFI_L2VPN][SAFI_EVPN]) { && !peer->afc_nego[AFI_L2VPN][SAFI_EVPN]) {
zlog_ferr(BGP_ERR_PKT_OPEN, flog_err(BGP_ERR_PKT_OPEN,
"%s [Error] Configured AFI/SAFIs do not " "%s [Error] Configured AFI/SAFIs do not "
"overlap with received MP capabilities", "overlap with received MP capabilities",
peer->host); peer->host);

42
bgpd/bgp_packet.c
View File

@ -1091,7 +1091,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
/* Just in case we have a silly peer who sends AS4 capability set to 0 /* Just in case we have a silly peer who sends AS4 capability set to 0
*/ */
if (CHECK_FLAG(peer->cap, PEER_CAP_AS4_RCV) && !as4) { if (CHECK_FLAG(peer->cap, PEER_CAP_AS4_RCV) && !as4) {
zlog_ferr(BGP_ERR_PKT_OPEN, flog_err(BGP_ERR_PKT_OPEN,
"%s bad OPEN, got AS4 capability, but AS4 set to 0", "%s bad OPEN, got AS4 capability, but AS4 set to 0",
peer->host); peer->host);
bgp_notify_send_with_data(peer, BGP_NOTIFY_OPEN_ERR, bgp_notify_send_with_data(peer, BGP_NOTIFY_OPEN_ERR,
@ -1106,7 +1106,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
* BGP_AS_TRANS, for some unknown reason. * BGP_AS_TRANS, for some unknown reason.
*/ */
if (as4 == BGP_AS_TRANS) { if (as4 == BGP_AS_TRANS) {
zlog_ferr( flog_err(
BGP_ERR_PKT_OPEN, BGP_ERR_PKT_OPEN,
"%s [AS4] NEW speaker using AS_TRANS for AS4, not allowed", "%s [AS4] NEW speaker using AS_TRANS for AS4, not allowed",
peer->host); peer->host);
@ -1136,7 +1136,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
if (CHECK_FLAG(peer->cap, PEER_CAP_AS4_RCV) if (CHECK_FLAG(peer->cap, PEER_CAP_AS4_RCV)
&& as4 != remote_as) { && as4 != remote_as) {
/* raise error, log this, close session */ /* raise error, log this, close session */
zlog_ferr( flog_err(
BGP_ERR_PKT_OPEN, BGP_ERR_PKT_OPEN,
"%s bad OPEN, got AS4 capability, but remote_as %u" "%s bad OPEN, got AS4 capability, but remote_as %u"
" mismatch with 16bit 'myasn' %u in open", " mismatch with 16bit 'myasn' %u in open",
@ -1304,7 +1304,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
/* Get sockname. */ /* Get sockname. */
if ((ret = bgp_getsockname(peer)) < 0) { if ((ret = bgp_getsockname(peer)) < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: bgp_getsockname() failed for peer: %s", "%s: bgp_getsockname() failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);
return BGP_Stop; return BGP_Stop;
@ -1319,7 +1319,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
|| peer->afc_nego[AFI_IP][SAFI_ENCAP]) { || peer->afc_nego[AFI_IP][SAFI_ENCAP]) {
if (!peer->nexthop.v4.s_addr) { if (!peer->nexthop.v4.s_addr) {
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
zlog_ferr( flog_err(
BGP_ERR_SND_FAIL, BGP_ERR_SND_FAIL,
"%s: No local IPv4 addr resetting connection, fd %d", "%s: No local IPv4 addr resetting connection, fd %d",
peer->host, peer->fd); peer->host, peer->fd);
@ -1336,7 +1336,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
|| peer->afc_nego[AFI_IP6][SAFI_ENCAP]) { || peer->afc_nego[AFI_IP6][SAFI_ENCAP]) {
if (IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_global)) { if (IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_global)) {
#if defined(HAVE_CUMULUS) #if defined(HAVE_CUMULUS)
zlog_ferr( flog_err(
BGP_ERR_SND_FAIL, BGP_ERR_SND_FAIL,
"%s: No local IPv6 addr resetting connection, fd %d", "%s: No local IPv6 addr resetting connection, fd %d",
peer->host, peer->fd); peer->host, peer->fd);
@ -1399,7 +1399,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size)
/* Status must be Established. */ /* Status must be Established. */
if (peer->status != Established) { if (peer->status != Established) {
zlog_ferr(BGP_ERR_INVALID_STATUS, flog_err(BGP_ERR_INVALID_STATUS,
"%s [FSM] Update packet received under status %s", "%s [FSM] Update packet received under status %s",
peer->host, peer->host,
lookup_msg(bgp_status_msg, peer->status, NULL)); lookup_msg(bgp_status_msg, peer->status, NULL));
@ -1423,7 +1423,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size)
Attribute Length + 23 exceeds the message Length), then the Error Attribute Length + 23 exceeds the message Length), then the Error
Subcode is set to Malformed Attribute List. */ Subcode is set to Malformed Attribute List. */
if (stream_pnt(s) + 2 > end) { if (stream_pnt(s) + 2 > end) {
zlog_ferr(BGP_ERR_UPDATE_RCV, flog_err(BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error" "%s [Error] Update packet error"
" (packet length is short for unfeasible length)", " (packet length is short for unfeasible length)",
peer->host); peer->host);
@ -1437,7 +1437,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size)
/* Unfeasible Route Length check. */ /* Unfeasible Route Length check. */
if (stream_pnt(s) + withdraw_len > end) { if (stream_pnt(s) + withdraw_len > end) {
zlog_ferr(BGP_ERR_UPDATE_RCV, flog_err(BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error" "%s [Error] Update packet error"
" (packet unfeasible length overflow %d)", " (packet unfeasible length overflow %d)",
peer->host, withdraw_len); peer->host, withdraw_len);
@ -1511,7 +1511,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size)
ret = bgp_dump_attr(&attr, peer->rcvd_attr_str, BUFSIZ); ret = bgp_dump_attr(&attr, peer->rcvd_attr_str, BUFSIZ);
if (attr_parse_ret == BGP_ATTR_PARSE_WITHDRAW) if (attr_parse_ret == BGP_ATTR_PARSE_WITHDRAW)
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s rcvd UPDATE with errors in attr(s)!! Withdrawing route.", "%s rcvd UPDATE with errors in attr(s)!! Withdrawing route.",
peer->host); peer->host);
@ -1572,7 +1572,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size)
} }
if (nlri_ret < 0) { if (nlri_ret < 0) {
zlog_ferr(BGP_ERR_UPDATE_RCV, flog_err(BGP_ERR_UPDATE_RCV,
"%s [Error] Error parsing NLRI", peer->host); "%s [Error] Error parsing NLRI", peer->host);
if (peer->status == Established) if (peer->status == Established)
bgp_notify_send( bgp_notify_send(
@ -1744,7 +1744,7 @@ static int bgp_route_refresh_receive(struct peer *peer, bgp_size_t size)
/* If peer does not have the capability, send notification. */ /* If peer does not have the capability, send notification. */
if (!CHECK_FLAG(peer->cap, PEER_CAP_REFRESH_ADV)) { if (!CHECK_FLAG(peer->cap, PEER_CAP_REFRESH_ADV)) {
zlog_ferr(BGP_ERR_NO_CAP, flog_err(BGP_ERR_NO_CAP,
"%s [Error] BGP route refresh is not enabled", "%s [Error] BGP route refresh is not enabled",
peer->host); peer->host);
bgp_notify_send(peer, BGP_NOTIFY_HEADER_ERR, bgp_notify_send(peer, BGP_NOTIFY_HEADER_ERR,
@ -1754,7 +1754,7 @@ static int bgp_route_refresh_receive(struct peer *peer, bgp_size_t size)
/* Status must be Established. */ /* Status must be Established. */
if (peer->status != Established) { if (peer->status != Established) {
zlog_ferr( flog_err(
BGP_ERR_INVALID_STATUS, BGP_ERR_INVALID_STATUS,
"%s [Error] Route refresh packet received under status %s", "%s [Error] Route refresh packet received under status %s",
peer->host, peer->host,
@ -2135,7 +2135,7 @@ int bgp_capability_receive(struct peer *peer, bgp_size_t size)
/* If peer does not have the capability, send notification. */ /* If peer does not have the capability, send notification. */
if (!CHECK_FLAG(peer->cap, PEER_CAP_DYNAMIC_ADV)) { if (!CHECK_FLAG(peer->cap, PEER_CAP_DYNAMIC_ADV)) {
zlog_ferr(BGP_ERR_NO_CAP, flog_err(BGP_ERR_NO_CAP,
"%s [Error] BGP dynamic capability is not enabled", "%s [Error] BGP dynamic capability is not enabled",
peer->host); peer->host);
bgp_notify_send(peer, BGP_NOTIFY_HEADER_ERR, bgp_notify_send(peer, BGP_NOTIFY_HEADER_ERR,
@ -2145,7 +2145,7 @@ int bgp_capability_receive(struct peer *peer, bgp_size_t size)
/* Status must be Established. */ /* Status must be Established. */
if (peer->status != Established) { if (peer->status != Established) {
zlog_ferr( flog_err(
BGP_ERR_NO_CAP, BGP_ERR_NO_CAP,
"%s [Error] Dynamic capability packet received under status %s", "%s [Error] Dynamic capability packet received under status %s",
peer->host, peer->host,
@ -2227,7 +2227,7 @@ int bgp_process_packet(struct thread *thread)
memory_order_relaxed); memory_order_relaxed);
mprc = bgp_open_receive(peer, size); mprc = bgp_open_receive(peer, size);
if (mprc == BGP_Stop) if (mprc == BGP_Stop)
zlog_ferr( flog_err(
BGP_ERR_PKT_OPEN, BGP_ERR_PKT_OPEN,
"%s: BGP OPEN receipt failed for peer: %s", "%s: BGP OPEN receipt failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);
@ -2238,7 +2238,7 @@ int bgp_process_packet(struct thread *thread)
peer->readtime = monotime(NULL); peer->readtime = monotime(NULL);
mprc = bgp_update_receive(peer, size); mprc = bgp_update_receive(peer, size);
if (mprc == BGP_Stop) if (mprc == BGP_Stop)
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: BGP UPDATE receipt failed for peer: %s", "%s: BGP UPDATE receipt failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);
@ -2248,7 +2248,7 @@ int bgp_process_packet(struct thread *thread)
memory_order_relaxed); memory_order_relaxed);
mprc = bgp_notify_receive(peer, size); mprc = bgp_notify_receive(peer, size);
if (mprc == BGP_Stop) if (mprc == BGP_Stop)
zlog_ferr( flog_err(
BGP_ERR_NOTIFY_RCV, BGP_ERR_NOTIFY_RCV,
"%s: BGP NOTIFY receipt failed for peer: %s", "%s: BGP NOTIFY receipt failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);
@ -2259,7 +2259,7 @@ int bgp_process_packet(struct thread *thread)
memory_order_relaxed); memory_order_relaxed);
mprc = bgp_keepalive_receive(peer, size); mprc = bgp_keepalive_receive(peer, size);
if (mprc == BGP_Stop) if (mprc == BGP_Stop)
zlog_ferr( flog_err(
BGP_ERR_KEEP_RCV, BGP_ERR_KEEP_RCV,
"%s: BGP KEEPALIVE receipt failed for peer: %s", "%s: BGP KEEPALIVE receipt failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);
@ -2270,7 +2270,7 @@ int bgp_process_packet(struct thread *thread)
memory_order_relaxed); memory_order_relaxed);
mprc = bgp_route_refresh_receive(peer, size); mprc = bgp_route_refresh_receive(peer, size);
if (mprc == BGP_Stop) if (mprc == BGP_Stop)
zlog_ferr( flog_err(
BGP_ERR_RFSH_RCV, BGP_ERR_RFSH_RCV,
"%s: BGP ROUTEREFRESH receipt failed for peer: %s", "%s: BGP ROUTEREFRESH receipt failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);
@ -2280,7 +2280,7 @@ int bgp_process_packet(struct thread *thread)
memory_order_relaxed); memory_order_relaxed);
mprc = bgp_capability_receive(peer, size); mprc = bgp_capability_receive(peer, size);
if (mprc == BGP_Stop) if (mprc == BGP_Stop)
zlog_ferr( flog_err(
BGP_ERR_CAP_RCV, BGP_ERR_CAP_RCV,
"%s: BGP CAPABILITY receipt failed for peer: %s", "%s: BGP CAPABILITY receipt failed for peer: %s",
__FUNCTION__, peer->host); __FUNCTION__, peer->host);

6
bgpd/bgp_pbr.c
View File

@ -653,7 +653,7 @@ static int bgp_pbr_build_and_validate_entry(struct prefix *p,
action_count++; action_count++;
if (action_count > ACTIONS_MAX_NUM) { if (action_count > ACTIONS_MAX_NUM) {
if (BGP_DEBUG(pbr, PBR_ERROR)) if (BGP_DEBUG(pbr, PBR_ERROR))
zlog_ferr(BGP_ERR_FLOWSPEC_PACKET, flog_err(BGP_ERR_FLOWSPEC_PACKET,
"%s: flowspec actions exceeds limit (max %u)", "%s: flowspec actions exceeds limit (max %u)",
__func__, action_count); __func__, action_count);
break; break;
@ -2252,7 +2252,7 @@ void bgp_pbr_update_entry(struct bgp *bgp, struct prefix *p,
if (!bgp_zebra_tm_chunk_obtained()) { if (!bgp_zebra_tm_chunk_obtained()) {
if (BGP_DEBUG(pbr, PBR_ERROR)) if (BGP_DEBUG(pbr, PBR_ERROR))
zlog_ferr(BGP_ERR_TABLE_CHUNK, flog_err(BGP_ERR_TABLE_CHUNK,
"%s: table chunk not obtained yet", "%s: table chunk not obtained yet",
__func__); __func__);
return; return;
@ -2260,7 +2260,7 @@ void bgp_pbr_update_entry(struct bgp *bgp, struct prefix *p,
if (bgp_pbr_build_and_validate_entry(p, info, &api) < 0) { if (bgp_pbr_build_and_validate_entry(p, info, &api) < 0) {
if (BGP_DEBUG(pbr, PBR_ERROR)) if (BGP_DEBUG(pbr, PBR_ERROR))
zlog_ferr(BGP_ERR_FLOWSPEC_INSTALLATION, flog_err(BGP_ERR_FLOWSPEC_INSTALLATION,
"%s: cancel updating entry %p in bgp pbr", "%s: cancel updating entry %p in bgp pbr",
__func__, info); __func__, info);
return; return;

14
bgpd/bgp_route.c
View File

@ -4203,7 +4203,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
/* Prefix length check. */ /* Prefix length check. */
if (p.prefixlen > prefix_blen(&p) * 8) { if (p.prefixlen > prefix_blen(&p) * 8) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error (wrong prefix length %d for afi %u)", "%s [Error] Update packet error (wrong prefix length %d for afi %u)",
peer->host, p.prefixlen, packet->afi); peer->host, p.prefixlen, packet->afi);
@ -4215,7 +4215,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
/* When packet overflow occur return immediately. */ /* When packet overflow occur return immediately. */
if (pnt + psize > lim) { if (pnt + psize > lim) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error (prefix length %d overflows packet)", "%s [Error] Update packet error (prefix length %d overflows packet)",
peer->host, p.prefixlen); peer->host, p.prefixlen);
@ -4225,7 +4225,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
/* Defensive coding, double-check the psize fits in a struct /* Defensive coding, double-check the psize fits in a struct
* prefix */ * prefix */
if (psize > (ssize_t)sizeof(p.u)) { if (psize > (ssize_t)sizeof(p.u)) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error (prefix length %d too large for prefix storage %zu)", "%s [Error] Update packet error (prefix length %d too large for prefix storage %zu)",
peer->host, p.prefixlen, sizeof(p.u)); peer->host, p.prefixlen, sizeof(p.u));
@ -4247,7 +4247,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
* be logged locally, and the prefix SHOULD be * be logged locally, and the prefix SHOULD be
* ignored. * ignored.
*/ */
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: IPv4 unicast NLRI is multicast address %s, ignoring", "%s: IPv4 unicast NLRI is multicast address %s, ignoring",
peer->host, inet_ntoa(p.u.prefix4)); peer->host, inet_ntoa(p.u.prefix4));
@ -4260,7 +4260,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
if (IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)) { if (IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)) {
char buf[BUFSIZ]; char buf[BUFSIZ];
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: IPv6 unicast NLRI is link-local address %s, ignoring", "%s: IPv6 unicast NLRI is link-local address %s, ignoring",
peer->host, peer->host,
@ -4272,7 +4272,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
if (IN6_IS_ADDR_MULTICAST(&p.u.prefix6)) { if (IN6_IS_ADDR_MULTICAST(&p.u.prefix6)) {
char buf[BUFSIZ]; char buf[BUFSIZ];
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s: IPv6 unicast NLRI is multicast address %s, ignoring", "%s: IPv6 unicast NLRI is multicast address %s, ignoring",
peer->host, peer->host,
@ -4302,7 +4302,7 @@ int bgp_nlri_parse_ip(struct peer *peer, struct attr *attr,
/* Packet length consistency check. */ /* Packet length consistency check. */
if (pnt != lim) { if (pnt != lim) {
zlog_ferr( flog_err(
BGP_ERR_UPDATE_RCV, BGP_ERR_UPDATE_RCV,
"%s [Error] Update packet error (prefix length mismatch with total length)", "%s [Error] Update packet error (prefix length mismatch with total length)",
peer->host); peer->host);

2
bgpd/bgp_updgrp.c
View File

@ -1631,7 +1631,7 @@ void update_group_adjust_peer(struct peer_af *paf)
if (!updgrp) { if (!updgrp) {
updgrp = update_group_create(paf); updgrp = update_group_create(paf);
if (!updgrp) { if (!updgrp) {
zlog_ferr(BGP_ERR_UPDGRP_CREATE, flog_err(BGP_ERR_UPDGRP_CREATE,
"couldn't create update group for peer %s", "couldn't create update group for peer %s",
paf->peer->host); paf->peer->host);
return; return;

2
bgpd/bgp_updgrp_packet.c
View File

@ -787,7 +787,7 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp)
* NLRI then * NLRI then
* return */ * return */
if (space_remaining < space_needed) { if (space_remaining < space_needed) {
zlog_ferr( flog_err(
BGP_ERR_UPDGRP_ATTR_LEN, BGP_ERR_UPDGRP_ATTR_LEN,
"u%" PRIu64 ":s%" PRIu64 "u%" PRIu64 ":s%" PRIu64
" attributes too long, cannot send UPDATE", " attributes too long, cannot send UPDATE",

2
bgpd/bgp_vty.c
View File

@ -10755,7 +10755,7 @@ static void bgp_show_all_instances_neighbors_vty(struct vty *vty,
for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
if (use_json) { if (use_json) {
if (!(json = json_object_new_object())) { if (!(json = json_object_new_object())) {
zlog_ferr( flog_err(
BGP_ERR_JSON_MEM_ERROR, BGP_ERR_JSON_MEM_ERROR,
"Unable to allocate memory for JSON object"); "Unable to allocate memory for JSON object");
vty_out(vty, vty_out(vty,

10
bgpd/bgp_zebra.c
View File

@ -1078,7 +1078,7 @@ int bgp_zebra_get_table_range(uint32_t chunk_size,
return -1; return -1;
ret = tm_get_table_chunk(zclient, chunk_size, start, end); ret = tm_get_table_chunk(zclient, chunk_size, start, end);
if (ret < 0) { if (ret < 0) {
zlog_ferr(BGP_ERR_TABLE_CHUNK, flog_err(BGP_ERR_TABLE_CHUNK,
"BGP: Error getting table chunk %u", chunk_size); "BGP: Error getting table chunk %u", chunk_size);
return -1; return -1;
} }
@ -2383,7 +2383,7 @@ static int bgp_zebra_process_local_macip(int command, struct zclient *zclient,
ipa_len = stream_getl(s); ipa_len = stream_getl(s);
if (ipa_len != 0 && ipa_len != IPV4_MAX_BYTELEN if (ipa_len != 0 && ipa_len != IPV4_MAX_BYTELEN
&& ipa_len != IPV6_MAX_BYTELEN) { && ipa_len != IPV6_MAX_BYTELEN) {
zlog_ferr(BGP_ERR_MACIP_LEN, flog_err(BGP_ERR_MACIP_LEN,
"%u:Recv MACIP %s with invalid IP addr length %d", "%u:Recv MACIP %s with invalid IP addr length %d",
vrf_id, (command == ZEBRA_MACIP_ADD) ? "Add" : "Del", vrf_id, (command == ZEBRA_MACIP_ADD) ? "Add" : "Del",
ipa_len); ipa_len);
@ -2476,12 +2476,12 @@ static void bgp_zebra_process_label_chunk(
STREAM_GETL(s, last); STREAM_GETL(s, last);
if (zclient->redist_default != proto) { if (zclient->redist_default != proto) {
zlog_ferr(BGP_ERR_LM_ERROR, "Got LM msg with wrong proto %u", flog_err(BGP_ERR_LM_ERROR, "Got LM msg with wrong proto %u",
proto); proto);
return; return;
} }
if (zclient->instance != instance) { if (zclient->instance != instance) {
zlog_ferr(BGP_ERR_LM_ERROR, "Got LM msg with wrong instance %u", flog_err(BGP_ERR_LM_ERROR, "Got LM msg with wrong instance %u",
proto); proto);
return; return;
} }
@ -2490,7 +2490,7 @@ static void bgp_zebra_process_label_chunk(
first < MPLS_LABEL_UNRESERVED_MIN || first < MPLS_LABEL_UNRESERVED_MIN ||
last > MPLS_LABEL_UNRESERVED_MAX) { last > MPLS_LABEL_UNRESERVED_MAX) {
zlog_ferr(BGP_ERR_LM_ERROR, "%s: Invalid Label chunk: %u - %u", flog_err(BGP_ERR_LM_ERROR, "%s: Invalid Label chunk: %u - %u",
__func__, first, last); __func__, first, last);
return; return;
} }

8
bgpd/bgpd.c
View File

@ -1804,7 +1804,7 @@ static int peer_activate_af(struct peer *peer, afi_t afi, safi_t safi)
int active; int active;
if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) { if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
zlog_ferr(BGP_ERR_PEER_GROUP, "%s was called for peer-group %s", flog_err(BGP_ERR_PEER_GROUP, "%s was called for peer-group %s",
__func__, peer->host); __func__, peer->host);
return 1; return 1;
} }
@ -1918,7 +1918,7 @@ static int non_peergroup_deactivate_af(struct peer *peer, afi_t afi,
safi_t safi) safi_t safi)
{ {
if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) { if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
zlog_ferr(BGP_ERR_PEER_GROUP, "%s was called for peer-group %s", flog_err(BGP_ERR_PEER_GROUP, "%s was called for peer-group %s",
__func__, peer->host); __func__, peer->host);
return 1; return 1;
} }
@ -1931,7 +1931,7 @@ static int non_peergroup_deactivate_af(struct peer *peer, afi_t afi,
peer->afc[afi][safi] = 0; peer->afc[afi][safi] = 0;
if (peer_af_delete(peer, afi, safi) != 0) { if (peer_af_delete(peer, afi, safi) != 0) {
zlog_ferr(BGP_ERR_PEER_DELETE, flog_err(BGP_ERR_PEER_DELETE,
"couldn't delete af structure for peer %s", "couldn't delete af structure for peer %s",
peer->host); peer->host);
return 1; return 1;
@ -1982,7 +1982,7 @@ int peer_deactivate(struct peer *peer, afi_t afi, safi_t safi)
group = peer->group; group = peer->group;
if (peer_af_delete(peer, afi, safi) != 0) { if (peer_af_delete(peer, afi, safi) != 0) {
zlog_ferr(BGP_ERR_PEER_DELETE, flog_err(BGP_ERR_PEER_DELETE,
"couldn't delete af structure for peer %s", "couldn't delete af structure for peer %s",
peer->host); peer->host);
} }

4
bgpd/rfapi/rfapi.c
View File

@ -3934,7 +3934,7 @@ void *rfapi_rfp_init_group_config_ptr_vty(void *rfp_start_val,
size); size);
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: Unknown group type=%d", flog_err(LIB_ERR_DEVELOPMENT, "%s: Unknown group type=%d",
__func__, type); __func__, type);
/* should never happen */ /* should never happen */
assert("Unknown type" == NULL); assert("Unknown type" == NULL);
@ -4049,7 +4049,7 @@ void *rfapi_rfp_get_group_config_ptr_name(
criteria, search_cb); criteria, search_cb);
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: Unknown group type=%d", flog_err(LIB_ERR_DEVELOPMENT, "%s: Unknown group type=%d",
__func__, type); __func__, type);
/* should never happen */ /* should never happen */
assert("Unknown type" == NULL); assert("Unknown type" == NULL);

6
bgpd/rfapi/rfapi_import.c
View File

@ -3029,7 +3029,7 @@ static void rfapiBgpInfoFilteredImportEncap(
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi);
return; return;
} }
@ -3486,7 +3486,7 @@ void rfapiBgpInfoFilteredImportVPN(
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi);
return; return;
} }
@ -3891,7 +3891,7 @@ rfapiBgpInfoFilteredImportFunction(safi_t safi)
default: default:
/* not expected */ /* not expected */
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad safi %d", __func__, flog_err(LIB_ERR_DEVELOPMENT, "%s: bad safi %d", __func__,
safi); safi);
return rfapiBgpInfoFilteredImportBadSafi; return rfapiBgpInfoFilteredImportBadSafi;
} }

22
bgpd/rfapi/vnc_export_bgp.c
View File

@ -188,7 +188,7 @@ void vnc_direct_bgp_add_route_ce(struct bgp *bgp, struct route_node *rn,
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: can't get afi of route node", __func__); "%s: can't get afi of route node", __func__);
return; return;
} }
@ -335,7 +335,7 @@ void vnc_direct_bgp_del_route_ce(struct bgp *bgp, struct route_node *rn,
struct prefix ce_nexthop; struct prefix ce_nexthop;
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi", __func__); flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi", __func__);
return; return;
} }
@ -700,7 +700,7 @@ void vnc_direct_bgp_add_prefix(struct bgp *bgp,
afi_t afi = family2afi(rn->p.family); afi_t afi = family2afi(rn->p.family);
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: can't get afi of route node", __func__); "%s: can't get afi of route node", __func__);
return; return;
} }
@ -810,7 +810,7 @@ void vnc_direct_bgp_del_prefix(struct bgp *bgp,
afi_t afi = family2afi(rn->p.family); afi_t afi = family2afi(rn->p.family);
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: can't get afi route node", flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi route node",
__func__); __func__);
return; return;
} }
@ -926,7 +926,7 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
afi_t afi = family2afi(rfd->vn_addr.addr_family); afi_t afi = family2afi(rfd->vn_addr.addr_family);
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: can't get afi of nve vn addr", __func__); "%s: can't get afi of nve vn addr", __func__);
return; return;
} }
@ -979,7 +979,7 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
if (afi == AFI_IP || afi == AFI_IP6) { if (afi == AFI_IP || afi == AFI_IP6) {
rt = import_table->imported_vpn[afi]; rt = import_table->imported_vpn[afi];
} else { } else {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d",
__func__, afi); __func__, afi);
return; return;
} }
@ -1072,7 +1072,7 @@ void vnc_direct_bgp_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
afi_t afi = family2afi(rfd->vn_addr.addr_family); afi_t afi = family2afi(rfd->vn_addr.addr_family);
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: can't get afi of nve vn addr", __func__); "%s: can't get afi of nve vn addr", __func__);
return; return;
} }
@ -1120,7 +1120,7 @@ void vnc_direct_bgp_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd)
if (afi == AFI_IP || afi == AFI_IP6) { if (afi == AFI_IP || afi == AFI_IP6) {
rt = import_table->imported_vpn[afi]; rt = import_table->imported_vpn[afi];
} else { } else {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d",
__func__, afi); __func__, afi);
return; return;
} }
@ -1296,7 +1296,7 @@ static void vnc_direct_bgp_add_group_afi(struct bgp *bgp,
if (afi == AFI_IP || afi == AFI_IP6) { if (afi == AFI_IP || afi == AFI_IP6) {
rt = import_table->imported_vpn[afi]; rt = import_table->imported_vpn[afi];
} else { } else {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi);
return; return;
} }
@ -1640,7 +1640,7 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi,
struct attr *iattr; struct attr *iattr;
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: can't get afi of route node", __func__); "%s: can't get afi of route node", __func__);
return; return;
} }
@ -1760,7 +1760,7 @@ void vnc_direct_bgp_rh_del_route(struct bgp *bgp, afi_t afi,
struct vnc_export_info *eti; struct vnc_export_info *eti;
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: can't get afi route node", flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi route node",
__func__); __func__);
return; return;
} }

8
bgpd/rfapi/vnc_import_bgp.c
View File

@ -603,7 +603,7 @@ static void vnc_import_bgp_add_route_mode_resolve_nve(
*/ */
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix",
__func__); __func__);
return; return;
} }
@ -720,7 +720,7 @@ static void vnc_import_bgp_add_route_mode_plain(struct bgp *bgp,
} }
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix",
__func__); __func__);
return; return;
} }
@ -908,7 +908,7 @@ vnc_import_bgp_add_route_mode_nvegroup(struct bgp *bgp, struct prefix *prefix,
assert(rfg); assert(rfg);
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix",
__func__); __func__);
return; return;
} }
@ -2632,7 +2632,7 @@ void vnc_import_bgp_add_route(struct bgp *bgp, struct prefix *prefix,
VNC_RHNCK(enter); VNC_RHNCK(enter);
if (!afi) { if (!afi) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix",
__func__); __func__);
return; return;
} }

8
bgpd/rfapi/vnc_zebra.c
View File

@ -571,7 +571,7 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp,
return; return;
if (rn->p.family != AF_INET && rn->p.family != AF_INET6) { if (rn->p.family != AF_INET && rn->p.family != AF_INET6) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: invalid route node addr family", __func__); "%s: invalid route node addr family", __func__);
return; return;
} }
@ -644,7 +644,7 @@ static void vnc_zebra_add_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd,
return; return;
if (afi != AFI_IP && afi != AFI_IP6) { if (afi != AFI_IP && afi != AFI_IP6) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: invalid vn addr family", flog_err(LIB_ERR_DEVELOPMENT, "%s: invalid vn addr family",
__func__); __func__);
return; return;
} }
@ -742,12 +742,12 @@ static void vnc_zebra_add_del_group_afi(struct bgp *bgp,
if (afi == AFI_IP || afi == AFI_IP6) { if (afi == AFI_IP || afi == AFI_IP6) {
rt = import_table->imported_vpn[afi]; rt = import_table->imported_vpn[afi];
} else { } else {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi);
return; return;
} }
if (!family) { if (!family) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: computed bad family: %d", flog_err(LIB_ERR_DEVELOPMENT, "%s: computed bad family: %d",
__func__, family); __func__, family);
return; return;
} }

2
eigrpd/eigrp_hello.c
View File

@ -421,7 +421,7 @@ void eigrp_sw_version_initialize(void)
ret = sscanf(ver_string, "%" SCNu32 ".%" SCNu32, &FRR_MAJOR, ret = sscanf(ver_string, "%" SCNu32 ".%" SCNu32, &FRR_MAJOR,
&FRR_MINOR); &FRR_MINOR);
if (ret != 2) if (ret != 2)
zlog_ferr(EIGRP_ERR_PACKET, flog_err(EIGRP_ERR_PACKET,
"Did not Properly parse %s, please fix VERSION string", "Did not Properly parse %s, please fix VERSION string",
VERSION); VERSION);
} }

2
eigrpd/eigrp_neighbor.c
View File

@ -336,7 +336,7 @@ int eigrp_nbr_count_get(void)
void eigrp_nbr_hard_restart(struct eigrp_neighbor *nbr, struct vty *vty) void eigrp_nbr_hard_restart(struct eigrp_neighbor *nbr, struct vty *vty)
{ {
if (nbr == NULL) { if (nbr == NULL) {
zlog_ferr(EIGRP_ERR_CONFIG, flog_err(EIGRP_ERR_CONFIG,
"Nbr Hard restart: Neighbor not specified."); "Nbr Hard restart: Neighbor not specified.");
return; return;
} }

16
eigrpd/eigrp_network.c
View File

@ -62,7 +62,7 @@ int eigrp_sock_init(void)
#endif #endif
if (eigrpd_privs.change(ZPRIVS_RAISE)) if (eigrpd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"eigrp_sock_init: could not raise privs, %s", "eigrp_sock_init: could not raise privs, %s",
safe_strerror(errno)); safe_strerror(errno));
@ -70,10 +70,10 @@ int eigrp_sock_init(void)
if (eigrp_sock < 0) { if (eigrp_sock < 0) {
int save_errno = errno; int save_errno = errno;
if (eigrpd_privs.change(ZPRIVS_LOWER)) if (eigrpd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"eigrp_sock_init: could not lower privs, %s", "eigrp_sock_init: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));
zlog_ferr(LIB_ERR_SOCKET, "eigrp_read_sock_init: socket: %s", flog_err(LIB_ERR_SOCKET, "eigrp_read_sock_init: socket: %s",
safe_strerror(save_errno)); safe_strerror(save_errno));
exit(1); exit(1);
} }
@ -85,7 +85,7 @@ 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_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"eigrp_sock_init: could not lower privs, %s", "eigrp_sock_init: could not lower privs, %s",
safe_strerror(errno)); 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",
@ -98,7 +98,7 @@ 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_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"eigrpd_sock_init: could not lower privs, %s", "eigrpd_sock_init: could not lower privs, %s",
safe_strerror(errno)); 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,
@ -117,7 +117,7 @@ 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_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"eigrp_sock_init: could not lower privs, %s", "eigrp_sock_init: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));
} }
@ -132,7 +132,7 @@ 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_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
__func__, 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
@ -152,7 +152,7 @@ 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_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
} }

6
eigrpd/eigrp_packet.c
View File

@ -348,13 +348,13 @@ int eigrp_write(struct thread *thread)
/* Get one packet from queue. */ /* Get one packet from queue. */
ep = eigrp_fifo_next(ei->obuf); ep = eigrp_fifo_next(ei->obuf);
if (!ep) { if (!ep) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: Interface %s no packet on queue?", "%s: Interface %s no packet on queue?",
__PRETTY_FUNCTION__, ei->ifp->name); __PRETTY_FUNCTION__, ei->ifp->name);
goto out; goto out;
} }
if (ep->length < EIGRP_HEADER_LEN) { if (ep->length < EIGRP_HEADER_LEN) {
zlog_ferr(EIGRP_ERR_PACKET, flog_err(EIGRP_ERR_PACKET,
"%s: Packet just has a header?", __PRETTY_FUNCTION__); "%s: Packet just has a header?", __PRETTY_FUNCTION__);
eigrp_header_dump((struct eigrp_header *)ep->s->data); eigrp_header_dump((struct eigrp_header *)ep->s->data);
eigrp_packet_delete(ei); eigrp_packet_delete(ei);
@ -1214,7 +1214,7 @@ uint16_t eigrp_add_internalTLV_to_stream(struct stream *s,
stream_putw(s, length); stream_putw(s, length);
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: Unexpected prefix length: %d", "%s: Unexpected prefix length: %d",
__PRETTY_FUNCTION__, pe->destination->prefixlen); __PRETTY_FUNCTION__, pe->destination->prefixlen);
return 0; return 0;

2
eigrpd/eigrp_reply.c
View File

@ -170,7 +170,7 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
if (!dest) { if (!dest) {
char buf[PREFIX_STRLEN]; char buf[PREFIX_STRLEN];
zlog_ferr(EIGRP_ERR_PACKET, flog_err(EIGRP_ERR_PACKET,
"%s: Received prefix %s which we do not know about", "%s: Received prefix %s which we do not know about",
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
prefix2str(&dest_addr, buf, sizeof(buf))); prefix2str(&dest_addr, buf, sizeof(buf)));

2
eigrpd/eigrp_topology.c
View File

@ -412,7 +412,7 @@ eigrp_topology_update_distance(struct eigrp_fsm_action_message *msg)
} }
break; break;
default: default:
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: Please implement handler", flog_err(LIB_ERR_DEVELOPMENT, "%s: Please implement handler",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
break; break;
} }

2
eigrpd/eigrpd.c
View File

@ -162,7 +162,7 @@ static struct eigrp *eigrp_new(const char *AS)
eigrp->networks = eigrp_topology_new(); eigrp->networks = eigrp_topology_new();
if ((eigrp_socket = eigrp_sock_init()) < 0) { if ((eigrp_socket = eigrp_sock_init()) < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"eigrp_new: fatal error: eigrp_sock_init was unable to open a socket"); "eigrp_new: fatal error: eigrp_sock_init was unable to open a socket");
exit(1); exit(1);
} }

4
isisd/isis_bpf.c
View File

@ -188,7 +188,7 @@ int isis_sock_init(struct isis_circuit *circuit)
int retval = ISIS_OK; int retval = ISIS_OK;
if (isisd_privs.change(ZPRIVS_RAISE)) if (isisd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
retval = open_bpf_dev(circuit); retval = open_bpf_dev(circuit);
@ -209,7 +209,7 @@ int isis_sock_init(struct isis_circuit *circuit)
end: end:
if (isisd_privs.change(ZPRIVS_LOWER)) if (isisd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
return retval; return retval;

4
isisd/isis_circuit.c
View File

@ -567,7 +567,7 @@ int isis_circuit_up(struct isis_circuit *circuit)
return ISIS_OK; return ISIS_OK;
if (circuit->area->lsp_mtu > isis_circuit_pdu_size(circuit)) { if (circuit->area->lsp_mtu > isis_circuit_pdu_size(circuit)) {
zlog_ferr( flog_err(
ISIS_ERR_CONFIG, ISIS_ERR_CONFIG,
"Interface MTU %zu on %s is too low to support area lsp mtu %u!", "Interface MTU %zu on %s is too low to support area lsp mtu %u!",
isis_circuit_pdu_size(circuit), isis_circuit_pdu_size(circuit),
@ -579,7 +579,7 @@ int isis_circuit_up(struct isis_circuit *circuit)
if (circuit->circ_type == CIRCUIT_T_BROADCAST) { if (circuit->circ_type == CIRCUIT_T_BROADCAST) {
circuit->circuit_id = isis_circuit_id_gen(isis, circuit->interface); circuit->circuit_id = isis_circuit_id_gen(isis, circuit->interface);
if (!circuit->circuit_id) { if (!circuit->circuit_id) {
zlog_ferr( flog_err(
ISIS_ERR_CONFIG, ISIS_ERR_CONFIG,
"There are already 255 broadcast circuits active!"); "There are already 255 broadcast circuits active!");
return ISIS_ERROR; return ISIS_ERROR;

4
isisd/isis_csm.c
View File

@ -138,11 +138,11 @@ isis_csm_state_change(int event, struct isis_circuit *circuit, void *arg)
case IF_UP_FROM_Z: case IF_UP_FROM_Z:
isis_circuit_if_add(circuit, (struct interface *)arg); isis_circuit_if_add(circuit, (struct interface *)arg);
if (isis_circuit_up(circuit) != ISIS_OK) { if (isis_circuit_up(circuit) != ISIS_OK) {
zlog_ferr( flog_err(
ISIS_ERR_CONFIG, ISIS_ERR_CONFIG,
"Could not bring up %s because of invalid config.", "Could not bring up %s because of invalid config.",
circuit->interface->name); circuit->interface->name);
zlog_ferr( flog_err(
ISIS_ERR_CONFIG, ISIS_ERR_CONFIG,
"Clearing config for %s. Please re-examine it.", "Clearing config for %s. Please re-examine it.",
circuit->interface->name); circuit->interface->name);

4
isisd/isis_dlpi.c
View File

@ -469,7 +469,7 @@ int isis_sock_init(struct isis_circuit *circuit)
int retval = ISIS_OK; int retval = ISIS_OK;
if (isisd_privs.change(ZPRIVS_RAISE)) if (isisd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
retval = open_dlpi_dev(circuit); retval = open_dlpi_dev(circuit);
@ -490,7 +490,7 @@ int isis_sock_init(struct isis_circuit *circuit)
end: end:
if (isisd_privs.change(ZPRIVS_LOWER)) if (isisd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
return retval; return retval;

2
isisd/isis_events.c
View File

@ -157,7 +157,7 @@ void isis_circuit_is_type_set(struct isis_circuit *circuit, int newtype)
return; /* No change */ return; /* No change */
if (!(newtype & circuit->area->is_type)) { if (!(newtype & circuit->area->is_type)) {
zlog_ferr( flog_err(
ISIS_ERR_CONFIG, ISIS_ERR_CONFIG,
"ISIS-Evt (%s) circuit type change - invalid level %s because area is %s", "ISIS-Evt (%s) circuit type change - invalid level %s because area is %s",
circuit->area->area_tag, circuit_t2string(newtype), circuit->area->area_tag, circuit_t2string(newtype),

6
isisd/isis_lsp.c
View File

@ -454,7 +454,7 @@ void lsp_update(struct isis_lsp *lsp, struct isis_lsp_hdr *hdr,
struct isis_area *area, int level, bool confusion) struct isis_area *area, int level, bool confusion)
{ {
if (lsp->own_lsp) { if (lsp->own_lsp) {
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"ISIS-Upd (%s): BUG updating LSP %s still marked as own LSP", "ISIS-Upd (%s): BUG updating LSP %s still marked as own LSP",
area->area_tag, rawlspid_print(lsp->hdr.lsp_id)); area->area_tag, rawlspid_print(lsp->hdr.lsp_id));
@ -1244,7 +1244,7 @@ static int lsp_regenerate(struct isis_area *area, int level)
lsp = lsp_search(lspid, lspdb); lsp = lsp_search(lspid, lspdb);
if (!lsp) { if (!lsp) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"ISIS-Upd (%s): lsp_regenerate: no L%d LSP found!", "ISIS-Upd (%s): lsp_regenerate: no L%d LSP found!",
area->area_tag, level); area->area_tag, level);
return ISIS_ERROR; return ISIS_ERROR;
@ -1613,7 +1613,7 @@ static int lsp_regenerate_pseudo(struct isis_circuit *circuit, int level)
lsp = lsp_search(lsp_id, lspdb); lsp = lsp_search(lsp_id, lspdb);
if (!lsp) { if (!lsp) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"lsp_regenerate_pseudo: no l%d LSP %s found!", level, "lsp_regenerate_pseudo: no l%d LSP %s found!", level,
rawlspid_print(lsp_id)); rawlspid_print(lsp_id));
return ISIS_ERROR; return ISIS_ERROR;

28
isisd/isis_pdu.c
View File

@ -88,7 +88,7 @@ static int ack_lsp(struct isis_lsp_hdr *hdr, struct isis_circuit *circuit,
retval = circuit->tx(circuit, level); retval = circuit->tx(circuit, level);
if (retval != ISIS_OK) if (retval != ISIS_OK)
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"ISIS-Upd (%s): Send L%d LSP PSNP on %s failed", "ISIS-Upd (%s): Send L%d LSP PSNP on %s failed",
circuit->area->area_tag, level, circuit->area->area_tag, level,
circuit->interface->name); circuit->interface->name);
@ -617,7 +617,7 @@ static int process_hello(uint8_t pdu_type, struct isis_circuit *circuit,
} }
if (!p2p_hello && !(level & iih.circ_type)) { if (!p2p_hello && !(level & iih.circ_type)) {
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"Level %d LAN Hello with Circuit Type %d", level, "Level %d LAN Hello with Circuit Type %d", level,
iih.circ_type); iih.circ_type);
return ISIS_ERROR; return ISIS_ERROR;
@ -1354,7 +1354,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
/* Verify that at least the 8 bytes fixed header have been received */ /* Verify that at least the 8 bytes fixed header have been received */
if (stream_get_endp(circuit->rcv_stream) < ISIS_FIXED_HDR_LEN) { if (stream_get_endp(circuit->rcv_stream) < ISIS_FIXED_HDR_LEN) {
zlog_ferr(ISIS_ERR_PACKET, "PDU is too short to be IS-IS."); flog_err(ISIS_ERR_PACKET, "PDU is too short to be IS-IS.");
return ISIS_ERROR; return ISIS_ERROR;
} }
@ -1369,13 +1369,13 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
uint8_t max_area_addrs = stream_getc(circuit->rcv_stream); uint8_t max_area_addrs = stream_getc(circuit->rcv_stream);
if (idrp == ISO9542_ESIS) { if (idrp == ISO9542_ESIS) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"No support for ES-IS packet IDRP=%" PRIx8, idrp); "No support for ES-IS packet IDRP=%" PRIx8, idrp);
return ISIS_ERROR; return ISIS_ERROR;
} }
if (idrp != ISO10589_ISIS) { if (idrp != ISO10589_ISIS) {
zlog_ferr(ISIS_ERR_PACKET, "Not an IS-IS packet IDRP=%" PRIx8, flog_err(ISIS_ERR_PACKET, "Not an IS-IS packet IDRP=%" PRIx8,
idrp); idrp);
return ISIS_ERROR; return ISIS_ERROR;
} }
@ -1386,7 +1386,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
} }
if (id_len != 0 && id_len != ISIS_SYS_ID_LEN) { if (id_len != 0 && id_len != ISIS_SYS_ID_LEN) {
zlog_ferr( flog_err(
ISIS_ERR_PACKET, ISIS_ERR_PACKET,
"IDFieldLengthMismatch: ID Length field in a received PDU %" PRIu8 "IDFieldLengthMismatch: ID Length field in a received PDU %" PRIu8
", while the parameter for this IS is %u", ", while the parameter for this IS is %u",
@ -1401,7 +1401,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
} }
if (length != expected_length) { if (length != expected_length) {
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"Exepected fixed header length = %" PRIu8 "Exepected fixed header length = %" PRIu8
" but got %" PRIu8, " but got %" PRIu8,
expected_length, length); expected_length, length);
@ -1409,7 +1409,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
} }
if (stream_get_endp(circuit->rcv_stream) < length) { if (stream_get_endp(circuit->rcv_stream) < length) {
zlog_ferr( flog_err(
ISIS_ERR_PACKET, ISIS_ERR_PACKET,
"PDU is too short to contain fixed header of given PDU type."); "PDU is too short to contain fixed header of given PDU type.");
return ISIS_ERROR; return ISIS_ERROR;
@ -1428,7 +1428,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
/* either 3 or 0 */ /* either 3 or 0 */
if (max_area_addrs != 0 && max_area_addrs != isis->max_area_addrs) { if (max_area_addrs != 0 && max_area_addrs != isis->max_area_addrs) {
zlog_ferr( flog_err(
ISIS_ERR_PACKET, ISIS_ERR_PACKET,
"maximumAreaAddressesMismatch: maximumAreaAdresses in a received PDU %" PRIu8 "maximumAreaAddressesMismatch: maximumAreaAdresses in a received PDU %" PRIu8
" while the parameter for this IS is %u", " while the parameter for this IS is %u",
@ -1653,7 +1653,7 @@ int send_hello(struct isis_circuit *circuit, int level)
retval = circuit->tx(circuit, level); retval = circuit->tx(circuit, level);
if (retval != ISIS_OK) if (retval != ISIS_OK)
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"ISIS-Adj (%s): Send L%d IIH on %s failed", "ISIS-Adj (%s): Send L%d IIH on %s failed",
circuit->area->area_tag, level, circuit->area->area_tag, level,
circuit->interface->name); circuit->interface->name);
@ -1851,7 +1851,7 @@ int send_csnp(struct isis_circuit *circuit, int level)
int retval = circuit->tx(circuit, level); int retval = circuit->tx(circuit, level);
if (retval != ISIS_OK) { if (retval != ISIS_OK) {
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"ISIS-Snp (%s): Send L%d CSNP on %s failed", "ISIS-Snp (%s): Send L%d CSNP on %s failed",
circuit->area->area_tag, level, circuit->area->area_tag, level,
circuit->interface->name); circuit->interface->name);
@ -2016,7 +2016,7 @@ static int send_psnp(int level, struct isis_circuit *circuit)
int retval = circuit->tx(circuit, level); int retval = circuit->tx(circuit, level);
if (retval != ISIS_OK) { if (retval != ISIS_OK) {
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"ISIS-Snp (%s): Send L%d PSNP on %s failed", "ISIS-Snp (%s): Send L%d PSNP on %s failed",
circuit->area->area_tag, level, circuit->area->area_tag, level,
circuit->interface->name); circuit->interface->name);
@ -2124,7 +2124,7 @@ int send_lsp(struct thread *thread)
* than * than
* the circuit's MTU. So handle and log this case here. */ * the circuit's MTU. So handle and log this case here. */
if (stream_get_endp(lsp->pdu) > stream_get_size(circuit->snd_stream)) { if (stream_get_endp(lsp->pdu) > stream_get_size(circuit->snd_stream)) {
zlog_ferr( flog_err(
ISIS_ERR_PACKET, ISIS_ERR_PACKET,
"ISIS-Upd (%s): Can't send L%d LSP %s, seq 0x%08" PRIx32 "ISIS-Upd (%s): Can't send L%d LSP %s, seq 0x%08" PRIx32
", cksum 0x%04" PRIx16 ", lifetime %" PRIu16 ", cksum 0x%04" PRIx16 ", lifetime %" PRIu16
@ -2160,7 +2160,7 @@ int send_lsp(struct thread *thread)
clear_srm = 0; clear_srm = 0;
retval = circuit->tx(circuit, lsp->level); retval = circuit->tx(circuit, lsp->level);
if (retval != ISIS_OK) { if (retval != ISIS_OK) {
zlog_ferr(ISIS_ERR_PACKET, flog_err(ISIS_ERR_PACKET,
"ISIS-Upd (%s): Send L%d LSP on %s failed %s", "ISIS-Upd (%s): Send L%d LSP on %s failed %s",
circuit->area->area_tag, lsp->level, circuit->area->area_tag, lsp->level,
circuit->interface->name, circuit->interface->name,

4
isisd/isis_pfpacket.c
View File

@ -186,7 +186,7 @@ int isis_sock_init(struct isis_circuit *circuit)
int retval = ISIS_OK; int retval = ISIS_OK;
if (isisd_privs.change(ZPRIVS_RAISE)) if (isisd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
retval = open_packet_socket(circuit); retval = open_packet_socket(circuit);
@ -211,7 +211,7 @@ int isis_sock_init(struct isis_circuit *circuit)
end: end:
if (isisd_privs.change(ZPRIVS_LOWER)) if (isisd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
return retval; return retval;

2
isisd/isis_spf.c
View File

@ -438,7 +438,7 @@ static void isis_vertex_id_init(struct isis_vertex *vertex, union isis_N *n,
} else if (VTYPE_IP(vtype)) { } else if (VTYPE_IP(vtype)) {
memcpy(&vertex->N.ip, &n->ip, sizeof(n->ip)); memcpy(&vertex->N.ip, &n->ip, sizeof(n->ip));
} else { } else {
zlog_ferr(LIB_ERR_DEVELOPMENT, "Unknown Vertex Type"); flog_err(LIB_ERR_DEVELOPMENT, "Unknown Vertex Type");
} }
} }

2
ldpd/ldpd.c
View File

@ -484,7 +484,7 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)
nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
if (nullfd == -1) { if (nullfd == -1) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: failed to open /dev/null: %s", __func__, "%s: failed to open /dev/null: %s", __func__,
safe_strerror(errno)); safe_strerror(errno));
} else { } else {

8
lib/agentx.c
View File

@ -142,19 +142,19 @@ static int agentx_log_callback(int major, int minor, void *serverarg,
msg[strlen(msg) - 1] = '\0'; msg[strlen(msg) - 1] = '\0';
switch (slm->priority) { switch (slm->priority) {
case LOG_EMERG: case LOG_EMERG:
zlog_ferr(LIB_ERR_SNMP, flog_err(LIB_ERR_SNMP,
"snmp[emerg]: %s", msg ? msg : slm->msg); "snmp[emerg]: %s", msg ? msg : slm->msg);
break; break;
case LOG_ALERT: case LOG_ALERT:
zlog_ferr(LIB_ERR_SNMP, flog_err(LIB_ERR_SNMP,
"snmp[alert]: %s", msg ? msg : slm->msg); "snmp[alert]: %s", msg ? msg : slm->msg);
break; break;
case LOG_CRIT: case LOG_CRIT:
zlog_ferr(LIB_ERR_SNMP, flog_err(LIB_ERR_SNMP,
"snmp[crit]: %s", msg ? msg : slm->msg); "snmp[crit]: %s", msg ? msg : slm->msg);
break; break;
case LOG_ERR: case LOG_ERR:
zlog_ferr(LIB_ERR_SNMP, flog_err(LIB_ERR_SNMP,
"snmp[err]: %s", msg ? msg : slm->msg); "snmp[err]: %s", msg ? msg : slm->msg);
break; break;
case LOG_WARNING: case LOG_WARNING:

4
lib/buffer.c
View File

@ -343,7 +343,7 @@ buffer_status_t buffer_flush_window(struct buffer *b, int fd, int width,
iov_alloc * sizeof(*iov)); iov_alloc * sizeof(*iov));
} else { } else {
/* This should absolutely never occur. */ /* This should absolutely never occur. */
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: corruption detected: iov_small overflowed; " "%s: corruption detected: iov_small overflowed; "
"head %p, tail %p, head->next %p", "head %p, tail %p, head->next %p",
__func__, (void *)b->head, __func__, (void *)b->head,
@ -458,7 +458,7 @@ in one shot. */
while (written > 0) { while (written > 0) {
struct buffer_data *d; struct buffer_data *d;
if (!(d = b->head)) { if (!(d = b->head)) {
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"%s: corruption detected: buffer queue empty, but written is %lu", "%s: corruption detected: buffer queue empty, but written is %lu",
__func__, (unsigned long)written); __func__, (unsigned long)written);

2
lib/command.c
View File

@ -2417,7 +2417,7 @@ static int set_log_file(struct vty *vty, const char *fname, int loglevel)
cwd[MAXPATHLEN] = '\0'; cwd[MAXPATHLEN] = '\0';
if (getcwd(cwd, MAXPATHLEN) == NULL) { if (getcwd(cwd, MAXPATHLEN) == NULL) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"config_log_file: Unable to alloc mem!"); "config_log_file: Unable to alloc mem!");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }

4
lib/frr_zmq.c
View File

@ -141,7 +141,7 @@ static int frrzmq_read_msg(struct thread *t)
return 0; return 0;
out_err: out_err:
zlog_ferr(LIB_ERR_ZMQ, "ZeroMQ read error: %s(%d)", strerror(errno), flog_err(LIB_ERR_ZMQ, "ZeroMQ read error: %s(%d)", strerror(errno),
errno); errno);
if (cb->read.cb_error) if (cb->read.cb_error)
cb->read.cb_error(cb->read.arg, cb->zmqsock); cb->read.cb_error(cb->read.arg, cb->zmqsock);
@ -255,7 +255,7 @@ static int frrzmq_write_msg(struct thread *t)
return 0; return 0;
out_err: out_err:
zlog_ferr(LIB_ERR_ZMQ, "ZeroMQ write error: %s(%d)", strerror(errno), flog_err(LIB_ERR_ZMQ, "ZeroMQ write error: %s(%d)", strerror(errno),
errno); errno);
if (cb->write.cb_error) if (cb->write.cb_error)
cb->write.cb_error(cb->write.arg, cb->zmqsock); cb->write.cb_error(cb->write.arg, cb->zmqsock);

8
lib/if.h
View File

@ -297,7 +297,7 @@ DECLARE_QOBJ_TYPE(interface)
#define IFNAME_RB_INSERT(vrf, ifp) \ #define IFNAME_RB_INSERT(vrf, ifp) \
if (RB_INSERT(if_name_head, &vrf->ifaces_by_name, (ifp))) \ if (RB_INSERT(if_name_head, &vrf->ifaces_by_name, (ifp))) \
zlog_ferr( \ flog_err( \
LIB_ERR_INTERFACE, \ LIB_ERR_INTERFACE, \
"%s(%s): corruption detected -- interface with this " \ "%s(%s): corruption detected -- interface with this " \
"name exists already in VRF %u!", \ "name exists already in VRF %u!", \
@ -305,7 +305,7 @@ DECLARE_QOBJ_TYPE(interface)
#define IFNAME_RB_REMOVE(vrf, ifp) \ #define IFNAME_RB_REMOVE(vrf, ifp) \
if (RB_REMOVE(if_name_head, &vrf->ifaces_by_name, (ifp)) == NULL) \ if (RB_REMOVE(if_name_head, &vrf->ifaces_by_name, (ifp)) == NULL) \
zlog_ferr( \ flog_err( \
LIB_ERR_INTERFACE, \ LIB_ERR_INTERFACE, \
"%s(%s): corruption detected -- interface with this " \ "%s(%s): corruption detected -- interface with this " \
"name doesn't exist in VRF %u!", \ "name doesn't exist in VRF %u!", \
@ -313,7 +313,7 @@ DECLARE_QOBJ_TYPE(interface)
#define IFINDEX_RB_INSERT(vrf, ifp) \ #define IFINDEX_RB_INSERT(vrf, ifp) \
if (RB_INSERT(if_index_head, &vrf->ifaces_by_index, (ifp))) \ if (RB_INSERT(if_index_head, &vrf->ifaces_by_index, (ifp))) \
zlog_ferr( \ flog_err( \
LIB_ERR_INTERFACE, \ LIB_ERR_INTERFACE, \
"%s(%u): corruption detected -- interface with this " \ "%s(%u): corruption detected -- interface with this " \
"ifindex exists already in VRF %u!", \ "ifindex exists already in VRF %u!", \
@ -321,7 +321,7 @@ DECLARE_QOBJ_TYPE(interface)
#define IFINDEX_RB_REMOVE(vrf, ifp) \ #define IFINDEX_RB_REMOVE(vrf, ifp) \
if (RB_REMOVE(if_index_head, &vrf->ifaces_by_index, (ifp)) == NULL) \ if (RB_REMOVE(if_index_head, &vrf->ifaces_by_index, (ifp)) == NULL) \
zlog_ferr( \ flog_err( \
LIB_ERR_INTERFACE, \ LIB_ERR_INTERFACE, \
"%s(%u): corruption detected -- interface with this " \ "%s(%u): corruption detected -- interface with this " \
"ifindex doesn't exist in VRF %u!", \ "ifindex doesn't exist in VRF %u!", \

4
lib/libfrr.c
View File

@ -829,7 +829,7 @@ static void frr_terminal_close(int isexit)
nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
if (nullfd == -1) { if (nullfd == -1) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: failed to open /dev/null: %s", __func__, "%s: failed to open /dev/null: %s", __func__,
safe_strerror(errno)); safe_strerror(errno));
} else { } else {
@ -902,7 +902,7 @@ void frr_run(struct thread_master *master)
} else if (di->daemon_mode) { } else if (di->daemon_mode) {
int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY); int nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
if (nullfd == -1) { if (nullfd == -1) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: failed to open /dev/null: %s", __func__, "%s: failed to open /dev/null: %s", __func__,
safe_strerror(errno)); safe_strerror(errno));
} else { } else {

14
lib/log.c
View File

@ -633,7 +633,7 @@ void zlog_backtrace(int priority)
size = backtrace(array, array_size(array)); size = backtrace(array, array_size(array));
if (size <= 0 || (size_t)size > array_size(array)) { if (size <= 0 || (size_t)size > array_size(array)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Cannot get backtrace, returned invalid # of frames %d " "Cannot get backtrace, returned invalid # of frames %d "
"(valid range is between 1 and %lu)", "(valid range is between 1 and %lu)",
size, (unsigned long)(array_size(array))); size, (unsigned long)(array_size(array)));
@ -641,7 +641,7 @@ void zlog_backtrace(int priority)
} }
zlog(priority, "Backtrace for %d stack frames:", size); zlog(priority, "Backtrace for %d stack frames:", size);
if (!(strings = backtrace_symbols(array, size))) { if (!(strings = backtrace_symbols(array, size))) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Cannot get backtrace symbols (out of memory?)"); "Cannot get backtrace symbols (out of memory?)");
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
zlog(priority, "[bt %d] %p", i, array[i]); zlog(priority, "[bt %d] %p", i, array[i]);
@ -715,7 +715,7 @@ void _zlog_assert_failed(const char *assertion, const char *file,
void memory_oom(size_t size, const char *name) void memory_oom(size_t size, const char *name)
{ {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"out of memory: failed to allocate %zu bytes for %s" "out of memory: failed to allocate %zu bytes for %s"
"object", "object",
size, name); size, name);
@ -867,7 +867,7 @@ int zlog_rotate(void)
save_errno = errno; save_errno = errno;
umask(oldumask); umask(oldumask);
if (zl->fp == NULL) { if (zl->fp == NULL) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Log rotate failed: cannot open file %s for append: %s", "Log rotate failed: cannot open file %s for append: %s",
zl->filename, safe_strerror(save_errno)); zl->filename, safe_strerror(save_errno));
ret = -1; ret = -1;
@ -987,7 +987,7 @@ static const struct zebra_desc_table *zroute_lookup(unsigned int zroute)
unsigned int i; unsigned int i;
if (zroute >= array_size(route_types)) { if (zroute >= array_size(route_types)) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "unknown zebra route type: %u", flog_err(LIB_ERR_DEVELOPMENT, "unknown zebra route type: %u",
zroute); zroute);
return &unknown; return &unknown;
} }
@ -1002,7 +1002,7 @@ static const struct zebra_desc_table *zroute_lookup(unsigned int zroute)
return &route_types[i]; return &route_types[i];
} }
} }
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"internal error: cannot find route type %u in table!", "internal error: cannot find route type %u in table!",
zroute); zroute);
return &unknown; return &unknown;
@ -1021,7 +1021,7 @@ char zebra_route_char(unsigned int zroute)
const char *zserv_command_string(unsigned int command) const char *zserv_command_string(unsigned int command)
{ {
if (command >= array_size(command_types)) { if (command >= array_size(command_types)) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "unknown zserv command type: %u", flog_err(LIB_ERR_DEVELOPMENT, "unknown zserv command type: %u",
command); command);
return unknown.string; return unknown.string;
} }

2
lib/log.h
View File

@ -86,7 +86,7 @@ extern void zlog_notice(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
extern void zlog_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2); extern void zlog_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
/* For logs which have error codes associated with them */ /* For logs which have error codes associated with them */
#define zlog_ferr(ferr_id, format, ...) \ #define flog_err(ferr_id, format, ...) \
zlog_err("[EC %d] " format, ferr_id, ##__VA_ARGS__) zlog_err("[EC %d] " format, ferr_id, ##__VA_ARGS__)

10
lib/netns_linux.c
View File

@ -219,7 +219,7 @@ static int ns_enable_internal(struct ns *ns, void (*func)(ns_id_t, void *))
} }
if (!ns_is_enabled(ns)) { if (!ns_is_enabled(ns)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Can not enable NS %u: %s!", ns->ns_id, "Can not enable NS %u: %s!", ns->ns_id,
safe_strerror(errno)); safe_strerror(errno));
return 0; return 0;
@ -227,7 +227,7 @@ static int ns_enable_internal(struct ns *ns, void (*func)(ns_id_t, void *))
/* Non default NS. leave */ /* Non default NS. leave */
if (ns->ns_id == NS_UNKNOWN) { if (ns->ns_id == NS_UNKNOWN) {
zlog_ferr(LIB_ERR_NS, flog_err(LIB_ERR_NS,
"Can not enable NS %s %u: Invalid NSID", "Can not enable NS %s %u: Invalid NSID",
ns->name, ns->ns_id); ns->name, ns->ns_id);
return 0; return 0;
@ -472,7 +472,7 @@ void ns_init(void)
if (have_netns_enabled < 0) { if (have_netns_enabled < 0) {
ns_default_ns_fd = open(NS_DEFAULT_NAME, O_RDONLY); ns_default_ns_fd = open(NS_DEFAULT_NAME, O_RDONLY);
if (ns_default_ns_fd == -1) if (ns_default_ns_fd == -1)
zlog_ferr(LIB_ERR_NS, flog_err(LIB_ERR_NS,
"NS initialization failure %d(%s)", errno, "NS initialization failure %d(%s)", errno,
safe_strerror(errno)); safe_strerror(errno));
} else { } else {
@ -495,7 +495,7 @@ void ns_init_management(ns_id_t default_ns_id, ns_id_t internal_ns)
ns_init(); ns_init();
default_ns = ns_get_created_internal(NULL, NULL, default_ns_id); default_ns = ns_get_created_internal(NULL, NULL, default_ns_id);
if (!default_ns) { if (!default_ns) {
zlog_ferr(LIB_ERR_NS, "%s: failed to create the default NS!", flog_err(LIB_ERR_NS, "%s: failed to create the default NS!",
__func__); __func__);
exit(1); exit(1);
} }
@ -513,7 +513,7 @@ void ns_init_management(ns_id_t default_ns_id, ns_id_t internal_ns)
/* Enable the default NS. */ /* Enable the default NS. */
if (!ns_enable(default_ns, NULL)) { if (!ns_enable(default_ns, NULL)) {
zlog_ferr(LIB_ERR_NS, "%s: failed to enable the default NS!", flog_err(LIB_ERR_NS, "%s: failed to enable the default NS!",
__func__); __func__);
exit(1); exit(1);
} }

8
lib/pid_output.c
View File

@ -42,7 +42,7 @@ pid_t pid_output(const char *path)
oldumask = umask(0777 & ~PIDFILE_MASK); oldumask = umask(0777 & ~PIDFILE_MASK);
fd = open(path, O_RDWR | O_CREAT, PIDFILE_MASK); fd = open(path, O_RDWR | O_CREAT, PIDFILE_MASK);
if (fd < 0) { if (fd < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Can't create pid lock file %s (%s), exiting", path, "Can't create pid lock file %s (%s), exiting", path,
safe_strerror(errno)); safe_strerror(errno));
umask(oldumask); umask(oldumask);
@ -59,7 +59,7 @@ pid_t pid_output(const char *path)
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
if (fcntl(fd, F_SETLK, &lock) < 0) { if (fcntl(fd, F_SETLK, &lock) < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Could not lock pid_file %s (%s), exiting", "Could not lock pid_file %s (%s), exiting",
path, safe_strerror(errno)); path, safe_strerror(errno));
exit(1); exit(1);
@ -68,11 +68,11 @@ pid_t pid_output(const char *path)
sprintf(buf, "%d\n", (int)pid); sprintf(buf, "%d\n", (int)pid);
pidsize = strlen(buf); pidsize = strlen(buf);
if ((tmp = write(fd, buf, pidsize)) != (int)pidsize) if ((tmp = write(fd, buf, pidsize)) != (int)pidsize)
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Could not write pid %d to pid_file %s, rc was %d: %s", "Could not write pid %d to pid_file %s, rc was %d: %s",
(int)pid, path, tmp, safe_strerror(errno)); (int)pid, path, tmp, safe_strerror(errno));
else if (ftruncate(fd, pidsize) < 0) else if (ftruncate(fd, pidsize) < 0)
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Could not truncate pid_file %s to %u bytes: %s", "Could not truncate pid_file %s to %u bytes: %s",
path, (unsigned int)pidsize, path, (unsigned int)pidsize,
safe_strerror(errno)); safe_strerror(errno));

2
lib/prefix.c
View File

@ -657,7 +657,7 @@ void prefix_copy(struct prefix *dest, const struct prefix *src)
memcpy((void *)dest->u.prefix_flowspec.ptr, memcpy((void *)dest->u.prefix_flowspec.ptr,
(void *)src->u.prefix_flowspec.ptr, len); (void *)src->u.prefix_flowspec.ptr, len);
} else { } else {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"prefix_copy(): Unknown address family %d", "prefix_copy(): Unknown address family %d",
src->family); src->family);
assert(0); assert(0);

2
lib/sigevent.c
View File

@ -84,7 +84,7 @@ int quagga_sigevent_process(void)
sigdelset(&newmask, SIGKILL); sigdelset(&newmask, SIGKILL);
if ((sigprocmask(SIG_BLOCK, &newmask, &oldmask)) < 0) { if ((sigprocmask(SIG_BLOCK, &newmask, &oldmask)) < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"quagga_signal_timer: couldnt block signals!"); "quagga_signal_timer: couldnt block signals!");
return -1; return -1;
} }

2
lib/skiplist.c
View File

@ -183,7 +183,7 @@ int skiplist_insert(register struct skiplist *l, register void *key,
/* DEBUG */ /* DEBUG */
if (!key) { if (!key) {
zlog_ferr(LIB_ERR_DEVELOPMENT, "%s: key is 0, value is %p", flog_err(LIB_ERR_DEVELOPMENT, "%s: key is 0, value is %p",
__func__, value); __func__, value);
} }

4
lib/sockopt.c
View File

@ -62,7 +62,7 @@ int getsockopt_so_sendbuf(const int sock)
int ret = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&optval, int ret = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&optval,
&optlen); &optlen);
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"fd %d: can't getsockopt SO_SNDBUF: %d (%s)", sock, "fd %d: can't getsockopt SO_SNDBUF: %d (%s)", sock,
errno, safe_strerror(errno)); errno, safe_strerror(errno));
return ret; return ret;
@ -672,7 +672,7 @@ int sockopt_tcp_signature(int sock, union sockunion *su, const char *password)
if (ENOENT == errno) if (ENOENT == errno)
ret = 0; ret = 0;
else else
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"sockopt_tcp_signature: setsockopt(%d): %s", "sockopt_tcp_signature: setsockopt(%d): %s",
sock, safe_strerror(errno)); sock, safe_strerror(errno));
} }

4
lib/sockunion.c
View File

@ -367,13 +367,13 @@ int sockopt_mark_default(int sock, int mark, struct zebra_privs_t *cap)
int ret; int ret;
if (cap->change(ZPRIVS_RAISE)) if (cap->change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"routing_socket: Can't raise privileges"); "routing_socket: Can't raise privileges");
ret = setsockopt(sock, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)); ret = setsockopt(sock, SOL_SOCKET, SO_MARK, &mark, sizeof(mark));
if (cap->change(ZPRIVS_LOWER)) if (cap->change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"routing_socket: Can't lower privileges"); "routing_socket: Can't lower privileges");
return ret; return ret;

24
lib/vrf.c
View File

@ -467,14 +467,14 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
/* The default VRF always exists. */ /* The default VRF always exists. */
default_vrf = vrf_get(VRF_DEFAULT, VRF_DEFAULT_NAME); default_vrf = vrf_get(VRF_DEFAULT, VRF_DEFAULT_NAME);
if (!default_vrf) { if (!default_vrf) {
zlog_ferr(LIB_ERR_VRF_START, flog_err(LIB_ERR_VRF_START,
"vrf_init: failed to create the default VRF!"); "vrf_init: failed to create the default VRF!");
exit(1); exit(1);
} }
/* Enable the default VRF. */ /* Enable the default VRF. */
if (!vrf_enable(default_vrf)) { if (!vrf_enable(default_vrf)) {
zlog_ferr(LIB_ERR_VRF_START, flog_err(LIB_ERR_VRF_START,
"vrf_init: failed to enable the default VRF!"); "vrf_init: failed to enable the default VRF!");
exit(1); exit(1);
} }
@ -545,7 +545,7 @@ int vrf_socket(int domain, int type, int protocol, vrf_id_t vrf_id,
ret = vrf_switch_to_netns(vrf_id); ret = vrf_switch_to_netns(vrf_id);
if (ret < 0) if (ret < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switch to VRF %u (%s)", __func__, vrf_id, "%s: Can't switch to VRF %u (%s)", __func__, vrf_id,
safe_strerror(errno)); safe_strerror(errno));
@ -560,7 +560,7 @@ int vrf_socket(int domain, int type, int protocol, vrf_id_t vrf_id,
save_errno = errno; save_errno = errno;
ret2 = vrf_switchback_to_initial(); ret2 = vrf_switchback_to_initial();
if (ret2 < 0) if (ret2 < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switchback from VRF %u (%s)", __func__, "%s: Can't switchback from VRF %u (%s)", __func__,
vrf_id, safe_strerror(errno)); vrf_id, safe_strerror(errno));
errno = save_errno; errno = save_errno;
@ -766,14 +766,14 @@ DEFUN_NOSH (vrf_netns,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
if (vrf_daemon_privs && vrf_daemon_privs->change(ZPRIVS_RAISE)) if (vrf_daemon_privs && vrf_daemon_privs->change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: Can't raise privileges", flog_err(LIB_ERR_PRIVILEGES, "%s: Can't raise privileges",
__func__); __func__);
ret = vrf_netns_handler_create(vty, vrf, pathname, ret = vrf_netns_handler_create(vty, vrf, pathname,
NS_UNKNOWN, NS_UNKNOWN); NS_UNKNOWN, NS_UNKNOWN);
if (vrf_daemon_privs && vrf_daemon_privs->change(ZPRIVS_LOWER)) if (vrf_daemon_privs && vrf_daemon_privs->change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: Can't lower privileges", flog_err(LIB_ERR_PRIVILEGES, "%s: Can't lower privileges",
__func__); __func__);
return ret; return ret;
} }
@ -912,14 +912,14 @@ int vrf_getaddrinfo(const char *node, const char *service,
ret = vrf_switch_to_netns(vrf_id); ret = vrf_switch_to_netns(vrf_id);
if (ret < 0) if (ret < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switch to VRF %u (%s)", __func__, vrf_id, "%s: Can't switch to VRF %u (%s)", __func__, vrf_id,
safe_strerror(errno)); safe_strerror(errno));
ret = getaddrinfo(node, service, hints, res); ret = getaddrinfo(node, service, hints, res);
save_errno = errno; save_errno = errno;
ret2 = vrf_switchback_to_initial(); ret2 = vrf_switchback_to_initial();
if (ret2 < 0) if (ret2 < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switchback from VRF %u (%s)", __func__, "%s: Can't switchback from VRF %u (%s)", __func__,
vrf_id, safe_strerror(errno)); vrf_id, safe_strerror(errno));
errno = save_errno; errno = save_errno;
@ -932,7 +932,7 @@ int vrf_ioctl(vrf_id_t vrf_id, int d, unsigned long request, char *params)
ret = vrf_switch_to_netns(vrf_id); ret = vrf_switch_to_netns(vrf_id);
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switch to VRF %u (%s)", __func__, vrf_id, "%s: Can't switch to VRF %u (%s)", __func__, vrf_id,
safe_strerror(errno)); safe_strerror(errno));
return 0; return 0;
@ -941,7 +941,7 @@ int vrf_ioctl(vrf_id_t vrf_id, int d, unsigned long request, char *params)
saved_errno = errno; saved_errno = errno;
ret = vrf_switchback_to_initial(); ret = vrf_switchback_to_initial();
if (ret < 0) if (ret < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switchback from VRF %u (%s)", __func__, "%s: Can't switchback from VRF %u (%s)", __func__,
vrf_id, safe_strerror(errno)); vrf_id, safe_strerror(errno));
errno = saved_errno; errno = saved_errno;
@ -955,14 +955,14 @@ int vrf_sockunion_socket(const union sockunion *su, vrf_id_t vrf_id,
ret = vrf_switch_to_netns(vrf_id); ret = vrf_switch_to_netns(vrf_id);
if (ret < 0) if (ret < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switch to VRF %u (%s)", __func__, vrf_id, "%s: Can't switch to VRF %u (%s)", __func__, vrf_id,
safe_strerror(errno)); safe_strerror(errno));
ret = sockunion_socket(su); ret = sockunion_socket(su);
save_errno = errno; save_errno = errno;
ret2 = vrf_switchback_to_initial(); ret2 = vrf_switchback_to_initial();
if (ret2 < 0) if (ret2 < 0)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't switchback from VRF %u (%s)", __func__, "%s: Can't switchback from VRF %u (%s)", __func__,
vrf_id, safe_strerror(errno)); vrf_id, safe_strerror(errno));
errno = save_errno; errno = save_errno;

24
lib/vty.c
View File

@ -1330,7 +1330,7 @@ static int vty_telnet_option(struct vty *vty, unsigned char *buf, int nbytes)
TELNET_NAWS_SB_LEN, TELNET_NAWS_SB_LEN,
(unsigned long)vty->sb_len); (unsigned long)vty->sb_len);
else if (sizeof(vty->sb_buf) < TELNET_NAWS_SB_LEN) else if (sizeof(vty->sb_buf) < TELNET_NAWS_SB_LEN)
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"Bug detected: sizeof(vty->sb_buf) %lu < %d, too small to handle the telnet NAWS option", "Bug detected: sizeof(vty->sb_buf) %lu < %d, too small to handle the telnet NAWS option",
(unsigned long)sizeof(vty->sb_buf), (unsigned long)sizeof(vty->sb_buf),
@ -1973,7 +1973,7 @@ static void vty_serv_sock_addrinfo(const char *hostname, unsigned short port)
ret = getaddrinfo(hostname, port_str, &req, &ainfo); ret = getaddrinfo(hostname, port_str, &req, &ainfo);
if (ret != 0) { if (ret != 0) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"getaddrinfo failed: %s", gai_strerror(ret)); "getaddrinfo failed: %s", gai_strerror(ret));
exit(1); exit(1);
} }
@ -2034,7 +2034,7 @@ static void vty_serv_un(const char *path)
/* Make UNIX domain socket. */ /* Make UNIX domain socket. */
sock = socket(AF_UNIX, SOCK_STREAM, 0); sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock < 0) { if (sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"Cannot create unix stream socket: %s", "Cannot create unix stream socket: %s",
safe_strerror(errno)); safe_strerror(errno));
return; return;
@ -2054,7 +2054,7 @@ static void vty_serv_un(const char *path)
ret = bind(sock, (struct sockaddr *)&serv, len); ret = bind(sock, (struct sockaddr *)&serv, len);
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"Cannot bind path %s: %s", "Cannot bind path %s: %s",
path, safe_strerror(errno)); path, safe_strerror(errno));
close(sock); /* Avoid sd leak. */ close(sock); /* Avoid sd leak. */
@ -2063,7 +2063,7 @@ static void vty_serv_un(const char *path)
ret = listen(sock, 5); ret = listen(sock, 5);
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"listen(fd %d) failed: %s", sock, "listen(fd %d) failed: %s", sock,
safe_strerror(errno)); safe_strerror(errno));
close(sock); /* Avoid sd leak. */ close(sock); /* Avoid sd leak. */
@ -2080,7 +2080,7 @@ static void vty_serv_un(const char *path)
if ((int)ids.gid_vty > 0) { if ((int)ids.gid_vty > 0) {
/* set group of socket */ /* set group of socket */
if (chown(path, -1, ids.gid_vty)) { if (chown(path, -1, ids.gid_vty)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"vty_serv_un: could chown socket, %s", "vty_serv_un: could chown socket, %s",
safe_strerror(errno)); safe_strerror(errno));
} }
@ -2413,7 +2413,7 @@ static void vty_read_file(FILE *confp)
nl = strchr(vty->error_buf, '\n'); nl = strchr(vty->error_buf, '\n');
if (nl) if (nl)
*nl = '\0'; *nl = '\0';
zlog_ferr(LIB_ERR_VTY, flog_err(LIB_ERR_VTY,
"ERROR: %s on config line %u: %s", message, line_num, "ERROR: %s on config line %u: %s", message, line_num,
vty->error_buf); vty->error_buf);
} }
@ -2488,7 +2488,7 @@ bool vty_read_config(const char *config_file, char *config_default_dir)
if (config_file != NULL) { if (config_file != NULL) {
if (!IS_DIRECTORY_SEP(config_file[0])) { if (!IS_DIRECTORY_SEP(config_file[0])) {
if (getcwd(cwd, MAXPATHLEN) == NULL) { if (getcwd(cwd, MAXPATHLEN) == NULL) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Failure to determine Current Working Directory %d!", "Failure to determine Current Working Directory %d!",
errno); errno);
exit(1); exit(1);
@ -2511,7 +2511,7 @@ bool vty_read_config(const char *config_file, char *config_default_dir)
zlog_warn( zlog_warn(
"WARNING: using backup configuration file!"); "WARNING: using backup configuration file!");
else { else {
zlog_ferr(LIB_ERR_VTY, flog_err(LIB_ERR_VTY,
"can't open configuration file [%s]", "can't open configuration file [%s]",
config_file); config_file);
exit(1); exit(1);
@ -2559,7 +2559,7 @@ bool vty_read_config(const char *config_file, char *config_default_dir)
"WARNING: using backup configuration file!"); "WARNING: using backup configuration file!");
fullpath = config_default_dir; fullpath = config_default_dir;
} else { } else {
zlog_ferr(LIB_ERR_VTY, flog_err(LIB_ERR_VTY,
"can't open configuration file [%s]", "can't open configuration file [%s]",
config_default_dir); config_default_dir);
goto tmp_free_and_out; goto tmp_free_and_out;
@ -3074,13 +3074,13 @@ static void vty_save_cwd(void)
* Hence not worrying about it too much. * Hence not worrying about it too much.
*/ */
if (!chdir(SYSCONFDIR)) { if (!chdir(SYSCONFDIR)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Failure to chdir to %s, errno: %d", "Failure to chdir to %s, errno: %d",
SYSCONFDIR, errno); SYSCONFDIR, errno);
exit(-1); exit(-1);
} }
if (getcwd(cwd, MAXPATHLEN) == NULL) { if (getcwd(cwd, MAXPATHLEN) == NULL) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"Failure to getcwd, errno: %d", errno); "Failure to getcwd, errno: %d", errno);
exit(-1); exit(-1);
} }

44
lib/zclient.c
View File

@ -313,7 +313,7 @@ int zclient_read_header(struct stream *s, int sock, uint16_t *size,
STREAM_GETW(s, *cmd); STREAM_GETW(s, *cmd);
if (*version != ZSERV_VERSION || *marker != ZEBRA_HEADER_MARKER) { if (*version != ZSERV_VERSION || *marker != ZEBRA_HEADER_MARKER) {
zlog_ferr(LIB_ERR_ZAPI_MISSMATCH, flog_err(LIB_ERR_ZAPI_MISSMATCH,
"%s: socket %d version mismatch, marker %d, version %d", "%s: socket %d version mismatch, marker %d, version %d",
__func__, sock, *marker, *version); __func__, sock, *marker, *version);
return -1; return -1;
@ -1046,7 +1046,7 @@ int zapi_route_encode(uint8_t cmd, struct stream *s, struct zapi_route *api)
char buf[PREFIX2STR_BUFFER]; char buf[PREFIX2STR_BUFFER];
prefix2str(&api->prefix, buf, prefix2str(&api->prefix, buf,
sizeof(buf)); sizeof(buf));
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"%s: prefix %s: can't encode " "%s: prefix %s: can't encode "
"%u labels (maximum is %u)", "%u labels (maximum is %u)",
__func__, buf, __func__, buf,
@ -1672,7 +1672,7 @@ static void link_params_set_value(struct stream *s, struct if_link_params *iflp)
for (i = 0; i < bwclassnum && i < MAX_CLASS_TYPE; i++) for (i = 0; i < bwclassnum && i < MAX_CLASS_TYPE; i++)
iflp->unrsv_bw[i] = stream_getf(s); iflp->unrsv_bw[i] = stream_getf(s);
if (i < bwclassnum) if (i < bwclassnum)
zlog_ferr(LIB_ERR_ZAPI_MISSMATCH, flog_err(LIB_ERR_ZAPI_MISSMATCH,
"%s: received %d > %d (MAX_CLASS_TYPE) bw entries" "%s: received %d > %d (MAX_CLASS_TYPE) bw entries"
" - outdated library?", " - outdated library?",
__func__, bwclassnum, MAX_CLASS_TYPE); __func__, bwclassnum, MAX_CLASS_TYPE);
@ -1704,7 +1704,7 @@ struct interface *zebra_interface_link_params_read(struct stream *s)
struct interface *ifp = if_lookup_by_index(ifindex, VRF_DEFAULT); struct interface *ifp = if_lookup_by_index(ifindex, VRF_DEFAULT);
if (ifp == NULL) { if (ifp == NULL) {
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"%s: unknown ifindex %u, shouldn't happen", __func__, "%s: unknown ifindex %u, shouldn't happen", __func__,
ifindex); ifindex);
return NULL; return NULL;
@ -2041,7 +2041,7 @@ static int zclient_read_sync_response(struct zclient *zclient,
size); size);
} }
if (ret != 0) { if (ret != 0) {
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"%s: Invalid Sync Message Reply", __func__); "%s: Invalid Sync Message Reply", __func__);
return -1; return -1;
} }
@ -2084,13 +2084,13 @@ int lm_label_manager_connect(struct zclient *zclient)
ret = writen(zclient->sock, s->data, stream_get_endp(s)); ret = writen(zclient->sock, s->data, stream_get_endp(s));
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, "Can't write to zclient sock"); flog_err(LIB_ERR_ZAPI_SOCKET, "Can't write to zclient sock");
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
return -1; return -1;
} }
if (ret == 0) { if (ret == 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, "Zclient sock closed"); flog_err(LIB_ERR_ZAPI_SOCKET, "Zclient sock closed");
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
return -1; return -1;
@ -2111,11 +2111,11 @@ int lm_label_manager_connect(struct zclient *zclient)
/* sanity */ /* sanity */
if (proto != zclient->redist_default) if (proto != zclient->redist_default)
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"Wrong proto (%u) in LM connect response. Should be %u", "Wrong proto (%u) in LM connect response. Should be %u",
proto, zclient->redist_default); proto, zclient->redist_default);
if (instance != zclient->instance) if (instance != zclient->instance)
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"Wrong instId (%u) in LM connect response. Should be %u", "Wrong instId (%u) in LM connect response. Should be %u",
instance, zclient->instance); instance, zclient->instance);
@ -2206,14 +2206,14 @@ int lm_get_label_chunk(struct zclient *zclient, uint8_t keep,
ret = writen(zclient->sock, s->data, stream_get_endp(s)); ret = writen(zclient->sock, s->data, stream_get_endp(s));
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"Can't write to zclient sock"); "Can't write to zclient sock");
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
return -1; return -1;
} }
if (ret == 0) { if (ret == 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"Zclient sock closed"); "Zclient sock closed");
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
@ -2235,11 +2235,11 @@ int lm_get_label_chunk(struct zclient *zclient, uint8_t keep,
/* sanities */ /* sanities */
if (proto != zclient->redist_default) if (proto != zclient->redist_default)
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"Wrong proto (%u) in get chunk response. Should be %u", "Wrong proto (%u) in get chunk response. Should be %u",
proto, zclient->redist_default); proto, zclient->redist_default);
if (instance != zclient->instance) if (instance != zclient->instance)
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"Wrong instId (%u) in get chunk response Should be %u", "Wrong instId (%u) in get chunk response Should be %u",
instance, zclient->instance); instance, zclient->instance);
@ -2251,14 +2251,14 @@ int lm_get_label_chunk(struct zclient *zclient, uint8_t keep,
/* not owning this response */ /* not owning this response */
if (keep != response_keep) { if (keep != response_keep) {
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"Invalid Label chunk: %u - %u, keeps mismatch %u != %u", "Invalid Label chunk: %u - %u, keeps mismatch %u != %u",
*start, *end, keep, response_keep); *start, *end, keep, response_keep);
} }
/* sanity */ /* sanity */
if (*start > *end || *start < MPLS_LABEL_UNRESERVED_MIN if (*start > *end || *start < MPLS_LABEL_UNRESERVED_MIN
|| *end > MPLS_LABEL_UNRESERVED_MAX) { || *end > MPLS_LABEL_UNRESERVED_MAX) {
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"Invalid Label chunk: %u - %u", *start, *end); "Invalid Label chunk: %u - %u", *start, *end);
return -1; return -1;
} }
@ -2309,13 +2309,13 @@ int lm_release_label_chunk(struct zclient *zclient, uint32_t start,
ret = writen(zclient->sock, s->data, stream_get_endp(s)); ret = writen(zclient->sock, s->data, stream_get_endp(s));
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, "Can't write to zclient sock"); flog_err(LIB_ERR_ZAPI_SOCKET, "Can't write to zclient sock");
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
return -1; return -1;
} }
if (ret == 0) { if (ret == 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"Zclient sock connection closed"); "Zclient sock connection closed");
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
@ -2419,14 +2419,14 @@ int tm_get_table_chunk(struct zclient *zclient, uint32_t chunk_size,
ret = writen(zclient->sock, s->data, stream_get_endp(s)); ret = writen(zclient->sock, s->data, stream_get_endp(s));
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"%s: can't write to zclient->sock", __func__); "%s: can't write to zclient->sock", __func__);
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
return -1; return -1;
} }
if (ret == 0) { if (ret == 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"%s: zclient->sock connection closed", __func__); "%s: zclient->sock connection closed", __func__);
close(zclient->sock); close(zclient->sock);
zclient->sock = -1; zclient->sock = -1;
@ -2513,7 +2513,7 @@ int zebra_send_pw(struct zclient *zclient, int command, struct zapi_pw *pw)
stream_write(s, (uint8_t *)&pw->nexthop.ipv6, 16); stream_write(s, (uint8_t *)&pw->nexthop.ipv6, 16);
break; break;
default: default:
zlog_ferr(LIB_ERR_ZAPI_ENCODE, flog_err(LIB_ERR_ZAPI_ENCODE,
"%s: unknown af", __func__); "%s: unknown af", __func__);
return -1; return -1;
} }
@ -2616,14 +2616,14 @@ static int zclient_read(struct thread *thread)
command = stream_getw(zclient->ibuf); command = stream_getw(zclient->ibuf);
if (marker != ZEBRA_HEADER_MARKER || version != ZSERV_VERSION) { if (marker != ZEBRA_HEADER_MARKER || version != ZSERV_VERSION) {
zlog_ferr(LIB_ERR_ZAPI_MISSMATCH, flog_err(LIB_ERR_ZAPI_MISSMATCH,
"%s: socket %d version mismatch, marker %d, version %d", "%s: socket %d version mismatch, marker %d, version %d",
__func__, zclient->sock, marker, version); __func__, zclient->sock, marker, version);
return zclient_failed(zclient); return zclient_failed(zclient);
} }
if (length < ZEBRA_HEADER_SIZE) { if (length < ZEBRA_HEADER_SIZE) {
zlog_ferr(LIB_ERR_ZAPI_MISSMATCH, flog_err(LIB_ERR_ZAPI_MISSMATCH,
"%s: socket %d message length %u is less than %d ", "%s: socket %d message length %u is less than %d ",
__func__, zclient->sock, length, ZEBRA_HEADER_SIZE); __func__, zclient->sock, length, ZEBRA_HEADER_SIZE);
return zclient_failed(zclient); return zclient_failed(zclient);

2
nhrpd/resolver.c
View File

@ -194,7 +194,7 @@ void resolver_resolve(struct resolver_query *query, int af,
union sockunion *)) union sockunion *))
{ {
if (query->callback != NULL) { if (query->callback != NULL) {
zlog_ferr(NHRP_ERR_RESOLVER, flog_err(NHRP_ERR_RESOLVER,
"Trying to resolve '%s', but previous query was not finished yet", "Trying to resolve '%s', but previous query was not finished yet",
hostname); hostname);
return; return;

8
nhrpd/vici.c
View File

@ -214,7 +214,7 @@ static void parse_sa_message(struct vici_message_ctx *ctx,
if (str2sockunion(buf, if (str2sockunion(buf,
&sactx->local.host) &sactx->local.host)
< 0) < 0)
zlog_ferr(NHRP_ERR_SWAN, flog_err(NHRP_ERR_SWAN,
"VICI: bad strongSwan local-host: %s", "VICI: bad strongSwan local-host: %s",
buf); buf);
} else if (blob_equal(key, "local-id") } else if (blob_equal(key, "local-id")
@ -232,7 +232,7 @@ static void parse_sa_message(struct vici_message_ctx *ctx,
if (str2sockunion(buf, if (str2sockunion(buf,
&sactx->remote.host) &sactx->remote.host)
< 0) < 0)
zlog_ferr(NHRP_ERR_SWAN, flog_err(NHRP_ERR_SWAN,
"VICI: bad strongSwan remote-host: %s", "VICI: bad strongSwan remote-host: %s",
buf); buf);
} else if (blob_equal(key, "remote-id") } else if (blob_equal(key, "remote-id")
@ -277,7 +277,7 @@ static void parse_cmd_response(struct vici_message_ctx *ctx,
case VICI_KEY_VALUE: case VICI_KEY_VALUE:
if (blob_equal(key, "errmsg") if (blob_equal(key, "errmsg")
&& blob2buf(val, buf, sizeof(buf))) && blob2buf(val, buf, sizeof(buf)))
zlog_ferr(NHRP_ERR_SWAN, "VICI: strongSwan: %s", buf); flog_err(NHRP_ERR_SWAN, "VICI: strongSwan: %s", buf);
break; break;
default: default:
break; break;
@ -336,7 +336,7 @@ static void vici_recv_message(struct vici_conn *vici, struct zbuf *msg)
break; break;
case VICI_EVENT_UNKNOWN: case VICI_EVENT_UNKNOWN:
case VICI_CMD_UNKNOWN: case VICI_CMD_UNKNOWN:
zlog_ferr(NHRP_ERR_SWAN, flog_err(NHRP_ERR_SWAN,
"VICI: StrongSwan does not support mandatory events (unpatched?)"); "VICI: StrongSwan does not support mandatory events (unpatched?)");
break; break;
case VICI_EVENT_CONFIRM: case VICI_EVENT_CONFIRM:

4
ospf6d/ospf6_message.c
View File

@ -1559,7 +1559,7 @@ int ospf6_receive(struct thread *thread)
/* receive message */ /* receive message */
len = ospf6_recvmsg(&src, &dst, &ifindex, iovector); len = ospf6_recvmsg(&src, &dst, &ifindex, iovector);
if (len > iobuflen) { if (len > iobuflen) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"Excess message read"); "Excess message read");
return 0; return 0;
} }
@ -1708,7 +1708,7 @@ static void ospf6_send(struct in6_addr *src, struct in6_addr *dst,
/* send message */ /* send message */
len = ospf6_sendmsg(src, dst, &oi->interface->ifindex, iovector); len = ospf6_sendmsg(src, dst, &oi->interface->ifindex, iovector);
if (len != ntohs(oh->length)) if (len != ntohs(oh->length))
zlog_ferr(LIB_ERR_DEVELOPMENT, "Could not send entire message"); flog_err(LIB_ERR_DEVELOPMENT, "Could not send entire message");
} }
static uint32_t ospf6_packet_max(struct ospf6_interface *oi) static uint32_t ospf6_packet_max(struct ospf6_interface *oi)

8
ospf6d/ospf6_network.c
View File

@ -77,19 +77,19 @@ static void ospf6_set_checksum(void)
int ospf6_serv_sock(void) int ospf6_serv_sock(void)
{ {
if (ospf6d_privs.change(ZPRIVS_RAISE)) if (ospf6d_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ospf6_serv_sock: could not raise privs"); "ospf6_serv_sock: could not raise privs");
ospf6_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_OSPFIGP); ospf6_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_OSPFIGP);
if (ospf6_sock < 0) { if (ospf6_sock < 0) {
zlog_warn("Network: can't create OSPF6 socket."); zlog_warn("Network: can't create OSPF6 socket.");
if (ospf6d_privs.change(ZPRIVS_LOWER)) if (ospf6d_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ospf6_sock_init: could not lower privs"); "ospf6_sock_init: could not lower privs");
return -1; return -1;
} }
if (ospf6d_privs.change(ZPRIVS_LOWER)) if (ospf6d_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ospf6_sock_init: could not lower privs"); "ospf6_sock_init: could not lower privs");
/* set socket options */ /* set socket options */
@ -124,7 +124,7 @@ int ospf6_sso(ifindex_t ifindex, struct in6_addr *group, int option)
ret = setsockopt(ospf6_sock, IPPROTO_IPV6, option, &mreq6, ret = setsockopt(ospf6_sock, IPPROTO_IPV6, option, &mreq6,
sizeof(mreq6)); sizeof(mreq6));
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"Network: setsockopt (%d) on ifindex %d failed: %s", "Network: setsockopt (%d) on ifindex %d failed: %s",
option, ifindex, safe_strerror(errno)); option, ifindex, safe_strerror(errno));
return ret; return ret;

4
ospf6d/ospf6_route.c
View File

@ -574,8 +574,8 @@ static void route_table_assert(struct ospf6_route_table *table)
if (link_error == 0 && num == table->count) if (link_error == 0 && num == table->count)
return; return;
zlog_ferr(LIB_ERR_DEVELOPMENT, "PANIC !!"); flog_err(LIB_ERR_DEVELOPMENT, "PANIC !!");
zlog_ferr(LIB_ERR_DEVELOPMENT, "Something has gone wrong with ospf6_route_table[%p]", table); flog_err(LIB_ERR_DEVELOPMENT, "Something has gone wrong with ospf6_route_table[%p]", table);
zlog_debug("table count = %d, real number = %d", table->count, num); zlog_debug("table count = %d, real number = %d", table->count, num);
zlog_debug("DUMP START"); zlog_debug("DUMP START");
for (r = ospf6_route_head(table); r; r = ospf6_route_next(r)) { for (r = ospf6_route_head(table); r; r = ospf6_route_next(r)) {

2
ospf6d/ospf6_spf.c
View File

@ -273,7 +273,7 @@ static void ospf6_nexthop_calc(struct ospf6_vertex *w, struct ospf6_vertex *v,
ifindex = (VERTEX_IS_TYPE(NETWORK, v) ? ospf6_spf_get_ifindex_from_nh(v) ifindex = (VERTEX_IS_TYPE(NETWORK, v) ? ospf6_spf_get_ifindex_from_nh(v)
: ROUTER_LSDESC_GET_IFID(lsdesc)); : ROUTER_LSDESC_GET_IFID(lsdesc));
if (ifindex == 0) { if (ifindex == 0) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"No nexthop ifindex at vertex %s", v->name); "No nexthop ifindex at vertex %s", v->name);
return; return;
} }

2
ospf6d/ospf6_zebra.c
View File

@ -363,7 +363,7 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request)
ret = zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api); ret = zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api);
if (ret < 0) if (ret < 0)
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"zclient_route_send() %s failed: %s", "zclient_route_send() %s failed: %s",
(type == REM ? "delete" : "add"), (type == REM ? "delete" : "add"),
safe_strerror(errno)); safe_strerror(errno));

2
ospfd/ospf_main.c
View File

@ -215,7 +215,7 @@ int main(int argc, char **argv)
ospf', ospf',
when quagga(ospfd) is restarted */ when quagga(ospfd) is restarted */
if (!ospf_get_instance(instance)) { if (!ospf_get_instance(instance)) {
zlog_ferr(OSPF_ERR_INIT_FAIL, "OSPF instance init failed: %s", flog_err(OSPF_ERR_INIT_FAIL, "OSPF instance init failed: %s",
strerror(errno)); strerror(errno));
exit(1); exit(1);
} }

6
ospfd/ospf_network.c
View File

@ -187,7 +187,7 @@ int ospf_sock_init(struct ospf *ospf)
return -1; return -1;
} }
if (ospfd_privs.change(ZPRIVS_RAISE)) if (ospfd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ospf_sock_init: could not raise privs, %s", "ospf_sock_init: could not raise privs, %s",
safe_strerror(errno)); safe_strerror(errno));
@ -197,7 +197,7 @@ int ospf_sock_init(struct ospf *ospf)
int save_errno = errno; int save_errno = errno;
if (ospfd_privs.change(ZPRIVS_LOWER)) if (ospfd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ospf_sock_init: could not lower privs, %s", "ospf_sock_init: could not lower privs, %s",
safe_strerror(save_errno)); safe_strerror(save_errno));
@ -244,7 +244,7 @@ int ospf_sock_init(struct ospf *ospf)
ospf->fd = ospf_sock; ospf->fd = ospf_sock;
out: out:
if (ospfd_privs.change(ZPRIVS_LOWER)) if (ospfd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ospf_sock_init: could not lower privs, %s", "ospf_sock_init: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));

8
ospfd/ospf_packet.c
View File

@ -231,7 +231,7 @@ void ospf_fifo_free(struct ospf_fifo *fifo)
void ospf_packet_add(struct ospf_interface *oi, struct ospf_packet *op) void ospf_packet_add(struct ospf_interface *oi, struct ospf_packet *op)
{ {
if (!oi->obuf) { if (!oi->obuf) {
zlog_ferr( flog_err(
OSPF_ERR_PKT_PROCESS, OSPF_ERR_PKT_PROCESS,
"ospf_packet_add(interface %s in state %d [%s], packet type %s, " "ospf_packet_add(interface %s in state %d [%s], packet type %s, "
"destination %s) called with NULL obuf, ignoring " "destination %s) called with NULL obuf, ignoring "
@ -255,7 +255,7 @@ static void ospf_packet_add_top(struct ospf_interface *oi,
struct ospf_packet *op) struct ospf_packet *op)
{ {
if (!oi->obuf) { if (!oi->obuf) {
zlog_ferr( flog_err(
OSPF_ERR_PKT_PROCESS, OSPF_ERR_PKT_PROCESS,
"ospf_packet_add(interface %s in state %d [%s], packet type %s, " "ospf_packet_add(interface %s in state %d [%s], packet type %s, "
"destination %s) called with NULL obuf, ignoring " "destination %s) called with NULL obuf, ignoring "
@ -1918,7 +1918,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
char buf2[INET_ADDRSTRLEN]; char buf2[INET_ADDRSTRLEN];
char buf3[INET_ADDRSTRLEN]; char buf3[INET_ADDRSTRLEN];
zlog_ferr(OSPF_ERR_ROUTER_LSA_MISMATCH, flog_err(OSPF_ERR_ROUTER_LSA_MISMATCH,
"Incoming Router-LSA from %s with " "Incoming Router-LSA from %s with "
"Adv-ID[%s] != LS-ID[%s]", "Adv-ID[%s] != LS-ID[%s]",
inet_ntop(AF_INET, &ospfh->router_id, inet_ntop(AF_INET, &ospfh->router_id,
@ -1928,7 +1928,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
inet_ntop(AF_INET, inet_ntop(AF_INET,
&lsa->data->adv_router, &lsa->data->adv_router,
buf3, INET_ADDRSTRLEN)); buf3, INET_ADDRSTRLEN));
zlog_ferr( flog_err(
OSPF_ERR_DOMAIN_CORRUPT, OSPF_ERR_DOMAIN_CORRUPT,
"OSPF domain compromised by attack or corruption. " "OSPF domain compromised by attack or corruption. "
"Verify correct operation of -ALL- OSPF routers."); "Verify correct operation of -ALL- OSPF routers.");

26
ospfd/ospf_sr.c
View File

@ -821,7 +821,7 @@ static struct sr_prefix *get_ext_prefix_sid(struct tlv_header *tlvh)
case EXT_SUBTLV_PREFIX_SID: case EXT_SUBTLV_PREFIX_SID:
psid = (struct ext_subtlv_prefix_sid *)sub_tlvh; psid = (struct ext_subtlv_prefix_sid *)sub_tlvh;
if (psid->algorithm != SR_ALGORITHM_SPF) { if (psid->algorithm != SR_ALGORITHM_SPF) {
zlog_ferr(OSPF_ERR_SR_INVALID_ALGORITHM, flog_err(OSPF_ERR_SR_INVALID_ALGORITHM,
"SR (%s): Unsupported Algorithm", "SR (%s): Unsupported Algorithm",
__func__); __func__);
XFREE(MTYPE_OSPF_SR_PARAMS, srp); XFREE(MTYPE_OSPF_SR_PARAMS, srp);
@ -1102,7 +1102,7 @@ void ospf_sr_ri_lsa_update(struct ospf_lsa *lsa)
return; return;
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
zlog_ferr(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1113,14 +1113,14 @@ void ospf_sr_ri_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (srn == NULL) { if (srn == NULL) {
zlog_ferr(OSPF_ERR_SR_NODE_CREATE, flog_err(OSPF_ERR_SR_NODE_CREATE,
"SR (%s): Abort! can't create SR node in hash table", "SR (%s): Abort! can't create SR node in hash table",
__func__); __func__);
return; return;
} }
if ((srn->instance != 0) && (srn->instance != ntohl(lsah->id.s_addr))) { if ((srn->instance != 0) && (srn->instance != ntohl(lsah->id.s_addr))) {
zlog_ferr(OSPF_ERR_SR_INVALID_LSA_ID, flog_err(OSPF_ERR_SR_INVALID_LSA_ID,
"SR (%s): Abort! Wrong " "SR (%s): Abort! Wrong "
"LSA ID 4.0.0.%u for SR node %s/%u", "LSA ID 4.0.0.%u for SR node %s/%u",
__func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)), __func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)),
@ -1213,7 +1213,7 @@ void ospf_sr_ri_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
zlog_ferr(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR Data Base", __func__); "SR (%s): Abort! no valid SR Data Base", __func__);
return; return;
} }
@ -1223,14 +1223,14 @@ void ospf_sr_ri_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (srn == NULL) { if (srn == NULL) {
zlog_ferr(OSPF_ERR_SR_NODE_CREATE, flog_err(OSPF_ERR_SR_NODE_CREATE,
"SR (%s): Abort! no entry in SRDB for SR Node %s", "SR (%s): Abort! no entry in SRDB for SR Node %s",
__func__, inet_ntoa(lsah->adv_router)); __func__, inet_ntoa(lsah->adv_router));
return; return;
} }
if ((srn->instance != 0) && (srn->instance != ntohl(lsah->id.s_addr))) { if ((srn->instance != 0) && (srn->instance != ntohl(lsah->id.s_addr))) {
zlog_ferr( flog_err(
OSPF_ERR_SR_INVALID_LSA_ID, OSPF_ERR_SR_INVALID_LSA_ID,
"SR (%s): Abort! Wrong LSA ID 4.0.0.%u for SR node %s", "SR (%s): Abort! Wrong LSA ID 4.0.0.%u for SR node %s",
__func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)), __func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)),
@ -1260,7 +1260,7 @@ void ospf_sr_ext_link_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
zlog_ferr(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1272,7 +1272,7 @@ void ospf_sr_ext_link_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (srn == NULL) { if (srn == NULL) {
zlog_ferr(OSPF_ERR_SR_NODE_CREATE, flog_err(OSPF_ERR_SR_NODE_CREATE,
"SR (%s): Abort! can't create SR node in hash table", "SR (%s): Abort! can't create SR node in hash table",
__func__); __func__);
return; return;
@ -1312,7 +1312,7 @@ void ospf_sr_ext_link_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
zlog_ferr(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1370,7 +1370,7 @@ void ospf_sr_ext_prefix_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
zlog_ferr(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }
@ -1382,7 +1382,7 @@ void ospf_sr_ext_prefix_lsa_update(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (srn == NULL) { if (srn == NULL) {
zlog_ferr(OSPF_ERR_SR_NODE_CREATE, flog_err(OSPF_ERR_SR_NODE_CREATE,
"SR (%s): Abort! can't create SR node in hash table", "SR (%s): Abort! can't create SR node in hash table",
__func__); __func__);
return; return;
@ -1423,7 +1423,7 @@ void ospf_sr_ext_prefix_lsa_delete(struct ospf_lsa *lsa)
/* Sanity check */ /* Sanity check */
if (OspfSR.neighbors == NULL) { if (OspfSR.neighbors == NULL) {
zlog_ferr(OSPF_ERR_SR_INVALID_DB, flog_err(OSPF_ERR_SR_INVALID_DB,
"SR (%s): Abort! no valid SR DataBase", __func__); "SR (%s): Abort! no valid SR DataBase", __func__);
return; return;
} }

4
ospfd/ospfd.c
View File

@ -2089,7 +2089,7 @@ static int ospf_vrf_enable(struct vrf *vrf)
if (old_vrf_id != ospf->vrf_id) { if (old_vrf_id != ospf->vrf_id) {
if (ospfd_privs.change(ZPRIVS_RAISE)) if (ospfd_privs.change(ZPRIVS_RAISE))
zlog_ferr( flog_err(
LIB_ERR_PRIVILEGES, LIB_ERR_PRIVILEGES,
"ospf_vrf_link: could not raise privs"); "ospf_vrf_link: could not raise privs");
@ -2103,7 +2103,7 @@ static int ospf_vrf_enable(struct vrf *vrf)
ret = ospf_sock_init(ospf); ret = ospf_sock_init(ospf);
if (ospfd_privs.change(ZPRIVS_LOWER)) if (ospfd_privs.change(ZPRIVS_LOWER))
zlog_ferr( flog_err(
LIB_ERR_PRIVILEGES, LIB_ERR_PRIVILEGES,
"ospf_sock_init: could not lower privs"); "ospf_sock_init: could not lower privs");

4
pimd/pim_igmp.c
View File

@ -97,7 +97,7 @@ static int igmp_sock_open(struct in_addr ifaddr, struct interface *ifp,
} }
if (!join) { if (!join) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"IGMP socket fd=%d could not join any group on interface address %s", "IGMP socket fd=%d could not join any group on interface address %s",
fd, inet_ntoa(ifaddr)); fd, inet_ntoa(ifaddr));
close(fd); close(fd);
@ -698,7 +698,7 @@ static void sock_close(struct igmp_sock *igmp)
THREAD_OFF(igmp->t_igmp_read); THREAD_OFF(igmp->t_igmp_read);
if (close(igmp->fd)) { if (close(igmp->fd)) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"Failure closing IGMP socket %s fd=%d on interface %s: errno=%d: %s", "Failure closing IGMP socket %s fd=%d on interface %s: errno=%d: %s",
inet_ntoa(igmp->ifaddr), igmp->fd, inet_ntoa(igmp->ifaddr), igmp->fd,

2
pimd/pim_igmpv3.c
View File

@ -1584,7 +1584,7 @@ void igmp_v3_send_query(struct igmp_group *group, int fd, const char *ifname,
msg_size = IGMP_V3_SOURCES_OFFSET + (num_sources << 2); msg_size = IGMP_V3_SOURCES_OFFSET + (num_sources << 2);
if (msg_size > query_buf_size) { if (msg_size > query_buf_size) {
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"%s %s: unable to send: msg_size=%zd larger than query_buf_size=%d", "%s %s: unable to send: msg_size=%zd larger than query_buf_size=%d",
__FILE__, __PRETTY_FUNCTION__, msg_size, __FILE__, __PRETTY_FUNCTION__, msg_size,

8
pimd/pim_mroute.c
View File

@ -57,7 +57,7 @@ static int pim_mroute_set(struct pim_instance *pim, int enable)
*/ */
if (pim->vrf_id != VRF_DEFAULT) { if (pim->vrf_id != VRF_DEFAULT) {
if (pimd_privs.change(ZPRIVS_RAISE)) if (pimd_privs.change(ZPRIVS_RAISE))
zlog_ferr( flog_err(
LIB_ERR_PRIVILEGES, LIB_ERR_PRIVILEGES,
"pim_mroute_socket_enable: could not raise privs, %s", "pim_mroute_socket_enable: could not raise privs, %s",
safe_strerror(errno)); safe_strerror(errno));
@ -75,7 +75,7 @@ static int pim_mroute_set(struct pim_instance *pim, int enable)
} }
if (pimd_privs.change(ZPRIVS_LOWER)) if (pimd_privs.change(ZPRIVS_LOWER))
zlog_ferr( flog_err(
LIB_ERR_PRIVILEGES, LIB_ERR_PRIVILEGES,
"pim_mroute_socket_enable: could not lower privs, %s", "pim_mroute_socket_enable: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));
@ -712,7 +712,7 @@ int pim_mroute_socket_enable(struct pim_instance *pim)
int fd; int fd;
if (pimd_privs.change(ZPRIVS_RAISE)) if (pimd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"pim_mroute_socket_enable: could not raise privs, %s", "pim_mroute_socket_enable: could not raise privs, %s",
safe_strerror(errno)); safe_strerror(errno));
@ -736,7 +736,7 @@ int pim_mroute_socket_enable(struct pim_instance *pim)
#endif #endif
if (pimd_privs.change(ZPRIVS_LOWER)) if (pimd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"pim_mroute_socket_enable: could not lower privs, %s", "pim_mroute_socket_enable: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));

2
pimd/pim_msdp.c
View File

@ -518,7 +518,7 @@ static void pim_msdp_sa_local_del_on_up_del(struct pim_instance *pim,
* the flow. Accounting for such cases requires lot of * the flow. Accounting for such cases requires lot of
* changes; perhaps * changes; perhaps
* address this in the next release? - XXX */ * address this in the next release? - XXX */
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"MSDP sa %s SPT teardown is causing the local entry to be removed", "MSDP sa %s SPT teardown is causing the local entry to be removed",
sa->sg_str); sa->sg_str);

4
pimd/pim_msdp_packet.c
View File

@ -147,7 +147,7 @@ static void pim_msdp_connect_check(struct pim_msdp_peer *mp)
/* If getsockopt is fail, this is fatal error. */ /* If getsockopt is fail, this is fatal error. */
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"can't get sockopt for nonblocking connect"); "can't get sockopt for nonblocking connect");
pim_msdp_peer_reset_tcp_conn(mp, "connect-failed"); pim_msdp_peer_reset_tcp_conn(mp, "connect-failed");
return; return;
@ -484,7 +484,7 @@ static void pim_msdp_pkt_sa_rx_one(struct pim_msdp_peer *mp, struct in_addr rp)
if (prefix_len != 32) { if (prefix_len != 32) {
/* ignore SA update if the prefix length is not 32 */ /* ignore SA update if the prefix length is not 32 */
zlog_ferr(PIM_ERR_MSDP_PACKET, flog_err(PIM_ERR_MSDP_PACKET,
"rxed sa update with invalid prefix length %d", "rxed sa update with invalid prefix length %d",
prefix_len); prefix_len);
return; return;

32
pimd/pim_msdp_socket.c
View File

@ -43,7 +43,7 @@ static void pim_msdp_update_sock_send_buffer_size(int fd)
socklen_t optlen = sizeof(optval); socklen_t optlen = sizeof(optval);
if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &optval, &optlen) < 0) { if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &optval, &optlen) < 0) {
zlog_ferr(LIB_ERR_SOCKET, "getsockopt of SO_SNDBUF failed %s\n", flog_err(LIB_ERR_SOCKET, "getsockopt of SO_SNDBUF failed %s\n",
safe_strerror(errno)); safe_strerror(errno));
return; return;
} }
@ -51,7 +51,7 @@ static void pim_msdp_update_sock_send_buffer_size(int fd)
if (optval < size) { if (optval < size) {
if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)) if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size))
< 0) { < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"Couldn't increase send buffer: %s\n", "Couldn't increase send buffer: %s\n",
safe_strerror(errno)); safe_strerror(errno));
} }
@ -73,7 +73,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
/* re-register accept thread */ /* re-register accept thread */
accept_sock = THREAD_FD(thread); accept_sock = THREAD_FD(thread);
if (accept_sock < 0) { if (accept_sock < 0) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"accept_sock is negative value %d", accept_sock); "accept_sock is negative value %d", accept_sock);
return -1; return -1;
} }
@ -84,7 +84,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
/* accept client connection. */ /* accept client connection. */
msdp_sock = sockunion_accept(accept_sock, &su); msdp_sock = sockunion_accept(accept_sock, &su);
if (msdp_sock < 0) { if (msdp_sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)", flog_err(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)",
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }
@ -94,7 +94,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
if (!mp || !PIM_MSDP_PEER_IS_LISTENER(mp)) { if (!mp || !PIM_MSDP_PEER_IS_LISTENER(mp)) {
++pim->msdp.rejected_accepts; ++pim->msdp.rejected_accepts;
if (PIM_DEBUG_MSDP_EVENTS) { if (PIM_DEBUG_MSDP_EVENTS) {
zlog_ferr(PIM_ERR_MSDP_PACKET, flog_err(PIM_ERR_MSDP_PACKET,
"msdp peer connection refused from %s", "msdp peer connection refused from %s",
sockunion2str(&su, buf, SU_ADDRSTRLEN)); sockunion2str(&su, buf, SU_ADDRSTRLEN));
} }
@ -140,7 +140,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
sock = socket(AF_INET, SOCK_STREAM, 0); sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock < 0) { if (sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, "socket: %s", safe_strerror(errno)); flog_err(LIB_ERR_SOCKET, "socket: %s", safe_strerror(errno));
return sock; return sock;
} }
@ -159,14 +159,14 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
struct interface *ifp = struct interface *ifp =
if_lookup_by_name(pim->vrf->name, pim->vrf_id); if_lookup_by_name(pim->vrf->name, pim->vrf_id);
if (!ifp) { if (!ifp) {
zlog_ferr(LIB_ERR_INTERFACE, flog_err(LIB_ERR_INTERFACE,
"%s: Unable to lookup vrf interface: %s", "%s: Unable to lookup vrf interface: %s",
__PRETTY_FUNCTION__, pim->vrf->name); __PRETTY_FUNCTION__, pim->vrf->name);
close(sock); close(sock);
return -1; return -1;
} }
if (pim_socket_bind(sock, ifp)) { if (pim_socket_bind(sock, ifp)) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Unable to bind to socket: %s", "%s: Unable to bind to socket: %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
close(sock); close(sock);
@ -175,7 +175,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
} }
if (pimd_privs.change(ZPRIVS_RAISE)) { if (pimd_privs.change(ZPRIVS_RAISE)) {
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"pim_msdp_socket: could not raise privs, %s", "pim_msdp_socket: could not raise privs, %s",
safe_strerror(errno)); safe_strerror(errno));
} }
@ -184,13 +184,13 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
rc = bind(sock, (struct sockaddr *)&sin, socklen); rc = bind(sock, (struct sockaddr *)&sin, socklen);
if (pimd_privs.change(ZPRIVS_LOWER)) { if (pimd_privs.change(ZPRIVS_LOWER)) {
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"pim_msdp_socket: could not lower privs, %s", "pim_msdp_socket: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));
} }
if (rc < 0) { if (rc < 0) {
zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket bind to port %d: %s", flog_err(LIB_ERR_SOCKET, "pim_msdp_socket bind to port %d: %s",
ntohs(sin.sin_port), safe_strerror(errno)); ntohs(sin.sin_port), safe_strerror(errno));
close(sock); close(sock);
return rc; return rc;
@ -198,7 +198,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
rc = listen(sock, 3 /* backlog */); rc = listen(sock, 3 /* backlog */);
if (rc < 0) { if (rc < 0) {
zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s", flog_err(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s",
safe_strerror(errno)); safe_strerror(errno));
close(sock); close(sock);
return rc; return rc;
@ -239,7 +239,7 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
/* Make socket for the peer. */ /* Make socket for the peer. */
mp->fd = sockunion_socket(&mp->su_peer); mp->fd = sockunion_socket(&mp->su_peer);
if (mp->fd < 0) { if (mp->fd < 0) {
zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket socket failure: %s", flog_err(LIB_ERR_SOCKET, "pim_msdp_socket socket failure: %s",
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} }
@ -248,13 +248,13 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
struct interface *ifp = struct interface *ifp =
if_lookup_by_name(mp->pim->vrf->name, mp->pim->vrf_id); if_lookup_by_name(mp->pim->vrf->name, mp->pim->vrf_id);
if (!ifp) { if (!ifp) {
zlog_ferr(LIB_ERR_INTERFACE, flog_err(LIB_ERR_INTERFACE,
"%s: Unable to lookup vrf interface: %s", "%s: Unable to lookup vrf interface: %s",
__PRETTY_FUNCTION__, mp->pim->vrf->name); __PRETTY_FUNCTION__, mp->pim->vrf->name);
return -1; return -1;
} }
if (pim_socket_bind(mp->fd, ifp)) { if (pim_socket_bind(mp->fd, ifp)) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Unable to bind to socket: %s", "%s: Unable to bind to socket: %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
close(mp->fd); close(mp->fd);
@ -273,7 +273,7 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
/* source bind */ /* source bind */
rc = sockunion_bind(mp->fd, &mp->su_local, 0, &mp->su_local); rc = sockunion_bind(mp->fd, &mp->su_local, 0, &mp->su_local);
if (rc < 0) { if (rc < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"pim_msdp_socket connect bind failure: %s", "pim_msdp_socket connect bind failure: %s",
safe_strerror(errno)); safe_strerror(errno));
close(mp->fd); close(mp->fd);

2
pimd/pim_neighbor.c
View File

@ -800,7 +800,7 @@ void pim_neighbor_update(struct pim_neighbor *neigh,
if (neigh->prefix_list == addr_list) { if (neigh->prefix_list == addr_list) {
if (addr_list) { if (addr_list) {
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"%s: internal error: trying to replace same prefix list=%p", "%s: internal error: trying to replace same prefix list=%p",
__PRETTY_FUNCTION__, (void *)addr_list); __PRETTY_FUNCTION__, (void *)addr_list);

2
pimd/pim_pim.c
View File

@ -116,7 +116,7 @@ void pim_sock_delete(struct interface *ifp, const char *delete_message)
delete_message); delete_message);
if (!ifp->info) { if (!ifp->info) {
zlog_ferr(PIM_ERR_CONFIG, flog_err(PIM_ERR_CONFIG,
"%s: %s: but PIM not enabled on interface %s (!)", "%s: %s: but PIM not enabled on interface %s (!)",
__PRETTY_FUNCTION__, delete_message, ifp->name); __PRETTY_FUNCTION__, delete_message, ifp->name);
return; return;

6
pimd/pim_rp.c
View File

@ -111,7 +111,7 @@ void pim_rp_init(struct pim_instance *pim)
rp_info = XCALLOC(MTYPE_PIM_RP, sizeof(*rp_info)); rp_info = XCALLOC(MTYPE_PIM_RP, sizeof(*rp_info));
if (!str2prefix("224.0.0.0/4", &rp_info->group)) { if (!str2prefix("224.0.0.0/4", &rp_info->group)) {
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"Unable to convert 224.0.0.0/4 to prefix"); "Unable to convert 224.0.0.0/4 to prefix");
list_delete_and_null(&pim->rp_list); list_delete_and_null(&pim->rp_list);
route_table_finish(pim->rp_table); route_table_finish(pim->rp_table);
@ -233,7 +233,7 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
rn = route_node_match(pim->rp_table, group); rn = route_node_match(pim->rp_table, group);
if (!rn) { if (!rn) {
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"%s: BUG We should have found default group information\n", "%s: BUG We should have found default group information\n",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
@ -622,7 +622,7 @@ int pim_rp_del(struct pim_instance *pim, const char *rp,
rn = route_node_get(pim->rp_table, &rp_info->group); rn = route_node_get(pim->rp_table, &rp_info->group);
if (rn) { if (rn) {
if (rn->info != rp_info) if (rn->info != rp_info)
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"Expected rn->info to be equal to rp_info"); "Expected rn->info to be equal to rp_info");

18
pimd/pim_sock.c
View File

@ -47,14 +47,14 @@ int pim_socket_raw(int protocol)
int fd; int fd;
if (pimd_privs.change(ZPRIVS_RAISE)) if (pimd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"pim_sockek_raw: could not raise privs, %s", "pim_sockek_raw: could not raise privs, %s",
safe_strerror(errno)); safe_strerror(errno));
fd = socket(AF_INET, SOCK_RAW, protocol); fd = socket(AF_INET, SOCK_RAW, protocol);
if (pimd_privs.change(ZPRIVS_LOWER)) if (pimd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"pim_socket_raw: could not lower privs, %s", "pim_socket_raw: could not lower privs, %s",
safe_strerror(errno)); safe_strerror(errno));
@ -72,16 +72,16 @@ void pim_socket_ip_hdr(int fd)
const int on = 1; const int on = 1;
if (pimd_privs.change(ZPRIVS_RAISE)) if (pimd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
if (setsockopt(fd, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on))) if (setsockopt(fd, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)))
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Could not turn on IP_HDRINCL option: %s", "%s: Could not turn on IP_HDRINCL option: %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
if (pimd_privs.change(ZPRIVS_LOWER)) if (pimd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
} }
@ -95,14 +95,14 @@ int pim_socket_bind(int fd, struct interface *ifp)
#ifdef SO_BINDTODEVICE #ifdef SO_BINDTODEVICE
if (pimd_privs.change(ZPRIVS_RAISE)) if (pimd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
ret = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifp->name, ret = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifp->name,
strlen(ifp->name)); strlen(ifp->name));
if (pimd_privs.change(ZPRIVS_LOWER)) if (pimd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s", flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
__PRETTY_FUNCTION__, safe_strerror(errno)); __PRETTY_FUNCTION__, safe_strerror(errno));
#endif #endif
@ -165,7 +165,7 @@ int pim_socket_mcast(int protocol, struct in_addr ifaddr, struct interface *ifp,
fd, errno, safe_strerror(errno)); fd, errno, safe_strerror(errno));
} }
#else #else
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"%s %s: Missing IP_PKTINFO and IP_RECVDSTADDR: unable to get dst addr from recvmsg()", "%s %s: Missing IP_PKTINFO and IP_RECVDSTADDR: unable to get dst addr from recvmsg()",
__FILE__, __PRETTY_FUNCTION__); __FILE__, __PRETTY_FUNCTION__);
@ -303,7 +303,7 @@ int pim_socket_join(int fd, struct in_addr group, struct in_addr ifaddr,
sizeof(ifaddr_str))) sizeof(ifaddr_str)))
sprintf(ifaddr_str, "<ifaddr?>"); sprintf(ifaddr_str, "<ifaddr?>");
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"Failure socket joining fd=%d group %s on interface address %s: errno=%d: %s", "Failure socket joining fd=%d group %s on interface address %s: errno=%d: %s",
fd, group_str, ifaddr_str, errno, safe_strerror(errno)); fd, group_str, ifaddr_str, errno, safe_strerror(errno));

2
pimd/pim_ssm.c
View File

@ -73,7 +73,7 @@ static int pim_is_grp_standard_ssm(struct prefix *group)
if (first) { if (first) {
if (!str2prefix(PIM_SSM_STANDARD_RANGE, &group_ssm)) if (!str2prefix(PIM_SSM_STANDARD_RANGE, &group_ssm))
zlog_ferr(LIB_ERR_DEVELOPMENT, flog_err(LIB_ERR_DEVELOPMENT,
"%s: Failure to Read Group Address: %s", "%s: Failure to Read Group Address: %s",
__PRETTY_FUNCTION__, PIM_SSM_STANDARD_RANGE); __PRETTY_FUNCTION__, PIM_SSM_STANDARD_RANGE);

4
pimd/pim_ssmpingd.c
View File

@ -83,7 +83,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (fd < 0) { if (fd < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: could not create socket: errno=%d: %s", "%s: could not create socket: errno=%d: %s",
__PRETTY_FUNCTION__, errno, safe_strerror(errno)); __PRETTY_FUNCTION__, errno, safe_strerror(errno));
return -1; return -1;
@ -126,7 +126,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
safe_strerror(errno)); safe_strerror(errno));
} }
#else #else
zlog_ferr( flog_err(
LIB_ERR_DEVELOPMENT, LIB_ERR_DEVELOPMENT,
"%s %s: missing IP_PKTINFO and IP_RECVDSTADDR: unable to get dst addr from recvmsg()", "%s %s: missing IP_PKTINFO and IP_RECVDSTADDR: unable to get dst addr from recvmsg()",
__FILE__, __PRETTY_FUNCTION__); __FILE__, __PRETTY_FUNCTION__);

8
pimd/pim_time.c
View File

@ -35,7 +35,7 @@ static int gettime_monotonic(struct timeval *tv)
result = gettimeofday(tv, 0); result = gettimeofday(tv, 0);
if (result) { if (result) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: gettimeofday() failure: errno=%d: %s", "%s: gettimeofday() failure: errno=%d: %s",
__PRETTY_FUNCTION__, errno, safe_strerror(errno)); __PRETTY_FUNCTION__, errno, safe_strerror(errno));
} }
@ -52,7 +52,7 @@ int64_t pim_time_monotonic_sec()
struct timeval now_tv; struct timeval now_tv;
if (gettime_monotonic(&now_tv)) { if (gettime_monotonic(&now_tv)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: gettime_monotonic() failure: errno=%d: %s", "%s: gettime_monotonic() failure: errno=%d: %s",
__PRETTY_FUNCTION__, errno, safe_strerror(errno)); __PRETTY_FUNCTION__, errno, safe_strerror(errno));
return -1; return -1;
@ -71,7 +71,7 @@ int64_t pim_time_monotonic_dsec()
int64_t now_dsec; int64_t now_dsec;
if (gettime_monotonic(&now_tv)) { if (gettime_monotonic(&now_tv)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: gettime_monotonic() failure: errno=%d: %s", "%s: gettime_monotonic() failure: errno=%d: %s",
__PRETTY_FUNCTION__, errno, safe_strerror(errno)); __PRETTY_FUNCTION__, errno, safe_strerror(errno));
return -1; return -1;
@ -89,7 +89,7 @@ int64_t pim_time_monotonic_usec(void)
int64_t now_dsec; int64_t now_dsec;
if (gettime_monotonic(&now_tv)) { if (gettime_monotonic(&now_tv)) {
zlog_ferr(LIB_ERR_SYSTEM_CALL, flog_err(LIB_ERR_SYSTEM_CALL,
"%s: gettime_monotonic() failure: errno=%d: %s", "%s: gettime_monotonic() failure: errno=%d: %s",
__PRETTY_FUNCTION__, errno, safe_strerror(errno)); __PRETTY_FUNCTION__, errno, safe_strerror(errno));
return -1; return -1;

16
pimd/pim_zlookup.c
View File

@ -123,7 +123,7 @@ void zclient_lookup_new(void)
{ {
zlookup = zclient_new_notify(master, &zclient_options_default); zlookup = zclient_new_notify(master, &zclient_options_default);
if (!zlookup) { if (!zlookup) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, "%s: zclient_new() failure", flog_err(LIB_ERR_ZAPI_SOCKET, "%s: zclient_new() failure",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
return; return;
} }
@ -170,7 +170,7 @@ static int zclient_read_nexthop(struct pim_instance *pim,
err = zclient_read_header(s, zlookup->sock, &length, &marker, err = zclient_read_header(s, zlookup->sock, &length, &marker,
&version, &vrf_id, &command); &version, &vrf_id, &command);
if (err < 0) { if (err < 0) {
zlog_ferr(LIB_ERR_ZAPI_MISSMATCH, flog_err(LIB_ERR_ZAPI_MISSMATCH,
"%s: zclient_read_header() failed", "%s: zclient_read_header() failed",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
zclient_lookup_failed(zlookup); zclient_lookup_failed(zlookup);
@ -315,7 +315,7 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
/* Check socket. */ /* Check socket. */
if (zlookup->sock < 0) { if (zlookup->sock < 0) {
zlog_ferr(LIB_ERR_ZAPI_SOCKET, flog_err(LIB_ERR_ZAPI_SOCKET,
"%s: zclient lookup socket is not connected", "%s: zclient lookup socket is not connected",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
zclient_lookup_failed(zlookup); zclient_lookup_failed(zlookup);
@ -337,7 +337,7 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
ret = writen(zlookup->sock, s->data, stream_get_endp(s)); ret = writen(zlookup->sock, s->data, stream_get_endp(s));
if (ret < 0) { if (ret < 0) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s: writen() failure: %d writing to zclient lookup socket", "%s: writen() failure: %d writing to zclient lookup socket",
__PRETTY_FUNCTION__, errno); __PRETTY_FUNCTION__, errno);
@ -345,7 +345,7 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
return -2; return -2;
} }
if (ret == 0) { if (ret == 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: connection closed on zclient lookup socket", "%s: connection closed on zclient lookup socket",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
zclient_lookup_failed(zlookup); zclient_lookup_failed(zlookup);
@ -515,7 +515,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
count = stream_get_endp(s); count = stream_get_endp(s);
ret = writen(zlookup->sock, s->data, count); ret = writen(zlookup->sock, s->data, count);
if (ret <= 0) { if (ret <= 0) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s: writen() failure: %d writing to zclient lookup socket", "%s: writen() failure: %d writing to zclient lookup socket",
__PRETTY_FUNCTION__, errno); __PRETTY_FUNCTION__, errno);
@ -535,7 +535,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
err = zclient_read_header(s, zlookup->sock, &length, &marker, err = zclient_read_header(s, zlookup->sock, &length, &marker,
&version, &vrf_id, &command); &version, &vrf_id, &command);
if (err < 0) { if (err < 0) {
zlog_ferr(LIB_ERR_ZAPI_MISSMATCH, flog_err(LIB_ERR_ZAPI_MISSMATCH,
"%s: zclient_read_header() failed", "%s: zclient_read_header() failed",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);
zclient_lookup_failed(zlookup); zclient_lookup_failed(zlookup);
@ -552,7 +552,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
more.src = c_oil->oil.mfcc_origin; more.src = c_oil->oil.mfcc_origin;
more.grp = c_oil->oil.mfcc_mcastgrp; more.grp = c_oil->oil.mfcc_mcastgrp;
zlog_ferr( flog_err(
LIB_ERR_ZAPI_MISSMATCH, LIB_ERR_ZAPI_MISSMATCH,
"%s: Received wrong %s(%s) information requested", "%s: Received wrong %s(%s) information requested",
__PRETTY_FUNCTION__, pim_str_sg_dump(&more), __PRETTY_FUNCTION__, pim_str_sg_dump(&more),

2
pimd/pimd.c
View File

@ -85,7 +85,7 @@ static void pim_free()
void pim_init() void pim_init()
{ {
if (!inet_aton(PIM_ALL_PIM_ROUTERS, &qpim_all_pim_routers_addr)) { if (!inet_aton(PIM_ALL_PIM_ROUTERS, &qpim_all_pim_routers_addr)) {
zlog_ferr( flog_err(
LIB_ERR_SOCKET, LIB_ERR_SOCKET,
"%s %s: could not solve %s to group address: errno=%d: %s", "%s %s: could not solve %s to group address: errno=%d: %s",
__FILE__, __PRETTY_FUNCTION__, PIM_ALL_PIM_ROUTERS, __FILE__, __PRETTY_FUNCTION__, PIM_ALL_PIM_ROUTERS,

2
ripd/rip_interface.c
View File

@ -865,7 +865,7 @@ static int rip_interface_wakeup(struct thread *t)
/* Join to multicast group. */ /* Join to multicast group. */
if (rip_multicast_join(ifp, rip->sock) < 0) { if (rip_multicast_join(ifp, rip->sock) < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"multicast join failed, interface %s not running", "multicast join failed, interface %s not running",
ifp->name); ifp->name);
return 0; return 0;

12
ripd/ripd.c
View File

@ -1058,7 +1058,7 @@ static void rip_auth_md5_set(struct stream *s, struct rip_interface *ri,
/* Check packet length. */ /* Check packet length. */
if (len < (RIP_HEADER_SIZE + RIP_RTE_SIZE)) { if (len < (RIP_HEADER_SIZE + RIP_RTE_SIZE)) {
zlog_ferr(RIP_ERR_PACKET, flog_err(RIP_ERR_PACKET,
"rip_auth_md5_set(): packet length %ld is less than minimum length.", "rip_auth_md5_set(): packet length %ld is less than minimum length.",
len); len);
return; return;
@ -1341,7 +1341,7 @@ static int rip_create_socket(void)
/* Make datagram socket. */ /* Make datagram socket. */
sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (sock < 0) { if (sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, "Cannot create UDP socket: %s", flog_err(LIB_ERR_SOCKET, "Cannot create UDP socket: %s",
safe_strerror(errno)); safe_strerror(errno));
exit(1); exit(1);
} }
@ -1358,7 +1358,7 @@ static int rip_create_socket(void)
#endif #endif
if (ripd_privs.change(ZPRIVS_RAISE)) if (ripd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"rip_create_socket: could not raise privs"); "rip_create_socket: could not raise privs");
setsockopt_so_recvbuf(sock, RIP_UDP_RCV_BUF); setsockopt_so_recvbuf(sock, RIP_UDP_RCV_BUF);
if ((ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr))) < 0) if ((ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr))) < 0)
@ -1366,10 +1366,10 @@ static int rip_create_socket(void)
{ {
int save_errno = errno; int save_errno = errno;
if (ripd_privs.change(ZPRIVS_LOWER)) if (ripd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"rip_create_socket: could not lower privs"); "rip_create_socket: could not lower privs");
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"%s: Can't bind socket %d to %s port %d: %s", "%s: Can't bind socket %d to %s port %d: %s",
__func__, sock, inet_ntoa(addr.sin_addr), __func__, sock, inet_ntoa(addr.sin_addr),
(int)ntohs(addr.sin_port), safe_strerror(save_errno)); (int)ntohs(addr.sin_port), safe_strerror(save_errno));
@ -1379,7 +1379,7 @@ static int rip_create_socket(void)
} }
if (ripd_privs.change(ZPRIVS_LOWER)) if (ripd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"rip_create_socket: could not lower privs"); "rip_create_socket: could not lower privs");
return sock; return sock;

6
ripngd/ripng_interface.c
View File

@ -73,7 +73,7 @@ static int ripng_multicast_join(struct interface *ifp)
* for this call as a workaround. * for this call as a workaround.
*/ */
if (ripngd_privs.change(ZPRIVS_RAISE)) if (ripngd_privs.change(ZPRIVS_RAISE))
zlog_ferr( flog_err(
LIB_ERR_PRIVILEGES, LIB_ERR_PRIVILEGES,
"ripng_multicast_join: could not raise privs"); "ripng_multicast_join: could not raise privs");
@ -82,7 +82,7 @@ static int ripng_multicast_join(struct interface *ifp)
save_errno = errno; save_errno = errno;
if (ripngd_privs.change(ZPRIVS_LOWER)) if (ripngd_privs.change(ZPRIVS_LOWER))
zlog_ferr( flog_err(
LIB_ERR_PRIVILEGES, LIB_ERR_PRIVILEGES,
"ripng_multicast_join: could not lower privs"); "ripng_multicast_join: could not lower privs");
@ -647,7 +647,7 @@ static int ripng_interface_wakeup(struct thread *t)
/* Join to multicast group. */ /* Join to multicast group. */
if (ripng_multicast_join(ifp) < 0) { if (ripng_multicast_join(ifp) < 0) {
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"multicast join failed, interface %s not running", "multicast join failed, interface %s not running",
ifp->name); ifp->name);
return 0; return 0;

14
ripngd/ripngd.c
View File

@ -95,7 +95,7 @@ static int ripng_make_socket(void)
sock = socket(AF_INET6, SOCK_DGRAM, 0); sock = socket(AF_INET6, SOCK_DGRAM, 0);
if (sock < 0) { if (sock < 0) {
zlog_ferr(LIB_ERR_SOCKET, "Can't make ripng socket"); flog_err(LIB_ERR_SOCKET, "Can't make ripng socket");
return sock; return sock;
} }
@ -126,20 +126,20 @@ static int ripng_make_socket(void)
ripaddr.sin6_port = htons(RIPNG_PORT_DEFAULT); ripaddr.sin6_port = htons(RIPNG_PORT_DEFAULT);
if (ripngd_privs.change(ZPRIVS_RAISE)) if (ripngd_privs.change(ZPRIVS_RAISE))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ripng_make_socket: could not raise privs"); "ripng_make_socket: could not raise privs");
ret = bind(sock, (struct sockaddr *)&ripaddr, sizeof(ripaddr)); ret = bind(sock, (struct sockaddr *)&ripaddr, sizeof(ripaddr));
if (ret < 0) { if (ret < 0) {
zlog_ferr(LIB_ERR_SOCKET, "Can't bind ripng socket: %s.", flog_err(LIB_ERR_SOCKET, "Can't bind ripng socket: %s.",
safe_strerror(errno)); safe_strerror(errno));
if (ripngd_privs.change(ZPRIVS_LOWER)) if (ripngd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ripng_make_socket: could not lower privs"); "ripng_make_socket: could not lower privs");
goto error; goto error;
} }
if (ripngd_privs.change(ZPRIVS_LOWER)) if (ripngd_privs.change(ZPRIVS_LOWER))
zlog_ferr(LIB_ERR_PRIVILEGES, flog_err(LIB_ERR_PRIVILEGES,
"ripng_make_socket: could not lower privs"); "ripng_make_socket: could not lower privs");
return sock; return sock;
@ -207,12 +207,12 @@ int ripng_send_packet(caddr_t buf, int bufsize, struct sockaddr_in6 *to,
if (ret < 0) { if (ret < 0) {
if (to) if (to)
zlog_ferr(LIB_ERR_SOCKET, flog_err(LIB_ERR_SOCKET,
"RIPng send fail on %s to %s: %s", ifp->name, "RIPng send fail on %s to %s: %s", ifp->name,
inet6_ntoa(to->sin6_addr), inet6_ntoa(to->sin6_addr),
safe_strerror(errno)); safe_strerror(errno));
else else
zlog_ferr(LIB_ERR_SOCKET, "RIPng send fail on %s: %s", flog_err(LIB_ERR_SOCKET, "RIPng send fail on %s: %s",
ifp->name, safe_strerror(errno)); ifp->name, safe_strerror(errno));
} }

Some files were not shown because too many files have changed in this diff Show More