X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Forigin.cpp;h=b4083721981a25e77e0466dfb5b22873b9e3ee86;hb=6905641b1284e5e323b343e365dff7ec6c4686cf;hp=29f544ba4d56eeb09d0d5cf05adf390e0dd2f68d;hpb=ef66a2136e7bc6bd0b9821d880ab949687159aa1;p=metaproxy-moved-to-github.git

diff --git a/src/origin.cpp b/src/origin.cpp
index 29f544b..b408372 100644
--- a/src/origin.cpp
+++ b/src/origin.cpp
@@ -1,49 +1,74 @@
-/* $Id: origin.cpp,v 1.2 2006-09-26 11:37:08 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: origin.cpp,v 1.6 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-   See the LICENSE file for details
- */
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
 
-#include "config.hpp"
-#include "package.hpp"
+//#include "config.hpp"
+#include "origin.hpp"
 
 #include <iostream>
 
 namespace mp = metaproxy_1;
 
-mp::Origin::Origin(std::string server_host, 
-                   unsigned int server_port) 
-    : type(API), address(""), origin_id(0),
-      m_server_host(server_host), m_server_port(server_port)
+mp::Origin::Origin(std::string listen_host, 
+                   unsigned int listen_port) 
+    : m_type(API), m_address(""), m_origin_id(0),
+      m_listen_host(listen_host), m_listen_port(listen_port)
 {
 }
 
-std::string mp::Origin::server_host() const
+std::string mp::Origin::listen_host() const
 {
-    return m_server_host;
+    return m_listen_host;
 };
 
-unsigned int mp::Origin::server_port() const
+std::string & mp::Origin::listen_host()
 {
-    return m_server_port;
+    return m_listen_host;
 };
 
+unsigned int mp::Origin::listen_port() const
+{
+    return m_listen_port;
+};
+
+unsigned int & mp::Origin::listen_port()
+{
+    return m_listen_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;
 }