Commit 0a0b3faf authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'master' of github.com:Seagate/kinetic-c

parents 6b03559a cf427636

include/kinetic_types.h

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ typedef struct _KineticSessionConfig { 
    // client and the device, used to sign requests.

    uint8_t keyData[KINETIC_MAX_KEY_LEN];

    ByteArray hmacKey;



    /// Set to `true' to enable SSL for for this session

    bool useSsl;



    /// Operation timeout. If 0, use the default (10 seconds).

    uint16_t timeoutSeconds;

} KineticSessionConfig;



/**

src/lib/kinetic_operation.c

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ static KineticStatus KineticOperation_SendRequestInner(KineticOperation* const o 
        .msg_size = offset,

        .cb       = KineticController_HandleResult,

        .udata    = operation,

        .timeout_sec = operation->timeoutSeconds,

        }))

    {

        LOGF0("Failed queuing request %p for transmit on fd=%d w/seq=%lld",

src/lib/kinetic_types_internal.c

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ void KineticOperation_Init(KineticOperation* op, KineticConnection* con) 
    KINETIC_ASSERT(con != NULL);

    *op = (KineticOperation) {

        .connection = con,

        .timeoutSeconds = con->pSession->config.timeoutSeconds,

    };

}

src/lib/kinetic_types_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct _KineticClient { 
    struct bus *bus;

};





// #TODO remove packed attribute and replace uses of sizeof(KineticPDUHeader)

//  with a constant

typedef struct __attribute__((__packed__)) _KineticPDUHeader {
@@ -179,6 +178,7 @@ struct _KineticOperation { 
    KineticP2P_Operation* p2pOp;

    KineticOperationCallback callback;

    KineticCompletionClosure closure;

    uint16_t timeoutSeconds;

};