WIP: split the e4cli.c file up into multiple parts.

Specific recv.c for receive processing (so it is clear for documentation
purposes).
clang-format integration + use
Implementation of some of the functions.

This code is very much a work-in-progress.

Author: diagprov

.clang

@@ -1,2 +1 @@
--I../lib-c/include/
--I./src/
+flags = -I$(pwd)/../libe4/include/ -Wall -Werror -std=c99

.clang-format

@@ -0,0 +1,46 @@
+AccessModifierOffset: 0
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit: 80
+CommentPragmas: ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 0
+Cpp11BracedListStyle: false
+DerivePointerBinding: false
+IndentCaseLabels: false
+IndentFunctionDeclarationAfterType: false
+IndentWidth: 4
+Language: Cpp
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 100
+PenaltyBreakComment: 100
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 100
+PenaltyExcessCharacter: 1
+PenaltyReturnTypeOnItsOwnLine: 20
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+Standard: Cpp11
+TabWidth: 4
+UseTab: Never

Makefile

@@ -24,8 +24,11 @@ BIN     = $(BINDIR)/e4cli
 LIB	= $(LIBDIR)/$(LIBNAME).a
 DISTDIR	= dist
 
-OBJS    = $(OBJDIR)/e4cli.o                  \
-          $(OBJDIR)/mqtt.o         #\
+OBJS    = $(OBJDIR)/commands.o      \
+          $(OBJDIR)/repl.o          \
+          $(OBJDIR)/recv.o          \
+          $(OBJDIR)/mqtt.o          \
+          $(OBJDIR)/e4cli.o
 
 default: setup $(BIN)
 
@@ -48,3 +51,6 @@ clean:
 dist: $(BIN)
 	@echo 'Making $(DISTDIR)/$(LIBNAME)-$(NOW)-$(GITCOMMIT).tar.bz2'
 	tar cfvj $(DISTDIR)/$(LIBNAME)-$(NOW)-$(GITCOMMIT).tar.bz2 $(LIBDIR)/* $(INCDIR)/*
+
+format:
+	clang-format -i src/*.c src/*.h

scripts/devenv.sh

@@ -16,7 +16,7 @@
 ## -- -- ...
 
 E4LIBPARENT="$(dirname $PWD)"
-export E4LIBDIR="$E4LIBPARENT/lib-c/"
+export E4LIBDIR="$E4LIBPARENT/libe4/"
 
 echo "E4LIBDIR=$E4LIBDIR"
 

src/commands.c

@@ -0,0 +1,145 @@
+
+#include "MQTTClient.h"
+
+/* Use the file storage command */
+#define E4_STORE_FILE
+#include "e4/e4.h"
+#include "e4/strlcpy.h"
+#include "e4/util.h"
+
+/* local header includes */
+#include "e4cli.h"
+
+
+void client_setid(e4client *client, const char *arg)
+{
+    uint8_t id[E4_ID_LEN];
+    size_t arglen = strlen(arg);
+    int result = 0;
+
+    memset(id, 0, sizeof id);
+
+    if (arglen == 0 || arglen != E4_ID_LEN * 2)
+    {
+        printf("Expected client ID of length %d, not received.\n", E4_ID_LEN * 2);
+        return;
+    }
+
+    result = e4c_hex_decode((char*)id, sizeof(id), (char*)arg, arglen);
+    if (result == 0)
+    {
+        printf("Unable to decode ID: invalid data.\n");
+        return;
+    }
+
+    client->store.e4c_set_id(client->store, id);
+    return;
+}
+
+void client_genkey(const char *arg)
+{
+
+    // do not generate but ask the C2 to do it?
+    // can clients do this?
+    // TODO: resolve above quesitons
+
+    printf("ERROR: not implemented in this client.\n");
+}
+
+
+void client_setalias(e4client *client, const char *arg)
+{
+
+    char id[E4_ID_LEN] = { 0 };
+
+    e4c_derive_clientid(id, sizeof id, arg, arglen);
+    memcpy(client->store.id, id, E4_ID_LEN);
+    e4c_sync(client->store);
+}
+
+// sets the client key to a given value when supplied on the
+// command line.
+void client_setkey(e4client *client, const char *arg)
+{
+    char keybuffer[E4_KEY_LEN];
+    size_t keylen = strlen(arg);
+    if (keylen != E4_KEY_LEN * 2)
+    {
+        printf("ERROR: key length must be %d characters, encoded in hex.\n", E4_KEY_LEN * 2);
+        return;
+    }
+    e4c_hex_decode(keybuffer, E4_KEY_LEN, arg, keylen);
+    e4c_set_idkey(client->store, keybuffer);
+}
+
+void client_settopickey(const char *arg)
+{
+    char keybuffer[E4_KEY_LEN];
+    char *topic = arg;
+    char *key = arg;
+
+    key = strchr(arg, ' ');
+    if (key == NULL || key == arg)
+    {
+        printf("ERROR: must specify a topic and key in the format:\n");
+        printf("       <topicname> <key>\n");
+        printf("       key must be %d hexadecimal characters.", 2 * E4_KEY_LEN);
+        return;
+    }
+
+    // tokenize the strings.
+    key[0] = '\0';
+    key += 1;
+
+    size_t keylen = strlen(key);
+    if (keylen != E4_KEY_LEN * 2)
+    {
+        printf("ERROR: key length must be %d characters, encoded in hex.\n", E4_KEY_LEN * 2);
+        return;
+    }
+    e4c_hex_decode(keybuffer, E4_KEY_LEN, key, keylen);
+    e4c_set_topic_key(client->store, keybuffer);
+}
+
+void client_setpwd(const char *arg)
+{
+    printf("ERROR: The C client does not yet implement password-derivation.\n");
+    printf("       Please use the setkey command.\n");
+}
+
+
+void client_subscribe(const char *arg)
+{
+
+    size_t arglen = strlen(arg);
+    if (arglen == 0) i
+        {
+            printf("client_subscribe: Invalid topic");
+            return;
+        }
+
+    MQTTClient_subscribe(handle, arg, 0);
+}
+
+
+void client_unsubscribe(const char *arg)
+{
+    size_t arglen = strlen(arg);
+    if (arglen == 0)
+    {
+        printf("client_subscribe: Invalid topic");
+        return;
+    }
+
+    MQTTClient_unsubscribe(handle, arg);
+}
+
+void client_changetopic(const char *arg) {}
+
+void client_e4msg(const char *arg) {}
+
+void client_clearmsg(const char *arg) {}
+
+void client_list(const char *arg) {}
+
+void client_zero(const char *arg) {}