Year 2007.

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

diff --git a/src/package.cpp b/src/package.cpp
index 2603aac..a3f173d 100644 (file)
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -1,5 +1,5 @@
-/* $Id: package.cpp,v 1.13 2006-08-30 08:49:13 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: package.cpp,v 1.18 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
  */
@@ -13,7 +13,7 @@
 namespace mp = metaproxy_1;
 
 mp::Package::Package() 
-    : m_route_pos(0), m_data(0)
+    : m_route_pos(0)
 {
 }
 
@@ -24,16 +24,10 @@ mp::Package::~Package()
 
 mp::Package::Package(mp::Session &session, const mp::Origin &origin) 
     : m_session(session), m_origin(origin),
-      m_route_pos(0), m_data(0)
+      m_route_pos(0)
 {
 }
 
-mp::Package::Package(mp::Session &session,
-                     const mp::Origin &origin, const mp::Origin &target) 
-    : m_session(session), m_origin(origin), m_target(target),
-      m_route_pos(0), m_data(0)
-{
-}
 
 mp::Package & mp::Package::copy_filter(const Package &p)
 {
@@ -70,23 +64,6 @@ mp::Session & mp::Package::session()
     return m_session;
 }
 
-
-int mp::Package::data() const
-{
-    return m_data;
-}
-
-int & mp::Package::data()
-{
-    return m_data;
-}
-        
-mp::Package & mp::Package::data(const int & data)
-{
-    m_data = data;
-    return *this;
-}
-
 mp::Origin mp::Package::origin() const 
 {
     return m_origin;
@@ -103,22 +80,6 @@ mp::Package & mp::Package::origin(const Origin & origin)
     return *this;
 }
 
-mp::Origin mp::Package::target() const 
-{
-    return m_target;
-}
-        
-mp::Origin & mp::Package::target()
-{
-    return m_target;
-}
-
-mp::Package & mp::Package::target(const Origin & target)
-{
-    m_target = target;
-    return *this;
-}
-
 mp::Package & mp::Package::router(const mp::Router &router)
 {
     m_route_pos = router.createpos();
@@ -143,19 +104,8 @@ mp::Session mp::Package::session() const
 
 std::ostream& std::operator<<(std::ostream& os,  mp::Package& p)
 {
-    os << p.session().id() << " ";
     os << p.origin() << " ";
-    os << p.target();
-    return os;
-}
-
-std::ostream& std::operator<<(std::ostream& os,  mp::Origin& o)
-{
-    if (o.address != "")
-        os << o.address;
-    else
-        os << "0";
-    os << ":" << o.port;
+    os << p.session().id();
     return os;
 }