Commit 953cf967 authored by Frank Barrus's avatar Frank Barrus
Browse files

Merge pull request #26 from DaisyHsiung/fix_The_wrong_output_of_GetLog_command_#25 

correct the mapping between KineticMessage and kinetic protocol enum
parents 6d601b3a 38a7f6fa

include/kinetic_types.h

+33 −33
Original line number Diff line number Diff line
@@ -354,39 +354,39 @@ typedef struct { 
 * Log info message types

 */

typedef enum {

    KINETIC_MESSAGE_TYPE_INVALID = 0,

    KINETIC_MESSAGE_TYPE_GET_RESPONSE,              ///< GET_RESPONSE

    KINETIC_MESSAGE_TYPE_GET,                       ///< GET

    KINETIC_MESSAGE_TYPE_PUT_RESPONSE,              ///< PUT_RESPONSE

    KINETIC_MESSAGE_TYPE_PUT,                       ///< PUT

    KINETIC_MESSAGE_TYPE_DELETE_RESPONSE,           ///< DELETE_RESPONSE

    KINETIC_MESSAGE_TYPE_DELETE,                    ///< DELETE

    KINETIC_MESSAGE_TYPE_GETNEXT_RESPONSE,          ///< GETNEXT_RESPONSE

    KINETIC_MESSAGE_TYPE_GETNEXT,                   ///< GETNEXT

    KINETIC_MESSAGE_TYPE_GETPREVIOUS_RESPONSE,      ///< GETPREVIOUS_RESPONSE

    KINETIC_MESSAGE_TYPE_GETPREVIOUS,               ///< GETPREVIOUS

    KINETIC_MESSAGE_TYPE_GETKEYRANGE_RESPONSE,      ///< GETKEYRANGE_RESPONSE

    KINETIC_MESSAGE_TYPE_GETKEYRANGE,               ///< GETKEYRANGE

    KINETIC_MESSAGE_TYPE_GETVERSION_RESPONSE,       ///< GETVERSION_RESPONSE

    KINETIC_MESSAGE_TYPE_GETVERSION,                ///< GETVERSION

    KINETIC_MESSAGE_TYPE_SETUP_RESPONSE,            ///< SETUP_RESPONSE

    KINETIC_MESSAGE_TYPE_SETUP,                     ///< SETUP

    KINETIC_MESSAGE_TYPE_GETLOG_RESPONSE,           ///< GETLOG_RESPONSE

    KINETIC_MESSAGE_TYPE_GETLOG,                    ///< GETLOG

    KINETIC_MESSAGE_TYPE_SECURITY_RESPONSE,         ///< SECURITY_RESPONSE

    KINETIC_MESSAGE_TYPE_SECURITY,                  ///< SECURITY

    KINETIC_MESSAGE_TYPE_PEER2PEERPUSH_RESPONSE,    ///< PEER2PEERPUSH_RESPONSE

    KINETIC_MESSAGE_TYPE_PEER2PEERPUSH,             ///< PEER2PEERPUSH

    KINETIC_MESSAGE_TYPE_NOOP_RESPONSE,             ///< NOOP_RESPONSE

    KINETIC_MESSAGE_TYPE_NOOP,                      ///< NOOP

    KINETIC_MESSAGE_TYPE_FLUSHALLDATA_RESPONSE,     ///< FLUSHALLDATA_RESPONSE

    KINETIC_MESSAGE_TYPE_FLUSHALLDATA,              ///< FLUSHALLDATA

    KINETIC_MESSAGE_TYPE_PINOP_RESPONSE,            ///< PINOP_RESPONSE

    KINETIC_MESSAGE_TYPE_PINOP,                     ///< PINOP

    KINETIC_MESSAGE_TYPE_MEDIASCAN_RESPONSE,        ///< MEDIASCAN_RESPONSE

    KINETIC_MESSAGE_TYPE_MEDIASCAN,                 ///< MEDIASCAN

    KINETIC_MESSAGE_TYPE_MEDIAOPTIMIZE_RESPONSE,    ///< MEDIAOPTIMIZE_RESPONSE

    KINETIC_MESSAGE_TYPE_MEDIAOPTIMIZE,             ///< MEDIAOPTIMIZE

    KINETIC_MESSAGE_TYPE_INVALID = -1,

    KINETIC_MESSAGE_TYPE_GET_RESPONSE = 1,              ///< GET_RESPONSE

    KINETIC_MESSAGE_TYPE_GET = 2 ,                      ///< GET

    KINETIC_MESSAGE_TYPE_PUT_RESPONSE = 3,              ///< PUT_RESPONSE

    KINETIC_MESSAGE_TYPE_PUT = 4,                       ///< PUT

    KINETIC_MESSAGE_TYPE_DELETE_RESPONSE = 5,           ///< DELETE_RESPONSE

    KINETIC_MESSAGE_TYPE_DELETE = 6,                    ///< DELETE

    KINETIC_MESSAGE_TYPE_GETNEXT_RESPONSE = 7,          ///< GETNEXT_RESPONSE

    KINETIC_MESSAGE_TYPE_GETNEXT = 8,                   ///< GETNEXT

    KINETIC_MESSAGE_TYPE_GETPREVIOUS_RESPONSE = 9,      ///< GETPREVIOUS_RESPONSE

    KINETIC_MESSAGE_TYPE_GETPREVIOUS = 10,               ///< GETPREVIOUS

    KINETIC_MESSAGE_TYPE_GETKEYRANGE_RESPONSE = 11,      ///< GETKEYRANGE_RESPONSE

    KINETIC_MESSAGE_TYPE_GETKEYRANGE = 12,               ///< GETKEYRANGE

    KINETIC_MESSAGE_TYPE_GETVERSION_RESPONSE = 15,       ///< GETVERSION_RESPONSE

    KINETIC_MESSAGE_TYPE_GETVERSION = 16,                ///< GETVERSION

    KINETIC_MESSAGE_TYPE_SETUP_RESPONSE = 21,            ///< SETUP_RESPONSE

    KINETIC_MESSAGE_TYPE_SETUP = 22,                     ///< SETUP

    KINETIC_MESSAGE_TYPE_GETLOG_RESPONSE = 23,           ///< GETLOG_RESPONSE

    KINETIC_MESSAGE_TYPE_GETLOG = 24,                    ///< GETLOG

    KINETIC_MESSAGE_TYPE_SECURITY_RESPONSE = 25,         ///< SECURITY_RESPONSE

    KINETIC_MESSAGE_TYPE_SECURITY = 26,                  ///< SECURITY

    KINETIC_MESSAGE_TYPE_PEER2PEERPUSH_RESPONSE = 27,    ///< PEER2PEERPUSH_RESPONSE

    KINETIC_MESSAGE_TYPE_PEER2PEERPUSH = 28,             ///< PEER2PEERPUSH

    KINETIC_MESSAGE_TYPE_NOOP_RESPONSE = 29,             ///< NOOP_RESPONSE

    KINETIC_MESSAGE_TYPE_NOOP = 30,                      ///< NOOP

    KINETIC_MESSAGE_TYPE_FLUSHALLDATA_RESPONSE = 31,     ///< FLUSHALLDATA_RESPONSE

    KINETIC_MESSAGE_TYPE_FLUSHALLDATA = 32,              ///< FLUSHALLDATA

    KINETIC_MESSAGE_TYPE_PINOP_RESPONSE = 35,            ///< PINOP_RESPONSE

    KINETIC_MESSAGE_TYPE_PINOP = 36,                     ///< PINOP

    KINETIC_MESSAGE_TYPE_MEDIASCAN_RESPONSE = 37,        ///< MEDIASCAN_RESPONSE

    KINETIC_MESSAGE_TYPE_MEDIASCAN = 38,                 ///< MEDIASCAN

    KINETIC_MESSAGE_TYPE_MEDIAOPTIMIZE_RESPONSE = 39,    ///< MEDIAOPTIMIZE_RESPONSE

    KINETIC_MESSAGE_TYPE_MEDIAOPTIMIZE = 40,             ///< MEDIAOPTIMIZE

} KineticMessageType;



/**

src/lib/kinetic_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static KineticLogInfo_Statistics *KineticLogInfo_GetStatistics( 
    *numStatistics = 0;

    if (stats) {

        for (size_t i = 0; i < num_stats; i++) {

            stats[i].messageType = getLog->statistics[i]->messagetype;

            stats[i].messageType = (KineticMessageType)getLog->statistics[i]->messagetype;

            if (getLog->statistics[i]->has_count) {

                stats[i].count = getLog->statistics[i]->count;

            }

src/lib/kinetic_operation.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static KineticStatus send_request_in_lock(KineticOperation* const op) 
    }

    uint8_t * commandData = request->message.message.commandbytes.data;



    log_request_seq_id(op->session->socket, seq_id, request->message.header.messagetype);

    log_request_seq_id(op->session->socket, seq_id, (KineticMessageType)request->message.header.messagetype);



    KineticSession *session = op->session;

    KineticStatus status = KineticRequest_PopulateAuthentication(&session->config,

src/lib/kinetic_types.c

+68 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ const char* Kinetic_GetStatusDescription(KineticStatus status) 


const char* KineticMessageTypeNames[33] =

{  

    "<UNKNOWN>"

    "<UNKNOWN>",

    "GET_RESPONSE",

    "GET",

    "PUT_RESPONSE",
@@ -103,45 +103,109 @@ const char* KineticMessageTypeNames[33] = 
    "MEDIASCAN_RESPONSE",

    "MEDIASCAN",

    "MEDIAOPTIMIZE_RESPONSE",

    "MEDIAOPTIMIZE"

    "MEDIAOPTIMIZE",

};



const char* KineticMessageType_GetName(KineticMessageType type)

{

    switch(type) {

    case KINETIC_MESSAGE_TYPE_GET_RESPONSE:

	return "GET_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_GET:

	return "GET";

	break;

    case KINETIC_MESSAGE_TYPE_PUT_RESPONSE:

	return "PUT_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_PUT:

	return "PUT";

	break;

    case KINETIC_MESSAGE_TYPE_DELETE_RESPONSE:

	return  "DELETE_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_DELETE:

	return "DELETE";

	break;

    case KINETIC_MESSAGE_TYPE_GETNEXT_RESPONSE:

	return "GETNEXT_RESPONSE";    

	break;

    case KINETIC_MESSAGE_TYPE_GETNEXT:

	return  "GETNEXT";

	break;

    case KINETIC_MESSAGE_TYPE_GETPREVIOUS_RESPONSE:

	return  "GETPREVIOUS_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_GETPREVIOUS:

	return "GETPREVIOUS";

	break;

    case KINETIC_MESSAGE_TYPE_GETKEYRANGE_RESPONSE:

	return "GETKEYRANGE_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_GETKEYRANGE:

	return "GETKEYRANGE";    

	break;

    case KINETIC_MESSAGE_TYPE_GETVERSION_RESPONSE:

	return "GETVERSION_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_GETVERSION:

	return "GETVERSION";

	break;

    case KINETIC_MESSAGE_TYPE_SETUP_RESPONSE:

	return "SETUP_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_SETUP:

	return "SETUP";

	break;

    case KINETIC_MESSAGE_TYPE_GETLOG_RESPONSE:

	return "GETLOG_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_GETLOG:

	return "GETLOG";

	break;

    case KINETIC_MESSAGE_TYPE_SECURITY_RESPONSE:

	return "SECURITY_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_SECURITY:

	return "SECURITY";

	break;

    case KINETIC_MESSAGE_TYPE_PEER2PEERPUSH_RESPONSE:

	return "PEER2PEERPUSH_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_PEER2PEERPUSH:

	return "PEER2PEERPUSH";

	break;

    case KINETIC_MESSAGE_TYPE_NOOP_RESPONSE:

	return "NOOP_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_NOOP:

	return "NOOP";

	break;

    case KINETIC_MESSAGE_TYPE_FLUSHALLDATA_RESPONSE:

	return "FLUSHALLDATA_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_FLUSHALLDATA:

	return "FLUSHALLDATA";

	break;



    case KINETIC_MESSAGE_TYPE_PINOP_RESPONSE:

	return "PINOP_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_PINOP:

	return "PINOP";

	break;

    case KINETIC_MESSAGE_TYPE_MEDIASCAN_RESPONSE:

	return "MEDIASCAN_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_MEDIASCAN:

	return "MEDIASCAN";

	break;

    case KINETIC_MESSAGE_TYPE_MEDIAOPTIMIZE_RESPONSE:

	return "MEDIAOPTIMIZE_RESPONSE";

	break;

    case KINETIC_MESSAGE_TYPE_MEDIAOPTIMIZE:

      return KineticMessageTypeNames[type];

	return "MEDIAOPTIMIZE";

	break;

    default:

    case KINETIC_MESSAGE_TYPE_INVALID:

      return KineticMessageTypeNames[0];