Commit 4643f2f3 authored by Scott Vokes's avatar Scott Vokes
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents 08206d59 e0e90bb9

Makefile

+9 −2
Original line number Diff line number Diff line
@@ -429,8 +429,15 @@ run: $(UTIL_EXEC) 
	@echo --------------------------------------------------------------------------------

	@echo

	# $(UTIL_EXEC) instanterase

	$(UTIL_EXEC) noop

	exec $(UTIL_EXEC) put get delete

	exec $(UTIL_EXEC) --help

	exec $(UTIL_EXEC) -?

	exec $(UTIL_EXEC) --noop

	exec $(UTIL_EXEC) --put

	exec $(UTIL_EXEC) --get

	exec $(UTIL_EXEC) --getnext key ""

	exec $(UTIL_EXEC) --getprevious key ""

	exec $(UTIL_EXEC) --delete

	exec $(UTIL_EXEC) --getlog

	@echo

	@echo Test Utility integration tests w/ kinetic-c lib passed!

	@echo

include/kinetic_admin_client.h

+11 −12
Original line number Diff line number Diff line
@@ -194,18 +194,6 @@ void KineticAdminClient_FreeLogInfo(KineticSession const * const session, 
KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const session,

    int64_t version);



/**

 * @brief Executes a Firmware Download command to update the firmware on the Kinetic device.

 *

 * @param session       The connected KineticSession to use for the operation.

 * @param fw_path       Path to firmware update image file.

 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

    char const * const fw_path);





/**

 * @brief Executes a SECURITY operation, setting one or more ACLs.

 *
@@ -218,4 +206,15 @@ KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const ses 
KineticStatus KineticAdminClient_SetACL(KineticSession const * const session,

                                        const char *ACLPath);



/**

 * @brief Executes a Firmware Download operation to update the firmware on the Kinetic device.

 *

 * @param session       The connected KineticSession to use for the operation.

 * @param fw_path       Path to firmware update image file.

 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

    char const * const fw_path);



#endif // _KINETIC_ADMIN_CLIENT_H

src/lib/kinetic_logger.c

+6 −2
Original line number Diff line number Diff line
@@ -66,11 +66,15 @@ void KineticLogger_Init(const char* log_file, int log_level) 
        KineticLogLevel = log_level;

        

        if (strncmp(log_file, "stdout", 4) == 0 || strncmp(log_file, "STDOUT", 4) == 0) {

            printf("\nLogging kinetic-c output to console (stdout) w/ log_level=%d\n", KineticLogLevel);

            if (log_level > 0) {

                printf("Logging kinetic-c output to console (stdout) w/ log_level=%d\n", KineticLogLevel);

            }

            KineticLoggerHandle = stdout;

        }

        else {

            printf("\nLogging kinetic-c output to %s w/ log_level=%d\n", log_file, KineticLogLevel);

            if (log_level > 0) {

                printf("Logging kinetic-c output to %s w/ log_level=%d\n", log_file, KineticLogLevel);

            }

            KineticLoggerHandle = fopen(log_file, "a+");

            KINETIC_ASSERT(KineticLoggerHandle != NULL);

        }

src/lib/kinetic_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int KineticSocket_Connect(const char* host, int port) 
    sprintf(port_str, "%d", port);



    // Open socket

    LOGF0("Connecting to %s:%d", host, port);

    LOGF1("Connecting to %s:%d", host, port);

    if (!socket99_open(&cfg, &result)) {

        char err_buf[256];

        socket99_snprintf(err_buf, 256, &result);

src/utility/main.c

+625 −182

File changed.

Preview size limit exceeded, changes collapsed.