X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.h;h=9c06dd489380e859492c75736fabb7f33e28e8ea;hb=b16ad193bad91e48cdfb9da42ae8192bd129d7fb;hp=143fb812f4c1be20368b93cbb60be26eaeb826fe;hpb=f4019242252bf8e7594a72efdac6214a5abd4364;p=paraslash.git

diff --git a/net.h b/net.h
index 143fb812..9c06dd48 100644
--- a/net.h
+++ b/net.h
@@ -51,14 +51,11 @@
 /** The maximum length of the host component in an URL. */
 #define MAX_HOSTLEN 256
 
-/**
- * Flowopts: Transport-layer independent encapsulation of socket options
- *           that need to be registered prior to setting up a connection.
- */
+/* Opaque, only known to net.c. */
 struct flowopts;
 
-extern struct flowopts *flowopt_new(void);
-extern void flowopt_add(struct flowopts *fo, int level, int opt,
+struct flowopts *flowopt_new(void);
+void flowopt_add(struct flowopts *fo, int level, int opt,
 		const char *name, const void *val, int len);
 void flowopt_cleanup(struct flowopts *fo);
 /** Flowopt shortcut macros */
@@ -67,11 +64,13 @@ void flowopt_cleanup(struct flowopts *fo);
 /**
  * Functions to parse and validate (parts of) URLs.
  */
-extern char *parse_cidr(const char *cidr,
-			char *addr, ssize_t addrlen, int32_t *netmask);
-extern char *parse_url(const char *url,
-		       char *host, ssize_t hostlen, int32_t *port);
-extern const char *stringify_port(int port, const char *transport);
+char *parse_cidr(const char *cidr,
+		char *addr, ssize_t addrlen, int32_t *netmask);
+char *parse_url(const char *url,
+		char *host, ssize_t hostlen, int32_t *port);
+char *format_url(const char *url, int default_port);
+const char *stringify_port(int port, const char *transport);
+
 /**
  * Ensure that string conforms to the IPv4 address format.
  *
@@ -128,20 +127,21 @@ bool sockaddr_equal(const struct sockaddr *sa1, const struct sockaddr *sa2);
 /** How many pending connections queue of a listening server will hold. */
 #define BACKLOG	10
 
+int para_listen(unsigned l4type, const char *addr, uint16_t port);
 int para_listen_simple(unsigned l4type, uint16_t port);
 
 /** Pretty-printing of IPv4/6 socket addresses */
-extern char *remote_name(int sockfd);
+char *remote_name(int sockfd);
 
 /**
  * Determining maximum payload (packet) size
  */
-extern int generic_max_transport_msg_size(int sockfd);
+int generic_max_transport_msg_size(int sockfd);
 
 int recv_bin_buffer(int fd, char *buf, size_t size);
 int recv_buffer(int fd, char *buf, size_t size);
 
-int para_accept(int fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd);
+int para_accept(int fd, void *addr, socklen_t size, int *new_fd);
 int create_local_socket(const char *name);
 int connect_local_socket(const char *name);
 int recv_cred_buffer(int, char *, size_t);
@@ -154,4 +154,4 @@ ssize_t send_cred_buffer(int, char*);
 #define DCCP_MAX_HEADER		128
 /** Hardcoded maximum number of separate CCID modules compiled into a host. */
 #define DCCP_MAX_HOST_CCIDS	20
-extern int dccp_available_ccids(uint8_t **ccid_array);
+int dccp_available_ccids(uint8_t **ccid_array);