cursor: split opcode and response_to checks.

Author: chergert

src/mongoc/mongoc-cursor.c

@@ -605,20 +605,29 @@ _mongoc_cursor_get_more (mongoc_cursor_t *cursor)
                             &cursor->buffer,
                             cursor->hint,
                             &cursor->error)) {
-      goto failure;
+      GOTO (failure);
    }
 
-   if ((cursor->rpc.header.opcode != MONGOC_OPCODE_REPLY) ||
-       (cursor->rpc.header.response_to != request_id)) {
-      bson_set_error(&cursor->error,
-                     MONGOC_ERROR_PROTOCOL,
-                     MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
-                     "A reply to an invalid request id was received.");
-      goto failure;
+   if (cursor->rpc.header.opcode != MONGOC_OPCODE_REPLY) {
+      bson_set_error (&cursor->error,
+                      MONGOC_ERROR_PROTOCOL,
+                      MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
+                      "Invalid opcode. Expected %d, got %d.",
+                      MONGOC_OPCODE_REPLY, cursor->rpc.header.opcode);
+      GOTO (failure);
+   }
+
+   if (cursor->rpc.header.response_to != request_id) {
+      bson_set_error (&cursor->error,
+                      MONGOC_ERROR_PROTOCOL,
+                      MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
+                      "Invalid response_to. Expected %d, got %d.",
+                      request_id, cursor->rpc.header.response_to);
+      GOTO (failure);
    }
 
    if (_mongoc_cursor_unwrap_failure(cursor)) {
-      goto failure;
+      GOTO (failure);
    }
 
    if (cursor->reader) {