ovs-sandbox: Add note about OVN to initial output.

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

diff --git a/lib/socket-util.h b/lib/socket-util.h
index 47a6ec9..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,8 +29,10 @@
 
 int set_nonblocking(int fd);
 void xset_nonblocking(int fd);
-int set_dscp(int fd, uint8_t dscp);
+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);
 
@@ -49,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);
@@ -93,6 +96,13 @@ int af_inet_ifreq_ioctl(const char *name, struct ifreq *,
 #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)