X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpackage.hpp;h=69fbcb77084d0f38aef649478b35418157d3d862;hb=6afc47267f76271433a958b94b2f534dd347c18e;hp=3fb632b55636018f4094b811c15cc5f4f4ebb012;hpb=daae7f857790a8826c1db2f0452c0a7d0ebb15e5;p=metaproxy-moved-to-github.git

diff --git a/src/package.hpp b/src/package.hpp
index 3fb632b..69fbcb7 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -1,50 +1,44 @@
-/* $Id: package.hpp,v 1.22 2006-08-30 10:48:52 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2010 Index Data
 
-   See the LICENSE file for details
- */
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef YP2_PACKAGE_HPP
 #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
-        unsigned long origin_id;
-    public:
-        Origin();
-        void set_tcpip_address(std::string addr, unsigned long id);
-    };
 
     class Package {
     public:
@@ -55,6 +49,7 @@ namespace metaproxy_1 {
         Package(metaproxy_1::Session &session, 
                 const metaproxy_1::Origin &origin);
 
+        /// 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
@@ -67,15 +62,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
@@ -84,6 +70,7 @@ namespace metaproxy_1 {
         /// set function - can be chained
         Package & origin(const Origin & origin);
 
+        /// set function - can be chained
         Package & router(const Router &router);
 
         yazpp_1::GDU &request();
@@ -99,7 +86,7 @@ namespace metaproxy_1 {
 
         RoutePos *m_route_pos;
 
-        int m_data;
+        //int m_data;
         
         yazpp_1::GDU m_request_gdu;
         yazpp_1::GDU m_response_gdu;
@@ -112,8 +99,9 @@ namespace metaproxy_1 {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+