auth: remove ceph_client_ticket struct

Ticket is generally opaque to client anyway.

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 6e6d945dc1e13446c035ef7cda86063f496a5a45..09899abc20241f15f309956a5431a5387976e31d 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -2476,7 +2476,6 @@ int Client::mount()
   whoami = messenger->get_myname().num();
 
   signed_ticket = monclient->get_signed_ticket();
-  ticket = monclient->get_ticket();
 
   objecter->signed_ticket = signed_ticket;
   objecter->init();

diff --git a/src/client/Client.h b/src/client/Client.h
index 3839a90891f7a6f35d35d6622f2c9513a3f3d910..e4bc9b9a42138bec86dfe7d3be59d9339c5984af 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -711,7 +711,6 @@ public:
   Messenger *messenger;  
   int whoami;
 
-  ceph_client_ticket ticket;
   bufferlist signed_ticket;
   
   // mds sessions

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 48e2e11aaa8458d0df8765a8979972db6b40a0ab..fbefa01a65716eb1d2d117e23e68b30c2076982f 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -314,16 +314,6 @@ struct ceph_client_unmount {
        __le64 have_version;
 } __attribute__ ((packed));
 
-/*
- * client authentication ticket
- */
-struct ceph_client_ticket {
-       __u32 client;
-       struct ceph_entity_addr addr;
-       struct ceph_timespec created, expires;
-       __u32 flags;
-} __attribute__ ((packed));
-
 /*
  * mds states
  *   > 0 -> in

diff --git a/src/include/types.h b/src/include/types.h
index 2b4e401f913c61f1405cb68516d7b34c1956b275..65041ca0cbe490c5603986c9666bd0eba0c92042 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -200,7 +200,6 @@ struct ltstr
 WRITE_RAW_ENCODER(ceph_fsid_t)
 WRITE_RAW_ENCODER(ceph_file_layout)
 WRITE_RAW_ENCODER(ceph_pg_pool)
-WRITE_RAW_ENCODER(ceph_client_ticket)
 WRITE_RAW_ENCODER(ceph_mds_session_head)
 WRITE_RAW_ENCODER(ceph_mds_request_head)
 WRITE_RAW_ENCODER(ceph_mds_request_release)

diff --git a/src/mon/ClientMap.h b/src/mon/ClientMap.h
index 48a7fa097a8367ea5bbd92c5ddfe74c85d6ab603..5c773b2b41908791808633d62ebe0de5e4acbe97 100644 (file)
--- a/src/mon/ClientMap.h
+++ b/src/mon/ClientMap.h
@@ -24,15 +24,10 @@
 using namespace std;
 
 #include "include/types.h"
-#if 0
-#include "msg/Messenger.h"
+#include "auth/ClientTicket.h"
 
-#include "mds/MDSMap.h"
-
-#include "PaxosService.h"
-#endif
 struct client_info_t {
-  ceph_client_ticket ticket;
+  ClientTicket ticket;
   bufferlist signed_ticket;
 
   entity_addr_t addr() { return entity_addr_t(ticket.addr); }

diff --git a/src/mon/ClientMonitor.cc b/src/mon/ClientMonitor.cc
index d0210d35ceaacd232123273b6643e01318e432e9..3d3642f6d129a4090451169eeecc0152df39b8f3 100644 (file)
--- a/src/mon/ClientMonitor.cc
+++ b/src/mon/ClientMonitor.cc
@@ -219,7 +219,6 @@ bool ClientMonitor::prepare_update(PaxosServiceMessage *m)
       }
       
       client_info_t info;
-      info.ticket.client = client;
       info.ticket.addr = addr;
       info.ticket.created = g_clock.now();
       info.ticket.expires = utime_t();

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 08370a29d30f3f81189c512d17005bae12368e11..c7e0ebdfb1c255ea808ca8f16bf01b16f697d938 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -19,9 +19,11 @@
 #include "msg/Messenger.h"
 
 #include "MonMap.h"
+#include "auth/ClientTicket.h"
 
 #include "common/Timer.h"
 
+
 class MonMap;
 class MMonMap;
 class MClientMountAck;
@@ -32,7 +34,7 @@ public:
 private:
   Messenger *messenger;
 
-  ceph_client_ticket ticket;
+  ClientTicket ticket;
   bufferlist signed_ticket;
 
   Context *mount_timeout_event;
@@ -109,7 +111,7 @@ private:
   void set_messenger(Messenger *m) { messenger = m; }
 
   bufferlist& get_signed_ticket() { return signed_ticket; }
-  ceph_client_ticket get_ticket() { return ticket; }
+  ClientTicket& get_ticket() { return ticket; }
 
 };