Change forms of get_vhost functions.. get_vhost_otherinfo returns

[metaproxy-moved-to-github.git] / src / package.hpp

diff --git a/src/package.hpp b/src/package.hpp
index 987a3c8..3fb632b 100644 (file)
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,4 +1,4 @@
-/* $Id: package.hpp,v 1.18 2006-06-19 23:54:02 adam Exp $
+/* $Id: package.hpp,v 1.22 2006-08-30 10:48:52 adam Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -7,7 +7,7 @@
 #ifndef YP2_PACKAGE_HPP
 #define YP2_PACKAGE_HPP
 
-#include <iostream>
+#include <iosfwd>
 #include <stdexcept>
 #include <yazpp/gdu.h>
 
@@ -15,18 +15,35 @@
 #include "filter.hpp"
 #include "session.hpp"
 
+namespace metaproxy_1
+{
+    class Origin;
+    class Package;
+}
+
+
+namespace std 
+{
+    std::ostream& operator<<(std::ostream& os, metaproxy_1::Origin& o);
+    std::ostream& operator<<(std::ostream& os, metaproxy_1::Package& p);
+}
+
 namespace metaproxy_1 {
     
     class Origin {
+        friend std::ostream& 
+        std::operator<<(std::ostream& os,  metaproxy_1::Origin& o);
+
         enum origin_t {
             API,
             UNIX,
             TCPIP
         } type;
         std::string address; // UNIX+TCPIP
-        int port;            // TCPIP only
+        unsigned long origin_id;
     public:
-        Origin() : type(API) {};
+        Origin();
+        void set_tcpip_address(std::string addr, unsigned long id);
     };
 
     class Package {
@@ -35,8 +52,8 @@ namespace metaproxy_1 {
 
         ~Package();
         
-        Package(metaproxy_1::Session &session, const 
-                metaproxy_1::Origin &origin);
+        Package(metaproxy_1::Session &session, 
+                const metaproxy_1::Origin &origin);
 
         Package & copy_filter(const Package &p);
 
@@ -89,6 +106,8 @@ namespace metaproxy_1 {
     };
 }
 
+
+
 #endif
 /*
  * Local variables: