X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpackage.hpp;h=466d7a0beb298aa1125698503936ed79530c2ced;hb=f0fb2a160e8c8cbb1147d476ae206ebcedbf8ecf;hp=d90cc765a47eca3a2a1b105f9a7433f55f8cd742;hpb=20a0ee8ffcc06380daaad873d35a9a0c24783963;p=metaproxy-moved-to-github.git

diff --git a/src/package.hpp b/src/package.hpp
index d90cc76..466d7a0 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,5 +1,5 @@
-/* $Id: package.hpp,v 1.20 2006-08-30 08:44:29 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: package.hpp,v 1.26 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -8,43 +8,25 @@
 #define YP2_PACKAGE_HPP
 
 #include <iosfwd>
-#include <stdexcept>
+
 #include <yazpp/gdu.h>
 
 #include "router.hpp"
 #include "filter.hpp"
 #include "session.hpp"
+#include "origin.hpp"
 
-namespace metaproxy_1
-{
-    class Origin;
+namespace metaproxy_1 {
     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
-    public:
-        Origin() : type(API) {};
-
-    };
 
     class Package {
     public:
@@ -54,11 +36,8 @@ namespace metaproxy_1 {
         
         Package(metaproxy_1::Session &session, 
                 const metaproxy_1::Origin &origin);
-        
-        Package(metaproxy_1::Session &session, 
-                const metaproxy_1::Origin &origin,
-                const metaproxy_1::Origin &target);
 
+        /// shallow copy constructor which only copies the filter chain info
         Package & copy_filter(const Package &p);
 
         /// send Package to it's next Filter defined in Router
@@ -71,15 +50,6 @@ namespace metaproxy_1 {
         metaproxy_1::Session & session();
         
         /// get function - right val in assignment
-        int data() const;
-
-        /// set function - left val in assignment
-        int & data();
-        
-        /// set function - can be chained
-        Package & data(const int & data);
-        
-        /// get function - right val in assignment
         Origin origin() const;
         
         /// set function - left val in assignment
@@ -88,15 +58,7 @@ namespace metaproxy_1 {
         /// set function - can be chained
         Package & origin(const Origin & origin);
 
-        /// get function - right val in assignment
-        Origin target() const;
-        
-        /// set function - left val in assignment
-        Origin & target();
-        
         /// set function - can be chained
-        Package & target(const Origin & target);
-
         Package & router(const Router &router);
 
         yazpp_1::GDU &request();
@@ -109,11 +71,10 @@ namespace metaproxy_1 {
     private:
         Session m_session;
         Origin m_origin;
-        Origin m_target;
 
         RoutePos *m_route_pos;
 
-        int m_data;
+        //int m_data;
         
         yazpp_1::GDU m_request_gdu;
         yazpp_1::GDU m_response_gdu;