Skip to content

Commit a44a6d8

Browse files
JafaralJafaral
authored
Merge pull request FRRouting#19822 from donaldsharp/bfd_packet_err_instead_of_fatal
bfdd: Turn zlog_fatal into zlog_err
2 parents 2e2d22a + 774118b commit a44a6d8

File tree

2 files changed

+28
-45
lines changed

2 files changed

+28
-45
lines changed

‎bfdd/bfd.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -532,17 +532,6 @@ extern const struct bfd_state_str_list state_list[];
532532
void socket_close(int *s);
533533

534534

535-
/*
536-
* logging - alias to zebra log
537-
*/
538-
#define zlog_fatal(msg, ...) \
539-
do { \
540-
zlog_err(msg, ##__VA_ARGS__); \
541-
assert(!msg); \
542-
abort(); \
543-
} while (0)
544-
545-
546535
/*
547536
* bfd_packet.c
548537
*

‎bfdd/bfd_packet.c‎

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,40 +1371,36 @@ static void bp_set_ipopts(int sd)
13711371
int rcvttl = BFD_RCV_TTL_VAL;
13721372

13731373
if (!bp_set_reuse_addr(sd))
1374-
zlog_fatal("set-reuse-addr: failed");
1374+
zlog_err("set-reuse-addr: failed");
13751375

13761376
if (!bp_set_reuse_port(sd))
1377-
zlog_fatal("set-reuse-port: failed");
1377+
zlog_err("set-reuse-port: failed");
13781378

13791379
if (bp_set_ttl(sd, BFD_TTL_VAL) != 0)
1380-
zlog_fatal("set-ipopts: TTL configuration failed");
1380+
zlog_err("set-ipopts: TTL configuration failed");
13811381

13821382
if (setsockopt(sd, IPPROTO_IP, IP_RECVTTL, &rcvttl, sizeof(rcvttl))
13831383
== -1)
1384-
zlog_fatal("set-ipopts: setsockopt(IP_RECVTTL, %d): %s", rcvttl,
1385-
strerror(errno));
1384+
zlog_err("set-ipopts: setsockopt(IP_RECVTTL, %d): %s", rcvttl, strerror(errno));
13861385

13871386
#ifdef BFD_LINUX
13881387
int pktinfo = BFD_PKT_INFO_VAL;
13891388

13901389
/* Figure out address and interface to do the peer matching. */
13911390
if (setsockopt(sd, IPPROTO_IP, IP_PKTINFO, &pktinfo, sizeof(pktinfo))
13921391
== -1)
1393-
zlog_fatal("set-ipopts: setsockopt(IP_PKTINFO, %d): %s",
1394-
pktinfo, strerror(errno));
1392+
zlog_err("set-ipopts: setsockopt(IP_PKTINFO, %d): %s", pktinfo, strerror(errno));
13951393
#endif /* BFD_LINUX */
13961394
#ifdef BFD_BSD
13971395
int yes = 1;
13981396

13991397
/* Find out our address for peer matching. */
14001398
if (setsockopt(sd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof(yes)) == -1)
1401-
zlog_fatal("set-ipopts: setsockopt(IP_RECVDSTADDR, %d): %s",
1402-
yes, strerror(errno));
1399+
zlog_err("set-ipopts: setsockopt(IP_RECVDSTADDR, %d): %s", yes, strerror(errno));
14031400

14041401
/* Find out interface where the packet came in. */
14051402
if (setsockopt_ifindex(AF_INET, sd, yes) == -1)
1406-
zlog_fatal("set-ipopts: setsockopt_ipv4_ifindex(%d): %s", yes,
1407-
strerror(errno));
1403+
zlog_err("set-ipopts: setsockopt_ipv4_ifindex(%d): %s", yes, strerror(errno));
14081404
#endif /* BFD_BSD */
14091405
}
14101406

@@ -1417,7 +1413,7 @@ static void bp_bind_ip(int sd, uint16_t port)
14171413
sin.sin_addr.s_addr = htonl(INADDR_ANY);
14181414
sin.sin_port = htons(port);
14191415
if (bind(sd, (struct sockaddr *)&sin, sizeof(sin)) == -1)
1420-
zlog_fatal("bind-ip: bind: %s", strerror(errno));
1416+
zlog_err("bind-ip: bind: %s", strerror(errno));
14211417
}
14221418

14231419
void bp_set_prio(int sd, int value)
@@ -1439,7 +1435,7 @@ int bp_udp_shop(const struct vrf *vrf)
14391435
vrf->name);
14401436
}
14411437
if (sd == -1)
1442-
zlog_fatal("udp-shop: socket: %s", strerror(errno));
1438+
zlog_err("udp-shop: socket: %s", strerror(errno));
14431439

14441440
bp_set_ipopts(sd);
14451441
bp_bind_ip(sd, BFD_DEFDESTPORT);
@@ -1455,7 +1451,7 @@ int bp_udp_mhop(const struct vrf *vrf)
14551451
vrf->name);
14561452
}
14571453
if (sd == -1)
1458-
zlog_fatal("udp-mhop: socket: %s", strerror(errno));
1454+
zlog_err("udp-mhop: socket: %s", strerror(errno));
14591455

14601456
bp_set_ipopts(sd);
14611457
bp_bind_ip(sd, BFD_DEF_MHOP_DEST_PORT);
@@ -1630,29 +1626,28 @@ static void bp_set_ipv6opts(int sd)
16301626
int ipv6_only = BFD_IPV6_ONLY_VAL;
16311627

16321628
if (!bp_set_reuse_addr(sd))
1633-
zlog_fatal("set-reuse-addr: failed");
1629+
zlog_err("set-reuse-addr: failed");
16341630

16351631
if (!bp_set_reuse_port(sd))
1636-
zlog_fatal("set-reuse-port: failed");
1632+
zlog_err("set-reuse-port: failed");
16371633

16381634
if (bp_set_ttlv6(sd, BFD_TTL_VAL) == -1)
1639-
zlog_fatal(
1640-
"set-ipv6opts: setsockopt(IPV6_UNICAST_HOPS, %d): %s",
1641-
BFD_TTL_VAL, strerror(errno));
1635+
zlog_err("set-ipv6opts: setsockopt(IPV6_UNICAST_HOPS, %d): %s", BFD_TTL_VAL,
1636+
strerror(errno));
16421637

16431638
if (setsockopt_ipv6_hoplimit(sd, BFD_RCV_TTL_VAL) == -1)
1644-
zlog_fatal("set-ipv6opts: setsockopt(IPV6_HOPLIMIT, %d): %s",
1645-
BFD_RCV_TTL_VAL, strerror(errno));
1639+
zlog_err("set-ipv6opts: setsockopt(IPV6_HOPLIMIT, %d): %s", BFD_RCV_TTL_VAL,
1640+
strerror(errno));
16461641

16471642
if (setsockopt_ipv6_pktinfo(sd, ipv6_pktinfo) == -1)
1648-
zlog_fatal("set-ipv6opts: setsockopt(IPV6_PKTINFO, %d): %s",
1649-
ipv6_pktinfo, strerror(errno));
1643+
zlog_err("set-ipv6opts: setsockopt(IPV6_PKTINFO, %d): %s", ipv6_pktinfo,
1644+
strerror(errno));
16501645

16511646
if (setsockopt(sd, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6_only,
16521647
sizeof(ipv6_only))
16531648
== -1)
1654-
zlog_fatal("set-ipv6opts: setsockopt(IPV6_V6ONLY, %d): %s",
1655-
ipv6_only, strerror(errno));
1649+
zlog_err("set-ipv6opts: setsockopt(IPV6_V6ONLY, %d): %s", ipv6_only,
1650+
strerror(errno));
16561651
}
16571652

16581653
static void bp_bind_ipv6(int sd, uint16_t port)
@@ -1667,7 +1662,7 @@ static void bp_bind_ipv6(int sd, uint16_t port)
16671662
sin6.sin6_len = sizeof(sin6);
16681663
#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
16691664
if (bind(sd, (struct sockaddr *)&sin6, sizeof(sin6)) == -1)
1670-
zlog_fatal("bind-ipv6: bind: %s", strerror(errno));
1665+
zlog_err("bind-ipv6: bind: %s", strerror(errno));
16711666
}
16721667

16731668
int bp_udp6_shop(const struct vrf *vrf)
@@ -1680,7 +1675,7 @@ int bp_udp6_shop(const struct vrf *vrf)
16801675
}
16811676
if (sd == -1) {
16821677
if (errno != EAFNOSUPPORT)
1683-
zlog_fatal("udp6-shop: socket: %s", strerror(errno));
1678+
zlog_err("udp6-shop: socket: %s", strerror(errno));
16841679
else
16851680
zlog_warn("udp6-shop: V6 is not supported, continuing");
16861681

@@ -1703,7 +1698,7 @@ int bp_udp6_mhop(const struct vrf *vrf)
17031698
}
17041699
if (sd == -1) {
17051700
if (errno != EAFNOSUPPORT)
1706-
zlog_fatal("udp6-mhop: socket: %s", strerror(errno));
1701+
zlog_err("udp6-mhop: socket: %s", strerror(errno));
17071702
else
17081703
zlog_warn("udp6-mhop: V6 is not supported, continuing");
17091704

@@ -1739,7 +1734,7 @@ int bp_echo_socket(const struct vrf *vrf)
17391734
}
17401735

17411736
if (s == -1)
1742-
zlog_fatal("echo-socket: socket: %s", strerror(errno));
1737+
zlog_err("echo-socket: socket: %s", strerror(errno));
17431738

17441739
struct sock_fprog pf;
17451740
struct sockaddr_ll sll = {0};
@@ -1777,7 +1772,7 @@ int bp_echo_socket(const struct vrf *vrf)
17771772
s = vrf_socket(AF_INET, SOCK_DGRAM, 0, vrf->vrf_id, vrf->name);
17781773
}
17791774
if (s == -1)
1780-
zlog_fatal("echo-socket: socket: %s", strerror(errno));
1775+
zlog_err("echo-socket: socket: %s", strerror(errno));
17811776

17821777
bp_set_ipopts(s);
17831778
bp_bind_ip(s, BFD_DEF_ECHO_PORT);
@@ -1795,8 +1790,7 @@ int bp_echov6_socket(const struct vrf *vrf)
17951790
}
17961791
if (s == -1) {
17971792
if (errno != EAFNOSUPPORT)
1798-
zlog_fatal("echov6-socket: socket: %s",
1799-
strerror(errno));
1793+
zlog_err("echov6-socket: socket: %s", strerror(errno));
18001794
else
18011795
zlog_warn("echov6-socket: V6 is not supported, continuing");
18021796

@@ -2137,7 +2131,7 @@ int bp_initv6_socket(const struct vrf *vrf)
21372131
}
21382132
if (sd == -1) {
21392133
if (errno != EAFNOSUPPORT)
2140-
zlog_fatal("echov6-socket: socket: %s", strerror(errno));
2134+
zlog_err("echov6-socket: socket: %s", strerror(errno));
21412135
else
21422136
zlog_warn("echov6-socket: V6 is not supported, continuing");
21432137

@@ -2341,7 +2335,7 @@ int bp_sbfd_socket(const struct vrf *vrf)
23412335
}
23422336
if (s == -1) {
23432337
if (errno != EAFNOSUPPORT)
2344-
zlog_fatal("sbfdv6-socket: socket: %s", strerror(errno));
2338+
zlog_err("sbfdv6-socket: socket: %s", strerror(errno));
23452339
else
23462340
zlog_warn("sbfdv6-socket: V6 is not supported, continuing");
23472341

0 commit comments

Comments
 (0)