Commit 8ca94af8 authored by Scott Vokes's avatar Scott Vokes
Browse files

Update tests / types for API changes.

parent 9548459d

include/kinetic_client.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ KineticStatus KineticClient_InstantSecureErase(KineticSession const * const sess 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_SetClusterVersion(KineticSessionHandle handle,

KineticStatus KineticClient_SetClusterVersion(KineticSession handle,

                                              int64_t clusterVersion,

                                              int64_t newClusterVersion);

src/lib/kinetic_client.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ KineticStatus KineticClient_InstantSecureErase(KineticSession const * const sess 
    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticClient_SetClusterVersion(KineticSessionHandle handle,

KineticStatus KineticClient_SetClusterVersion(KineticSession handle,

                                              int64_t clusterVersion,

                                              int64_t newClusterVersion)

{

src/lib/kinetic_operation.c

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ KineticStatus KineticOperation_SendRequest(KineticOperation* const operation) 
    case KINETIC_PROTO_MESSAGE_AUTH_TYPE_HMACAUTH:

        // Populate the HMAC for the protobuf

        KineticHMAC_Init(&request->hmac, KINETIC_PROTO_COMMAND_SECURITY_ACL_HMACALGORITHM_HmacSHA1);

        KineticHMAC_Populate(&request->hmac, request->proto, request->connection->session.hmacKey);

        KineticHMAC_Populate(&request->hmac, request->proto, request->connection->session.config.hmacKey);

        break;

    default:

        break;
@@ -703,7 +703,7 @@ void KineticOperation_BuildInstantSecureErase(KineticOperation* operation) 
    operation->request->command->body = &operation->request->protoData.message.body;

    operation->request->command->body->pinOp = &operation->request->protoData.message.pinOp;

 

#if 1

#if 0

    /* Replace HMAC auth with pin auth */

    KineticProto_Message* pdu = operation->request->proto;

    pdu->has_authType = true;
@@ -748,7 +748,7 @@ KineticStatus KineticOperation_SetClusterVersionCallback(KineticOperation* opera 
void KineticOperation_BuildSetClusterVersion(KineticOperation* operation, int64_t newClusterVersion)

{

    KineticOperation_ValidateOperation(operation);

    KineticConnection_IncrementSequence(operation->connection);

    KineticSession_IncrementSequence(&operation->connection->session);

    operation->request->protoData.message.command.header->messageType = KINETIC_PROTO_COMMAND_MESSAGE_TYPE_SETUP;

    operation->request->protoData.message.command.header->has_messageType = true;

src/lib/kinetic_socket.c

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ KineticStatus KineticSocket_Read(int socket, ByteBuffer* dest, size_t len) 
        while (!abortFlush && dest->bytesUsed < len) {

            int opStatus;

            fd_set readSet;

            fd_set errorSet;

            struct timeval timeout;

            size_t remainingLen = len - dest->bytesUsed;

src/lib/kinetic_types_internal.c

+2 −2
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ void KineticMessage_HeaderInit(KineticProto_Command_Header* hdr, 
    *hdr = (KineticProto_Command_Header) {

        .base = PROTOBUF_C_MESSAGE_INIT(&KineticProto_command_header__descriptor),

        .has_clusterVersion = true,

        .clusterVersion = con->session.clusterVersion,

        .clusterVersion = con->session.config.clusterVersion,

        .has_connectionID = true,

        .connectionID = con->connectionID,

        .has_sequence = true,
@@ -492,7 +492,7 @@ void KineticPDU_Init(KineticPDU* pdu, KineticConnection* con) 
    pdu->headerNBO = KINETIC_PDU_HEADER_INIT;

    KineticMessage_Init(&(pdu->protoData.message));

    Kinetic_auth_init_hmac(

            &(pdu->protoData.message), con->session.identity, con->session.hmacKey);

            &(pdu->protoData.message), con->session.config.identity, con->session.config.hmacKey);

    KineticMessage_HeaderInit(&(pdu->protoData.message.header), con);

}