Merge pull request #3356 from opensourcerouting/router-id-loopbacks

[mirror_frr.git] / lib / sockunion.c

diff --git a/lib/sockunion.c b/lib/sockunion.c
index f4e806e928009add2f0fcb347164c4689dad28b1..af4f41f37ca380ec45a2f11267ef78cff7df7bf4 100644 (file)
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -140,7 +140,7 @@ int sockunion_socket(const union sockunion *su)
        sock = socket(su->sa.sa_family, SOCK_STREAM, 0);
        if (sock < 0) {
                char buf[SU_ADDRSTRLEN];
-               flog_err(LIB_ERR_SOCKET, "Can't make socket for %s : %s",
+               flog_err(EC_LIB_SOCKET, "Can't make socket for %s : %s",
                         sockunion_log(su, buf, SU_ADDRSTRLEN),
                         safe_strerror(errno));
                return -1;
@@ -235,7 +235,7 @@ int sockunion_stream_socket(union sockunion *su)
        sock = socket(su->sa.sa_family, SOCK_STREAM, 0);
 
        if (sock < 0)
-               flog_err(LIB_ERR_SOCKET,
+               flog_err(EC_LIB_SOCKET,
                         "can't make socket sockunion_stream_socket");
 
        return sock;
@@ -274,7 +274,7 @@ int sockunion_bind(int sock, union sockunion *su, unsigned short port,
        ret = bind(sock, (struct sockaddr *)su, size);
        if (ret < 0) {
                char buf[SU_ADDRSTRLEN];
-               flog_err(LIB_ERR_SOCKET, "can't bind socket for %s : %s",
+               flog_err(EC_LIB_SOCKET, "can't bind socket for %s : %s",
                         sockunion_log(su, buf, SU_ADDRSTRLEN),
                         safe_strerror(errno));
        }
@@ -290,7 +290,7 @@ int sockopt_reuseaddr(int sock)
        ret = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
                         sizeof(on));
        if (ret < 0) {
-               flog_err(LIB_ERR_SOCKET,
+               flog_err(EC_LIB_SOCKET,
                         "can't set sockopt SO_REUSEADDR to socket %d", sock);
                return -1;
        }
@@ -306,7 +306,7 @@ int sockopt_reuseport(int sock)
        ret = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (void *)&on,
                         sizeof(on));
        if (ret < 0) {
-               flog_err(LIB_ERR_SOCKET,
+               flog_err(EC_LIB_SOCKET,
                         "can't set sockopt SO_REUSEPORT to socket %d", sock);
                return -1;
        }
@@ -328,7 +328,7 @@ int sockopt_ttl(int family, int sock, int ttl)
                ret = setsockopt(sock, IPPROTO_IP, IP_TTL, (void *)&ttl,
                                 sizeof(int));
                if (ret < 0) {
-                       flog_err(LIB_ERR_SOCKET,
+                       flog_err(EC_LIB_SOCKET,
                                 "can't set sockopt IP_TTL %d to socket %d",
                                 ttl, sock);
                        return -1;
@@ -341,7 +341,7 @@ int sockopt_ttl(int family, int sock, int ttl)
                                 (void *)&ttl, sizeof(int));
                if (ret < 0) {
                        flog_err(
-                               LIB_ERR_SOCKET,
+                               EC_LIB_SOCKET,
                                "can't set sockopt IPV6_UNICAST_HOPS %d to socket %d",
                                ttl, sock);
                        return -1;
@@ -356,7 +356,7 @@ int sockopt_ttl(int family, int sock, int ttl)
  * Which on linux is a no-op since it is enabled by
  * default and on BSD it uses TCP_NOPUSH to do
  * the same thing( which it was not configured to
- * use).  This cleanup of the api occured on 8/1/17
+ * use).  This cleanup of the api occurred on 8/1/17
  * I imagine if after more than 1 year of no-one
  * complaining, and a major upgrade release we
  * can deprecate and remove this function call
@@ -389,7 +389,7 @@ int sockopt_minttl(int family, int sock, int minttl)
                                     sizeof(minttl));
                if (ret < 0)
                        flog_err(
-                               LIB_ERR_SOCKET,
+                               EC_LIB_SOCKET,
                                "can't set sockopt IP_MINTTL to %d on socket %d: %s",
                                minttl, sock, safe_strerror(errno));
                return ret;
@@ -401,7 +401,7 @@ int sockopt_minttl(int family, int sock, int minttl)
                                     &minttl, sizeof(minttl));
                if (ret < 0)
                        flog_err(
-                               LIB_ERR_SOCKET,
+                               EC_LIB_SOCKET,
                                "can't set sockopt IPV6_MINHOPCOUNT to %d on socket %d: %s",
                                minttl, sock, safe_strerror(errno));
                return ret;
@@ -421,7 +421,7 @@ int sockopt_v6only(int family, int sock)
                ret = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&on,
                                 sizeof(int));
                if (ret < 0) {
-                       flog_err(LIB_ERR_SOCKET,
+                       flog_err(EC_LIB_SOCKET,
                                 "can't set sockopt IPV6_V6ONLY "
                                 "to socket %d",
                                 sock);
@@ -539,7 +539,7 @@ union sockunion *sockunion_getsockname(int fd)
 
        ret = getsockname(fd, (struct sockaddr *)&name, &len);
        if (ret < 0) {
-               flog_err(LIB_ERR_SOCKET,
+               flog_err(EC_LIB_SOCKET,
                         "Can't get local address and port by getsockname: %s",
                         safe_strerror(errno));
                return NULL;
@@ -576,8 +576,7 @@ union sockunion *sockunion_getpeername(int fd)
        len = sizeof name;
        ret = getpeername(fd, (struct sockaddr *)&name, &len);
        if (ret < 0) {
-               flog_err(LIB_ERR_SOCKET,
-                        "Can't get remote address and port: %s",
+               flog_err(EC_LIB_SOCKET, "Can't get remote address and port: %s",
                         safe_strerror(errno));
                return NULL;
        }