Commit 21cbdfb1 authored by Scott Vokes's avatar Scott Vokes
Browse files

Merge branch 'develop' into develop_eliminate_sender 

Conflicts:
	include/kinetic_types.h
	src/lib/kinetic_types.c
parents 269342e2 08206d59

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_allocator.o \

	$(OUT_DIR)/kinetic_nbo.o \

	$(OUT_DIR)/kinetic_operation.o \

	$(OUT_DIR)/kinetic_pdu.o \

	$(OUT_DIR)/kinetic_response.o \

	$(OUT_DIR)/kinetic_bus.o \

	$(OUT_DIR)/kinetic_auth.o \

	$(OUT_DIR)/kinetic_pdu_unpack.o \

	$(OUT_DIR)/kinetic_proto.o \
@@ -68,7 +69,6 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_hmac.o \

	$(OUT_DIR)/kinetic_controller.o \

	$(OUT_DIR)/kinetic_device_info.o \

	$(OUT_DIR)/kinetic_serial_allocator.o \

	$(OUT_DIR)/kinetic_session.o \

	$(OUT_DIR)/kinetic_types_internal.o \

	$(OUT_DIR)/kinetic_types.o \

cleanhouse.diff

0 → 100644
+2582 −0

File added.

Preview size limit exceeded, changes collapsed.

include/kinetic_types.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ typedef enum { 
    KINETIC_STATUS_DEVICE_LOCKED,           ///< The operation failed because the device is sercurely locked. An UNLOCK must be issued to unlock for use.

    KINETIC_STATUS_ACL_ERROR,               ///< A security operation failed due to bad ACL(s)

    KINETIC_STATUS_NOT_AUTHORIZED,          ///< Authorization failure

    KINETIC_STATUS_INVALID_FILE,            ///< Specified file does not exist or could not be read/writtten

    KINETIC_STATUS_REQUEST_REJECTED,        ///< No request was attempted.

    KINETIC_STATUS_COUNT                    ///< Number of status codes in KineticStatusDescriptor

} KineticStatus;

src/lib/kinetic_admin_client.c

+17 −14
Original line number Diff line number Diff line
@@ -218,10 +218,6 @@ KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const 
    assert(session != NULL);

    assert(session->connection != NULL);



    KineticStatus status;

    status = KineticAuth_EnsureSslEnabled(&session->config);

    if (status != KINETIC_STATUS_SUCCESS) {return status;}



    KineticOperation* operation = KineticAllocator_NewOperation(session->connection);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}
@@ -229,16 +225,6 @@ KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const 
    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

    char const * const fw_path)

{

    assert(session != NULL);

    assert(session->connection != NULL);

    (void)session;

    (void)fw_path;

    return KINETIC_STATUS_INVALID;

}



KineticStatus KineticAdminClient_SetACL(KineticSession const * const session,

        const char *ACLPath) {

    assert(session != NULL);
@@ -269,3 +255,20 @@ KineticStatus KineticAdminClient_SetACL(KineticSession const * const session, 


    return status;

}



KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

    char const * const fw_path)

{

    assert(session != NULL);

    assert(session->connection != NULL);



    KineticOperation* operation = KineticAllocator_NewOperation(session->connection);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}

    

    KineticStatus status = KineticOperation_BuildUpdateFirmware(operation, fw_path);

    if (status != KINETIC_STATUS_SUCCESS) {

        return status;

    }

    

    return KineticController_ExecuteOperation(operation, NULL);

}

src/lib/kinetic_allocator.c

+2 −2
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ KineticOperation* KineticAllocator_NewOperation(KineticConnection* const connect 
    }

    KineticOperation_Init(newOperation, connection->pSession);

    LOGF3("Allocating new PDU on connection (0x%0llX)", connection);

    newOperation->request = (KineticPDU*)KineticCalloc(1, sizeof(KineticPDU));

    newOperation->request = (KineticRequest*)KineticCalloc(1, sizeof(KineticRequest));

    if (newOperation->request == NULL) {

        LOG0("Failed allocating new PDU!");

        KineticFree(newOperation);

        return NULL;

    }

    KineticPDU_InitWithCommand(newOperation->request, connection->pSession);

    KineticRequest_Init(newOperation->request, connection->pSession);

    LOGF3("Allocated new operation (0x%0llX) on connection (0x%0llX)", newOperation, connection);

    return newOperation;

}