code cleanup

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

diff --git a/src/origin.cpp b/src/origin.cpp
index 0def014..0880c3a 100644 (file)
--- a/src/origin.cpp
+++ b/src/origin.cpp
@@ -1,36 +1,49 @@
-/* $Id: origin.cpp,v 1.1 2006-08-30 10:48:52 adam Exp $
+/* $Id: origin.cpp,v 1.3 2006-09-26 13:02:50 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
  */
 
 
-#include "config.hpp"
-#include "package.hpp"
+//#include "config.hpp"
+#include "origin.hpp"
 
 #include <iostream>
 
 namespace mp = metaproxy_1;
 
-mp::Origin::Origin() : type(API) 
-{ 
-    origin_id = 0; 
+mp::Origin::Origin(std::string server_host, 
+                   unsigned int server_port) 
+    : m_type(API), m_address(""), m_origin_id(0),
+      m_server_host(server_host), m_server_port(server_port)
+{
 }
 
+std::string mp::Origin::server_host() const
+{
+    return m_server_host;
+};
+
+unsigned int mp::Origin::server_port() const
+{
+    return m_server_port;
+};
+
+
 void mp::Origin::set_tcpip_address(std::string addr, unsigned long s)
 {
-    address = addr;
-    origin_id = s;
-    type = TCPIP;
+    m_type = TCPIP;
+    m_address = addr;
+    m_origin_id = s;
 }
 
 std::ostream& std::operator<<(std::ostream& os,  mp::Origin& o)
 {
-    if (o.address != "")
-        os << o.address;
+    if (o.m_address != "")
+        os << o.m_address;
     else
         os << "0";
-    os << ":" << o.origin_id;
+    os << ":" << o.m_origin_id;
     return os;
 }