08_refactor-makesock.diff

[paraslash.git] / net.h

diff --git a/net.h b/net.h
index 96fa07eeb43c4745687fd4efde9b7f16d4dabe5d..831cd3b8b72f2b3a7f90592c64f6a5f725c4b7d7 100644 (file)
--- a/net.h
+++ b/net.h
@@ -87,9 +87,16 @@ _static_inline_ bool is_valid_ipv6_address(const char *address)
 /**
  * Generic socket creation (passive and active sockets).
  */
-extern int makesock(unsigned l3type, unsigned l4type, int passive,
-                   const char *host, unsigned short port_number,
+extern int makesock(unsigned l4type, bool passive,
+                   const char *host, uint16_t port_number,
                    struct flowopts *fo);
+
+static inline int para_connect_simple(unsigned l4type,
+                                     const char *host, uint16_t port)
+{
+       return makesock(l4type, 0, host, port, NULL);
+}
+
 extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
 
 /**
@@ -97,7 +104,12 @@ extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
  */
 /** How many pending connections queue of a listening server will hold. */
 #define BACKLOG        10
-extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
+extern int para_listen(unsigned l4type, uint16_t port, struct flowopts *fo);
+
+static inline int para_listen_simple(unsigned l4type, uint16_t port)
+{
+       return para_listen(l4type, port, NULL);
+}
 
 /** Pretty-printing of IPv4/6 socket addresses */
 extern char *local_name(int sockfd);