zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / network.c

diff --git a/lib/network.c b/lib/network.c
index 3f72b7141e916eb164ac72d6a6dde65ac9139fd2..411661a5e1bca1764803289f0edad2f373794acf 100644 (file)
--- a/lib/network.c
+++ b/lib/network.c
@@ -22,9 +22,10 @@
 #include <zebra.h>
 #include "log.h"
 #include "network.h"
+#include "lib_errors.h"
 
 /* Read nbytes from fd and store into ptr. */
-int readn(int fd, u_char *ptr, int nbytes)
+int readn(int fd, uint8_t *ptr, int nbytes)
 {
        int nleft;
        int nread;
@@ -47,7 +48,7 @@ int readn(int fd, u_char *ptr, int nbytes)
 }
 
 /* Write nbytes from ptr to fd. */
-int writen(int fd, const u_char *ptr, int nbytes)
+int writen(int fd, const uint8_t *ptr, int nbytes)
 {
        int nleft;
        int nwritten;
@@ -78,13 +79,15 @@ int set_nonblocking(int fd)
           should
           never be negative. */
        if ((flags = fcntl(fd, F_GETFL)) < 0) {
-               zlog_warn("fcntl(F_GETFL) failed for fd %d: %s", fd,
-                         safe_strerror(errno));
+               flog_err(EC_LIB_SYSTEM_CALL,
+                        "fcntl(F_GETFL) failed for fd %d: %s", fd,
+                        safe_strerror(errno));
                return -1;
        }
        if (fcntl(fd, F_SETFL, (flags | O_NONBLOCK)) < 0) {
-               zlog_warn("fcntl failed setting fd %d non-blocking: %s", fd,
-                         safe_strerror(errno));
+               flog_err(EC_LIB_SYSTEM_CALL,
+                        "fcntl failed setting fd %d non-blocking: %s", fd,
+                        safe_strerror(errno));
                return -1;
        }
        return 0;
@@ -105,12 +108,12 @@ int set_cloexec(int fd)
 
 float htonf(float host)
 {
-       u_int32_t lu1, lu2;
+       uint32_t lu1, lu2;
        float convert;
 
-       memcpy(&lu1, &host, sizeof(u_int32_t));
+       memcpy(&lu1, &host, sizeof(uint32_t));
        lu2 = htonl(lu1);
-       memcpy(&convert, &lu2, sizeof(u_int32_t));
+       memcpy(&convert, &lu2, sizeof(uint32_t));
        return convert;
 }