This file should not have been checked in!

[wxWidgets.git] / include / wx / sckaddr.h

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 1ea7a599dd91e3b2838718a475cd9302c5e7f521..fb165f0885a697df9f39db462f611a216297ff5a 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -6,14 +6,14 @@
 // Created:     26/04/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     26/04/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "sckaddr.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -21,34 +21,42 @@
 #if wxUSE_SOCKETS
 
 #include "wx/string.h"
 #if wxUSE_SOCKETS
 
 #include "wx/string.h"

-#include "gsocket.h"
+#include "wx/gsocket.h"

 
 
 
 

-class WXDLLEXPORT wxSockAddress : public wxObject {
+class WXDLLIMPEXP_NET wxSockAddress : public wxObject {

   DECLARE_ABSTRACT_CLASS(wxSockAddress)
 public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
 
   wxSockAddress();
   DECLARE_ABSTRACT_CLASS(wxSockAddress)
 public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
 
   wxSockAddress();

+  wxSockAddress(const wxSockAddress& other);

   virtual ~wxSockAddress();
 
   virtual ~wxSockAddress();
 

+  wxSockAddress& operator=(const wxSockAddress& other);
+

   virtual void Clear();
   virtual int Type() = 0;
 
   GAddress *GetAddress() const { return m_address; }
   void SetAddress(GAddress *address);
   virtual void Clear();
   virtual int Type() = 0;
 
   GAddress *GetAddress() const { return m_address; }
   void SetAddress(GAddress *address);

-  const wxSockAddress& operator =(const wxSockAddress& addr);

 
 

-  void CopyObject(wxObject& dest) const;
+  // we need to be able to create copies of the addresses polymorphically (i.e.
+  // without knowing the exact address class)
+  virtual wxSockAddress *Clone() const = 0;

 
 protected:
   GAddress *m_address;
 
 protected:
   GAddress *m_address;

+
+private:
+  void Init();

 };
 
 };
 

-class WXDLLEXPORT wxIPV4address : public wxSockAddress {
+class WXDLLIMPEXP_NET wxIPV4address : public wxSockAddress {

   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();
   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();

+  wxIPV4address(const wxIPV4address& other);

   virtual ~wxIPV4address();
 
   bool Hostname(const wxString& name);
   virtual ~wxIPV4address();
 
   bool Hostname(const wxString& name);


@@ -56,24 +64,29 @@ public:
   bool Service(const wxString& name);
   bool Service(unsigned short port);
   bool LocalHost();
   bool Service(const wxString& name);
   bool Service(unsigned short port);
   bool LocalHost();

+  bool AnyAddress();

 
   wxString Hostname();
 
   wxString Hostname();

+  wxString OrigHostname() { return m_origHostname; }

   unsigned short Service();
   unsigned short Service();

+  wxString IPAddress() const;

 
 

-  void Build(struct sockaddr*& addr, size_t& len);
-  void Disassemble(struct sockaddr *addr, size_t len);
+  virtual int Type() { return wxSockAddress::IPV4; }
+  virtual wxSockAddress *Clone() const;

 
 

-  inline int Type() { return wxSockAddress::IPV4; }
+private:
+  wxString m_origHostname;

 };
 
 #ifdef ENABLE_IPV6
 };
 
 #ifdef ENABLE_IPV6

-class WXDLLEXPORT wxIPV6address : public wxSockAddress {
+class WXDLLIMPEXP_NET wxIPV6address : public wxSockAddress {

   DECLARE_DYNAMIC_CLASS(wxIPV6address)
 private:
   struct sockaddr_in6 *m_addr;
 public:
   wxIPV6address();
   DECLARE_DYNAMIC_CLASS(wxIPV6address)
 private:
   struct sockaddr_in6 *m_addr;
 public:
   wxIPV6address();

-  ~wxIPV6address();
+  wxIPV6address(const wxIPV6address& other);
+  virtual ~wxIPV6address();

 
   bool Hostname(const wxString& name);
   bool Hostname(unsigned char addr[16]);
 
   bool Hostname(const wxString& name);
   bool Hostname(unsigned char addr[16]);


@@ -84,31 +97,37 @@ public:
   wxString Hostname() const;
   unsigned short Service() const;
 
   wxString Hostname() const;
   unsigned short Service() const;
 

-  inline int Type() { return wxSockAddress::IPV6; }
+  virtual int Type() { return wxSockAddress::IPV6; }
+  virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); }

 };
 #endif
 
 };
 #endif
 

-#ifdef __UNIX__
-#include <sys/un.h>
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#include <sys/socket.h>
+#ifndef __VMS__
+# include <sys/un.h>
+#endif

 
 

-class WXDLLEXPORT wxUNIXaddress : public wxSockAddress {
+class WXDLLIMPEXP_NET wxUNIXaddress : public wxSockAddress {

   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
 private:
   struct sockaddr_un *m_addr;
 public:
   wxUNIXaddress();
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
 private:
   struct sockaddr_un *m_addr;
 public:
   wxUNIXaddress();

-  ~wxUNIXaddress();
+  wxUNIXaddress(const wxUNIXaddress& other);
+  virtual ~wxUNIXaddress();

 
   void Filename(const wxString& name);
   wxString Filename();
 
 
   void Filename(const wxString& name);
   wxString Filename();
 

-  inline int Type() { return wxSockAddress::UNIX; }
+  virtual int Type() { return wxSockAddress::UNIX; }
+  virtual wxSockAddress *Clone() const { return new wxUNIXaddress(*this); }

 };
 #endif
   // __UNIX__
 
 #endif
   // wxUSE_SOCKETS
 };
 #endif
   // __UNIX__
 
 #endif
   // wxUSE_SOCKETS

-  
+

 #endif
   // _WX_NETWORK_ADDRESS_H
 #endif
   // _WX_NETWORK_ADDRESS_H