SERVER-20077 requestId field of message header should always be a signed integer

20 files changed, 65 insertions, 67 deletions

diff --git a/src/mongo/client/remote_command_runner_impl.cpp b/src/mongo/client/remote_command_runner_impl.cpp
index e856173a314..36bf7283d90 100644
--- a/src/mongo/client/remote_command_runner_impl.cpp
+++ b/src/mongo/client/remote_command_runner_impl.cpp
@@ -81,7 +81,7 @@ Status getStatusFromCursorResult(DBClientCursor& cursor) {
 }
 
 using RequestDownconverter = StatusWith<Message>(*)(const RemoteCommandRequest&);
-using ReplyUpconverter = StatusWith<RemoteCommandResponse>(*)(std::uint32_t requestId,
+using ReplyUpconverter = StatusWith<RemoteCommandResponse>(*)(std::int32_t requestId,
                                                               StringData cursorNamespace,
                                                               const Message& response);
 
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index c20fa2426bd..5ca96a91f11 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -178,7 +178,7 @@ public:
             }
 
             if (!dbresponse.response.empty()) {
-                port->reply(m, dbresponse.response, dbresponse.responseTo);
+                port->reply(m, dbresponse.response, dbresponse.responseToMsgId);
                 if (dbresponse.exhaustNS.size() > 0) {
                     MsgData::View header = dbresponse.response.header();
                     QueryResult::View qr = header.view2ptr();
@@ -190,7 +190,7 @@ public:
                         BufBuilder b(512);
                         b.appendNum((int)0 /*size set later in appendData()*/);
                         b.appendNum(header.getId());
-                        b.appendNum(header.getResponseTo());
+                        b.appendNum(header.getResponseToMsgId());
                         b.appendNum((int)dbGetMore);
                         b.appendNum((int)0);
                         b.appendStr(ns);
diff --git a/src/mongo/db/dbmessage.cpp b/src/mongo/db/dbmessage.cpp
index e8529486f8a..61a4d1509ac 100644
--- a/src/mongo/db/dbmessage.cpp
+++ b/src/mongo/db/dbmessage.cpp
@@ -227,7 +227,7 @@ void replyToQuery(int queryResultFlags, Message& m, DbResponse& dbresponse, BSON
     Message resp;
     replyToQuery(queryResultFlags, resp, obj);
     dbresponse.response = std::move(resp);
-    dbresponse.responseTo = m.header().getId();
+    dbresponse.responseToMsgId = m.header().getId();
 }
 
 void replyToQuery(int queryResultFlags, Message& response, const BSONObj& resultObj) {
diff --git a/src/mongo/db/dbmessage.h b/src/mongo/db/dbmessage.h
index 7cc1d62268c..976e4b37de1 100644
--- a/src/mongo/db/dbmessage.h
+++ b/src/mongo/db/dbmessage.h
@@ -313,9 +313,9 @@ public:
  */
 struct DbResponse {
     Message response;
-    MSGID responseTo;
+    int32_t responseToMsgId;
     std::string exhaustNS; /* points to ns if exhaust mode. 0=normal mode*/
-    DbResponse(Message r, MSGID rt) : response(std::move(r)), responseTo(rt) {}
+    DbResponse(Message r, int32_t rtId) : response(std::move(r)), responseToMsgId(rtId) {}
     DbResponse() = default;
 };
 
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 166a2b5683f..96bcf7d64ad 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -236,7 +236,7 @@ static void receivedCommand(OperationContext* txn,
                             Message& message) {
     invariant(nss.isCommand());
 
-    const MSGID responseTo = message.header().getId();
+    const int32_t responseToMsgId = message.header().getId();
 
     DbMessage dbMessage(message);
     QueryMessage queryMessage(dbMessage);
@@ -275,7 +275,7 @@ static void receivedCommand(OperationContext* txn,
     op->debug().responseLength = response.header().dataLen();
 
     dbResponse.response = std::move(response);
-    dbResponse.responseTo = responseTo;
+    dbResponse.responseToMsgId = responseToMsgId;
 }
 
 namespace {
@@ -283,7 +283,7 @@ namespace {
 void receivedRpc(OperationContext* txn, Client& client, DbResponse& dbResponse, Message& message) {
     invariant(message.operation() == dbCommand);
 
-    const MSGID responseTo = message.header().getId();
+    const int32_t responseToMsgId = message.header().getId();
 
     rpc::CommandReplyBuilder replyBuilder{};
 
@@ -316,7 +316,7 @@ void receivedRpc(OperationContext* txn, Client& client, DbResponse& dbResponse,
     curOp->debug().responseLength = response.header().dataLen();
 
     dbResponse.response = std::move(response);
-    dbResponse.responseTo = responseTo;
+    dbResponse.responseToMsgId = responseToMsgId;
 }
 
 // In SERVER-7775 we reimplemented the pseudo-commands fsyncUnlock, inProg, and killOp
@@ -386,7 +386,7 @@ static void receivedQuery(OperationContext* txn,
                           Message& m) {
     invariant(!nss.isCommand());
 
-    MSGID responseTo = m.header().getId();
+    int32_t responseToMsgId = m.header().getId();
 
     DbMessage d(m);
     QueryMessage q(d);
@@ -413,7 +413,7 @@ static void receivedQuery(OperationContext* txn,
     }
 
     op.debug().responseLength = dbResponse.response.header().dataLen();
-    dbResponse.responseTo = responseTo;
+    dbResponse.responseToMsgId = responseToMsgId;
 }
 
 // Mongod on win32 defines a value for this function. In all other executables it is NULL.
@@ -547,7 +547,7 @@ void assembleResponse(OperationContext* txn,
         else
             dbresponse.response.setData(opReply, "i am fine - dbMsg deprecated");
 
-        dbresponse.responseTo = m.header().getId();
+        dbresponse.responseToMsgId = m.header().getId();
     } else {
         try {
             // The following operations all require authorization.
@@ -951,7 +951,7 @@ bool receivedGetMore(OperationContext* txn, DbResponse& dbresponse, Message& m,
     curop.debug().responseLength = dbresponse.response.header().dataLen();
     curop.debug().nreturned = msgdata.getNReturned();
 
-    dbresponse.responseTo = m.header().getId();
+    dbresponse.responseToMsgId = m.header().getId();
 
     if (exhaust) {
         curop.debug().exhaust = true;
diff --git a/src/mongo/executor/async_mock_stream_factory.cpp b/src/mongo/executor/async_mock_stream_factory.cpp
index 2a2d8322b59..ae8356a4982 100644
--- a/src/mongo/executor/async_mock_stream_factory.cpp
+++ b/src/mongo/executor/async_mock_stream_factory.cpp
@@ -306,7 +306,7 @@ void AsyncMockStreamFactory::MockStream::simulateServer(
     replyBuilder->setMetadata(resp.metadata);
 
     auto replyMsg = replyBuilder->done();
-    replyMsg.header().setResponseTo(messageId);
+    replyMsg.header().setResponseToMsgId(messageId);
 
     {
         // The first read will be for the header.
diff --git a/src/mongo/executor/downconvert_find_and_getmore_commands.cpp b/src/mongo/executor/downconvert_find_and_getmore_commands.cpp
index 034c1f133cc..e03e8a0b2d4 100644
--- a/src/mongo/executor/downconvert_find_and_getmore_commands.cpp
+++ b/src/mongo/executor/downconvert_find_and_getmore_commands.cpp
@@ -56,7 +56,7 @@ namespace executor {
 
 namespace {
 
-StatusWith<std::tuple<CursorId, BSONArray>> getBatchFromReply(std::uint32_t requestId,
+StatusWith<std::tuple<CursorId, BSONArray>> getBatchFromReply(std::int32_t requestId,
                                                               const Message& response) {
     auto header = response.header();
     if (header.getNetworkOp() != mongo::opReply) {
@@ -65,10 +65,10 @@ StatusWith<std::tuple<CursorId, BSONArray>> getBatchFromReply(std::uint32_t requ
                               << mongo::networkOpToString(header.getNetworkOp())};
     }
 
-    if (header.getResponseTo() != requestId) {
+    if (header.getResponseToMsgId() != requestId) {
         return {ErrorCodes::ProtocolError,
                 str::stream() << "responseTo field of OP_REPLY header with value '"
-                              << header.getResponseTo() << "' does not match requestId '"
+                              << header.getResponseToMsgId() << "' does not match requestId '"
                               << requestId << "'"};
     }
 
@@ -204,7 +204,7 @@ StatusWith<Message> downconvertFindCommandRequest(const RemoteCommandRequest& re
     return {std::move(message)};
 }
 
-StatusWith<RemoteCommandResponse> upconvertLegacyQueryResponse(std::uint32_t requestId,
+StatusWith<RemoteCommandResponse> upconvertLegacyQueryResponse(std::int32_t requestId,
                                                                StringData cursorNamespace,
                                                                const Message& response) {
     auto swBatch = getBatchFromReply(requestId, response);
@@ -248,7 +248,7 @@ StatusWith<Message> downconvertGetMoreCommandRequest(const RemoteCommandRequest&
     return {std::move(m)};
 }
 
-StatusWith<RemoteCommandResponse> upconvertLegacyGetMoreResponse(std::uint32_t requestId,
+StatusWith<RemoteCommandResponse> upconvertLegacyGetMoreResponse(std::int32_t requestId,
                                                                  StringData cursorNamespace,
                                                                  const Message& response) {
     auto swBatch = getBatchFromReply(requestId, response);
diff --git a/src/mongo/executor/downconvert_find_and_getmore_commands.h b/src/mongo/executor/downconvert_find_and_getmore_commands.h
index dea13150ddd..d3f24f7331d 100644
--- a/src/mongo/executor/downconvert_find_and_getmore_commands.h
+++ b/src/mongo/executor/downconvert_find_and_getmore_commands.h
@@ -56,7 +56,7 @@ StatusWith<Message> downconvertFindCommandRequest(const RemoteCommandRequest& re
  * find command response. The 'requestId' parameter is the messageId of the original OP_QUERY, and
  * the 'cursorNamespace' is the full namespace of the collection the query ran on.
  */
-StatusWith<RemoteCommandResponse> upconvertLegacyQueryResponse(std::uint32_t requestId,
+StatusWith<RemoteCommandResponse> upconvertLegacyQueryResponse(std::int32_t requestId,
                                                                StringData cursorNamespace,
                                                                const Message& response);
 
@@ -73,7 +73,7 @@ StatusWith<Message> downconvertGetMoreCommandRequest(const RemoteCommandRequest&
  * getMore command response. The 'requestId' parameter is the messageId of the original OP_GET_MORE,
  * and the 'curesorNamespace' is the full namespace of the collection the original query ran on.
  */
-StatusWith<RemoteCommandResponse> upconvertLegacyGetMoreResponse(std::uint32_t requestId,
+StatusWith<RemoteCommandResponse> upconvertLegacyGetMoreResponse(std::int32_t requestId,
                                                                  StringData cursorNamespace,
                                                                  const Message& response);
 
diff --git a/src/mongo/executor/network_interface_asio_command.cpp b/src/mongo/executor/network_interface_asio_command.cpp
index c6dd3cb67dc..6ea3a10cc2f 100644
--- a/src/mongo/executor/network_interface_asio_command.cpp
+++ b/src/mongo/executor/network_interface_asio_command.cpp
@@ -75,7 +75,7 @@ template <typename Handler>
 void asyncSendMessage(AsyncStreamInterface& stream, Message* m, Handler&& handler) {
     static_assert(IsNetworkHandler<Handler>::value,
                   "Handler passed to asyncSendMessage does not conform to NetworkHandler concept");
-    m->header().setResponseTo(0);
+    m->header().setResponseToMsgId(0);
     m->header().setId(nextMessageId());
     // TODO: Some day we may need to support vector messages.
     fassert(28708, m->buf() != 0);
@@ -174,7 +174,7 @@ NetworkInterfaceASIO::AsyncCommand::AsyncCommand(AsyncConnection* conn,
                                                  Date_t now,
                                                  const HostAndPort& target)
     : _conn(conn), _type(type), _toSend(std::move(command)), _start(now), _target(target) {
-    _toSend.header().setResponseTo(0);
+    _toSend.header().setResponseToMsgId(0);
 }
 
 NetworkInterfaceASIO::AsyncConnection& NetworkInterfaceASIO::AsyncCommand::conn() {
@@ -364,7 +364,7 @@ void NetworkInterfaceASIO::_asyncRunCommand(AsyncOp* op, NetworkOpHandler handle
                         [this, op, recvMessageCallback, ec, bytes, cmd, handler] {
                             // validate response id
                             uint32_t expectedId = cmd->toSend().header().getId();
-                            uint32_t actualId = cmd->header().constView().getResponseTo();
+                            uint32_t actualId = cmd->header().constView().getResponseToMsgId();
                             if (actualId != expectedId) {
                                 LOG(3) << "got wrong response:"
                                        << " expected response id: " << expectedId
diff --git a/src/mongo/executor/network_interface_asio_test.cpp b/src/mongo/executor/network_interface_asio_test.cpp
index c188a182e1f..2a6e1844f26 100644
--- a/src/mongo/executor/network_interface_asio_test.cpp
+++ b/src/mongo/executor/network_interface_asio_test.cpp
@@ -436,7 +436,7 @@ public:
         replyBuilder->setMetadata(BSONObj());
 
         auto message = replyBuilder->done();
-        message.header().setResponseTo(messageId);
+        message.header().setResponseToMsgId(messageId);
 
         auto actualSize = message.header().getLen();
 
@@ -465,10 +465,11 @@ public:
 };
 
 TEST_F(MalformedMessageTest, messageHeaderWrongResponseTo) {
-    runMessageTest(
-        ErrorCodes::ProtocolError,
-        false,
-        [](MsgData::View message) { message.setResponseTo(message.getResponseTo() + 1); });
+    runMessageTest(ErrorCodes::ProtocolError,
+                   false,
+                   [](MsgData::View message) {
+                       message.setResponseToMsgId(message.getResponseToMsgId() + 1);
+                   });
 }
 
 TEST_F(MalformedMessageTest, messageHeaderlenZero) {
diff --git a/src/mongo/s/request.cpp b/src/mongo/s/request.cpp
index dcd78794a93..a396b0d7b86 100644
--- a/src/mongo/s/request.cpp
+++ b/src/mongo/s/request.cpp
@@ -84,7 +84,7 @@ void Request::process(OperationContext* txn, int attempt) {
     int op = _m.operation();
     verify(op > dbMsg);
 
-    const MSGID msgId = _m.header().getId();
+    const int32_t msgId = _m.header().getId();
 
     LOG(3) << "Request::process begin ns: " << getnsIfPresent() << " msg id: " << msgId
            << " op: " << op << " attempt: " << attempt;
diff --git a/src/mongo/s/request.h b/src/mongo/s/request.h
index 5e6779f8c79..5664474e845 100644
--- a/src/mongo/s/request.h
+++ b/src/mongo/s/request.h
@@ -61,7 +61,7 @@ public:
 
     bool isCommand() const;
 
-    MSGID id() const {
+    int32_t id() const {
         return _id;
     }
 
@@ -86,7 +86,7 @@ private:
     DbMessage _d;
     AbstractMessagingPort* const _p;
 
-    MSGID _id;
+    int32_t _id;
 
     bool _didInit;
 };
diff --git a/src/mongo/tools/sniffer.cpp b/src/mongo/tools/sniffer.cpp
index c879d8aaaf6..64abdf01a67 100644
--- a/src/mongo/tools/sniffer.cpp
+++ b/src/mongo/tools/sniffer.cpp
@@ -287,7 +287,7 @@ void processMessage(Connection& c, Message& m) {
     AuditingDbMessage d(m);
 
     if (m.operation() == mongo::opReply)
-        out() << " - " << (unsigned)m.header().getResponseTo();
+        out() << " - " << m.header().getResponseToMsgId();
     out() << '\n';
 
     try {
diff --git a/src/mongo/util/net/abstract_message_port.h b/src/mongo/util/net/abstract_message_port.h
index 49deebf9afc..c4e6530d5b2 100644
--- a/src/mongo/util/net/abstract_message_port.h
+++ b/src/mongo/util/net/abstract_message_port.h
@@ -43,7 +43,7 @@ public:
     AbstractMessagingPort() : tag(0), _connectionId(0) {}
     virtual ~AbstractMessagingPort() {}
     // like the reply below, but doesn't rely on received.data still being available
-    virtual void reply(Message& received, Message& response, MSGID responseTo) = 0;
+    virtual void reply(Message& received, Message& response, int32_t responseToMsgId) = 0;
     virtual void reply(Message& received, Message& response) = 0;
 
     virtual HostAndPort remote() const = 0;
diff --git a/src/mongo/util/net/message.cpp b/src/mongo/util/net/message.cpp
index f2777cb7972..515efc9c853 100644
--- a/src/mongo/util/net/message.cpp
+++ b/src/mongo/util/net/message.cpp
@@ -51,7 +51,7 @@ void Message::send(MessagingPort& p, const char* context) {
     }
 }
 
-AtomicWord<MSGID> NextMsgId;
+AtomicWord<int32_t> NextMsgId;
 
 /*struct MsgStart {
     MsgStart() {
@@ -60,7 +60,7 @@ AtomicWord<MSGID> NextMsgId;
     }
 } msgstart;*/
 
-MSGID nextMessageId() {
+int32_t nextMessageId() {
     return NextMsgId.fetchAndAdd(1);
 }
 
diff --git a/src/mongo/util/net/message.h b/src/mongo/util/net/message.h
index 7dd00e1beca..96de70c0235 100644
--- a/src/mongo/util/net/message.h
+++ b/src/mongo/util/net/message.h
@@ -53,8 +53,6 @@ const size_t MaxMessageSizeBytes = 48 * 1000 * 1000;
 class Message;
 class MessagingPort;
 
-typedef uint32_t MSGID;
-
 enum NetworkOp : int32_t {
     opInvalid = 0,
     opReply = 1,     /* reply. responseTo is set. */
@@ -216,11 +214,11 @@ public:
         return data().read<LittleEndian<int32_t>>(offsetof(Layout, messageLength));
     }
 
-    int32_t getRequestID() const {
+    int32_t getRequestMsgId() const {
         return data().read<LittleEndian<int32_t>>(offsetof(Layout, requestID));
     }
 
-    int32_t getResponseTo() const {
+    int32_t getResponseToMsgId() const {
         return data().read<LittleEndian<int32_t>>(offsetof(Layout, responseTo));
     }
 
@@ -252,11 +250,11 @@ public:
         data().write(tagLittleEndian(value), offsetof(Layout, messageLength));
     }
 
-    void setRequestID(int32_t value) {
+    void setRequestMsgId(int32_t value) {
         data().write(tagLittleEndian(value), offsetof(Layout, requestID));
     }
 
-    void setResponseTo(int32_t value) {
+    void setResponseToMsgId(int32_t value) {
         data().write(tagLittleEndian(value), offsetof(Layout, responseTo));
     }
 
@@ -301,12 +299,12 @@ public:
         return header().getMessageLength();
     }
 
-    MSGID getId() const {
-        return header().getRequestID();
+    int32_t getId() const {
+        return header().getRequestMsgId();
     }
 
-    MSGID getResponseTo() const {
-        return header().getResponseTo();
+    int32_t getResponseToMsgId() const {
+        return header().getResponseToMsgId();
     }
 
     NetworkOp getNetworkOp() const {
@@ -326,7 +324,7 @@ public:
     }
 
     int64_t getCursor() const {
-        verify(getResponseTo() > 0);
+        verify(getResponseToMsgId() > 0);
         verify(getNetworkOp() == opReply);
         return ConstDataView(data() + sizeof(int32_t)).read<LittleEndian<int64_t>>();
     }
@@ -359,12 +357,12 @@ public:
         return header().setMessageLength(value);
     }
 
-    void setId(MSGID value) {
-        return header().setRequestID(value);
+    void setId(int32_t value) {
+        return header().setRequestMsgId(value);
     }
 
-    void setResponseTo(MSGID value) {
-        return header().setResponseTo(value);
+    void setResponseToMsgId(int32_t value) {
+        return header().setResponseToMsgId(value);
     }
 
     void setOperation(int value) {
@@ -582,7 +580,7 @@ private:
 };
 
 
-MSGID nextMessageId();
+int32_t nextMessageId();
 
 
 }  // namespace mongo
diff --git a/src/mongo/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
index c916c2cfa50..03a6432c47b 100644
--- a/src/mongo/util/net/message_port.cpp
+++ b/src/mongo/util/net/message_port.cpp
@@ -157,14 +157,14 @@ bool MessagingPort::recv(Message& m) {
         // If responseTo is not 0 or -1 for first packet assume SSL
         else if (psock->isAwaitingHandshake()) {
 #ifndef MONGO_CONFIG_SSL
-            if (header.constView().getResponseTo() != 0 &&
-                header.constView().getResponseTo() != -1) {
+            if (header.constView().getResponseToMsgId() != 0 &&
+                header.constView().getResponseToMsgId() != -1) {
                 uasserted(17133,
                           "SSL handshake requested, SSL feature not available in this build");
             }
 #else
-            if (header.constView().getResponseTo() != 0 &&
-                header.constView().getResponseTo() != -1) {
+            if (header.constView().getResponseToMsgId() != 0 &&
+                header.constView().getResponseToMsgId() != -1) {
                 uassert(17132,
                         "SSL handshake received but server is started without SSL support",
                         sslGlobalParams.sslMode.load() != SSLParams::SSLMode_disabled);
@@ -215,8 +215,8 @@ void MessagingPort::reply(Message& received, Message& response) {
     say(/*received.from, */ response, received.header().getId());
 }
 
-void MessagingPort::reply(Message& received, Message& response, MSGID responseTo) {
-    say(/*received.from, */ response, responseTo);
+void MessagingPort::reply(Message& received, Message& response, int32_t responseToMsgId) {
+    say(/*received.from, */ response, responseToMsgId);
 }
 
 bool MessagingPort::call(Message& toSend, Message& response) {
@@ -231,12 +231,11 @@ bool MessagingPort::recv(const Message& toSend, Message& response) {
             mmm(log() << "recv not ok" << endl;) return false;
         }
         // log() << "got response: " << response.data->responseTo << endl;
-        if (response.header().getResponseTo() == toSend.header().getId())
+        if (response.header().getResponseToMsgId() == toSend.header().getId())
             break;
         error() << "MessagingPort::call() wrong id got:" << std::hex
-                << (unsigned)response.header().getResponseTo()
-                << " expect:" << (unsigned)toSend.header().getId() << '\n' << std::dec
-                << "  toSend op: " << (unsigned)toSend.operation() << '\n'
+                << response.header().getResponseToMsgId() << " expect:" << toSend.header().getId()
+                << '\n' << std::dec << "  toSend op: " << (unsigned)toSend.operation() << '\n'
                 << "  response msgid:" << (unsigned)response.header().getId() << '\n'
                 << "  response len:  " << (unsigned)response.header().getLen() << '\n'
                 << "  response op:  " << static_cast<int>(response.operation()) << '\n'
@@ -251,7 +250,7 @@ void MessagingPort::say(Message& toSend, int responseTo) {
     verify(!toSend.empty());
     mmm(log() << "*  say()  thr:" << GetCurrentThreadId() << endl;)
         toSend.header().setId(nextMessageId());
-    toSend.header().setResponseTo(responseTo);
+    toSend.header().setResponseToMsgId(responseTo);
     toSend.send(*this, "say");
 }
 
diff --git a/src/mongo/util/net/message_port.h b/src/mongo/util/net/message_port.h
index 6fc9b04620b..c1922b7202a 100644
--- a/src/mongo/util/net/message_port.h
+++ b/src/mongo/util/net/message_port.h
@@ -61,7 +61,7 @@ public:
        also, the Message data will go out of scope on the subsequent recv call.
     */
     bool recv(Message& m);
-    void reply(Message& received, Message& response, MSGID responseTo);
+    void reply(Message& received, Message& response, int32_t responseToMsgId);
     void reply(Message& received, Message& response);
     bool call(Message& toSend, Message& response);
 
diff --git a/src/mongo/util/net/message_port_mock.cpp b/src/mongo/util/net/message_port_mock.cpp
index 8f12c2280d2..ae6deb90c8e 100644
--- a/src/mongo/util/net/message_port_mock.cpp
+++ b/src/mongo/util/net/message_port_mock.cpp
@@ -42,7 +42,7 @@ MessagingPortMock::~MessagingPortMock() {}
 
 void MessagingPortMock::reply(Message& received, Message& response) {}
 
-void MessagingPortMock::reply(Message& received, Message& response, MSGID responseTo) {}
+void MessagingPortMock::reply(Message& received, Message& response, int32_t responseToMsgId) {}
 
 HostAndPort MessagingPortMock::remote() const {
     return _remote;
diff --git a/src/mongo/util/net/message_port_mock.h b/src/mongo/util/net/message_port_mock.h
index 5cc0f0662eb..39676a89094 100644
--- a/src/mongo/util/net/message_port_mock.h
+++ b/src/mongo/util/net/message_port_mock.h
@@ -44,7 +44,7 @@ public:
     MessagingPortMock();
     virtual ~MessagingPortMock();
 
-    virtual void reply(Message& received, Message& response, MSGID responseTo);
+    virtual void reply(Message& received, Message& response, int32_t responseToMsgId);
     virtual void reply(Message& received, Message& response);
 
     virtual HostAndPort remote() const;