lib/addr.c: Introduce our own `freeaddrinfo' function.

[disorder] / lib / addr.h

diff --git a/lib/addr.h b/lib/addr.h
index 4049b078dba343f6eaa4180bdfb1190153927ab9..c0e82b04ec0713ec8356355fbc12aeddc6e5b97c 100644 (file)
--- a/lib/addr.h
+++ b/lib/addr.h
@@ -1,21 +1,19 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008, 2013 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/addr.h
  * @brief Socket address support */
@@ -23,19 +21,51 @@
 #ifndef ADDR_H
 #define ADDR_H
 
-#include <netdb.h>
+#if HAVE_NETDB_H
+# include <netdb.h>
+#endif
+
+struct stringlist;
 
-#include "configuration.h"
+/** @brief A network address */
+struct netaddress {
+  /** @brief Address family
+   *
+   * Typically @c AF_UNIX, @c AF_INET, @c AF_INET6 or @c AF_UNSPEC.
+   * Set to -1 to mean 'no address'.
+   */
+  int af;
+
+  /** @brief Address or NULL for 'any' */
+  char *address;
+
+  /** @brief Port number */
+  int port;
+};
 
 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) attribute((nonnull (1, 2)));
+
+int multicast(const struct sockaddr *sa) attribute((nonnull (1)));
+char *format_sockaddr(const struct sockaddr *sa) attribute((nonnull (1)));
 
-int multicast(const struct sockaddr *sa);
-char *format_sockaddr(const struct sockaddr *sa);
+int netaddress_parse(struct netaddress *na,
+                    int nvec,
+                    char **vec) attribute((nonnull (1)));
+void netaddress_format(const struct netaddress *na,
+                      int *nvecp,
+                      char ***vecp) attribute((nonnull (1)));
+struct addrinfo *netaddress_resolve(const struct netaddress *na,
+                                   int passive,
+                                   int protocol) attribute((nonnull (1)));
+void netaddress_freeaddrinfo(struct addrinfo *res) attribute((nonnull (1)));
 
 #endif /* ADDR_H */