projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added m_target member to keep track of target information. This is to
[metaproxy-moved-to-github.git]
/
src
/
package.hpp
diff --git
a/src/package.hpp
b/src/package.hpp
index
c5e63ff
..
d90cc76
100644
(file)
--- a/
src/package.hpp
+++ b/
src/package.hpp
@@
-1,23
+1,39
@@
-/* $Id: package.hpp,v 1.10 2005-11-11 15:00:25 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: package.hpp,v 1.20 2006-08-30 08:44:29 marc Exp $
+ Copyright (c) 2005-2006, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#ifndef YP2_PACKAGE_HPP
#define YP2_PACKAGE_HPP
*/
#ifndef YP2_PACKAGE_HPP
#define YP2_PACKAGE_HPP
-#include <iostream>
+#include <iosfwd>
#include <stdexcept>
#include <stdexcept>
-#include <yaz++/gdu.h>
+#include <yazpp/gdu.h>
#include "router.hpp"
#include "filter.hpp"
#include "session.hpp"
#include "router.hpp"
#include "filter.hpp"
#include "session.hpp"
-namespace yp2 {
+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 {
class Origin {
+ friend std::ostream&
+ std::operator<<(std::ostream& os, metaproxy_1::Origin& o);
+
enum origin_t {
API,
UNIX,
enum origin_t {
API,
UNIX,
@@
-27,31
+43,41
@@
namespace yp2 {
int port; // TCPIP only
public:
Origin() : type(API) {};
int port; // TCPIP only
public:
Origin() : type(API) {};
+
};
};
-
+
class Package {
public:
class Package {
public:
- Package() ;
+ Package();
+
+ ~Package();
+
+ Package(metaproxy_1::Session &session,
+ const metaproxy_1::Origin &origin);
- Package(yp2::Session &session, yp2::Origin &origin);
+ Package(metaproxy_1::Session &session,
+ const metaproxy_1::Origin &origin,
+ const metaproxy_1::Origin &target);
Package & copy_filter(const Package &p);
/// send Package to it's next Filter defined in Router
void move();
Package & copy_filter(const Package &p);
/// send Package to it's next Filter defined in Router
void move();
+
+ /// send Package to other route
+ void move(std::string route);
/// access session - left val in assignment
/// access session - left val in assignment
- yp2::Session & session();
+ metaproxy_1::Session & session();
/// get function - right val in assignment
/// get function - right val in assignment
- unsigned int data() const;
+ int data() const;
-
/// set function - left val in assignment
/// set function - left val in assignment
- unsigned int & data();
+ int & data();
/// set function - can be chained
/// set function - can be chained
- Package & data(const unsigned int & data);
+ Package & data(const int & data);
/// get function - right val in assignment
Origin origin() const;
/// get function - right val in assignment
Origin origin() const;
@@
-62,6
+88,15
@@
namespace yp2 {
/// set function - can be chained
Package & origin(const Origin & origin);
/// 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();
Package & router(const Router &router);
yazpp_1::GDU &request();
@@
-74,16
+109,19
@@
namespace yp2 {
private:
Session m_session;
Origin m_origin;
private:
Session m_session;
Origin m_origin;
-
- const filter::Base *m_filter;
- const Router *m_router;
- unsigned int m_data;
+ Origin m_target;
+
+ RoutePos *m_route_pos;
+
+ int m_data;
yazpp_1::GDU m_request_gdu;
yazpp_1::GDU m_response_gdu;
};
}
yazpp_1::GDU m_request_gdu;
yazpp_1::GDU m_response_gdu;
};
}
+
+
#endif
/*
* Local variables:
#endif
/*
* Local variables: