From f8a101085b1797c0857ac3a6ea93f4735498f859 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Tue, 9 Oct 2007 17:30:46 +0000
Subject: [PATCH] fixed fakesyn

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1897 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/config.cc            | 4 ++--
 trunk/ceph/fakesyn.cc           | 4 ++--
 trunk/ceph/msg/FakeMessenger.cc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/trunk/ceph/config.cc b/trunk/ceph/config.cc
index a3bafec849c16..6e4d82ea609b1 100644
--- a/trunk/ceph/config.cc
+++ b/trunk/ceph/config.cc
@@ -451,9 +451,9 @@ bool parse_ip_port(const char *s, entity_addr_t& a)
     s++; off++;
 
     if (count <= 3)
-      a.ipq[count] = val;
+      a.v.ipq[count] = val;
     else
-      a.port = val;
+      a.v.port = val;
     
     count++;
     if (count == 4 && *s != ':') break;
diff --git a/trunk/ceph/fakesyn.cc b/trunk/ceph/fakesyn.cc
index 2e9f53e53e9df..9d12f138379ae 100644
--- a/trunk/ceph/fakesyn.cc
+++ b/trunk/ceph/fakesyn.cc
@@ -86,9 +86,9 @@ int main(int argc, char **argv)
 
   MonMap *monmap = new MonMap(g_conf.num_mon);
   entity_addr_t a;
-  a.nonce = getpid();
+  a.v.nonce = getpid();
   for (int i=0; i<g_conf.num_mon; i++) {
-    a.port = i;
+    a.v.port = i;
     monmap->mon_inst[i] = entity_inst_t(entity_name_t::MON(i), a);  // hack ; see FakeMessenger.cc
   }
   
diff --git a/trunk/ceph/msg/FakeMessenger.cc b/trunk/ceph/msg/FakeMessenger.cc
index a7b2d60b01511..8c6d9d71e7b19 100644
--- a/trunk/ceph/msg/FakeMessenger.cc
+++ b/trunk/ceph/msg/FakeMessenger.cc
@@ -273,9 +273,9 @@ FakeMessenger::FakeMessenger(entity_name_t me)  : Messenger(me)
   {
     // assign rank
     _myinst.name = me;
-    _myinst.addr.port = nranks++;
+    _myinst.addr.v.port = nranks++;
     //if (!me.is_mon())
-    _myinst.addr.nonce = getpid();
+    _myinst.addr.v.nonce = getpid();
 
     // add to directory
     directory[ _myinst.addr ] = this;
-- 
2.39.5