X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fmetaproxy%2Forigin.hpp;h=658872a44423618d23c25c06bf36e14f1db58919;hb=8b5b1897bd1223b6c8608685e0cceb82b47e5aed;hp=955476f28bd5fef958345a498c9447423805a507;hpb=cdb9d2053fa54a0a2d7da1514164de3bbe52edb3;p=metaproxy-moved-to-github.git

diff --git a/include/metaproxy/origin.hpp b/include/metaproxy/origin.hpp
index 955476f..658872a 100644
--- a/include/metaproxy/origin.hpp
+++ b/include/metaproxy/origin.hpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) Index Data
 
 Metaproxy 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
@@ -27,27 +27,15 @@ namespace metaproxy_1 {
 }
 
 namespace std {
-    std::ostream& operator<<(std::ostream& os, metaproxy_1::Origin& o);
+    std::ostream& operator<<(std::ostream& os, const metaproxy_1::Origin& o);
 }
 
 namespace metaproxy_1 {
-    
+
     class Origin {
     public:
-        Origin(std::string listen_host = "", unsigned int listen_port = 0);
-        
-        /// get function - right val in assignment
-        std::string listen_host() const;
-
-        /// set function - left val in assignment
-        std::string & listen_host();
- 
-        /// get function - right val in assignment
-        unsigned int listen_port() const;
-        
-        /// set function - left val in assignment
-        unsigned int & listen_port();
- 
+        Origin();
+
         /// set client IP info - left val in assignment
         void set_tcpip_address(std::string addr, unsigned long id);
 
@@ -56,32 +44,26 @@ namespace metaproxy_1 {
 
         /// set max sockets (for outgoing connections to a given target)
         int get_max_sockets();
-        
+
         /// get tcpip address
         std::string get_address();
 
+        /// get tcpip address
+        std::string get_bind_address();
+
         void set_custom_session(const std::string &s);
     private:
-        friend std::ostream& 
-        std::operator<<(std::ostream& os,  metaproxy_1::Origin& o);
-        
-        enum origin_t {
-            API,
-            UNIX,
-            TCPIP
-        } m_type;
-        std::string m_address; // UNIX+TCPIP
+        friend std::ostream&
+        std::operator<<(std::ostream& os, const metaproxy_1::Origin& o);
+
+        std::string m_address;
         unsigned int m_origin_id;
-        std::string m_listen_host;
-        unsigned int m_listen_port;
         int m_max_sockets;
         std::string m_custom_session;
+        std::string get_forward_address() const;
     };
-
 }
 
-
-
 #endif
 /*
  * Local variables: