Merge branch 'xpetrak2/coincer/protocol'

Makefile.am

@@ -5,6 +5,8 @@ bin_PROGRAMS = src/coincerd src/coincer
 src_coincerd_SOURCES = \
 	src/coincerd.c \
 	src/configuration.c src/configuration.h \
+	src/daemon_messages.h \
+	src/json_parser.c src/json_parser.h \
 	src/linkedlist.c src/linkedlist.h \
 	src/log.c src/log.h \
 	src/neighbours.c src/neighbours.h \

src/coincerd.c

@@ -19,6 +19,7 @@
 #include <event2/event.h>
 #include <event2/listener.h>
 #include <signal.h>
+#include <sodium.h>
 #include <stdlib.h>
 #include <time.h>
 
@@ -58,6 +59,11 @@ int main(void)
 	struct event		*sigint_event;
 	struct event		*sigterm_event;
 
+	if (sodium_init() < 0) {
+		log_error("Libsodium failed to initialize");
+		return 4;
+	}
+
 	/* TODO: use randombytes (from libsodium?) for the seed of randomness */
 	srand((unsigned) time(NULL));
 

src/daemon_messages.h

+/*
+ *  Coincer
+ *  Copyright (C) 2017-2018  Coincer Developers
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DAEMON_MESSAGES_H
+#define DAEMON_MESSAGES_H
+
+#include <sodium.h>
+#include <stdint.h>
+
+/** Types of daemon messages. */
+enum message_type {
+	P2P_PING,
+	P2P_PONG
+	/* TODO: and other message types */
+};
+
+/* TODO: define all structs of daemon messages in here */
+
+typedef struct s_message_body {
+	unsigned char		to[crypto_box_PUBLICKEYBYTES];
+	enum message_type	type;
+	void			*data;
+	uint64_t		nonce;
+} message_body_t;
+
+typedef struct s_message {
+	int		version;
+	unsigned char	from[crypto_box_PUBLICKEYBYTES];
+	message_body_t	body;
+	unsigned char	sig[crypto_sign_BYTES];
+} message_t;
+
+#endif /* DAEMON_MESSAGES_H */

src/json_parser.c

+/*
+ *  Coincer
+ *  Copyright (C) 2017-2018  Coincer Developers
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sodium.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "daemon_messages.h"
+#include "json_parser.h"
+#include "log.h"
+
+
+/* TODO: Implement */
+/**
+ * Decode a JSON message (including its JSON body) into daemon message.
+ *
+ * @param	json_message	Decode this JSON message.
+ * @param	message		Store decoded data in here.
+ *
+ * @return	0		Decoding successful.
+ * @return	1		Failure.
+ */
+int decode_message(const char *json_message, message_t *message)
+{
+	char from_hex[65];
+	char to_hex[65];
+	char sig_hex[129];
+	/* TODO: fill the above arrays with values from 'json_message' */
+
+	/* after sodium_hex2bin, the unused bytes will be set to 0 */
+	memset(message->from, 0x0, sizeof(message->from));
+	memset(message->body.to, 0x0, sizeof(message->body.to));
+	memset(message->sig, 0x0, sizeof(message->sig));
+
+	/* if converting field 'from' to binary failed */
+	if (sodium_hex2bin(message->from,
+			   sizeof(message->from),
+			   from_hex,
+			   strlen(from_hex),
+			   NULL, /* disallow non-hexa chars */
+			   NULL, /* don't remember the number of used bytes */
+			   NULL)) { /* we don't need the address of a byte
+				     * after the last parsed char, hence NULL */
+		log_debug("decode_message - 'from' to bin");
+		return 1;
+	}
+	/* if converting field 'to' to binary failed */
+	if (sodium_hex2bin(message->body.to,
+			   sizeof(message->body.to),
+			   to_hex,
+			   strlen(to_hex),
+			   NULL,
+			   NULL,
+			   NULL)) {
+		log_debug("decode_message - 'to' to bin");
+		return 1;
+	}
+	/* if converting field 'sig' to binary failed */
+	if (sodium_hex2bin(message->sig,
+			   sizeof(message->sig),
+			   sig_hex,
+			   strlen(sig_hex),
+			   NULL,
+			   NULL,
+			   NULL)) {
+		log_debug("decode_message - 'sig' to bin");
+		return 1;
+	}
+	/* message->from, message->body.to, message->sig are set now */
+
+	return 0;
+}
+
+/* TODO: Implement */
+/**
+ * Encode a daemon message into JSON format output.
+ *
+ * @param	message		Message to be encoded.
+ * @param	json_message	Dynamically allocated string of JSON format.
+ *
+ * @return	0		Encoding successful.
+ * @return	1		Failure.
+ */
+int encode_message(const message_t *message, char **json_message)
+{
+	char from_hex[65];
+	char to_hex[65];
+	char sig_hex[129];
+
+	/* sodium_bin2hex also appends '\0' */
+
+	/* if converting field 'from' to hexadecimal failed */
+	if (!sodium_bin2hex(from_hex,
+			    sizeof(from_hex),
+			    message->from,
+			    sizeof(message->from))) {
+		log_debug("encode_message - 'from' to hex");
+		return 1;
+	}
+	/* if converting field 'to' to hexadecimal failed */
+	if (!sodium_bin2hex(to_hex,
+			    sizeof(to_hex),
+			    message->body.to,
+			    sizeof(message->body.to))) {
+		log_debug("encode_message - 'to' to hex");
+		return 1;
+	}
+	/* if converting field 'sig' to hexadecimal failed */
+	if (!sodium_bin2hex(sig_hex,
+			    sizeof(sig_hex),
+			    message->sig,
+			    sizeof(message->sig))) {
+		log_debug("encode_message - 'sig' to hex");
+		return 1;
+	}
+	/* from_hex, to_hex, sig_hex are initialized now, ready to be
+	 * included in output 'json_message' */
+
+	return 0;
+}
+
+/* TODO: Implement */
+/**
+ * Fetch a JSON message body from a JSON message.
+ *
+ * @param	json_message		JSON message.
+ * @param	json_message_body	Dynamically allocated message body
+ *					retrieved from json_message.
+ *
+ * @return	0			Successfully fetched.
+ * @return	1			Failure.
+ */
+int fetch_json_message_body(const char *json_message, char **json_message_body)
+{
+	return 0;
+}

src/json_parser.h

+/*
+ *  Coincer
+ *  Copyright (C) 2017-2018  Coincer Developers
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef JSON_PARSER_H
+#define JSON_PARSER_H
+
+#include "daemon_messages.h"
+
+static const char *msg_type_str[] = {
+	"p2p.ping",
+	"p2p.pong"
+	/* TODO: and other string representations of daemon type messages */
+};
+
+int decode_message(const char *json_message, message_t *message);
+int encode_message(const message_t *message, char **json_message);
+int fetch_json_message_body(const char *json_message, char **json_message_body);
+
+#endif /* JSON_PARSER_H */