simplemessenger fixup w new structs

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1910 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/fakefuse.cc b/trunk/ceph/fakefuse.cc
index 2a78281b8064ce94f3f7072e0aec4087c004383c..b08d00d11a5d69f034b7b3a9191cbc8939cdf3d8 100644 (file)
--- a/trunk/ceph/fakefuse.cc
+++ b/trunk/ceph/fakefuse.cc
@@ -88,9 +88,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/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc
index d503f4f3bb9b6a30f62c719fde9a3dd2ff047cb7..846d8a6381665bfee122d6fd9137d9ec28c82f5f 100644 (file)
--- a/trunk/ceph/msg/SimpleMessenger.cc
+++ b/trunk/ceph/msg/SimpleMessenger.cc
@@ -152,13 +152,13 @@ int Rank::Accepter::start()
           myhostname->h_addr_list[0], 
           myhostname->h_length);
     rank.my_addr.set_addr(listen_addr);
-    rank.my_addr.port = 0;  // see below
+    rank.my_addr.v.port = 0;  // see below
   }
-  if (rank.my_addr.port == 0) {
+  if (rank.my_addr.v.port == 0) {
     entity_addr_t tmp;
     tmp.set_addr(listen_addr);
-    rank.my_addr.port = tmp.port;
-    rank.my_addr.nonce = getpid(); // FIXME: pid might not be best choice here.
+    rank.my_addr.v.port = tmp.v.port;
+    rank.my_addr.v.nonce = getpid(); // FIXME: pid might not be best choice here.
   }
 
   dout(1) << "accepter.start my_addr is " << rank.my_addr << dendl;
@@ -602,7 +602,7 @@ Message *Rank::Pipe::read_message()
   // envelope
   //dout(10) << "receiver.read_message from sd " << sd  << dendl;
   
-  msg_envelope_t env; 
+  ceph_message_header env; 
   if (!tcp_read( sd, (char*)&env, sizeof(env) )) {
     need_to_send_close = false;
     return 0;
@@ -617,7 +617,7 @@ Message *Rank::Pipe::read_message()
   bufferlist blist;
   int32_t pos = 0;
   list<int> chunk_at;
-  for (int i=0; i<env.nchunks; i++) {
+  for (unsigned i=0; i<env.nchunks; i++) {
     int32_t size;
     if (!tcp_read( sd, (char*)&size, sizeof(size) )) {
       need_to_send_close = false;
@@ -712,7 +712,7 @@ int Rank::Pipe::do_sendmsg(Message *m, struct msghdr *msg, int len)
 int Rank::Pipe::write_message(Message *m)
 {
   // get envelope, buffers
-  msg_envelope_t *env = &m->get_envelope();
+  ceph_message_header *env = &m->get_envelope();
   bufferlist blist;
   blist.claim( m->get_payload() );