lib/addr.c, etc.: Return plain addresses from `netaddress_resolve'.

[disorder] / lib / addr.h

diff --git a/lib/addr.h b/lib/addr.h
index 6b3991f123ae5ac42070ee9e2052550db62d8f13..edb727c52d636799722d3bda5283047a6596d7a2 100644 (file)
--- a/lib/addr.h
+++ b/lib/addr.h
@@ -43,27 +43,39 @@ struct netaddress {
   int port;
 };
 
+/** @brief A socket address and length */
+struct resolved {
+
+  /** @brief Pointer to the address */
+  struct sockaddr *sa;
+
+  /** @brief Length of the address */
+  socklen_t len;
+};
+
 struct addrinfo *get_address(const struct stringlist *a,
                             const struct addrinfo *pref,
-                            char **namep);
+                            char **namep)
+  attribute((nonnull (1)));
 
 int addrinfocmp(const struct addrinfo *a,
-               const struct addrinfo *b);
+               const struct addrinfo *b) attribute((nonnull (1, 2)));
 int sockaddrcmp(const struct sockaddr *a,
-               const struct sockaddr *b);
+               const struct sockaddr *b) attribute((nonnull (1, 2)));
 
-int multicast(const struct sockaddr *sa);
-char *format_sockaddr(const struct sockaddr *sa);
+int multicast(const struct sockaddr *sa) attribute((nonnull (1)));
+char *format_sockaddr(const struct sockaddr *sa) attribute((nonnull (1)));
 
 int netaddress_parse(struct netaddress *na,
                     int nvec,
-                    char **vec);
+                    char **vec) attribute((nonnull (1)));
 void netaddress_format(const struct netaddress *na,
                       int *nvecp,
-                      char ***vecp);
-struct addrinfo *netaddress_resolve(const struct netaddress *na,
-                                   int passive,
-                                   int protocol);
+                      char ***vecp) attribute((nonnull (1)));
+int netaddress_resolve(const struct netaddress *na, int passive, int type,
+                      struct resolved **raddr_out, size_t *nraddr_out)
+  attribute((nonnull (1, 4, 5)));
+void netaddress_free_resolved(struct resolved *raddr, size_t nraddr);
 
 #endif /* ADDR_H */