Imported Upstream version 3.3.0

[debian/amanda] / common-src / sockaddr-util.h

diff --git a/common-src/sockaddr-util.h b/common-src/sockaddr-util.h
index 868df2d2832dfa21c829b86c24f74bd44861d4b9..2b162018d025081bc663e2bb8327399d7d427f50 100644 (file)
--- a/common-src/sockaddr-util.h
+++ b/common-src/sockaddr-util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007,2008 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 2008, 2010 Zmanda, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -42,6 +42,7 @@ void  dump_sockaddr(sockaddr_union *  sa);
  * @returns: pointer to statically allocated string
  */
 char *  str_sockaddr(sockaddr_union *sa);
+char *  str_sockaddr_no_port(sockaddr_union *sa);
 
 /* Compare two sockaddr_union objects, optionally comparing
  * only the address (and thus ignoring port, flow info, etc.).
@@ -55,6 +56,17 @@ int     cmp_sockaddr(sockaddr_union *su1,
                     sockaddr_union *su2,
                     int addr_only);
 
+/* Parse a string into a sockaddr.  This will try all available address
+ * families.
+ *
+ * @param src: the string representation of the address
+ * @param dst: the sockaddr_union in which to store the result
+ * @returns: 1 on success, -1 on error, or 0 if unparseable
+ */
+int    str_to_sockaddr(
+       const char *src,
+       sockaddr_union *dst);
+
 /* Copy a sockaddr object.
  *
  * @param dest: destination