Commit 23bfeca4 authored by Greg Williams's avatar Greg Williams
Browse files

Merged in develop

parents df5a0e76 5b9d209f

Makefile

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

	$(OUT_DIR)/kinetic_device_info.o \

	$(OUT_DIR)/kinetic_serial_allocator.o \

	$(OUT_DIR)/kinetic_connection.o \

	$(OUT_DIR)/kinetic_session.o \

	$(OUT_DIR)/kinetic_types_internal.o \

	$(OUT_DIR)/kinetic_types.o \

	$(OUT_DIR)/byte_array.o \
@@ -73,7 +73,7 @@ makedirs: 
all: default test system_tests run examples



clean: makedirs

	rm -rf ./bin/**/*

	rm -rf ./bin/**

	rm -f $(OUT_DIR)/*.o *.core *.log

	bundle exec rake clobber

	git submodule update --init

include/kinetic_types.h

+5 −2
Original line number Diff line number Diff line
@@ -350,18 +350,21 @@ typedef struct { 
    bool    tls; // optional, defaults to false

} KineticP2P_Peer;



typedef struct _KineticP2P_Operation KineticP2P_Operation;



typedef struct {

    ByteBuffer    key;

    ByteBuffer    version; // optional (defaults to force if not specified)

    ByteBuffer    newKey;

    KineticP2P_Operation* chainedOperation;

    KineticStatus resultStatus; // populated with the result of the operation

} KineticP2P_OperationData;



typedef struct {

struct _KineticP2P_Operation {

    KineticP2P_Peer peer; 

    size_t numOperations;

    KineticP2P_OperationData* operations; // pointer must remain valid until operations complete

} KineticP2P_Operation;

};



const char* KineticMessageType_GetName(KineticMessageType type);

kinetic-c.sublime-project

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
      "-Werror=implicit-function-declaration",

      "-D_POSIX_C_SOURCE=199309L",

      "-D_C99_SOURCE=1",

      "-DSYSTEM_TEST_HOST2=\"\"",

      "-Wno-nonnull",

      "-Wno-address",

      "-Wno-missing-field-initializers",

src/lib/kinetic_client.c

+10 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "kinetic_types_internal.h"

#include "kinetic_client.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_controller.h"

#include "kinetic_operation.h"

#include "kinetic_logger.h"
@@ -272,7 +272,15 @@ KineticStatus KineticClient_P2POperation(KineticSession const * const session, 
    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request

    KineticOperation_BuildP2POperation(operation, p2pOp);

    KineticStatus status = KineticOperation_BuildP2POperation(operation, p2pOp);

    if (status != KINETIC_STATUS_SUCCESS) {

        // TODO we need to find a more generic way to handle errors on command construction

        if (closure != NULL) {

            operation->closure = *closure;

        }

        KineticOperation_Complete(operation, status);

        return status;

    }



    // Execute the operation

    return KineticController_ExecuteOperation(operation, closure);

src/lib/kinetic_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
*/



#include "kinetic_controller.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_operation.h"

#include "kinetic_pdu.h"

#include "kinetic_auth.h"