Working directory pane in restore. Will get this into the stack next.

[bacula/bacula] / bacula / src / lib / address_conf.h

diff --git a/bacula/src/lib/address_conf.h b/bacula/src/lib/address_conf.h
index 1e86c745a454c5ca7c62858afda125cf7e09730e..78d7992d2be8a1254b5780dfe0600845c3ed580c 100644 (file)
--- a/bacula/src/lib/address_conf.h
+++ b/bacula/src/lib/address_conf.h
@@ -1,32 +1,38 @@
 /*
  *
- *   Written by Meno Abels, June MMIIII
+ *   Written by Meno Abels, June MMIV
  *
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   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 (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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.
-
- */
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
-class IPADDR {
+class IPADDR : public SMARTALLOC {
  public:
    typedef enum { R_SINGLE, R_SINGLE_PORT, R_SINGLE_ADDR, R_MULTIPLE,
                   R_DEFAULT, R_EMPTY
@@ -34,7 +40,7 @@ class IPADDR {
    IPADDR(int af);
    IPADDR(const IPADDR & src);
  private:
-   IPADDR() {  /* block this construction */ } 
+   IPADDR() {  /* block this construction */ }
    i_type type;
    union {
       struct sockaddr dontuse;
@@ -42,7 +48,7 @@ class IPADDR {
 #ifdef HAVE_IPV6
       struct sockaddr_in6 dontuse6;
 #endif
-   } buf;
+   } saddrbuf;
    struct sockaddr *saddr;
    struct sockaddr_in *saddr4;
 #ifdef HAVE_IPV6
@@ -51,8 +57,12 @@ class IPADDR {
  public:
    void set_type(i_type o);
    i_type get_type() const;
-   unsigned short get_port() const;
-   void set_port(unsigned short port);
+   unsigned short get_port_net_order() const;
+   unsigned short get_port_host_order() const
+   {
+      return ntohs(get_port_net_order());
+   }
+   void set_port_net(unsigned short port);
    int get_family() const;
    struct sockaddr *get_sockaddr();
    int get_sockaddr_len();
@@ -77,6 +87,17 @@ extern void store_addresses_port(LEX * lc, RES_ITEM * item, int index, int pass)
 extern void init_default_addresses(dlist ** addr, int port);
 
 extern const char *get_first_address(dlist * addrs, char *outputbuf, int outlen);
-extern int get_first_port(dlist * addrs);
+extern int get_first_port_net_order(dlist * addrs);
+extern int get_first_port_host_order(dlist * addrs);
 
 extern const char *build_addresses_str(dlist *addrs, char *buf, int blen);
+
+extern int sockaddr_get_port_net_order(const struct sockaddr *sa);
+extern int sockaddr_get_port(const struct sockaddr *sa);
+extern char *sockaddr_to_ascii(const struct sockaddr *sa, char *buf, int len);
+#ifdef WIN32
+#undef HAVE_OLD_SOCKOPT
+#endif
+#ifdef HAVE_OLD_SOCKOPT
+extern int inet_aton(const char *cp, struct in_addr *inp);
+#endif