ovsdb-server: Refactoring and clean up remote status reporting.

[cascardo/ovs.git] / lib / socket-util.h

diff --git a/lib/socket-util.h b/lib/socket-util.h
index 6e55a4c..c3c1224 100644 (file)
--- a/lib/socket-util.h
+++ b/lib/socket-util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,10 @@
 
 int set_nonblocking(int fd);
 void xset_nonblocking(int fd);
-int set_dscp(int fd, uint8_t dscp);
-
-int get_max_fds(void);
+void setsockopt_tcp_nodelay(int fd);
+int set_dscp(int fd, int family, uint8_t dscp);
 
+bool addr_is_ipv6(const char *host_name);
 int lookup_ip(const char *host_name, struct in_addr *address);
 int lookup_ipv6(const char *host_name, struct in6_addr *address);
 
@@ -40,13 +40,8 @@ int lookup_hostname(const char *host_name, struct in_addr *);
 
 int get_socket_rcvbuf(int sock);
 int check_connection_completion(int fd);
-int drain_rcvbuf(int fd);
 void drain_fd(int fd, size_t n_packets);
-int make_unix_socket(int style, bool nonblock,
-                     const char *bind_path, const char *connect_path);
-int get_unix_name_len(socklen_t sun_len);
 ovs_be32 guess_netmask(ovs_be32 ip);
-int get_null_fd(void);
 
 bool inet_parse_active(const char *target, uint16_t default_port,
                        struct sockaddr_storage *ssp);
@@ -56,7 +51,8 @@ int inet_open_active(int style, const char *target, uint16_t default_port,
 bool inet_parse_passive(const char *target, int default_port,
                         struct sockaddr_storage *ssp);
 int inet_open_passive(int style, const char *target, int default_port,
-                      struct sockaddr_storage *ssp, uint8_t dscp);
+                      struct sockaddr_storage *ssp, uint8_t dscp,
+                      bool kernel_print_port);
 
 int read_fully(int fd, void *, size_t, size_t *bytes_read);
 int write_fully(int fd, const void *, size_t, size_t *bytes_written);
@@ -64,9 +60,6 @@ int write_fully(int fd, const void *, size_t, size_t *bytes_written);
 int fsync_parent_dir(const char *file_name);
 int get_mtime(const char *file_name, struct timespec *mtime);
 
-void xpipe(int fds[2]);
-void xpipe_nonblocking(int fds[2]);
-
 char *describe_fd(int fd);
 
 /* Default value of dscp bits for connection between controller and manager.
@@ -74,12 +67,6 @@ char *describe_fd(int fd);
  * in <netinet/ip.h> is used. */
 #define DSCP_DEFAULT (IPTOS_PREC_INTERNETCONTROL >> 2)
 
-/* Helpers for calling ioctl() on an AF_INET socket. */
-struct ifreq;
-int af_inet_ioctl(unsigned long int command, const void *arg);
-int af_inet_ifreq_ioctl(const char *name, struct ifreq *,
-                        unsigned long int cmd, const char *cmd_name);
-
 /* Functions for working with sockaddr_storage that might contain an IPv4 or
  * IPv6 address. */
 uint16_t ss_get_port(const struct sockaddr_storage *);
@@ -89,7 +76,33 @@ char *ss_format_address(const struct sockaddr_storage *,
 size_t ss_length(const struct sockaddr_storage *);
 const char *sock_strerror(int error);
 
+#ifndef _WIN32
+void xpipe(int fds[2]);
+void xpipe_nonblocking(int fds[2]);
+
+int drain_rcvbuf(int fd);
+
+int make_unix_socket(int style, bool nonblock,
+                     const char *bind_path, const char *connect_path);
+int get_unix_name_len(socklen_t sun_len);
+
+/* Helpers for calling ioctl() on an AF_INET socket. */
+struct ifreq;
+int af_inet_ioctl(unsigned long int command, const void *arg);
+int af_inet_ifreq_ioctl(const char *name, struct ifreq *,
+                        unsigned long int cmd, const char *cmd_name);
+
+#define closesocket close
+#endif
+
 #ifdef _WIN32
+static inline int make_unix_socket(int style, bool nonblock,
+                                   const char *bind_path,
+                                   const char *connect_path)
+{
+    return -EINVAL;
+}
+
 /* Windows defines the 'optval' argument as char * instead of void *. */
 #define setsockopt(sock, level, optname, optval, optlen) \
     rpl_setsockopt(sock, level, optname, optval, optlen)
@@ -98,6 +111,14 @@ static inline int rpl_setsockopt(int sock, int level, int optname,
 {
     return (setsockopt)(sock, level, optname, optval, optlen);
 }
+
+#define getsockopt(sock, level, optname, optval, optlen) \
+    rpl_getsockopt(sock, level, optname, optval, optlen)
+static inline int rpl_getsockopt(int sock, int level, int optname,
+                                 void *optval, socklen_t *optlen)
+{
+    return (getsockopt)(sock, level, optname, optval, optlen);
+}
 #endif
 
 /* In Windows platform, errno is not set for socket calls.