ext/libcouchbase/src/mcserver/mcserver.h in libcouchbase-0.3.3 vs ext/libcouchbase/src/mcserver/mcserver.h in libcouchbase-1.0.0

@@ -22,13 +22,10 @@
 #include <lcbio/timer-ng.h>
 #include <mc/mcreq.h>
 #include <netbuf/netbuf.h>
 
 #ifdef __cplusplus
-struct lcb_settings_st;
-struct lcb_server_st;
-
 namespace lcb {
 
 class RetryQueue;
 struct RetryOp;
 
@@ -107,10 +104,14 @@
 
     bool supports_mutation_tokens() const {
         return mutation_tokens;
     }
 
+    bool supports_compression() const {
+        return compsupport;
+    }
+
     bool is_connected() const {
         return connctx != NULL;
     }
 
     /** "Temporary" constructor. Only for use in retry queue */
@@ -170,14 +171,17 @@
 
     void handle_connected(lcbio_SOCKET *socket, lcb_error_t err, lcbio_OSERR syserr);
 
     enum ReadState {
         PKT_READ_COMPLETE,
-        PKT_READ_PARTIAL
+        PKT_READ_PARTIAL,
+        PKT_READ_ABORT
     };
 
     ReadState try_read(lcbio_CTX *ctx, rdb_IOROPE *ior);
+    int handle_unknown_error(const mc_PACKET *request,
+                             const MemcachedResponse& resinfo, lcb_error_t& newerr);
     bool handle_nmv(MemcachedResponse& resinfo, mc_PACKET *oldpkt);
     bool maybe_retry_packet(mc_PACKET *pkt, lcb_error_t err);
     bool maybe_reconnect_on_fake_timeout(lcb_error_t received_error);
 
     /** Disable */
@@ -198,21 +202,13 @@
 
     /** Whether extended 'UUID' and 'seqno' are available for each mutation */
     short mutation_tokens;
 
     lcbio_CTX *connctx;
-    lcbio_CONNREQ connreq;
+    lcb::io::ConnectionRequest *connreq;
 
     /** Request for current connection */
     lcb_host_t *curhost;
 };
 }
-
-typedef lcb::Server mc_SERVER;
-extern "C" {int mcserver_supports_compression(mc_SERVER*);}
-
-#else
-/* C only */
-typedef struct mc_SERVER mc_SERVER;
-int mcserver_supports_compression(mc_SERVER *server);
 #endif /* __cplusplus */
 #endif /* LCB_MCSERVER_H */