X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpackage.hpp;h=719aaf593ad2a2055a5402b50ddc4592d846e676;hb=c3c716e784b76e911dcb43cff74fa11af6d8853b;hp=a4924ddf39bb46c25b188d7791f62b8edc8b3bb3;hpb=7969e482bd427717e116917116e52958432a9c16;p=metaproxy-moved-to-github.git

diff --git a/src/package.hpp b/src/package.hpp
index a4924dd..719aaf5 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -3,81 +3,97 @@
 #define PACKAGE_HPP
 
 #include <stdexcept>
+#include <yaz++/gdu.h>
 
+#include "router.hpp"
+#include "filter.hpp"
+#include "session.hpp"
 
 namespace yp2 {
-  
-  class Package {
-  public:
-      
-      Package(unsigned long int id = 0, bool close = 0) 
-          : m_session_id(id),  m_session_close(close),
-          m_filter(0), m_router(0), m_data(0)  {}
-
-      /// send Package to it's next Filter defined in Router
-      Package & move() {
-          m_filter = m_router->move(m_filter, this);
-          if (m_filter)
-              return m_filter->process(*this);
-          else
-              return *this;
-          }
-      
-
-      /// get function - right val in assignment
-      unsigned int session_id() const {
-          return m_session_id;
-      }
-      
-      /// get function - right val in assignment
-      unsigned int session_close() const {
-          return m_session_close;
-      }
-   
-
-      /// get function - right val in assignment
-      unsigned int data() const {
-          return m_data;
-      }
-
-      /// set function - left val in assignment
-      unsigned int & data() {
-          return m_data;
-      }
-
-      /// set function - can be chained
-      Package & data(const unsigned int & data){
-          m_data = data;
-          return *this;
-      }
-      
-
-      //Router router() const {
-      //  return m_router;
-      //}
-
-      //Router & router() {
-      //  return m_router;
-      //}
-
-      /// set function - can be chained
-      Package & router(const Router &router){
-          m_filter = 0;
-          m_router = &router;
-          return *this;
-      }
-
-      
-  private:
-      unsigned long int m_session_id;
-      bool m_session_close;
-      const Filter *m_filter;
-      const Router *m_router;
-      unsigned int m_data;
-  };
-  
-
-  
+    
+    class Origin {
+        enum origin_t {
+            API,
+            UNIX,
+            TCPIP
+        } type;
+        std::string address; // UNIX+TCPIP
+        int port;            // TCPIP only
+    public:
+        Origin() : type(API) {};
+    };
+    
+    class Package {
+    public:
+        
+        Package(yp2::Session &session, yp2::Origin &origin) 
+            : m_session(session), m_origin(origin),
+              m_filter(0), m_router(0), m_data(0)  {}
+        
+        /// send Package to it's next Filter defined in Router
+        Package & move() {
+            m_filter = m_router->move(m_filter, this);
+            if (m_filter)
+                return m_filter->process(*this);
+            else
+                return *this;
+        }
+        
+        /// access session - left val in assignment
+        yp2::Session & session() {
+            return m_session;
+        }
+        
+        /// get function - right val in assignment
+        unsigned int data() const {
+            return m_data;
+        }
+        
+        /// set function - left val in assignment
+        unsigned int & data() {
+            return m_data;
+        }
+        
+        /// set function - can be chained
+        Package & data(const unsigned int & data){
+            m_data = data;
+            return *this;
+        }
+        
+        
+        /// get function - right val in assignment
+        Origin origin() const {
+            return m_origin;
+        }
+        
+        /// set function - left val in assignment
+        Origin & origin() {
+            return m_origin;
+        }
+        
+        /// set function - can be chained
+        Package & origin(const Origin & origin){
+            m_origin = origin;
+            return *this;
+        }
+        
+        Package & router(const Router &router){
+            m_filter = 0;
+            m_router = &router;
+            return *this;
+        }
+                
+    private:
+        Session m_session;
+        Origin m_origin;
+        
+        const Filter *m_filter;
+        const Router *m_router;
+        unsigned int m_data;
+        
+        yazpp_1::GDU m_request_gdu;
+        yazpp_1::GDU m_response_gdu;
+    };
 }
 
 #endif