From b25865cc827f4a6a9c31f3d92a4e443485fd5d93 Mon Sep 17 00:00:00 2001 From: Gediminas Jakutis Date: Sun, 26 May 2019 14:46:36 +0300 Subject: common: cosmetic changes. Signed-off-by: Gediminas Jakutis --- include/net.h | 6 +++--- include/protocol.h | 6 +++--- include/utils.h | 6 +++--- src/common/protocol.c | 4 +--- src/common/protocol_private.h | 28 +++++++++++++++++++++++++++- src/common/utils.c | 20 ++++++++++++++++++++ 6 files changed, 57 insertions(+), 13 deletions(-) diff --git a/include/net.h b/include/net.h index 6860455..59071a5 100644 --- a/include/net.h +++ b/include/net.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef NET_H_INCLUDED -#define NET_H_INCLUDED +#ifndef USURPATION_NET_H_INCLUDED +#define USURPATION_NET_H_INCLUDED #define dgsize 512 @@ -50,4 +50,4 @@ int net_close(int nd); */ int net_getlastdata(int nd, char * const data); -#endif /* NET_H_INCLUDED */ +#endif /* USURPATION_NET_H_INCLUDED */ diff --git a/include/protocol.h b/include/protocol.h index 598b8e3..34ad4a3 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef PROTOCOL_H_INCLUDED -#define PROTOCOL_H_INCLUDED +#ifndef USURPATION_PROTOCOL_H_INCLUDED +#define USURPATION_PROTOCOL_H_INCLUDED #include @@ -134,4 +134,4 @@ void clear_data(struct tlv_packet *packet); */ size_t tlv_data_size(struct tlv_parser *parser); -#endif /* PROTOCOL_H_INCLUDED */ +#endif /* USURPATION_PROTOCOL_H_INCLUDED */ diff --git a/include/utils.h b/include/utils.h index c769917..95b553d 100644 --- a/include/utils.h +++ b/include/utils.h @@ -1,5 +1,5 @@ -#ifndef PROJECT_UTILS_H -#define PROJECT_UTILS_H +#ifndef USURPATION_UTILS_H +#define USURPATION_UTILS_H #include @@ -19,4 +19,4 @@ fpi1_t fpi1_sub(fpi1_t a, fpi1_t b); fpi1_t fpi1_mul(fpi1_t a, fpi1_t b); fpi1_t fpi1_div(fpi1_t a, fpi1_t b); -#endif /* PROJECT_UTILS_H */ +#endif /* USURPATION_UTILS_H */ diff --git a/src/common/protocol.c b/src/common/protocol.c index bae38d8..b2e0d40 100644 --- a/src/common/protocol.c +++ b/src/common/protocol.c @@ -32,8 +32,6 @@ #include "net.h" #include "utils.h" -#define READ_AS(type, from) (*((type*)(from))) - int push_tlv(struct tlv_packet *packet, enum tlv_type type, char *data) { int ret = 0; @@ -132,4 +130,4 @@ size_t tlv_data_size(struct tlv_parser *parser) memcpy(&size, parser->data + parser->offset + sizeof(enum tlv_type), sizeof(size_t)); } return size; -} \ No newline at end of file +} diff --git a/src/common/protocol_private.h b/src/common/protocol_private.h index fe28aa0..51d5431 100644 --- a/src/common/protocol_private.h +++ b/src/common/protocol_private.h @@ -1,3 +1,29 @@ +/* + * Usurpataion --- clinet-server protocol implementation. + * + * Copyright (C) 2019 Ramūnas Mažeikis + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * Common parts of protocol implementation. Handling of anything that actually + * deals with connection descriptor has to be implemented by device and daemon + * separately. + */ + #ifndef PROTOCOL_PRIVATE_H #define PROTOCOL_PRIVATE_H @@ -19,4 +45,4 @@ int push_bytes(struct tlv_packet *packet, char *data, size_t size); */ int push_tlv_header(struct tlv_packet *packet, enum tlv_type type, size_t size); -#endif /* PROTOCOL_PRIVATE_H */ \ No newline at end of file +#endif /* PROTOCOL_PRIVATE_H */ diff --git a/src/common/utils.c b/src/common/utils.c index 0619517..7522404 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1,3 +1,23 @@ +/* + * Usurpataion --- utility functions. + * + * Copyright (C) 2019 Ramūnas Mažeikis + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + #include "utils.h" #include "string.h" -- cgit v1.2.3