matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospfd: Convert ospf_network.c to use error code subsystem

Browse source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-08-20 14:14:23 -04:00 committed by Quentin Young
parent 266469ebab
commit abcc171c93
1 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ospfd/ospf_network.c
View file

@ -51,7 +51,7 @@ int ospf_if_add_allspfrouters(struct ospf *top, struct prefix *p,
p->u.prefix4, htonl(OSPF_ALLSPFROUTERS), p->u.prefix4, htonl(OSPF_ALLSPFROUTERS),
ifindex); ifindex);
if (ret < 0) if (ret < 0)
zlog_warn( flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, " "can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, "
"ifindex %u, AllSPFRouters): %s; perhaps a kernel limit " "ifindex %u, AllSPFRouters): %s; perhaps a kernel limit "
"on # of multicast group memberships has been exceeded?", "on # of multicast group memberships has been exceeded?",
@ -76,7 +76,7 @@ int ospf_if_drop_allspfrouters(struct ospf *top, struct prefix *p,
p->u.prefix4, htonl(OSPF_ALLSPFROUTERS), p->u.prefix4, htonl(OSPF_ALLSPFROUTERS),
ifindex); ifindex);
if (ret < 0) if (ret < 0)
zlog_warn( flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, " "can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, "
"ifindex %u, AllSPFRouters): %s", "ifindex %u, AllSPFRouters): %s",
top->fd, inet_ntoa(p->u.prefix4), ifindex, top->fd, inet_ntoa(p->u.prefix4), ifindex,
@ -101,7 +101,7 @@ int ospf_if_add_alldrouters(struct ospf *top, struct prefix *p,
p->u.prefix4, htonl(OSPF_ALLDROUTERS), p->u.prefix4, htonl(OSPF_ALLDROUTERS),
ifindex); ifindex);
if (ret < 0) if (ret < 0)
zlog_warn( flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, " "can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, "
"ifindex %u, AllDRouters): %s; perhaps a kernel limit " "ifindex %u, AllDRouters): %s; perhaps a kernel limit "
"on # of multicast group memberships has been exceeded?", "on # of multicast group memberships has been exceeded?",
@ -124,7 +124,7 @@ int ospf_if_drop_alldrouters(struct ospf *top, struct prefix *p,
p->u.prefix4, htonl(OSPF_ALLDROUTERS), p->u.prefix4, htonl(OSPF_ALLDROUTERS),
ifindex); ifindex);
if (ret < 0) if (ret < 0)
zlog_warn( flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, " "can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, "
"ifindex %u, AllDRouters): %s", "ifindex %u, AllDRouters): %s",
top->fd, inet_ntoa(p->u.prefix4), ifindex, top->fd, inet_ntoa(p->u.prefix4), ifindex,
@ -145,7 +145,8 @@ int ospf_if_ipmulticast(struct ospf *top, struct prefix *p, ifindex_t ifindex)
/* Prevent receiving self-origined multicast packets. */ /* Prevent receiving self-origined multicast packets. */
ret = setsockopt_ipv4_multicast_loop(top->fd, 0); ret = setsockopt_ipv4_multicast_loop(top->fd, 0);
if (ret < 0) if (ret < 0)
zlog_warn("can't setsockopt IP_MULTICAST_LOOP(0) for fd %d: %s", flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_MULTICAST_LOOP(0) for fd %d: %s",
top->fd, safe_strerror(errno)); top->fd, safe_strerror(errno));
/* Explicitly set multicast ttl to 1 -- endo. */ /* Explicitly set multicast ttl to 1 -- endo. */
@ -154,7 +155,8 @@ int ospf_if_ipmulticast(struct ospf *top, struct prefix *p, ifindex_t ifindex)
ret = setsockopt(top->fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&val, ret = setsockopt(top->fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&val,
len); len);
if (ret < 0) if (ret < 0)
zlog_warn("can't setsockopt IP_MULTICAST_TTL(1) for fd %d: %s", flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_MULTICAST_TTL(1) for fd %d: %s",
top->fd, safe_strerror(errno)); top->fd, safe_strerror(errno));
#ifndef GNU_LINUX #ifndef GNU_LINUX
/* For GNU LINUX ospf_write uses IP_PKTINFO, in_pktinfo to send /* For GNU LINUX ospf_write uses IP_PKTINFO, in_pktinfo to send
@ -162,7 +164,7 @@ int ospf_if_ipmulticast(struct ospf *top, struct prefix *p, ifindex_t ifindex)
*/ */
ret = setsockopt_ipv4_multicast_if(top->fd, p->u.prefix4, ifindex); ret = setsockopt_ipv4_multicast_if(top->fd, p->u.prefix4, ifindex);
if (ret < 0) if (ret < 0)
zlog_warn( flog_err(LIB_ERR_SOCKET,
"can't setsockopt IP_MULTICAST_IF(fd %d, addr %s, " "can't setsockopt IP_MULTICAST_IF(fd %d, addr %s, "
"ifindex %u): %s", "ifindex %u): %s",
top->fd, inet_ntoa(p->u.prefix4), ifindex, top->fd, inet_ntoa(p->u.prefix4), ifindex,
@ -190,7 +192,8 @@ int ospf_sock_init(struct ospf *ospf)
ospf_sock = vrf_socket(AF_INET, SOCK_RAW, IPPROTO_OSPFIGP, ospf_sock = vrf_socket(AF_INET, SOCK_RAW, IPPROTO_OSPFIGP,
ospf->vrf_id, ospf->name); ospf->vrf_id, ospf->name);
if (ospf_sock < 0) { if (ospf_sock < 0) {
zlog_err("ospf_read_sock_init: socket: %s", flog_err(LIB_ERR_SOCKET,
"ospf_read_sock_init: socket: %s",
safe_strerror(errno)); safe_strerror(errno));
exit(1); exit(1);
} }
@ -200,7 +203,8 @@ int ospf_sock_init(struct ospf *ospf)
ret = setsockopt(ospf_sock, IPPROTO_IP, IP_HDRINCL, &hincl, ret = setsockopt(ospf_sock, IPPROTO_IP, IP_HDRINCL, &hincl,
sizeof(hincl)); sizeof(hincl));
if (ret < 0) { if (ret < 0) {
zlog_warn("Can't set IP_HDRINCL option for fd %d: %s", flog_err(LIB_ERR_SOCKET,
"Can't set IP_HDRINCL option for fd %d: %s",
ospf_sock, safe_strerror(errno)); ospf_sock, safe_strerror(errno));
close(ospf_sock); close(ospf_sock);
break; break;
@ -211,20 +215,23 @@ int ospf_sock_init(struct ospf *ospf)
ret = setsockopt_ipv4_tos(ospf_sock, ret = setsockopt_ipv4_tos(ospf_sock,
IPTOS_PREC_INTERNETCONTROL); IPTOS_PREC_INTERNETCONTROL);
if (ret < 0) { if (ret < 0) {
zlog_warn("can't set sockopt IP_TOS %d to socket %d: %s", flog_err(LIB_ERR_SOCKET,
"can't set sockopt IP_TOS %d to socket %d: %s",
tos, ospf_sock, safe_strerror(errno)); tos, ospf_sock, safe_strerror(errno));
close(ospf_sock); /* Prevent sd leak. */ close(ospf_sock); /* Prevent sd leak. */
break; break;
} }
#else /* !IPTOS_PREC_INTERNETCONTROL */ #else /* !IPTOS_PREC_INTERNETCONTROL */
#warning "IP_HDRINCL not available, nor is IPTOS_PREC_INTERNETCONTROL" #warning "IP_HDRINCL not available, nor is IPTOS_PREC_INTERNETCONTROL"
zlog_warn("IP_HDRINCL option not available"); flog_err(LIB_ERR_UNAVAILABLE,
"IP_HDRINCL option not available");
#endif /* IP_HDRINCL */ #endif /* IP_HDRINCL */
ret = setsockopt_ifindex(AF_INET, ospf_sock, 1); ret = setsockopt_ifindex(AF_INET, ospf_sock, 1);
if (ret < 0) if (ret < 0)
zlog_warn("Can't set pktinfo option for fd %d", flog_err(LIB_ERR_SOCKET,
"Can't set pktinfo option for fd %d",
ospf_sock); ospf_sock);
setsockopt_so_sendbuf(ospf_sock, bufsize); setsockopt_so_sendbuf(ospf_sock, bufsize);