Commit fbc90802 authored by Greg Williams's avatar Greg Williams
Browse files

Internal refactoring and cleanup. 

* Changed KineticPDU to KineticRequest to finish seperation between request and responses.
* Broke up kinetic_pdu into kinetic_respone and kinetic_bus.
* Changed KineticPDU_InitWithCommand to KineticRequest_Init.
* Changed KineticClient_Put to validate value buffer length while building operation to clean up operation handling.
* Changed value payload handling to always use value array in KineticOperation for clean/consistent use and eliminated valueEnabled and sendValue attributes.
* Various test cleanup per refactoring, removed extraneous logging in tests.
parent bf4a3218

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.

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;

}

src/lib/kinetic_allocator.h

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ void KineticAllocator_FreeSession(KineticSession* session); 
KineticConnection* KineticAllocator_NewConnection(struct bus * b, KineticSession* const session);

void KineticAllocator_FreeConnection(KineticConnection* connection);



KineticPDU* KineticAllocator_NewPDU(KineticConnection* connection);

void KineticAllocator_FreePDU(KineticPDU* pdu);

KineticRequest* KineticAllocator_NewPDU(KineticConnection* connection);

void KineticAllocator_FreePDU(KineticRequest* pdu);



KineticOperation* KineticAllocator_NewOperation(KineticConnection* connection);

void KineticAllocator_FreeOperation(KineticOperation* operation);

src/lib/kinetic_auth.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ KineticStatus KineticAuth_EnsureSslEnabled(KineticSessionConfig const * const co 
    return KINETIC_STATUS_SUCCESS;

}



KineticStatus KineticAuth_PopulateHmac(KineticSessionConfig const * const config, KineticPDU * const pdu)

KineticStatus KineticAuth_PopulateHmac(KineticSessionConfig const * const config, KineticRequest * const pdu)

{

    assert(config);

    assert(pdu);
@@ -73,7 +73,7 @@ KineticStatus KineticAuth_PopulateHmac(KineticSessionConfig const * const config 
    return KINETIC_STATUS_SUCCESS;

}



KineticStatus KineticAuth_PopulatePin(KineticSessionConfig const * const config, KineticPDU * const pdu, ByteArray pin)

KineticStatus KineticAuth_PopulatePin(KineticSessionConfig const * const config, KineticRequest * const pdu, ByteArray pin)

{

    assert(config);

    assert(pdu);