Refactor: add MC::sendBuffer(cb::const_byte_buffer)

Change-Id: I132dcb81da3455eaa23d5da474823c40ecc59f56
Reviewed-on: http://review.couchbase.org/110275
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: trondn

protocol/connection/client_connection.cc

@@ -524,14 +524,7 @@ void MemcachedConnection::readPlain(Frame& frame, size_t bytes) {
 }
 
 void MemcachedConnection::sendFrame(const Frame& frame) {
-    if (ssl) {
-        sendFrameSsl(frame);
-    } else {
-        sendFramePlain(frame);
-    }
-    if (packet_dump) {
-        cb::mcbp::dump(frame.payload.data(), std::cerr);
-    }
+    sendBuffer({frame.payload.data(), frame.payload.size()});
 }
 
 void MemcachedConnection::sendBuffer(const std::vector<iovec>& list) {
@@ -555,6 +548,21 @@ void MemcachedConnection::sendBuffer(const std::vector<iovec>& list) {
     }
 }
 
+void MemcachedConnection::sendBuffer(cb::const_byte_buffer buf) {
+    if (packet_dump) {
+        try {
+            cb::mcbp::dumpStream(buf, std::cerr);
+        } catch (const std::exception&) {
+            // ignore..
+        }
+    }
+    if (ssl) {
+        sendBufferSsl(buf);
+    } else {
+        sendBufferPlain(buf);
+    }
+}
+
 void MemcachedConnection::sendPartialFrame(Frame& frame,
                                            Frame::size_type length) {
     // Move the remainder to a new frame.

protocol/connection/client_connection.h

@@ -820,17 +820,8 @@ class MemcachedConnection {
 
     void readSsl(Frame& frame, size_t bytes);
 
-    void sendFramePlain(const Frame& frame) {
-        sendBufferPlain(cb::const_byte_buffer(frame.payload.data(),
-                                              frame.payload.size()));
-    }
-
-    void sendFrameSsl(const Frame& frame) {
-        sendBufferSsl(cb::const_byte_buffer(frame.payload.data(),
-                                             frame.payload.size()));
-    }
-
     void sendBuffer(const std::vector<iovec>& buf);
+    void sendBuffer(cb::const_byte_buffer buf);
 
     void sendBufferPlain(cb::const_byte_buffer buf);
     void sendBufferPlain(const std::vector<iovec>& list);