summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/application/libspid/Makefile (renamed from cleopatre/application/spidlib/Makefile)4
-rw-r--r--cleopatre/application/libspid/inc/label.h50
-rw-r--r--cleopatre/application/libspid/inc/libspid.h145
-rw-r--r--cleopatre/application/libspid/inc/openssl_md32_common.h (renamed from cleopatre/application/spidlib/inc/openssl_md32_common.h)0
-rw-r--r--cleopatre/application/libspid/inc/openssl_sha256.h (renamed from cleopatre/application/spidlib/inc/openssl_sha256.h)0
-rw-r--r--cleopatre/application/libspid/inc/path.h55
-rw-r--r--cleopatre/application/libspid/src/config_item.c (renamed from cleopatre/application/spidlib/src/config_item.c)84
-rw-r--r--cleopatre/application/libspid/src/config_line.c (renamed from cleopatre/application/spidlib/src/config_line.c)156
-rw-r--r--cleopatre/application/libspid/src/image.c (renamed from cleopatre/application/spidlib/src/image.c)130
-rw-r--r--cleopatre/application/libspid/src/misc.c (renamed from cleopatre/application/spidlib/src/misc.c)28
-rw-r--r--cleopatre/application/libspid/src/network.c (renamed from cleopatre/application/spidlib/src/network.c)102
-rw-r--r--cleopatre/application/libspid/src/openssl_sha256.c (renamed from cleopatre/application/spidlib/src/openssl_sha256.c)0
-rw-r--r--cleopatre/application/libspid/src/secu.c (renamed from cleopatre/application/spidlib/src/secu.c)42
-rw-r--r--cleopatre/application/libspid/src/system.c (renamed from cleopatre/application/spidlib/src/system.c)200
-rw-r--r--cleopatre/application/spidinit/Makefile12
-rw-r--r--cleopatre/application/spidinit/src/descupd.c4
-rw-r--r--cleopatre/application/spidlib/inc/label.h50
-rw-r--r--cleopatre/application/spidlib/inc/path.h55
-rw-r--r--cleopatre/application/spidlib/inc/spidlib.h145
-rw-r--r--cleopatre/buildroot/package/Config.in2
-rw-r--r--cleopatre/buildroot/package/libspid/Config.in (renamed from cleopatre/buildroot/package/libspidlib/Config.in)4
-rw-r--r--cleopatre/buildroot/package/libspid/libspid.mk (renamed from cleopatre/buildroot/package/libspidlib/libspidlib.mk)54
-rw-r--r--cleopatre/buildroot/package/spidinit/spidinit.mk2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/arizona_defconfig2
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300g_defconfig2
-rw-r--r--cleopatre/devkit/plcd/Makefile12
-rw-r--r--cleopatre/devkit/plcd/src/event.c72
-rw-r--r--cleopatre/devkit/plcd/src/hpav.c36
-rw-r--r--cleopatre/devkit/plcd/src/plcd.c14
-rw-r--r--cleopatre/devkit/tests/libspid/ftests/Makefile (renamed from cleopatre/devkit/tests/spidlib/ftests/Makefile)14
-rw-r--r--cleopatre/devkit/tests/libspid/ftests/spidlib_ftests.c (renamed from cleopatre/devkit/tests/spidlib/ftests/spidlib_ftests.c)78
-rw-r--r--cleopatre/devkit/tests/libspid/ftests/test.cnf (renamed from cleopatre/devkit/tests/spidlib/ftests/test.cnf)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/Makefile (renamed from cleopatre/devkit/tests/spidlib/utests/Makefile)6
-rw-r--r--cleopatre/devkit/tests/libspid/utests/inc/config_item_utests.h (renamed from cleopatre/devkit/tests/spidlib/utests/inc/config_item_utests.h)6
-rw-r--r--cleopatre/devkit/tests/libspid/utests/inc/config_line_utests.h (renamed from cleopatre/devkit/tests/spidlib/utests/inc/config_line_utests.h)8
-rw-r--r--cleopatre/devkit/tests/libspid/utests/inc/image_utests.h (renamed from cleopatre/devkit/tests/spidlib/utests/inc/image_utests.h)8
-rw-r--r--cleopatre/devkit/tests/libspid/utests/inc/network_utests.h (renamed from cleopatre/devkit/tests/spidlib/utests/inc/network_utests.h)8
-rw-r--r--cleopatre/devkit/tests/libspid/utests/inc/system_utests.h (renamed from cleopatre/devkit/tests/spidlib/utests/inc/system_utests.h)20
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c (renamed from cleopatre/devkit/tests/spidlib/utests/src/config_item_utests.c)110
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c (renamed from cleopatre/devkit/tests/spidlib/utests/src/config_line_utests.c)224
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/image_utests.c396
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/network_utests.c (renamed from cleopatre/devkit/tests/spidlib/utests/src/network_utests.c)100
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/system_utests.c (renamed from cleopatre/devkit/tests/spidlib/utests/src/system_utests.c)212
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/image1.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/image1.tst)bin1028 -> 1028 bytes
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/image2.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/image2.tst)bin1028 -> 1028 bytes
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/item.cnf (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/item.cnf)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/line.cnf (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/line.cnf)2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/line_dos.cnf (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/line_dos.cnf)2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/line_removed.cnf (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/line_removed.cnf)2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/meminfo.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/meminfo.tst)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/mtd.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/mtd.tst)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/network.expected.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/network.expected.tst)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/network.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/network.tst)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/nvram1.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/nvram1.tst)bin744 -> 744 bytes
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/nvram2.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/nvram2.tst)bin744 -> 744 bytes
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/uptime.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/uptime.tst)0
-rw-r--r--cleopatre/devkit/tests/libspid/utests/testfiles/version.tst (renamed from cleopatre/devkit/tests/spidlib/utests/testfiles/version.tst)0
-rw-r--r--cleopatre/devkit/tests/plcd/utests/Makefile12
-rw-r--r--cleopatre/devkit/tests/plcd/utests/inc/hpav_utests.h2
-rw-r--r--cleopatre/devkit/tests/plcd/utests/inc/plcd_utests.h6
-rw-r--r--cleopatre/devkit/tests/plcd/utests/src/check_event.c12
-rw-r--r--cleopatre/devkit/tests/plcd/utests/src/hpav_utests.c8
-rw-r--r--cleopatre/devkit/tests/plcd/utests/src/plcd_utests.c6
-rw-r--r--cleopatre/devkit/tests/spidlib/utests/src/image_utests.c396
-rw-r--r--cleopatre/doc/Doxyfile2
65 files changed, 1551 insertions, 1551 deletions
diff --git a/cleopatre/application/spidlib/Makefile b/cleopatre/application/libspid/Makefile
index 59ed682e8a..2f99cdc55c 100644
--- a/cleopatre/application/spidlib/Makefile
+++ b/cleopatre/application/libspid/Makefile
@@ -1,5 +1,5 @@
-STAT_LIB=libspidlib.a
-DYN_LIB=libspidlib.so
+STAT_LIB=libspid.a
+DYN_LIB=libspid.so
OBJPATH=obj
SRCPATH=src
INCPATH=inc
diff --git a/cleopatre/application/libspid/inc/label.h b/cleopatre/application/libspid/inc/label.h
new file mode 100644
index 0000000000..bf0f274c60
--- /dev/null
+++ b/cleopatre/application/libspid/inc/label.h
@@ -0,0 +1,50 @@
+/* SPC300 project {{{
+ *
+ * Copyright (C) 2009 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file application/libspid/inc/label.h
+ * \brief define all labels used inside configuration / info files
+ * \ingroup libspid
+ *
+ * All labels of config / info files are defined here to avoid some possible type mistakes
+ */
+#ifndef LIBSPID_LABEL_H
+#define LIBSPID_LABEL_H
+
+/* LIBSPID_HARDWARE_INFO_PATH */
+#define LIBSPID_HARDWARE_INFO_LABEL_TOTO "toto"
+
+/* LIBSPID_HPAV_CONF_PATH */
+#define LIBSPID_HPAV_CONF_LABEL_CCO_PREFERRED "CCO_PREFERRED"
+#define LIBSPID_HPAV_CONF_LABEL_WAS_CCO "WAS_CCO"
+#define LIBSPID_HPAV_CONF_LABEL_NPW "NPW" /* network password */
+#define LIBSPID_HPAV_CONF_LABEL_NMK "NMK" /* network management key */
+#define LIBSPID_HPAV_CONF_LABEL_NID "NID" /* network identifier */
+#define LIBSPID_HPAV_CONF_LABEL_SL "SL" /* security level */
+#define LIBSPID_HPAV_CONF_LABEL_USER_HFID "USER_HFID" /* user human friendly identifier */
+#define LIBSPID_HPAV_CONF_LABEL_AVLN_HFID "AVLN_HFID" /* AVLN friendly identifer */
+
+#define LIBSPID_HPAV_CONF_VALUE_NONE "none"
+#define LIBSPID_HPAV_CONF_VALUE_SL_SC "sc" /* simple connect */
+#define LIBSPID_HPAV_CONF_VALUE_SL_HS "hs" /* high security */
+
+/* LIBSPID_HPAV_INFO_PATH */
+#define LIBSPID_HPAV_INFO_LABEL_PLCD_PID "PLCD_PID"
+#define LIBSPID_HPAV_INFO_LABEL_STATUS "STATUS"
+#define LIBSPID_HPAV_INFO_LABEL_CCO "CCO"
+#define LIBSPID_HPAV_INFO_LABEL_BACKUP_CCO "BACKUP_CCO"
+#define LIBSPID_HPAV_INFO_LABEL_SC "SC" /* station is in simple connect state */
+#define LIBSPID_HPAV_INFO_LABEL_NID "NID" /* network identifier */
+
+#define LIBSPID_HPAV_INFO_VALUE_STATUS_UNASSOCIATED "unassociated"
+#define LIBSPID_HPAV_INFO_VALUE_STATUS_ASSOCIATED "associated"
+#define LIBSPID_HPAV_INFO_VALUE_STATUS_AUTHENTICATED "authenticated"
+#define LIBSPID_HPAV_INFO_VALUE_CCO_STATION "station"
+#define LIBSPID_HPAV_INFO_VALUE_CCO_PROXY "proxy"
+#define LIBSPID_HPAV_INFO_VALUE_CCO_MAIN "main"
+
+#endif /* LIBSPID_LABEL_H */
diff --git a/cleopatre/application/libspid/inc/libspid.h b/cleopatre/application/libspid/inc/libspid.h
new file mode 100644
index 0000000000..29f354d573
--- /dev/null
+++ b/cleopatre/application/libspid/inc/libspid.h
@@ -0,0 +1,145 @@
+/* SPC300 bundle {{{
+ *
+ * Copyright (C) 2009 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file application/libspid/inc/libspid.h
+ * \brief structures and function prototypes of libspid
+ * \defgroup libspid libspid : general purpose SPiDCOM library
+ *
+ */
+
+#ifndef LIBSPID_H
+#define LIBSPID_H
+
+#include <stdint.h>
+#include <assert.h>
+
+#include "spid_img_desc.h"
+#include "nvram.h"
+#include "label.h"
+#include "openssl_sha256.h"
+#include "path.h"
+
+/** size of buffer to manage ip address */
+#define LIBSPID_IP_MAX_LEN 16
+
+/** size of buffer to manage mac address */
+#define LIBSPID_MAC_STR_LEN 18
+
+#define LIBSPID_LINE_MAX_LEN 1024
+#define LIBSPID_KEY_MAX_LEN 63
+#define LIBSPID_ELT_MAX_NB 32
+#define LIBSPID_CONFIG_DELIMITER "="
+#define LIBSPID_FALSE 0
+#define LIBSPID_TRUE 1
+
+/**
+ * list of errors returned by libspid functions
+ */
+typedef enum {
+ LIBSPID_SUCCESS = 0,
+ /** bad input parameters */
+ LIBSPID_ERROR_PARAM,
+ /** not enough available space */
+ LIBSPID_ERROR_NO_SPACE,
+ /** item / data not found */
+ LIBSPID_ERROR_NOT_FOUND,
+ /** system error, see errno for more details */
+ LIBSPID_ERROR_SYSTEM,
+} libspid_error_t;
+
+/**
+ * IP mode of interface : static or DHCP
+ */
+typedef enum {
+ /** interface setting is static : configuration is given by the local config file */
+ LIBSPID_IP_MODE_STATIC,
+ /** interface setting is DHCP : configuration is given by a DHCP server */
+ LIBSPID_IP_MODE_DHCP,
+} libspid_ip_mode_t;
+
+/** structure to manage IP network data */
+typedef struct {
+ /** IP mode */
+ libspid_ip_mode_t mode;
+ /** IP address in string format */
+ unsigned char address[LIBSPID_IP_MAX_LEN];
+ /** IP netmask in string format */
+ unsigned char netmask[LIBSPID_IP_MAX_LEN];
+ /** broadcast address in string format */
+ unsigned char broadcast[LIBSPID_IP_MAX_LEN];
+ /** gateway IP address in string format */
+ unsigned char gateway[LIBSPID_IP_MAX_LEN];
+ /** MTU of interface */
+ unsigned int mtu;
+} libspid_ip_t;
+
+typedef enum {
+ LIBSPID_IMAGE_DESC_TYPE_0,
+ LIBSPID_IMAGE_DESC_TYPE_1,
+ LIBSPID_IMAGE_DESC_TYPE_CURRENT,
+ LIBSPID_IMAGE_DESC_TYPE_ALTERNATE,
+ LIBSPID_IMAGE_DESC_TYPE_NB
+} libspid_image_desc_type_t;
+
+typedef enum {
+ LIBSPID_IMAGE_SELECT_0,
+ LIBSPID_IMAGE_SELECT_1,
+ LIBSPID_IMAGE_SELECT_SWITCH,
+ LIBSPID_IMAGE_SELECT_NB
+} libspid_image_select_t;
+
+/** */
+typedef struct
+{
+ int nothing;
+} spc300_image_desc_t;
+
+#define LIBSPID_GET_BOOLEAN(array) ((array[0] == 'Y' || array[0] == 'y')?1:0)
+/** size of pbkdf1 salt */
+#define LIBSPID_SECU_SALT_SIZE 8
+/** max password size. */
+#define LIBSPID_SECU_PWD_SIZE_MAX 64
+/** SHA 256 size. */
+#define LIBSPID_SECU_SHA256_SIZE 32
+/** pbkdf1 generated key size */
+#define LIBSPID_SECU_OUTPUT_KEY_SIZE 16
+/** PBKDF1 iteration. */
+#define LIBSPID_SECU_PBKDF1_ITERATION 1000
+
+typedef enum {
+ LIBSPID_SECU_SALT_TYPE_NONE = 0,
+ LIBSPID_SECU_SALT_TYPE_DAK,
+ LIBSPID_SECU_SALT_TYPE_NMK,
+ LIBSPID_SECU_SALT_TYPE_NB
+} libspid_secu_salt_type_t;
+
+extern libspid_error_t libspid_config_read_item (const char *filename, const char *label, char *value, int buffer_len);
+extern libspid_error_t libspid_config_write_item(const char *filename, const char *label, const char *value);
+extern libspid_error_t libspid_config_read_line(const char *filename, const char* delimiters, char *key, unsigned int *elt_number, char *elt[], char *buffer, unsigned int buffer_len);
+extern libspid_error_t libspid_config_write_line(const char *filename, const char delimiter, const char *key, unsigned int elt_number, char *elt[]);
+extern libspid_error_t libspid_config_remove_line(const char *filename, const char *delimiters, const char *key);
+extern libspid_error_t libspid_mac_str_to_bin(const char *str, unsigned char *bin);
+extern libspid_error_t libspid_mac_bin_to_str(const unsigned char *bin, char *str);
+extern libspid_error_t libspid_image_get_desc(libspid_image_desc_type_t type, spidcom_image_desc_t *image_desc, char *mtd_name);
+extern libspid_error_t libspid_image_select(libspid_image_select_t select);
+extern libspid_error_t libspid_network_get_ip (const char *interface, libspid_ip_t *ip);
+extern libspid_error_t libspid_network_set_ip (const char *interface, const libspid_ip_t *ip);
+extern libspid_error_t libspid_network_get_mac (const char *interface, unsigned char *mac);
+extern libspid_error_t libspid_system_get_kernel_version(char *buffer, int buffer_len);
+extern libspid_error_t libspid_system_get_plc_version (char *buffer, const int buffer_len);
+extern libspid_error_t libspid_system_get_av_version (char *buffer, const int buffer_len);
+extern libspid_error_t libspid_system_get_uptime(unsigned int *total_s, unsigned int *idle_s);
+extern libspid_error_t libspid_system_get_meminfo(char *buffer, int buffer_len);
+extern void libspid_system_reboot(void);
+extern libspid_error_t libspid_system_save(void);
+extern libspid_error_t libspid_system_save_file(const char *filename);
+extern libspid_error_t libspid_system_factory(void);
+extern libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram);
+extern libspid_error_t libspid_secu_pbkdf1 (const unsigned char input[], const unsigned int input_length, const libspid_secu_salt_type_t salt_type, const unsigned int it_count, unsigned char output[], unsigned int output_length);
+
+#endif /* LIBSPID_H */
diff --git a/cleopatre/application/spidlib/inc/openssl_md32_common.h b/cleopatre/application/libspid/inc/openssl_md32_common.h
index 7c20684b06..7c20684b06 100644
--- a/cleopatre/application/spidlib/inc/openssl_md32_common.h
+++ b/cleopatre/application/libspid/inc/openssl_md32_common.h
diff --git a/cleopatre/application/spidlib/inc/openssl_sha256.h b/cleopatre/application/libspid/inc/openssl_sha256.h
index 86309e95e3..86309e95e3 100644
--- a/cleopatre/application/spidlib/inc/openssl_sha256.h
+++ b/cleopatre/application/libspid/inc/openssl_sha256.h
diff --git a/cleopatre/application/libspid/inc/path.h b/cleopatre/application/libspid/inc/path.h
new file mode 100644
index 0000000000..a308e922e5
--- /dev/null
+++ b/cleopatre/application/libspid/inc/path.h
@@ -0,0 +1,55 @@
+/* SPC300 bundle {{{
+ *
+ * Copyright (C) 2009 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file application/libspid/inc/path.h
+ * \brief path defines of configuration files
+ * \ingroup libspid
+ *
+ * This file defines all pathes of configuraiton files.
+ * Modify it to add / change a file path.
+ *
+ */
+#ifndef LIBSPID_PATH_H
+#define LIBSPID_PATH_H
+
+#ifndef __UTESTS__
+
+ #define LIBSPID_SAVE_LIST_PATH "/etc/save.lst"
+ #define LIBSPID_SAVE_DIR_PATH "/usr/local/etc"
+ #define LIBSPID_CONF_ROOT_PATH "/etc"
+ #define LIBSPID_HARDWARE_INFO_PATH "/etc/hardware.info"
+ #define LIBSPID_HPAV_CONF_PATH "/etc/hpav.conf"
+ #define LIBSPID_HPAV_INFO_PATH "/etc/hpav.info"
+ #define LIBSPID_NETWORK_CONF_PATH "/etc/network/interfaces"
+ #define LIBSPID_SYSTEM_VERSION_PATH "/proc/version"
+ #define LIBSPID_SYSTEM_UPTIME_PATH "/proc/uptime"
+ #define LIBSPID_SYSTEM_MEMINFO_PATH "/proc/meminfo"
+ #define LIBSPID_SYSTEM_MTD_PATH "/proc/mtd"
+ #define LIBSPID_FACTORY_PATH "/factory"
+ #define LIBSPID_DEV_PATH "/dev"
+
+#else /* unitary tests paths */
+
+ #define UTESTS_TMP_DIR "/tmp/utests"
+ #define LIBSPID_SAVE_LIST_PATH "/tmp/utests/etc/save.lst"
+ #define LIBSPID_SAVE_DIR_PATH "/tmp/utests/local"
+ #define LIBSPID_CONF_ROOT_PATH "/tmp/utests/etc"
+ #define LIBSPID_HARDWARE_INFO_PATH "/tmp/utests/etc/hardware.info"
+ #define LIBSPID_HPAV_CONF_PATH "/tmp/utests/etc/hpav.conf"
+ #define LIBSPID_HPAV_INFO_PATH "/tmp/utests/etc/hpav.info"
+ #define LIBSPID_NETWORK_CONF_PATH "/tmp/utests/network/interfaces"
+ #define LIBSPID_SYSTEM_VERSION_PATH "/tmp/utests/proc/version"
+ #define LIBSPID_SYSTEM_UPTIME_PATH "/tmp/utests/proc/uptime"
+ #define LIBSPID_SYSTEM_MEMINFO_PATH "/tmp/utests/proc/meminfo"
+ #define LIBSPID_SYSTEM_MTD_PATH "/tmp/utests/proc/mtd"
+ #define LIBSPID_FACTORY_PATH "/tmp/utests/factory"
+ #define LIBSPID_DEV_PATH "/tmp/utests/dev"
+
+#endif
+
+#endif /* LIBSPID_PATH_H */
diff --git a/cleopatre/application/spidlib/src/config_item.c b/cleopatre/application/libspid/src/config_item.c
index d8bc2b9aba..5d78fd2a34 100644
--- a/cleopatre/application/spidlib/src/config_item.c
+++ b/cleopatre/application/libspid/src/config_item.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/config_item.c
+ * \file application/libspid/src/config_item.c
* \brief item management in configuration file
- * \ingroup spidlib
+ * \ingroup libspid
*
*/
@@ -19,7 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-#include "spidlib.h"
+#include "libspid.h"
#ifdef __UTESTS__
#include "config_item_utests.h"
@@ -33,47 +33,47 @@
* \param label label of wanted item to read
* \param value pointer to buffer where read value is written
* \param buffer_len length of value buffer
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NOT_FOUND: item has not been found
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
- * \return SPIDLIB_ERROR_NO_SPACE: not enough space in buffer
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NOT_FOUND: item has not been found
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_NO_SPACE: not enough space in buffer
*/
-spidlib_error_t spidlib_config_read_item (const char *filename, const char *label, char *value, int buffer_len)
+libspid_error_t libspid_config_read_item (const char *filename, const char *label, char *value, int buffer_len)
{
- char buffer[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
FILE *fp;
char *strtok_ctx, *ptr, *blank_ptr;
/* check input parameters */
if((filename == NULL) || (label == NULL) || (value == NULL) || (buffer_len <= 0))
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check key validity */
- if ( strstr(label, SPIDLIB_CONFIG_DELIMITER) || strchr(label, ' ') || strchr(label, '\t') )
+ if ( strstr(label, LIBSPID_CONFIG_DELIMITER) || strchr(label, ' ') || strchr(label, '\t') )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* open config file */
if((fp = fopen(filename, "r")) == NULL)
{
- //syslog(LOG_WARNING, "spidlib_read_config_param: cannot open %s (errno=%d)\n", filename, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ //syslog(LOG_WARNING, "libspid_read_config_param: cannot open %s (errno=%d)\n", filename, errno);
+ return LIBSPID_ERROR_SYSTEM;
}
- while( fgets(buffer, SPIDLIB_LINE_MAX_LEN - 1, fp) )
+ while( fgets(buffer, LIBSPID_LINE_MAX_LEN - 1, fp) )
{
/* get the label */
- ptr = strtok_r(buffer, SPIDLIB_CONFIG_DELIMITER " \t", &strtok_ctx);
+ ptr = strtok_r(buffer, LIBSPID_CONFIG_DELIMITER " \t", &strtok_ctx);
/* check if it is the wanted label */
if((ptr == NULL) || (strlen(ptr) <= 0) || (*ptr == '#') || strcmp(ptr, label))
continue;
/* remove space and '=' before the value */
ptr += strlen(ptr) + 1;
- while(isblank(*ptr) || (*ptr == *SPIDLIB_CONFIG_DELIMITER))
+ while(isblank(*ptr) || (*ptr == *LIBSPID_CONFIG_DELIMITER))
ptr++;
ptr = strtok_r(ptr, "\n\r", &strtok_ctx);
/* init value to empty */
@@ -91,17 +91,17 @@ spidlib_error_t spidlib_config_read_item (const char *filename, const char *labe
if(strlen(ptr) >= buffer_len)
{
fclose(fp);
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
strcpy(value, ptr);
}
fclose(fp);
- //syslog(LOG_DEBUG, "spidlib_read_config_param: '%s' = '%s'", label, value);
- return SPIDLIB_SUCCESS;
+ //syslog(LOG_DEBUG, "libspid_read_config_param: '%s' = '%s'", label, value);
+ return LIBSPID_SUCCESS;
}
/* label not found */
fclose(fp);
- return SPIDLIB_ERROR_NOT_FOUND;
+ return LIBSPID_ERROR_NOT_FOUND;
}
/**
@@ -110,15 +110,15 @@ spidlib_error_t spidlib_config_read_item (const char *filename, const char *labe
* \param filename full path filename of a configuration file
* \param label label of item value to write; if item does not already exists, it will be added into the configuration file
* \param value value of item to write
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
- * \return SPIDLIB_ERROR_NO_SPACE: not enough space in buffer
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_NO_SPACE: not enough space in buffer
*/
-spidlib_error_t spidlib_config_write_item(const char *filename, const char *label, const char *value)
+libspid_error_t libspid_config_write_item(const char *filename, const char *label, const char *value)
{
- char buffer[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
char out_filename[64];
char *ptr, *strtok_ctx;
FILE *fp_in, *fp_out;
@@ -129,19 +129,19 @@ spidlib_error_t spidlib_config_write_item(const char *filename, const char *labe
/* check input parameters */
if ( (filename == NULL) || (label == NULL) || (strlen(label) <= 0) || (value == NULL) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check key validity */
- if ( strstr(label, SPIDLIB_CONFIG_DELIMITER) || strchr(label, ' ') || strchr(label, '\t') )
+ if ( strstr(label, LIBSPID_CONFIG_DELIMITER) || strchr(label, ' ') || strchr(label, '\t') )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* open config file */
if ( (fd_in = open(filename, O_RDONLY | O_CREAT, 0666)) < 0 )
{
- //syslog(LOG_WARNING, "spidlib_write_config_param: cannot open %s (errno=%d)", filename, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ //syslog(LOG_WARNING, "libspid_write_config_param: cannot open %s (errno=%d)", filename, errno);
+ return LIBSPID_ERROR_SYSTEM;
}
fp_in = fdopen(fd_in, "r");
/* create the modified config file */
@@ -150,15 +150,15 @@ spidlib_error_t spidlib_config_write_item(const char *filename, const char *labe
{
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* find the label to modify */
- while ( fgets(buffer, SPIDLIB_LINE_MAX_LEN - 1, fp_in) )
+ while ( fgets(buffer, LIBSPID_LINE_MAX_LEN - 1, fp_in) )
{
tmp_line = strdup(buffer);
/* get the label */
- ptr = strtok_r(buffer, SPIDLIB_CONFIG_DELIMITER " \t", &strtok_ctx);
+ ptr = strtok_r(buffer, LIBSPID_CONFIG_DELIMITER " \t", &strtok_ctx);
/* check if it is the wanted label */
if ( (ptr == NULL) || (strlen(ptr) <= 0) || (*ptr == '#') || strcmp(ptr, label) )
{
@@ -168,29 +168,29 @@ spidlib_error_t spidlib_config_write_item(const char *filename, const char *labe
}
/* check for buffer overload */
- if ( SPIDLIB_LINE_MAX_LEN - 1/*'\0'*/ - 1 /*'\n'*/ - ( strlen(ptr) + 1/*' '*/ + 1/*'='*/ + 1/*' '*/ ) < strlen(value) )
+ if ( LIBSPID_LINE_MAX_LEN - 1/*'\0'*/ - 1 /*'\n'*/ - ( strlen(ptr) + 1/*' '*/ + 1/*'='*/ + 1/*' '*/ ) < strlen(value) )
{
fclose(fp_out);
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
/* write the new value */
- fprintf(fp_out, "%s %s %s\n", ptr, SPIDLIB_CONFIG_DELIMITER, value); /* make line in format "label = value" */
+ fprintf(fp_out, "%s %s %s\n", ptr, LIBSPID_CONFIG_DELIMITER, value); /* make line in format "label = value" */
is_found = 1;
}
if (!is_found)
{
/* add new 'label = value' at the end of file */
- fprintf(fp_out, "%s %s %s\n", label, SPIDLIB_CONFIG_DELIMITER, value);
+ fprintf(fp_out, "%s %s %s\n", label, LIBSPID_CONFIG_DELIMITER, value);
}
fclose(fp_out);
fclose(fp_in);
close(fd_in);
if ( rename(out_filename, filename) < 0 )
{
- //syslog(LOG_WARNING, "spidlib_write_config_param : rename (errno=%d)\n", errno);
+ //syslog(LOG_WARNING, "libspid_write_config_param : rename (errno=%d)\n", errno);
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidlib/src/config_line.c b/cleopatre/application/libspid/src/config_line.c
index 2800ab9cec..67dba8afe7 100644
--- a/cleopatre/application/spidlib/src/config_line.c
+++ b/cleopatre/application/libspid/src/config_line.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/config_line.c
+ * \file application/libspid/src/config_line.c
* \brief line management in configuration file
- * \ingroup spidlib
+ * \ingroup libspid
*
*/
@@ -19,7 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-#include "spidlib.h"
+#include "libspid.h"
/**
* Read a configuration line from a file.<BR>
@@ -32,7 +32,7 @@
* element table is filled with pointers to each found line
* elements.If the key is an empty string, the key of the
* first line is returned into the key buffer.<BR>
- * Key buffer must not be smaller than SPIDLIB_MAX_KEY_LEN.<BR>
+ * Key buffer must not be smaller than LIBSPID_MAX_KEY_LEN.<BR>
* When line elements are returned, the key buffer if filled
* with the next found key in the next line. If there is no more
* line to read, the key buffer contains a empty string. The
@@ -50,20 +50,20 @@
* elements
* \param buffer whole line working buffer
* \param buffer_len working buffer length
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NOT_FOUND: key not found or no more
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NOT_FOUND: key not found or no more
* line to read
- * \return SPIDLIB_ERROR_NO_SPACE: no enough space in buffer or
+ * \return LIBSPID_ERROR_NO_SPACE: no enough space in buffer or
* to much elements to put into element table
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_config_read_line(const char *filename, const char* delimiters, char *key, unsigned int *elt_number, char *elt[], char *buffer, unsigned int buffer_len)
+libspid_error_t libspid_config_read_line(const char *filename, const char* delimiters, char *key, unsigned int *elt_number, char *elt[], char *buffer, unsigned int buffer_len)
{
FILE *fp;
- char key_buffer[SPIDLIB_KEY_MAX_LEN];
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char key_buffer[LIBSPID_KEY_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
char *ptr, *strtok_ctx;
#ifdef USE_LOCK
struct flock lock;
@@ -75,37 +75,37 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
if ( (filename == NULL) || (delimiters == NULL) || (key == NULL) || (elt_number == NULL)
|| (elt == NULL) || (buffer == NULL) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if ( (strlen(delimiters) <= 0) || (*elt_number > SPIDLIB_ELT_MAX_NB)
+ if ( (strlen(delimiters) <= 0) || (*elt_number > LIBSPID_ELT_MAX_NB)
|| (buffer_len <= 0) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check delimiter validity */
if ( strchr(delimiters, '\n') || strchr(delimiters, '\r') )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check key validity */
- if ( strlen(key) > SPIDLIB_KEY_MAX_LEN )
+ if ( strlen(key) > LIBSPID_KEY_MAX_LEN )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
if ( strpbrk(key, delimiters) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* open config file */
if ( (fp = fopen(filename, "r")) == NULL )
{
//syslog(LOG_WARNING, "%s: cannot open %s (errno=%d)\n", __FUNCTION__, filename, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#ifdef USE_LOCK
@@ -118,13 +118,13 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
{
//syslog(LOG_WARNING, "%s: lock set failed (errno=%d)\n)", __FUNCTION__, errno);
fclose(fp);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#endif /* USE_LOCK */
max_elt_number = *elt_number;
*elt_number = 0;
- is_key_found = SPIDLIB_FALSE;
+ is_key_found = LIBSPID_FALSE;
if ( strlen(key) > 0 )
{
@@ -147,7 +147,7 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
else
{
/* chops chars until end of line */
- fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp);
+ fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp);
}
/* get the index */
ptr = strtok_r(buffer, delimiters, &strtok_ctx);
@@ -156,7 +156,7 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
if ( (ptr == NULL) || (strlen(ptr) <= 0) || (*ptr == '#') || strcmp(ptr, key) )
continue;
- is_key_found = SPIDLIB_TRUE;
+ is_key_found = LIBSPID_TRUE;
/* get all elements */
while ( (ptr = strtok_r(NULL, delimiters, &strtok_ctx)) && (*elt_number < max_elt_number) )
@@ -171,7 +171,7 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
else
{
/* just find the first key */
- is_key_found = SPIDLIB_TRUE;
+ is_key_found = LIBSPID_TRUE;
}
/* check if key has been found */
if (!is_key_found)
@@ -182,11 +182,11 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
#endif /* USE_LOCK */
/* close file */
fclose(fp);
- return SPIDLIB_ERROR_NOT_FOUND;
+ return LIBSPID_ERROR_NOT_FOUND;
}
/* get next key */
*key = '\0';
- while ( NULL != fgets(key_buffer, SPIDLIB_KEY_MAX_LEN - 1, fp) )
+ while ( NULL != fgets(key_buffer, LIBSPID_KEY_MAX_LEN - 1, fp) )
{
/* remove the newline */
if ( key_buffer[strlen(key_buffer) - 1] == '\n' )
@@ -210,7 +210,7 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
/* close file */
fclose(fp);
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -221,29 +221,29 @@ spidlib_error_t spidlib_config_read_line(const char *filename, const char* delim
* already exists, the line is updated with new elements.
* If the key does not exist, the line is added to the end of
* the file.<BR>
- * The key length must not be longer than SPIDLIB_KEY_MAX_LEN.
+ * The key length must not be longer than LIBSPID_KEY_MAX_LEN.
*
* \param filename full path filename of a configuration file
* \param delimiter char used for delimiting key and elements
* \param key the key (index) of the line
* \param elt_number number of elements to write
* \param elt list of elements to write
- * \result error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NO_SPACE: no enough space in buffer or
+ * \result error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NO_SPACE: no enough space in buffer or
* to much elements to put into element table
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_config_write_line(const char *filename, const char delimiter, const char *key, unsigned int elt_number, char *elt[])
+libspid_error_t libspid_config_write_line(const char *filename, const char delimiter, const char *key, unsigned int elt_number, char *elt[])
{
- char buffer[SPIDLIB_LINE_MAX_LEN], key_buffer[SPIDLIB_KEY_MAX_LEN + 1];
+ char buffer[LIBSPID_LINE_MAX_LEN], key_buffer[LIBSPID_KEY_MAX_LEN + 1];
char out_filename[64];
char *ptr, *strtok_ctx;
FILE *fp_in, *fp_out;
int fd_in, index = 0;
- int is_key_found = SPIDLIB_FALSE;
- char delimiters[8] = SPIDLIB_CONFIG_DELIMITER " \t";
+ int is_key_found = LIBSPID_FALSE;
+ char delimiters[8] = LIBSPID_CONFIG_DELIMITER " \t";
#ifdef USE_LOCK
struct flock lock;
#endif /* USE_LOCK */
@@ -252,38 +252,38 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
strncat(delimiters, &delimiter, 1);
/* check input parameters */
- if ( (filename == NULL) || (key == NULL) || (elt == NULL) || (elt_number > SPIDLIB_ELT_MAX_NB) )
+ if ( (filename == NULL) || (key == NULL) || (elt == NULL) || (elt_number > LIBSPID_ELT_MAX_NB) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check sizes */
if ( (strlen(key) == 0) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check delimiter validity */
if ( (delimiter == '\n') || (delimiter == '\r') )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check key validity */
if ( strchr(key, delimiter) != NULL )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if ( strlen(key) > SPIDLIB_KEY_MAX_LEN )
+ if ( strlen(key) > LIBSPID_KEY_MAX_LEN )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* open config file */
if ( (fd_in = open(filename, O_RDWR | O_CREAT, 0666)) < 0 )
{
//syslog(LOG_WARNING, "%s: cannot open %s (errno=%d)", __FUNCTION__, filename, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
fp_in = fdopen(fd_in, "r");
/* create the modified config file */
@@ -293,7 +293,7 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
fclose(fp_out);
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#ifdef USE_LOCK
@@ -308,14 +308,14 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
fclose(fp_out);
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#endif /* USE_LOCK */
/* find the label to modify */
- while ( fgets(buffer, SPIDLIB_LINE_MAX_LEN - 1, fp_in) )
+ while ( fgets(buffer, LIBSPID_LINE_MAX_LEN - 1, fp_in) )
{
/* fill working copy for key */
- strncpy(key_buffer, buffer, SPIDLIB_KEY_MAX_LEN);
+ strncpy(key_buffer, buffer, LIBSPID_KEY_MAX_LEN);
/* get the index */
ptr = strtok_r(key_buffer, delimiters, &strtok_ctx);
if ( (ptr == NULL) || (strlen(ptr) <= 0) || (*ptr == '#') || strcmp(ptr, key) )
@@ -324,13 +324,13 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
continue;
}
- is_key_found = SPIDLIB_TRUE;
+ is_key_found = LIBSPID_TRUE;
/* create the new line */
sprintf(buffer, "%s%c", key, delimiter);
for (index = 0; index < elt_number; index++)
{
/* check for buffer overflow */
- if ( ( strlen(buffer) + 1 /*delimiter*/ + strlen(elt[index]) + 1 /*'\0'*/ ) > SPIDLIB_LINE_MAX_LEN )
+ if ( ( strlen(buffer) + 1 /*delimiter*/ + strlen(elt[index]) + 1 /*'\0'*/ ) > LIBSPID_LINE_MAX_LEN )
{
fclose(fp_out);
fclose(fp_in);
@@ -339,7 +339,7 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
fcntl(fd_in, F_UNLCK, &lock);
#endif /* USE_LOCK */
close(fd_in);
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
sprintf(buffer + strlen(buffer), "%s%c", elt[index], delimiter);
}
@@ -354,7 +354,7 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
for(index = 0; index < elt_number; index++)
{
/* check for buffer overflow */
- if ( ( strlen(buffer) + 1 /*delimiter*/ + strlen(elt[index]) + 1 /*'\0'*/ ) > SPIDLIB_LINE_MAX_LEN )
+ if ( ( strlen(buffer) + 1 /*delimiter*/ + strlen(elt[index]) + 1 /*'\0'*/ ) > LIBSPID_LINE_MAX_LEN )
{
fclose(fp_out);
fclose(fp_in);
@@ -363,7 +363,7 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
fcntl(fd_in, F_UNLCK, &lock);
#endif /* USE_LOCK */
close(fd_in);
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
sprintf(buffer + strlen(buffer), "%s%c", elt[index], delimiter );
}
@@ -383,7 +383,7 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
//syslog(LOG_WARNING, "%s : rename (errno=%d)\n", __FUNCTION__, errno);
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -391,25 +391,25 @@ spidlib_error_t spidlib_config_write_line(const char *filename, const char delim
* Line to remove is referred according to a provided key. A
* line is composed of a key and several elements, separated by
* a common delimiter.<BR>
- * The provided key must not be longer than SPIDLIB_MAX_KEY_LEN.
+ * The provided key must not be longer than LIBSPID_MAX_KEY_LEN.
*
* \param filename full path filename of a configuration file
* \param delimiters chars used for delimiting key and elements
* \param key key (index) of the line to remove
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NOT_FOUND: key not found
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NOT_FOUND: key not found
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_config_remove_line(const char *filename, const char *delimiters, const char *key)
+libspid_error_t libspid_config_remove_line(const char *filename, const char *delimiters, const char *key)
{
- char buffer[SPIDLIB_LINE_MAX_LEN], key_buffer[SPIDLIB_KEY_MAX_LEN + 1];
+ char buffer[LIBSPID_LINE_MAX_LEN], key_buffer[LIBSPID_KEY_MAX_LEN + 1];
char out_filename[64];
char *ptr, *strtok_ctx;
FILE *fp_in, *fp_out;
int fd_in;
- int is_key_found = SPIDLIB_FALSE;
+ int is_key_found = LIBSPID_FALSE;
#ifdef USE_LOCK
struct flock lock;
#endif /* USE_LOCK */
@@ -417,36 +417,36 @@ spidlib_error_t spidlib_config_remove_line(const char *filename, const char *del
/* check input parameters */
if ( (filename == NULL) || (delimiters == NULL) || (key == NULL) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check sizes */
if ( (strlen(key) == 0) || (strlen(delimiters) == 0) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check delimiter validity */
if ( strchr(delimiters, '\n') || strchr(delimiters, '\r') )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* check key validity */
if ( strpbrk(key, delimiters) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if ( strlen(key) > SPIDLIB_KEY_MAX_LEN )
+ if ( strlen(key) > LIBSPID_KEY_MAX_LEN )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* open config file */
if ( (fd_in = open(filename, O_RDWR | O_CREAT, 0666)) < 0 )
{
//syslog(LOG_WARNING, "%s: cannot open %s (errno=%d)", __FUNCTION__, filename, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
fp_in = fdopen(fd_in, "r");
/* create the modified config file */
@@ -455,7 +455,7 @@ spidlib_error_t spidlib_config_remove_line(const char *filename, const char *del
{
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#ifdef USE_LOCK
@@ -470,15 +470,15 @@ spidlib_error_t spidlib_config_remove_line(const char *filename, const char *del
fclose(fp_out);
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#endif /* USE_LOCK */
/* find the label to modify */
- while ( fgets(buffer, SPIDLIB_LINE_MAX_LEN - 1, fp_in) )
+ while ( fgets(buffer, LIBSPID_LINE_MAX_LEN - 1, fp_in) )
{
/* fill working copy for key */
- memset(key_buffer, '\0', SPIDLIB_KEY_MAX_LEN + 1);
- strncpy(key_buffer, buffer, SPIDLIB_KEY_MAX_LEN);
+ memset(key_buffer, '\0', LIBSPID_KEY_MAX_LEN + 1);
+ strncpy(key_buffer, buffer, LIBSPID_KEY_MAX_LEN);
/* get the index */
ptr = strtok_r(key_buffer, delimiters, &strtok_ctx);
@@ -488,7 +488,7 @@ spidlib_error_t spidlib_config_remove_line(const char *filename, const char *del
continue;
}
- is_key_found = SPIDLIB_TRUE;
+ is_key_found = LIBSPID_TRUE;
}
fclose(fp_out);
fclose(fp_in);
@@ -507,7 +507,7 @@ spidlib_error_t spidlib_config_remove_line(const char *filename, const char *del
else
{
remove(out_filename);
- return SPIDLIB_ERROR_NOT_FOUND;
+ return LIBSPID_ERROR_NOT_FOUND;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidlib/src/image.c b/cleopatre/application/libspid/src/image.c
index a47a2a9d33..fd658067d6 100644
--- a/cleopatre/application/spidlib/src/image.c
+++ b/cleopatre/application/libspid/src/image.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/image.c
+ * \file application/libspid/src/image.c
* \brief firmware image management
- * \ingroup spidlib
+ * \ingroup libspid
*
*/
@@ -21,7 +21,7 @@
#ifndef __UTESTS__
#include <mtd/mtd-user.h>
#endif /* __UTESTS__ */
-#include "spidlib.h"
+#include "libspid.h"
/**
* Give informations on the stored firmware images : current,
@@ -30,27 +30,27 @@
* image infomration.<BR>
* The device name of flash partition where image is stored is
* put inside the provided mtd_name buffer. Buffer length must
- * be >= SPIDLIB_MTD_NAME_MAX_LEN (16).
+ * be >= LIBSPID_MTD_NAME_MAX_LEN (16).
*
* \param type type of image to get information
* \param image_desc pointer to structure where information is
* filled
* \param mtd_name buffer to get the mtd device name where the
* requested image is stored.
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NOT_FOUND: requested image not found
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NOT_FOUND: requested image not found
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_image_desc_t *image_desc, char *mtd_name)
+libspid_error_t libspid_image_get_desc(libspid_image_desc_type_t type, spidcom_image_desc_t *image_desc, char *mtd_name)
{
int fd0 = 0;
int fd1 = 0;
spidcom_image_desc_t image_desc_temp[2];
char mtd_name_temp[2][32] = {{0}};
int found_index = -1;
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
char *strtok_ctx;
int img_desc_0_found = 0;
int img_desc_1_found = 0;
@@ -60,36 +60,36 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
if ( (image_desc == NULL) || (mtd_name == NULL) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if ( (type < 0) || (type >= SPIDLIB_IMAGE_DESC_TYPE_NB) )
+ if ( (type < 0) || (type >= LIBSPID_IMAGE_DESC_TYPE_NB) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if ( SPIDLIB_SUCCESS != spidlib_system_get_nvram(&nvram) )
+ if ( LIBSPID_SUCCESS != libspid_system_get_nvram(&nvram) )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- if ( nvram.nb_images == 1 && ( type != SPIDLIB_IMAGE_DESC_TYPE_0 && type != SPIDLIB_IMAGE_DESC_TYPE_CURRENT ) )
+ if ( nvram.nb_images == 1 && ( type != LIBSPID_IMAGE_DESC_TYPE_0 && type != LIBSPID_IMAGE_DESC_TYPE_CURRENT ) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if( (fp = fopen (SPIDLIB_SYSTEM_MTD_PATH, "r")) == NULL)
+ if( (fp = fopen (LIBSPID_SYSTEM_MTD_PATH, "r")) == NULL)
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- while ( fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp) != NULL )
+ while ( fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp) != NULL )
{
if ( strstr(line_buffer, SPIDCOM_IMG_DESC_MTD_NAME_0) != NULL )
{
img_desc_0_found = 1;
/* Extract mtd path from line mtd<num>: <size> <erasesize> "nvram" */
img_desc_mtd_num = strtok_r(line_buffer, ": ", &strtok_ctx);
- sprintf(mtd_name_temp[0], "%s/%s", SPIDLIB_DEV_PATH, img_desc_mtd_num);
+ sprintf(mtd_name_temp[0], "%s/%s", LIBSPID_DEV_PATH, img_desc_mtd_num);
}
else if ( nvram.nb_images > 1 && ( strstr(line_buffer, SPIDCOM_IMG_DESC_MTD_NAME_1) != NULL ) )
@@ -97,7 +97,7 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
img_desc_1_found = 1;
/* Extract mtd path from line mtd<num>: <size> <erasesize> "nvram" */
img_desc_mtd_num = strtok_r(line_buffer, ": ", &strtok_ctx);
- sprintf(mtd_name_temp[1], "%s/%s",SPIDLIB_DEV_PATH, img_desc_mtd_num);
+ sprintf(mtd_name_temp[1], "%s/%s",LIBSPID_DEV_PATH, img_desc_mtd_num);
}
}
@@ -105,18 +105,18 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
if ( img_desc_0_found == 0 || (nvram.nb_images > 1 && img_desc_1_found == 0) )
{
- return SPIDLIB_ERROR_NOT_FOUND;
+ return LIBSPID_ERROR_NOT_FOUND;
}
/* open the MTD devices for partition #0 and #1 */
if ( (fd0 = open(mtd_name_temp[0], O_RDONLY)) < 0 )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
if ( nvram.nb_images > 1 && (fd1 = open(mtd_name_temp[1], O_RDONLY)) < 0 )
{
close(fd0);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* get image descriptor infos from both MTD */
@@ -126,7 +126,7 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
close(fd0);
if (nvram.nb_images > 1)
close(fd1);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
close(fd0);
close(fd1);
@@ -134,22 +134,22 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
/* give asked type */
switch(type)
{
- case SPIDLIB_IMAGE_DESC_TYPE_0 :
+ case LIBSPID_IMAGE_DESC_TYPE_0 :
if ( SPIDCOM_IMG_DESC_IS_VALID(image_desc_temp) )
{
found_index = 0;
}
break;
- case SPIDLIB_IMAGE_DESC_TYPE_1:
+ case LIBSPID_IMAGE_DESC_TYPE_1:
if ( SPIDCOM_IMG_DESC_IS_VALID(image_desc_temp + 1) )
{
found_index = 1;
}
break;
- case SPIDLIB_IMAGE_DESC_TYPE_CURRENT:
- case SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE:
+ case LIBSPID_IMAGE_DESC_TYPE_CURRENT:
+ case LIBSPID_IMAGE_DESC_TYPE_ALTERNATE:
/* check image validity */
if ( nvram.nb_images == 1 )
{
@@ -176,7 +176,7 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
}
}
/* give alternate index if asked */
- if ( type == SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE )
+ if ( type == LIBSPID_IMAGE_DESC_TYPE_ALTERNATE )
{
found_index = (found_index + 1) % 2;
}
@@ -194,24 +194,24 @@ spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_i
if ( (found_index < 0) || !SPIDCOM_IMG_DESC_IS_VALID(image_desc_temp + found_index) )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
memcpy( image_desc, &image_desc_temp[found_index], sizeof(spidcom_image_desc_t) );
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
* Select the current image firmware to boot on the next time.
*
* \param select the image to select for nrxt boot
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NOT_FOUND: selected image is not valid
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NOT_FOUND: selected image is not valid
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
+libspid_error_t libspid_image_select(libspid_image_select_t select)
{
int fd;
spidcom_image_desc_t image_desc[2], *image_desc_ptr;
@@ -230,53 +230,53 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
} meminfo;
#endif /* __UTESTS__ */
- if ( (select < SPIDLIB_IMAGE_SELECT_0) || (select >= SPIDLIB_IMAGE_SELECT_NB) )
+ if ( (select < LIBSPID_IMAGE_SELECT_0) || (select >= LIBSPID_IMAGE_SELECT_NB) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- if ( SPIDLIB_SUCCESS != spidlib_system_get_nvram(&nvram) )
+ if ( LIBSPID_SUCCESS != libspid_system_get_nvram(&nvram) )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
if ( nvram.nb_images == 1 )
{
- if ( select != SPIDLIB_IMAGE_SELECT_0 )
- return SPIDLIB_ERROR_PARAM;
+ if ( select != LIBSPID_IMAGE_SELECT_0 )
+ return LIBSPID_ERROR_PARAM;
else
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/* get the current partition mtd_name */
- if ( SPIDLIB_SUCCESS != spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_CURRENT, image_desc, current_mtd_name) )
+ if ( LIBSPID_SUCCESS != libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_CURRENT, image_desc, current_mtd_name) )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* fill table with index 0='the new selected', 1='the other' */
switch(select)
{
- case SPIDLIB_IMAGE_SELECT_0:
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_0, image_desc, mtd_name[0]);
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_1, image_desc + 1, mtd_name[1]);
+ case LIBSPID_IMAGE_SELECT_0:
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_0, image_desc, mtd_name[0]);
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_1, image_desc + 1, mtd_name[1]);
break;
- case SPIDLIB_IMAGE_SELECT_1:
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_1, image_desc, mtd_name[0]);
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_0, image_desc + 1, mtd_name[1]);
+ case LIBSPID_IMAGE_SELECT_1:
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_1, image_desc, mtd_name[0]);
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_0, image_desc + 1, mtd_name[1]);
break;
- case SPIDLIB_IMAGE_SELECT_SWITCH:
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE, image_desc, mtd_name[0]);
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_CURRENT, image_desc + 1, mtd_name[1]);
+ case LIBSPID_IMAGE_SELECT_SWITCH:
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_ALTERNATE, image_desc, mtd_name[0]);
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_CURRENT, image_desc + 1, mtd_name[1]);
break;
default:
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* check the validity of selected partition */
if (!image_desc[0].is_valid)
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* check if we are selecting our current partition */
@@ -285,13 +285,13 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
/* no work to be done
* bacause we are demanded to switch to the image
* that we are actually already running */
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/* open the selected mtd partition */
if ( (fd = open(mtd_name[0], O_RDWR)) < 0 )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#ifndef __UTESTS__
@@ -300,7 +300,7 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
{
//syslog(LOG_WARNING, "%s: cannot get info from %s (errno=%d)", __FUNCTION__, mtd_name[0], errno);
close(fd);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#else
meminfo.erasesize = 64000; /* 64K sector */
@@ -311,7 +311,7 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
{
//syslog(LOG_WARNING, "%s: memory allocation of %d bytes failed (errno=%d)", __FUNCTION__, meminfo.erasesize, errno);
close(fd);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* read the 1st sector data */
@@ -319,7 +319,7 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
{
free(sector_data);
close(fd);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* set the new index to alternate.index + 1 */
@@ -335,7 +335,7 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
//syslog(LOG_WARNING, "%s: flash erase of %s failed (errno=%d)", __FUNCTION__, mtd_name[0], errno);
free(sector_data);
close(fd);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#endif /* __UTESTS__ */
@@ -352,6 +352,6 @@ spidlib_error_t spidlib_image_select(spidlib_image_select_t select)
free(sector_data);
/* ok, new sector is selected */
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidlib/src/misc.c b/cleopatre/application/libspid/src/misc.c
index 2a5a1af48a..1c10bd0ef0 100644
--- a/cleopatre/application/spidlib/src/misc.c
+++ b/cleopatre/application/libspid/src/misc.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/misc.c
+ * \file application/libspid/src/misc.c
* \brief misc functions
- * \ingroup spidlib
+ * \ingroup libspid
*
*/
@@ -17,7 +17,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
-#include "spidlib.h"
+#include "libspid.h"
/**
* Convert a MAC address in string format aa:bb:cc:dd:ee:ff into a
@@ -27,18 +27,18 @@
*
* \param str MAC address string
* \param bin MAC address returned in binary format
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
*/
-spidlib_error_t spidlib_mac_str_to_bin(const char *str, unsigned char *bin)
+libspid_error_t libspid_mac_str_to_bin(const char *str, unsigned char *bin)
{
int i;
char *s, *e;
if( (bin == NULL) || (str == NULL) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
s = (char *)str;
@@ -49,32 +49,32 @@ spidlib_error_t spidlib_mac_str_to_bin(const char *str, unsigned char *bin)
s = (*e) ? e + 1 : e;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
* Convert a MAC address in binary format (6 bytes) into a MAC address
* in string format aa:bb:cc:dd:ee:ff.<br>
* The array to store the string MAC address needs to be provided with minimal
- * size of 18 bytes (SPIDLIB_MAC_STR_LEN).<br>
+ * size of 18 bytes (LIBSPID_MAC_STR_LEN).<br>
* Example : { 0x00, 0x23, 0x54, 0xae, 0xf5, 0x24 } ---> "00:23:54:ae:f5:24"
*
* \param bin MAC address returned in binary format
* \param str MAC address string
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
*/
-spidlib_error_t spidlib_mac_bin_to_str(const unsigned char *bin, char *str)
+libspid_error_t libspid_mac_bin_to_str(const unsigned char *bin, char *str)
{
if( (bin == NULL) || (str == NULL) )
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
sprintf ( str, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
bin[0], bin[1], bin[2], bin[3], bin[4], bin[5] );
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidlib/src/network.c b/cleopatre/application/libspid/src/network.c
index e7c10050d9..c7ae34236c 100644
--- a/cleopatre/application/spidlib/src/network.c
+++ b/cleopatre/application/libspid/src/network.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/network.c
+ * \file application/libspid/src/network.c
* \brief networking functions
- * \ingroup spidlib
+ * \ingroup libspid
*
*/
#include <stdio.h>
@@ -23,7 +23,7 @@
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
-#include "spidlib.h"
+#include "libspid.h"
/**
* Give the IP setting of a network interface.<br>
@@ -31,16 +31,16 @@
*
* \param interface string containing network interface name (“br0”, “plc0” or “eth0”)
* \param ip pointer to structure to get all IP data of interface
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NO_SPACE: no enough space in buffer or
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NO_SPACE: no enough space in buffer or
* to much elements to put into element table
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
+libspid_error_t libspid_network_get_ip (const char *interface, libspid_ip_t *ip)
{
FILE *fp;
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
int record = 0; /* flag that tells if we should process or not found data */
char *ptr;
char *strtok_ctx;
@@ -48,16 +48,16 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
if (interface == NULL || ip == NULL)
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- /* reset spidlib_ip_t structure */
- memset(ip, 0x0, sizeof(spidlib_ip_t));
+ /* reset libspid_ip_t structure */
+ memset(ip, 0x0, sizeof(libspid_ip_t));
- fp = fopen (SPIDLIB_NETWORK_CONF_PATH, "r");
+ fp = fopen (LIBSPID_NETWORK_CONF_PATH, "r");
if (fp != NULL)
{
- while ( fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp) )
+ while ( fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp) )
{
if ( strstr(line_buffer, "iface") != NULL )
{
@@ -68,11 +68,11 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
if ( strstr(line_buffer, "static") != NULL )
{
- ip->mode = SPIDLIB_IP_MODE_STATIC;
+ ip->mode = LIBSPID_IP_MODE_STATIC;
}
else if ( strstr(line_buffer, "dhcp") != NULL )
{
- ip->mode = SPIDLIB_IP_MODE_DHCP;
+ ip->mode = LIBSPID_IP_MODE_DHCP;
}
}
else
@@ -104,9 +104,9 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
/* suppress '\n' character */
value[strlen(value) - 1] = '\0';
/* check for buffer overflow */
- if ( strlen(value) + 1 > SPIDLIB_IP_MAX_LEN )
+ if ( strlen(value) + 1 > LIBSPID_IP_MAX_LEN )
{
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
strcpy((char *)ip->address, value);
}
@@ -124,9 +124,9 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
/* suppress '\n' character */
value[strlen(value) - 1] = '\0';
/* check for buffer overflow */
- if ( strlen(value) + 1 > SPIDLIB_IP_MAX_LEN )
+ if ( strlen(value) + 1 > LIBSPID_IP_MAX_LEN )
{
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
strcpy((char *)ip->netmask, value);
}
@@ -144,9 +144,9 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
/* suppress '\n' character */
value[strlen(value) - 1] = '\0';
/* check for buffer overflow */
- if ( strlen(value) + 1 > SPIDLIB_IP_MAX_LEN )
+ if ( strlen(value) + 1 > LIBSPID_IP_MAX_LEN )
{
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
strcpy((char *)ip->broadcast, value);
}
@@ -164,9 +164,9 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
/* suppress '\n' character */
value[strlen(value) - 1] = '\0';
/* check for buffer overflow */
- if ( strlen(value) + 1 > SPIDLIB_IP_MAX_LEN )
+ if ( strlen(value) + 1 > LIBSPID_IP_MAX_LEN )
{
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
}
strcpy((char *)ip->gateway, value);
}
@@ -176,10 +176,10 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
}
else
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -188,35 +188,35 @@ spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip)
*
* \param interface string containing network interface name (“br0”, “plc0” or “eth0”)
* \param ip pointer to structure containing all IP data to set to the interface
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_t *ip)
+libspid_error_t libspid_network_set_ip (const char *interface, const libspid_ip_t *ip)
{
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
int skip = 0; /* flag that tells if we should keep these lines or not */
int auto_exists = 0; /* flag set if line auto <our_interface> exists */
char out_filename[64];
- char filename[] = SPIDLIB_NETWORK_CONF_PATH;
+ char filename[] = LIBSPID_NETWORK_CONF_PATH;
FILE *fp_in, *fp_out;
int fd_in = 0;
if (interface == NULL || ip == NULL)
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* open config file */
if ( (fd_in = open(filename, O_RDWR | O_CREAT, 0666)) < 0 )
{
//syslog(LOG_WARNING, "%s: cannot open %s (errno=%d)", __FUNCTION__, filename, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
if ( (fp_in = fdopen(fd_in, "r")) == NULL )
{
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* create the modified config file */
sprintf(out_filename, "%sXXXXXX", filename);
@@ -224,7 +224,7 @@ spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_
{
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#ifdef USE_LOCK
@@ -239,11 +239,11 @@ spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_
fclose(fp_out);
fclose(fp_in);
close(fd_in);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
#endif /* USE_LOCK */
- while ( fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp_in) )
+ while ( fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp_in) )
{
/* Start skipping lines (i.e. not writing them to output file)
* the moment we saw mentioned our interface,
@@ -291,14 +291,14 @@ spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_
}
switch (ip->mode)
{
- case SPIDLIB_IP_MODE_STATIC:
+ case LIBSPID_IP_MODE_STATIC:
fprintf(fp_out, "iface %s inet static\n", interface);
break;
- case SPIDLIB_IP_MODE_DHCP:
+ case LIBSPID_IP_MODE_DHCP:
fprintf(fp_out, "iface %s inet dhcp\n", interface);
break;
default:
- return SPIDLIB_ERROR_PARAM; /* ip->mode not known */
+ return LIBSPID_ERROR_PARAM; /* ip->mode not known */
break;
}
@@ -332,20 +332,20 @@ spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_
//syslog(LOG_WARNING, "%s : rename (errno=%d)\n", __FUNCTION__, errno);
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
* Get the MAC address of an network interface.<br>
- * Result is put into a provided buffer in string format aa:bb:cc:dd:ee:ff hexa address. Buffer must be of SPIDLIB_MAC_STRING_MAX_LEN.
+ * Result is put into a provided buffer in string format aa:bb:cc:dd:ee:ff hexa address. Buffer must be of LIBSPID_MAC_STRING_MAX_LEN.
*
* \param interface string containing network interface name (“br0”, “plc0” or “eth0”)
* \param mac buffer to get the MAC address in hexa string format with ':' inside
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_network_get_mac (const char *interface, unsigned char *mac)
+libspid_error_t libspid_network_get_mac (const char *interface, unsigned char *mac)
{
struct ifreq ifr;
int s;
@@ -353,7 +353,7 @@ spidlib_error_t spidlib_network_get_mac (const char *interface, unsigned char *m
if (interface == NULL || mac == NULL)
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
/* reset mac string */
@@ -362,14 +362,14 @@ spidlib_error_t spidlib_network_get_mac (const char *interface, unsigned char *m
s = socket( PF_PACKET, SOCK_RAW, htons(ETH_P_ALL) );
if( s < 0 )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
memset (&ifr, 0, sizeof (struct ifreq));
strcpy(ifr.ifr_name, interface);
if ( ioctl(s, SIOCGIFHWADDR, &ifr) != 0 )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
memcpy(ea.ether_addr_octet, ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
sprintf ((char *)mac, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
@@ -379,7 +379,7 @@ spidlib_error_t spidlib_network_get_mac (const char *interface, unsigned char *m
close(s);
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidlib/src/openssl_sha256.c b/cleopatre/application/libspid/src/openssl_sha256.c
index 841d7026b1..841d7026b1 100644
--- a/cleopatre/application/spidlib/src/openssl_sha256.c
+++ b/cleopatre/application/libspid/src/openssl_sha256.c
diff --git a/cleopatre/application/spidlib/src/secu.c b/cleopatre/application/libspid/src/secu.c
index e337e0a578..397e359704 100644
--- a/cleopatre/application/spidlib/src/secu.c
+++ b/cleopatre/application/libspid/src/secu.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/secu.c
+ * \file application/libspid/src/secu.c
* \brief security functions
- * \ingroup spidlib
+ * \ingroup libspid
*
* Utilities to generate keys and manage security stuffs
*/
@@ -16,10 +16,10 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include "spidlib.h"
+#include "libspid.h"
static void
-spidlib_secu_sha256 (unsigned char *data, unsigned int length, unsigned char *output)
+libspid_secu_sha256 (unsigned char *data, unsigned int length, unsigned char *output)
{
assert (data);
assert (output);
@@ -29,7 +29,7 @@ spidlib_secu_sha256 (unsigned char *data, unsigned int length, unsigned char *ou
static void
secu_pbkdf1 (const unsigned char input[], const unsigned int input_length,
- const unsigned char salt[SPIDLIB_SECU_SALT_SIZE],
+ const unsigned char salt[LIBSPID_SECU_SALT_SIZE],
const unsigned int it_count, unsigned char output[],
unsigned int output_length)
{
@@ -43,9 +43,9 @@ secu_pbkdf1 (const unsigned char input[], const unsigned int input_length,
assert (output_length);
/* Maximum size of dk. */
- unsigned char dk[SPIDLIB_SECU_PWD_SIZE_MAX + SPIDLIB_SECU_SALT_SIZE]
+ unsigned char dk[LIBSPID_SECU_PWD_SIZE_MAX + LIBSPID_SECU_SALT_SIZE]
__attribute__((aligned(128)));
- unsigned char sha_output[SPIDLIB_SECU_SHA256_SIZE]
+ unsigned char sha_output[LIBSPID_SECU_SHA256_SIZE]
__attribute__((aligned(128)));
memset (dk, 0, sizeof (dk));
@@ -56,18 +56,18 @@ secu_pbkdf1 (const unsigned char input[], const unsigned int input_length,
memcpy (dk, input, input_length);
/* If there is a salt, add it at the end. */
if (salt)
- memcpy (dk + input_length, salt, SPIDLIB_SECU_SALT_SIZE);
+ memcpy (dk + input_length, salt, LIBSPID_SECU_SALT_SIZE);
/* Compute the first derived key with sha256. */
- spidlib_secu_sha256 (dk, input_length + (salt ? SPIDLIB_SECU_SALT_SIZE : 0),
+ libspid_secu_sha256 (dk, input_length + (salt ? LIBSPID_SECU_SALT_SIZE : 0),
sha_output);
/* Compute the following iterations. */
unsigned int i;
for (i = 1; i < it_count; i++)
{
- spidlib_secu_sha256 (sha_output, SPIDLIB_SECU_SHA256_SIZE, sha_output);
+ libspid_secu_sha256 (sha_output, LIBSPID_SECU_SHA256_SIZE, sha_output);
}
- /* Copy only SPIDLIB_SECU_OUTPUT_KEY_SIZE as result. */
+ /* Copy only LIBSPID_SECU_OUTPUT_KEY_SIZE as result. */
memcpy (output, sha_output, output_length);
}
@@ -86,34 +86,34 @@ secu_pbkdf1 (const unsigned char input[], const unsigned int input_length,
* \param it_count number of iteration to process
* \param output buffer where is stored the result hash
* \param output_length length of buffer where to store the result hash
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
*/
-spidlib_error_t spidlib_secu_pbkdf1 (const unsigned char input[], const unsigned int input_length, const spidlib_secu_salt_type_t salt_type, const unsigned int it_count, unsigned char output[], unsigned int output_length)
+libspid_error_t libspid_secu_pbkdf1 (const unsigned char input[], const unsigned int input_length, const libspid_secu_salt_type_t salt_type, const unsigned int it_count, unsigned char output[], unsigned int output_length)
{
unsigned char *pbkdf1;
/* The salt to use for the PBKDF1 function. */
- unsigned char salt[SPIDLIB_SECU_SALT_SIZE] = {0x08, 0x85, 0x6d, 0xaf, 0x7c, 0xf5, 0x81, 0x00};
+ unsigned char salt[LIBSPID_SECU_SALT_SIZE] = {0x08, 0x85, 0x6d, 0xaf, 0x7c, 0xf5, 0x81, 0x00};
/* Check parameters. */
if((NULL == input) || (0 == input_length)
- || (salt_type < 0) || (salt_type >= SPIDLIB_SECU_SALT_TYPE_NB)
+ || (salt_type < 0) || (salt_type >= LIBSPID_SECU_SALT_TYPE_NB)
|| (0 == it_count) || (NULL == output) || (0 == output_length))
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
switch (salt_type)
{
- case SPIDLIB_SECU_SALT_TYPE_DAK:
+ case LIBSPID_SECU_SALT_TYPE_DAK:
salt[7] = 0x85;
pbkdf1 = salt;
break;
- case SPIDLIB_SECU_SALT_TYPE_NMK:
+ case LIBSPID_SECU_SALT_TYPE_NMK:
salt[7] = 0x86;
pbkdf1 = salt;
break;
- case SPIDLIB_SECU_SALT_TYPE_NONE:
+ case LIBSPID_SECU_SALT_TYPE_NONE:
default:
pbkdf1 = NULL;
break;
@@ -122,7 +122,7 @@ spidlib_error_t spidlib_secu_pbkdf1 (const unsigned char input[], const unsigned
secu_pbkdf1 (input, input_length,
pbkdf1, it_count,
output, output_length);
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidlib/src/system.c b/cleopatre/application/libspid/src/system.c
index 45f3aeb53d..7290b0cf38 100644
--- a/cleopatre/application/spidlib/src/system.c
+++ b/cleopatre/application/libspid/src/system.c
@@ -6,9 +6,9 @@
*
* }}} */
/**
- * \file application/spidlib/src/system.c
+ * \file application/libspid/src/system.c
* \brief system functions
- * \ingroup spidlib
+ * \ingroup libspid
*
*/
@@ -19,43 +19,43 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-#include "spidlib.h"
+#include "libspid.h"
/**
* Give the current Linux OS version inside a provided buffer.
*
* \param buffer buffer where to put the result
* \param buffer_len length of buffer where to put the result
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NO_SPACE: no enough space in buffer
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NO_SPACE: no enough space in buffer
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_get_kernel_version(char *buffer, int buffer_len)
+libspid_error_t libspid_system_get_kernel_version(char *buffer, int buffer_len)
{
FILE *fp;
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
unsigned int len = 0;
unsigned int total = 0;
if (buffer == NULL || buffer_len <= 0)
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
/* initialize buffer - important for strcat to work properly */
memset(buffer, 0x0, buffer_len);
- fp = fopen (SPIDLIB_SYSTEM_VERSION_PATH, "r");
+ fp = fopen (LIBSPID_SYSTEM_VERSION_PATH, "r");
if (fp != NULL)
{
- while ( fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp) )
+ while ( fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp) )
{
/* check for buffer overload */
len = strlen(line_buffer);
total += len;
if (total > buffer_len)
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
strcat(buffer, line_buffer);
}
@@ -64,10 +64,10 @@ spidlib_error_t spidlib_system_get_kernel_version(char *buffer, int buffer_len)
}
else
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -75,15 +75,15 @@ spidlib_error_t spidlib_system_get_kernel_version(char *buffer, int buffer_len)
*
* \param buffer buffer where to put the result
* \param buffer_len length of buffer where to put the result
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NO_SPACE: no enough space in buffer
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NO_SPACE: no enough space in buffer
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_get_plc_version (char *buffer, const int buffer_len)
+libspid_error_t libspid_system_get_plc_version (char *buffer, const int buffer_len)
{
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -91,15 +91,15 @@ spidlib_error_t spidlib_system_get_plc_version (char *buffer, const int buffer_l
*
* \param buffer buffer where to put the result
* \param buffer_len length of buffer where to put the result
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NO_SPACE: no enough space in buffer
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NO_SPACE: no enough space in buffer
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_get_av_version (char *buffer, const int buffer_len)
+libspid_error_t libspid_system_get_av_version (char *buffer, const int buffer_len)
{
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -109,22 +109,22 @@ spidlib_error_t spidlib_system_get_av_version (char *buffer, const int buffer_le
* \param total_s total time in seconds since system start
* \param idle_s total time of processor idle state since system
* start
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *idle_s)
+libspid_error_t libspid_system_get_uptime(unsigned int *total_s, unsigned int *idle_s)
{
FILE *fp;
- char buf[SPIDLIB_LINE_MAX_LEN];
+ char buf[LIBSPID_LINE_MAX_LEN];
int res;
unsigned int uptotal = 0;
unsigned int upidle = 0;
unsigned int dummy1, dummy2; /* we use dummy vars to take decimal parts */
if (total_s == NULL || idle_s == NULL)
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
/*
/proc/uptime <--- we will read uptime info from this file
This file contains information detailing how long the system
@@ -135,10 +135,10 @@ spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *i
The first number is the total number of seconds the system has been up.
The second number is how much of that time the machine has spent idle, in seconds.
*/
- fp = fopen (SPIDLIB_SYSTEM_UPTIME_PATH, "r");
+ fp = fopen (LIBSPID_SYSTEM_UPTIME_PATH, "r");
if (fp != NULL)
{
- if ( fgets(buf, SPIDLIB_LINE_MAX_LEN - 1, fp) != NULL )
+ if ( fgets(buf, LIBSPID_LINE_MAX_LEN - 1, fp) != NULL )
{
/* we cannot scanf %lf, we do not have double or float type on our ARM */
res = sscanf (buf, "%d.%d %d.%d", &uptotal, &dummy1, &upidle, &dummy2);
@@ -146,7 +146,7 @@ spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *i
if (res != 4)
{
fclose(fp);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
}
@@ -156,7 +156,7 @@ spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *i
*total_s = uptotal;
*idle_s = upidle;
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -165,34 +165,34 @@ spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *i
*
* \param buffer buffer where the result is put
* \param buffer_len size of provided buffer
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
- * \return SPIDLIB_ERROR_NO_SPACE: not enough space in buffer
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_NO_SPACE: not enough space in buffer
*/
-spidlib_error_t spidlib_system_get_meminfo(char *buffer, int buffer_len)
+libspid_error_t libspid_system_get_meminfo(char *buffer, int buffer_len)
{
FILE *fp;
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
unsigned int len = 0;
unsigned int total = 0;
if (buffer == NULL || buffer_len <= 0)
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
/* initialize buffer - important for strcat to work properly */
memset(buffer, 0x0, buffer_len);
- fp = fopen (SPIDLIB_SYSTEM_MEMINFO_PATH, "r");
+ fp = fopen (LIBSPID_SYSTEM_MEMINFO_PATH, "r");
if (fp != NULL)
{
- while ( fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp) )
+ while ( fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp) )
{
/* check for buffer overload */
len = strlen(line_buffer);
total += len;
if (total > buffer_len)
- return SPIDLIB_ERROR_NO_SPACE;
+ return LIBSPID_ERROR_NO_SPACE;
strcat(buffer, line_buffer);
}
@@ -201,10 +201,10 @@ spidlib_error_t spidlib_system_get_meminfo(char *buffer, int buffer_len)
}
else
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
@@ -212,7 +212,7 @@ spidlib_error_t spidlib_system_get_meminfo(char *buffer, int buffer_len)
*
*/
-void spidlib_system_reboot(void)
+void libspid_system_reboot(void)
{
system("reboot");
}
@@ -220,28 +220,28 @@ void spidlib_system_reboot(void)
/**
* Save the system configuration files into the user ffs.
*
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_save(void)
+libspid_error_t libspid_system_save(void)
{
FILE *fp;
char *ptr, filename[128], command_buffer[256];
int rc = 0;
char prefix[16] = {0};
- if ( (fp = fopen(SPIDLIB_SAVE_LIST_PATH, "r")) == NULL )
+ if ( (fp = fopen(LIBSPID_SAVE_LIST_PATH, "r")) == NULL )
{
- //syslog(LOG_WARNING, "spidlib_save_config: cannot open %s (errno=%d)", SPIDLIB_SAVE_LIST_PATH, errno);
- return SPIDLIB_ERROR_SYSTEM;
+ //syslog(LOG_WARNING, "libspid_save_config: cannot open %s (errno=%d)", LIBSPID_SAVE_LIST_PATH, errno);
+ return LIBSPID_ERROR_SYSTEM;
}
/* check for /usr/local/etc validity */
rc = system("mkdir -p /usr/local/etc");
if (rc != 0)
{
fclose(fp);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
while(fgets(filename, 127, fp))
@@ -251,7 +251,7 @@ spidlib_error_t spidlib_system_save(void)
filename[strlen(filename) - 1] = '\0';
}
/* check if the line in cnf file is /etc/<name> or just <name> */
- sprintf(prefix, "%s/", SPIDLIB_CONF_ROOT_PATH);
+ sprintf(prefix, "%s/", LIBSPID_CONF_ROOT_PATH);
if ( !strncmp(filename, prefix, strlen(prefix)) )
ptr = filename + strlen(prefix);
else
@@ -260,36 +260,36 @@ spidlib_error_t spidlib_system_save(void)
{
continue;
}
- sprintf(command_buffer, "cp -a %s/%.64s %s", SPIDLIB_CONF_ROOT_PATH, ptr, SPIDLIB_SAVE_DIR_PATH);
- //syslog(LOG_DEBUG, "spidlib_save_config: %s", command_buffer);
+ sprintf(command_buffer, "cp -a %s/%.64s %s", LIBSPID_CONF_ROOT_PATH, ptr, LIBSPID_SAVE_DIR_PATH);
+ //syslog(LOG_DEBUG, "libspid_save_config: %s", command_buffer);
rc = system(command_buffer);
if (rc !=0)
{
fclose(fp);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
}
fclose(fp);
/* make sure that all *.conf files have been copied, even new ones not in save.lst */
- sprintf(command_buffer, "cp -a %s/*.conf %s", SPIDLIB_CONF_ROOT_PATH, SPIDLIB_SAVE_DIR_PATH);
+ sprintf(command_buffer, "cp -a %s/*.conf %s", LIBSPID_CONF_ROOT_PATH, LIBSPID_SAVE_DIR_PATH);
rc = system(command_buffer);
if (rc !=0)
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
* Save a configuration file inside the user ffs.
*
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad parameter
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad parameter
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_save_file(const char *filename)
+libspid_error_t libspid_system_save_file(const char *filename)
{
FILE *fp;
char *ptr, command_buffer[256];
@@ -298,84 +298,84 @@ spidlib_error_t spidlib_system_save_file(const char *filename)
if(filename == NULL)
{
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
}
- sprintf(command_buffer, "cp -a %s %s", filename, SPIDLIB_SAVE_DIR_PATH);
- //syslog(LOG_DEBUG, "spidlib_save_config: %s", command_buffer);
+ sprintf(command_buffer, "cp -a %s %s", filename, LIBSPID_SAVE_DIR_PATH);
+ //syslog(LOG_DEBUG, "libspid_save_config: %s", command_buffer);
rc = system(command_buffer);
if (rc !=0)
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/**
* Restore the system into the factory configuration.
*
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_factory(void)
+libspid_error_t libspid_system_factory(void)
{
int rc;
char cmd[256] = {0};
- sprintf(cmd, "rm -rf %s/*", SPIDLIB_SAVE_DIR_PATH);
+ sprintf(cmd, "rm -rf %s/*", LIBSPID_SAVE_DIR_PATH);
rc = system(cmd);
if (rc !=0)
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
- sprintf(cmd, "cp -a %s/* %s", SPIDLIB_FACTORY_PATH, SPIDLIB_CONF_ROOT_PATH);
+ sprintf(cmd, "cp -a %s/* %s", LIBSPID_FACTORY_PATH, LIBSPID_CONF_ROOT_PATH);
rc = system(cmd);
if (rc !=0)
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
- sprintf(cmd, "cp -a %s/* %s", SPIDLIB_FACTORY_PATH, SPIDLIB_SAVE_DIR_PATH);
+ sprintf(cmd, "cp -a %s/* %s", LIBSPID_FACTORY_PATH, LIBSPID_SAVE_DIR_PATH);
rc = system(cmd);
if (rc !=0)
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
- //syslog("spidlib_factory: returned to factory default");
- return SPIDLIB_SUCCESS;
+ //syslog("libspid_factory: returned to factory default");
+ return LIBSPID_SUCCESS;
}
/**
* Get the NVRAM content.
*
- * \return error type (SPIDLIB_SUCCESS if success)
- * \return SPIDLIB_ERROR_PARAM: bad input parameters
- * \return SPIDLIB_ERROR_NOT_FOUND: key not found or no more
+ * \return error type (LIBSPID_SUCCESS if success)
+ * \return LIBSPID_ERROR_PARAM: bad input parameters
+ * \return LIBSPID_ERROR_NOT_FOUND: key not found or no more
* line to read
- * \return SPIDLIB_ERROR_SYSTEM: system error, see errno
+ * \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-spidlib_error_t spidlib_system_get_nvram(spc300_nvram_t *nvram)
+libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram)
{
FILE *fp;
int fd;
char *nvram_mtd_num;
char nvram_mtd_path[128];
- char line_buffer[SPIDLIB_LINE_MAX_LEN];
+ char line_buffer[LIBSPID_LINE_MAX_LEN];
char *strtok_ctx;
int is_found = 0;
if (nvram == NULL)
- return SPIDLIB_ERROR_PARAM;
+ return LIBSPID_ERROR_PARAM;
- fp = fopen (SPIDLIB_SYSTEM_MTD_PATH, "r");
+ fp = fopen (LIBSPID_SYSTEM_MTD_PATH, "r");
if (fp != NULL)
{
- while ( fgets(line_buffer, SPIDLIB_LINE_MAX_LEN - 1, fp) != NULL )
+ while ( fgets(line_buffer, LIBSPID_LINE_MAX_LEN - 1, fp) != NULL )
{
if ( strstr(line_buffer, NVRAM_MTD_NAME) != NULL )
{
is_found = 1;
/* Extract mtd path from line mtd<num>: <size> <erasesize> "nvram" */
nvram_mtd_num = strtok_r(line_buffer, ": ", &strtok_ctx);
- sprintf(nvram_mtd_path, "%s/%s", SPIDLIB_DEV_PATH, nvram_mtd_num);
+ sprintf(nvram_mtd_path, "%s/%s", LIBSPID_DEV_PATH, nvram_mtd_num);
}
}
@@ -383,32 +383,32 @@ spidlib_error_t spidlib_system_get_nvram(spc300_nvram_t *nvram)
if (is_found == 0)
{
- return SPIDLIB_ERROR_NOT_FOUND;
+ return LIBSPID_ERROR_NOT_FOUND;
}
}
else
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
/* open found mtd path using fd, i.e. with open sys call,
read NVRAM magic string and verify (done below) */
if ( (fd = open(nvram_mtd_path, O_RDONLY)) < 0 )
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
if( read(fd, nvram, sizeof(spc300_nvram_t)) < sizeof(spc300_nvram_t) )
{
close(fd);
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
close(fd);
/* check NVRAM validity */
if(!NVRAM_IS_VALID(nvram))
{
- return SPIDLIB_ERROR_SYSTEM;
+ return LIBSPID_ERROR_SYSTEM;
}
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
diff --git a/cleopatre/application/spidinit/Makefile b/cleopatre/application/spidinit/Makefile
index 914c3032a9..4a42dc3890 100644
--- a/cleopatre/application/spidinit/Makefile
+++ b/cleopatre/application/spidinit/Makefile
@@ -8,14 +8,14 @@ CC=arm-linux-gcc
CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
CC_WITHOUT_CFLAGS=$(CC)
LINUX_DIR=../../linux-2.6.25.10-spc300
-SPIDLIB_DIR=../spidlib
+LIBSPID_DIR=../libspid
LIBMME_DIR=../libmme
else #compile from buildroot
CC_WITH_CFLAGS=$(CC)
CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
endif
-EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(SPIDLIB_DIR)/inc -MMD
-LIBS=-L$(LIBMME_DIR) -L$(SPIDLIB_DIR) -lmme -lspidlib
+EXTRA_CFLAGS=-I$(INCPATH) -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -MMD
+LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
@@ -23,7 +23,7 @@ DEPS=$(patsubst %o,%d,$(OBJS))
all: $(BIN)
-$(BIN): $(OBJPATH) spidlib libmme $(OBJS)
+$(BIN): $(OBJPATH) libspid libmme $(OBJS)
$(CC_WITHOUT_CFLAGS) -static -o $@ $(OBJS) $(LIBS)
$(OBJPATH)/%.o: $(SRCPATH)/%.c
@@ -32,8 +32,8 @@ $(OBJPATH)/%.o: $(SRCPATH)/%.c
$(OBJPATH):
mkdir -p $(OBJPATH)
-spidlib:
- make -C $(SPIDLIB_DIR) libspidlib.a
+libspid:
+ make -C $(LIBSPID_DIR) libspid.a
libmme:
make -C $(LIBMME_DIR) libmme.a
diff --git a/cleopatre/application/spidinit/src/descupd.c b/cleopatre/application/spidinit/src/descupd.c
index bc64eaf552..ab737a05ad 100644
--- a/cleopatre/application/spidinit/src/descupd.c
+++ b/cleopatre/application/spidinit/src/descupd.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <fcntl.h>
-#include "spidlib.h"
+#include "libspid.h"
#include "spid_img_desc.h"
#include "spidinit.h"
@@ -69,7 +69,7 @@ int update_img_desc(void)
int fd;
spidcom_image_desc_t desc;
- spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_CURRENT, &desc, mtd_name);
+ libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_CURRENT, &desc, mtd_name);
if (desc.is_not_success == 0)
{
print_img_desc(&desc);
diff --git a/cleopatre/application/spidlib/inc/label.h b/cleopatre/application/spidlib/inc/label.h
deleted file mode 100644
index 57176fc22f..0000000000
--- a/cleopatre/application/spidlib/inc/label.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPC300 project {{{
- *
- * Copyright (C) 2009 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file application/spidlib/inc/label.h
- * \brief define all labels used inside configuration / info files
- * \ingroup spidlib
- *
- * All labels of config / info files are defined here to avoid some possible type mistakes
- */
-#ifndef SPIDLIB_LABEL_H
-#define SPIDLIB_LABEL_H
-
-/* SPIDLIB_HARDWARE_INFO_PATH */
-#define SPIDLIB_HARDWARE_INFO_LABEL_TOTO "toto"
-
-/* SPIDLIB_HPAV_CONF_PATH */
-#define SPIDLIB_HPAV_CONF_LABEL_CCO_PREFERRED "CCO_PREFERRED"
-#define SPIDLIB_HPAV_CONF_LABEL_WAS_CCO "WAS_CCO"
-#define SPIDLIB_HPAV_CONF_LABEL_NPW "NPW" /* network password */
-#define SPIDLIB_HPAV_CONF_LABEL_NMK "NMK" /* network management key */
-#define SPIDLIB_HPAV_CONF_LABEL_NID "NID" /* network identifier */
-#define SPIDLIB_HPAV_CONF_LABEL_SL "SL" /* security level */
-#define SPIDLIB_HPAV_CONF_LABEL_USER_HFID "USER_HFID" /* user human friendly identifier */
-#define SPIDLIB_HPAV_CONF_LABEL_AVLN_HFID "AVLN_HFID" /* AVLN friendly identifer */
-
-#define SPIDLIB_HPAV_CONF_VALUE_NONE "none"
-#define SPIDLIB_HPAV_CONF_VALUE_SL_SC "sc" /* simple connect */
-#define SPIDLIB_HPAV_CONF_VALUE_SL_HS "hs" /* high security */
-
-/* SPIDLIB_HPAV_INFO_PATH */
-#define SPIDLIB_HPAV_INFO_LABEL_PLCD_PID "PLCD_PID"
-#define SPIDLIB_HPAV_INFO_LABEL_STATUS "STATUS"
-#define SPIDLIB_HPAV_INFO_LABEL_CCO "CCO"
-#define SPIDLIB_HPAV_INFO_LABEL_BACKUP_CCO "BACKUP_CCO"
-#define SPIDLIB_HPAV_INFO_LABEL_SC "SC" /* station is in simple connect state */
-#define SPIDLIB_HPAV_INFO_LABEL_NID "NID" /* network identifier */
-
-#define SPIDLIB_HPAV_INFO_VALUE_STATUS_UNASSOCIATED "unassociated"
-#define SPIDLIB_HPAV_INFO_VALUE_STATUS_ASSOCIATED "associated"
-#define SPIDLIB_HPAV_INFO_VALUE_STATUS_AUTHENTICATED "authenticated"
-#define SPIDLIB_HPAV_INFO_VALUE_CCO_STATION "station"
-#define SPIDLIB_HPAV_INFO_VALUE_CCO_PROXY "proxy"
-#define SPIDLIB_HPAV_INFO_VALUE_CCO_MAIN "main"
-
-#endif /* SPIDLIB_LABEL_H */
diff --git a/cleopatre/application/spidlib/inc/path.h b/cleopatre/application/spidlib/inc/path.h
deleted file mode 100644
index 90a1bf65ee..0000000000
--- a/cleopatre/application/spidlib/inc/path.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* SPC300 bundle {{{
- *
- * Copyright (C) 2009 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file application/spidlib/inc/path.h
- * \brief path defines of configuration files
- * \ingroup spidlib
- *
- * This file defines all pathes of configuraiton files.
- * Modify it to add / change a file path.
- *
- */
-#ifndef SPIDLIB_PATH_H
-#define SPIDLIB_PATH_H
-
-#ifndef __UTESTS__
-
- #define SPIDLIB_SAVE_LIST_PATH "/etc/save.lst"
- #define SPIDLIB_SAVE_DIR_PATH "/usr/local/etc"
- #define SPIDLIB_CONF_ROOT_PATH "/etc"
- #define SPIDLIB_HARDWARE_INFO_PATH "/etc/hardware.info"
- #define SPIDLIB_HPAV_CONF_PATH "/etc/hpav.conf"
- #define SPIDLIB_HPAV_INFO_PATH "/etc/hpav.info"
- #define SPIDLIB_NETWORK_CONF_PATH "/etc/network/interfaces"
- #define SPIDLIB_SYSTEM_VERSION_PATH "/proc/version"
- #define SPIDLIB_SYSTEM_UPTIME_PATH "/proc/uptime"
- #define SPIDLIB_SYSTEM_MEMINFO_PATH "/proc/meminfo"
- #define SPIDLIB_SYSTEM_MTD_PATH "/proc/mtd"
- #define SPIDLIB_FACTORY_PATH "/factory"
- #define SPIDLIB_DEV_PATH "/dev"
-
-#else /* unitary tests paths */
-
- #define UTESTS_TMP_DIR "/tmp/utests"
- #define SPIDLIB_SAVE_LIST_PATH "/tmp/utests/etc/save.lst"
- #define SPIDLIB_SAVE_DIR_PATH "/tmp/utests/local"
- #define SPIDLIB_CONF_ROOT_PATH "/tmp/utests/etc"
- #define SPIDLIB_HARDWARE_INFO_PATH "/tmp/utests/etc/hardware.info"
- #define SPIDLIB_HPAV_CONF_PATH "/tmp/utests/etc/hpav.conf"
- #define SPIDLIB_HPAV_INFO_PATH "/tmp/utests/etc/hpav.info"
- #define SPIDLIB_NETWORK_CONF_PATH "/tmp/utests/network/interfaces"
- #define SPIDLIB_SYSTEM_VERSION_PATH "/tmp/utests/proc/version"
- #define SPIDLIB_SYSTEM_UPTIME_PATH "/tmp/utests/proc/uptime"
- #define SPIDLIB_SYSTEM_MEMINFO_PATH "/tmp/utests/proc/meminfo"
- #define SPIDLIB_SYSTEM_MTD_PATH "/tmp/utests/proc/mtd"
- #define SPIDLIB_FACTORY_PATH "/tmp/utests/factory"
- #define SPIDLIB_DEV_PATH "/tmp/utests/dev"
-
-#endif
-
-#endif /* SPIDLIB_PATH_H */
diff --git a/cleopatre/application/spidlib/inc/spidlib.h b/cleopatre/application/spidlib/inc/spidlib.h
deleted file mode 100644
index 086eaa766d..0000000000
--- a/cleopatre/application/spidlib/inc/spidlib.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* SPC300 bundle {{{
- *
- * Copyright (C) 2009 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file application/spidlib/inc/spidlib.h
- * \brief structures and function prototypes of spidlib
- * \defgroup spidlib spidlib : general purpose SPiDCOM library
- *
- */
-
-#ifndef SPIDLIB_H
-#define SPIDLIB_H
-
-#include <stdint.h>
-#include <assert.h>
-
-#include "spid_img_desc.h"
-#include "nvram.h"
-#include "label.h"
-#include "openssl_sha256.h"
-#include "path.h"
-
-/** size of buffer to manage ip address */
-#define SPIDLIB_IP_MAX_LEN 16
-
-/** size of buffer to manage mac address */
-#define SPIDLIB_MAC_STR_LEN 18
-
-#define SPIDLIB_LINE_MAX_LEN 1024
-#define SPIDLIB_KEY_MAX_LEN 63
-#define SPIDLIB_ELT_MAX_NB 32
-#define SPIDLIB_CONFIG_DELIMITER "="
-#define SPIDLIB_FALSE 0
-#define SPIDLIB_TRUE 1
-
-/**
- * list of errors returned by spidlib functions
- */
-typedef enum {
- SPIDLIB_SUCCESS = 0,
- /** bad input parameters */
- SPIDLIB_ERROR_PARAM,
- /** not enough available space */
- SPIDLIB_ERROR_NO_SPACE,
- /** item / data not found */
- SPIDLIB_ERROR_NOT_FOUND,
- /** system error, see errno for more details */
- SPIDLIB_ERROR_SYSTEM,
-} spidlib_error_t;
-
-/**
- * IP mode of interface : static or DHCP
- */
-typedef enum {
- /** interface setting is static : configuration is given by the local config file */
- SPIDLIB_IP_MODE_STATIC,
- /** interface setting is DHCP : configuration is given by a DHCP server */
- SPIDLIB_IP_MODE_DHCP,
-} spidlib_ip_mode_t;
-
-/** structure to manage IP network data */
-typedef struct {
- /** IP mode */
- spidlib_ip_mode_t mode;
- /** IP address in string format */
- unsigned char address[SPIDLIB_IP_MAX_LEN];
- /** IP netmask in string format */
- unsigned char netmask[SPIDLIB_IP_MAX_LEN];
- /** broadcast address in string format */
- unsigned char broadcast[SPIDLIB_IP_MAX_LEN];
- /** gateway IP address in string format */
- unsigned char gateway[SPIDLIB_IP_MAX_LEN];
- /** MTU of interface */
- unsigned int mtu;
-} spidlib_ip_t;
-
-typedef enum {
- SPIDLIB_IMAGE_DESC_TYPE_0,
- SPIDLIB_IMAGE_DESC_TYPE_1,
- SPIDLIB_IMAGE_DESC_TYPE_CURRENT,
- SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE,
- SPIDLIB_IMAGE_DESC_TYPE_NB
-} spidlib_image_desc_type_t;
-
-typedef enum {
- SPIDLIB_IMAGE_SELECT_0,
- SPIDLIB_IMAGE_SELECT_1,
- SPIDLIB_IMAGE_SELECT_SWITCH,
- SPIDLIB_IMAGE_SELECT_NB
-} spidlib_image_select_t;
-
-/** */
-typedef struct
-{
- int nothing;
-} spc300_image_desc_t;
-
-#define SPIDLIB_GET_BOOLEAN(array) ((array[0] == 'Y' || array[0] == 'y')?1:0)
-/** size of pbkdf1 salt */
-#define SPIDLIB_SECU_SALT_SIZE 8
-/** max password size. */
-#define SPIDLIB_SECU_PWD_SIZE_MAX 64
-/** SHA 256 size. */
-#define SPIDLIB_SECU_SHA256_SIZE 32
-/** pbkdf1 generated key size */
-#define SPIDLIB_SECU_OUTPUT_KEY_SIZE 16
-/** PBKDF1 iteration. */
-#define SPIDLIB_SECU_PBKDF1_ITERATION 1000
-
-typedef enum {
- SPIDLIB_SECU_SALT_TYPE_NONE = 0,
- SPIDLIB_SECU_SALT_TYPE_DAK,
- SPIDLIB_SECU_SALT_TYPE_NMK,
- SPIDLIB_SECU_SALT_TYPE_NB
-} spidlib_secu_salt_type_t;
-
-extern spidlib_error_t spidlib_config_read_item (const char *filename, const char *label, char *value, int buffer_len);
-extern spidlib_error_t spidlib_config_write_item(const char *filename, const char *label, const char *value);
-extern spidlib_error_t spidlib_config_read_line(const char *filename, const char* delimiters, char *key, unsigned int *elt_number, char *elt[], char *buffer, unsigned int buffer_len);
-extern spidlib_error_t spidlib_config_write_line(const char *filename, const char delimiter, const char *key, unsigned int elt_number, char *elt[]);
-extern spidlib_error_t spidlib_config_remove_line(const char *filename, const char *delimiters, const char *key);
-extern spidlib_error_t spidlib_mac_str_to_bin(const char *str, unsigned char *bin);
-extern spidlib_error_t spidlib_mac_bin_to_str(const unsigned char *bin, char *str);
-extern spidlib_error_t spidlib_image_get_desc(spidlib_image_desc_type_t type, spidcom_image_desc_t *image_desc, char *mtd_name);
-extern spidlib_error_t spidlib_image_select(spidlib_image_select_t select);
-extern spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip);
-extern spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_t *ip);
-extern spidlib_error_t spidlib_network_get_mac (const char *interface, unsigned char *mac);
-extern spidlib_error_t spidlib_system_get_kernel_version(char *buffer, int buffer_len);
-extern spidlib_error_t spidlib_system_get_plc_version (char *buffer, const int buffer_len);
-extern spidlib_error_t spidlib_system_get_av_version (char *buffer, const int buffer_len);
-extern spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *idle_s);
-extern spidlib_error_t spidlib_system_get_meminfo(char *buffer, int buffer_len);
-extern void spidlib_system_reboot(void);
-extern spidlib_error_t spidlib_system_save(void);
-extern spidlib_error_t spidlib_system_save_file(const char *filename);
-extern spidlib_error_t spidlib_system_factory(void);
-extern spidlib_error_t spidlib_system_get_nvram(spc300_nvram_t *nvram);
-extern spidlib_error_t spidlib_secu_pbkdf1 (const unsigned char input[], const unsigned int input_length, const spidlib_secu_salt_type_t salt_type, const unsigned int it_count, unsigned char output[], unsigned int output_length);
-
-#endif /* SPIDLIB_H */
diff --git a/cleopatre/buildroot/package/Config.in b/cleopatre/buildroot/package/Config.in
index c5af9ba3a6..0227ee8385 100644
--- a/cleopatre/buildroot/package/Config.in
+++ b/cleopatre/buildroot/package/Config.in
@@ -184,7 +184,7 @@ endif
source "package/libosip2/Config.in"
source "package/libpcap/Config.in"
if BR2_TARGET_SPIDCOM
-source "package/libspidlib/Config.in"
+source "package/libspid/Config.in"
endif
if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
source "package/lighttpd/Config.in"
diff --git a/cleopatre/buildroot/package/libspidlib/Config.in b/cleopatre/buildroot/package/libspid/Config.in
index 05a174f8ff..340378b885 100644
--- a/cleopatre/buildroot/package/libspidlib/Config.in
+++ b/cleopatre/buildroot/package/libspid/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_LIBSPIDLIB
- bool "libspidlib"
+config BR2_PACKAGE_LIBSPID
+ bool "libspid"
help
SPiDCOM library for SPC300 board.
diff --git a/cleopatre/buildroot/package/libspidlib/libspidlib.mk b/cleopatre/buildroot/package/libspid/libspid.mk
index 071902e92f..54e7f11bd5 100644
--- a/cleopatre/buildroot/package/libspidlib/libspidlib.mk
+++ b/cleopatre/buildroot/package/libspid/libspid.mk
@@ -1,6 +1,6 @@
#############################################################
#
-# SPiDLib (provides SPiDCOM APIs needed by applications)
+# LibSPiD (provides SPiDCOM APIs needed by applications)
# (works only under SPiDCOM SPC300 board)
#
#############################################################
@@ -22,46 +22,46 @@
# USA
#
-SPIDLIB_VERSION_MSB:=0
-SPIDLIB_VERSION:=$(SPIDLIB_VERSION_MSB).0.1
-SPIDLIB_SITE:=$(BASE_DIR)/../application/spidlib
-SPIDLIB_NAME:=libspidlib.so.$(SPIDLIB_VERSION)
-SPIDLIB_DIR:=$(BUILD_DIR)/spidlib-$(SPIDLIB_VERSION)
+LIBSPID_VERSION_MSB:=0
+LIBSPID_VERSION:=$(LIBSPID_VERSION_MSB).0.1
+LIBSPID_SITE:=$(BASE_DIR)/../application/libspid
+LIBSPID_NAME:=libspid.so.$(LIBSPID_VERSION)
+LIBSPID_DIR:=$(BUILD_DIR)/libspid-$(LIBSPID_VERSION)
-spidlib-source:
+libspid-source:
-$(SPIDLIB_DIR)/.unpacked:
- ln -s $(SPIDLIB_SITE) $(SPIDLIB_DIR)
- touch $(SPIDLIB_DIR)/.unpacked
+$(LIBSPID_DIR)/.unpacked:
+ ln -s $(LIBSPID_SITE) $(LIBSPID_DIR)
+ touch $(LIBSPID_DIR)/.unpacked
-$(SPIDLIB_DIR)/.configured: $(SPIDLIB_DIR)/.unpacked
- touch $(SPIDLIB_DIR)/.configured
+$(LIBSPID_DIR)/.configured: $(LIBSPID_DIR)/.unpacked
+ touch $(LIBSPID_DIR)/.configured
-$(SPIDLIB_DIR)/libspidlib.so: $(SPIDLIB_DIR)/.configured
- (cd $(SPIDLIB_DIR); $(TARGET_CONFIGURE_OPTS) $(MAKE) libspidlib.so LINUX_DIR="$(BASE_DIR)/../linux-2.6.25.10-spc300")
+$(LIBSPID_DIR)/liblibspid.so: $(LIBSPID_DIR)/.configured
+ (cd $(LIBSPID_DIR); $(TARGET_CONFIGURE_OPTS) $(MAKE) libspid.so LINUX_DIR="$(BASE_DIR)/../linux-2.6.25.10-spc300")
-$(TARGET_DIR)/usr/lib/$(SPIDLIB_NAME): $(SPIDLIB_DIR)/libspidlib.so
+$(TARGET_DIR)/usr/lib/$(LIBSPID_NAME): $(LIBSPID_DIR)/libspid.so
mkdir -p $(TARGET_DIR)/usr/lib
cp $< $@
(cd $(TARGET_DIR)/usr/lib; \
- ln -fs $(SPIDLIB_NAME) libmme.so; \
- ln -fs $(SPIDLIB_NAME) libmme.so.$(SPIDLIB_VERSION_MSB))
+ ln -fs $(LIBSPID_NAME) libmme.so; \
+ ln -fs $(LIBSPID_NAME) libmme.so.$(LIBSPID_VERSION_MSB))
-spidlib: uclibc $(TARGET_DIR)/usr/lib/$(SPIDLIB_NAME)
+libspid: uclibc $(TARGET_DIR)/usr/lib/$(LIBSPID_NAME)
-spidlib-clean:
- rm -f $(TARGET_DIR)/usr/lib/libspidlib.so
- rm -f $(TARGET_DIR)/usr/lib/libspidlib.so.$(SPIDLIB_VERSION_MSB)
- rm -f $(TARGET_DIR)/usr/lib/$(SPIDLIB_NAME)
- -$(MAKE) -C $(SPIDLIB_DIR) clean
+libspid-clean:
+ rm -f $(TARGET_DIR)/usr/lib/libspid.so
+ rm -f $(TARGET_DIR)/usr/lib/libspid.so.$(LIBSPID_VERSION_MSB)
+ rm -f $(TARGET_DIR)/usr/lib/$(LIBSPID_NAME)
+ -$(MAKE) -C $(LIBSPID_DIR) clean
-spidlib-dirclean:
- rm -f $(SPIDLIB_DIR)
+libspid-dirclean:
+ rm -f $(LIBSPID_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBSPIDLIB)),y)
-TARGETS+=spidlib
+ifeq ($(strip $(BR2_PACKAGE_LIBSPID)),y)
+TARGETS+=libspid
endif
diff --git a/cleopatre/buildroot/package/spidinit/spidinit.mk b/cleopatre/buildroot/package/spidinit/spidinit.mk
index ef01cd0d9c..9df50c54a9 100644
--- a/cleopatre/buildroot/package/spidinit/spidinit.mk
+++ b/cleopatre/buildroot/package/spidinit/spidinit.mk
@@ -40,7 +40,7 @@ $(SPIDINIT_DIR)/spidinit: $(SPIDINIT_DIR)/.configured
(cd $(SPIDINIT_DIR); \
$(TARGET_CONFIGURE_OPTS) $(MAKE) LINUX_DIR="$(BASE_DIR)/../linux-2.6.25.10-spc300" \
LIBMME_DIR="$(BASE_DIR)/../application/libmme" \
- SPIDLIB_DIR="$(BASE_DIR)/../application/spidlib")
+ LIBSPID_DIR="$(BASE_DIR)/../application/libspid")
$(TARGET_DIR)/usr/bin/spidinit: $(SPIDINIT_DIR)/spidinit
mkdir -p $(TARGET_DIR)/usr/bin
diff --git a/cleopatre/buildroot/target/device/Spidcom/arizona_defconfig b/cleopatre/buildroot/target/device/Spidcom/arizona_defconfig
index f86017612b..8ef19ce1b7 100644
--- a/cleopatre/buildroot/target/device/Spidcom/arizona_defconfig
+++ b/cleopatre/buildroot/target/device/Spidcom/arizona_defconfig
@@ -358,7 +358,7 @@ BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_LIBMME=y
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBPCAP is not set
-BR2_PACKAGE_LIBSPIDLIB=y
+BR2_PACKAGE_LIBSPID=y
# BR2_PACKAGE_LIGHTTPD is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LLTD is not set
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g_defconfig b/cleopatre/buildroot/target/device/Spidcom/spk300g_defconfig
index bc05bfda24..4964a9da81 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g_defconfig
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300g_defconfig
@@ -352,7 +352,7 @@ BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_LIBMME=y
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBPCAP is not set
-BR2_PACKAGE_LIBSPIDLIB=y
+BR2_PACKAGE_LIBSPID=y
# BR2_PACKAGE_LIGHTTPD is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LLTD is not set
diff --git a/cleopatre/devkit/plcd/Makefile b/cleopatre/devkit/plcd/Makefile
index 6c923dcfdb..a8182b6e87 100644
--- a/cleopatre/devkit/plcd/Makefile
+++ b/cleopatre/devkit/plcd/Makefile
@@ -4,15 +4,15 @@ SRCPATH=src
INCPATH=inc
LIBMME_DIR=../../application/libmme
-SPIDLIB_DIR=../../application/spidlib
+LIBSPID_DIR=../../application/libspid
LINUX_DIR=../../linux-2.6.25.10-spc300
-INC=-I$(INCPATH) -I$(LIBMME_DIR)/inc -I$(SPIDLIB_DIR)/inc -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
+INC=-I$(INCPATH) -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
-I$(LINUX_DIR)/include -I$(LINUX_DIR)/scripts/mksimage/
CC=arm-linux-gcc
CFLAGS+= $(INC) -Os -MMD
-LIBFLAGS=-L$(LIBMME_DIR) -L$(SPIDLIB_DIR) -lmme -lspidlib
+LIBFLAGS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid
SRCS=$(subst $(SRCPATH)/,,$(wildcard $(SRCPATH)/*.c))
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
@@ -20,7 +20,7 @@ DEPS=$(patsubst %o,%d,$(OBJS))
all: $(BIN)
-$(BIN): $(OBJPATH) $(OBJS) $(LIBMME_DIR)/libmme.a $(SPIDLIB_DIR)/libspidlib.a
+$(BIN): $(OBJPATH) $(OBJS) $(LIBMME_DIR)/libmme.a $(LIBSPID_DIR)/libspid.a
$(CC) $(LDFLAGS) -static -o $@ $(OBJS) $(LIBFLAGS)
$(OBJPATH)/%.o: $(SRCPATH)/%.c
@@ -29,8 +29,8 @@ $(OBJPATH)/%.o: $(SRCPATH)/%.c
$(OBJPATH):
mkdir -p $(OBJPATH)
-$(SPIDLIB_DIR)/libspidlib.a:
- $(MAKE) -C $(SPIDLIB_DIR) libspidlib.a
+$(LIBSPID_DIR)/libspid.a:
+ $(MAKE) -C $(LIBSPID_DIR) libspid.a
$(LIBMME_DIR)/libmme.a:
$(MAKE) -C $(LIBMME_DIR) libmme.a
diff --git a/cleopatre/devkit/plcd/src/event.c b/cleopatre/devkit/plcd/src/event.c
index d364e8893d..88c422d55d 100644
--- a/cleopatre/devkit/plcd/src/event.c
+++ b/cleopatre/devkit/plcd/src/event.c
@@ -23,20 +23,20 @@
#include <arpa/inet.h>
#include <sys/select.h>
#include "libmme.h"
-#include "spidlib.h"
+#include "libspid.h"
#include "plcd.h"
char *assoc_table[] = {
- SPIDLIB_HPAV_INFO_VALUE_STATUS_UNASSOCIATED,
- SPIDLIB_HPAV_INFO_VALUE_STATUS_ASSOCIATED,
- SPIDLIB_HPAV_INFO_VALUE_STATUS_AUTHENTICATED,
+ LIBSPID_HPAV_INFO_VALUE_STATUS_UNASSOCIATED,
+ LIBSPID_HPAV_INFO_VALUE_STATUS_ASSOCIATED,
+ LIBSPID_HPAV_INFO_VALUE_STATUS_AUTHENTICATED,
NULL
};
char *cco_table[] = {
- SPIDLIB_HPAV_INFO_VALUE_CCO_STATION,
- SPIDLIB_HPAV_INFO_VALUE_CCO_PROXY,
- SPIDLIB_HPAV_INFO_VALUE_CCO_MAIN,
+ LIBSPID_HPAV_INFO_VALUE_CCO_STATION,
+ LIBSPID_HPAV_INFO_VALUE_CCO_PROXY,
+ LIBSPID_HPAV_INFO_VALUE_CCO_MAIN,
NULL
};
@@ -68,56 +68,56 @@ static int refresh_status (plcd_ctx_t *ctx, mme_ctx_t *status_ctx, int *is_save_
/* check new association status */
mme_pull (status_ctx, &assoc_new, sizeof(assoc_new), &len);
- spidlib_config_read_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
+ libspid_config_read_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
if((assoc_new < MME_DRV_STATUS_ASSOC_NB) && strcmp (buffer, assoc_table[assoc_new]))
{
- spidlib_config_write_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_STATUS, assoc_table [assoc_new]);
- *is_info_manager_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, assoc_table [assoc_new]);
+ *is_info_manager_needed = LIBSPID_TRUE;
}
/* set new cco status */
mme_pull (status_ctx, &cco_new, sizeof(cco_new), &len);
- spidlib_config_read_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_CCO, buffer, sizeof(buffer));
+ libspid_config_read_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_CCO, buffer, sizeof(buffer));
if((cco_new < MME_DRV_STATUS_CCO_NB) && strcmp (buffer, cco_table[cco_new]))
{
- spidlib_config_write_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_CCO, cco_table [cco_new]);
- *is_info_manager_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_CCO, cco_table [cco_new]);
+ *is_info_manager_needed = LIBSPID_TRUE;
/* check if WAS_CCO needs to be updated */
- spidlib_config_read_item (ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_WAS_CCO, buffer, sizeof(buffer));
+ libspid_config_read_item (ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_WAS_CCO, buffer, sizeof(buffer));
if((MME_DRV_STATUS_ASSOC_AUTHENTICATED == assoc_new)
- && (((MME_DRV_STATUS_CCO_MAIN == cco_new) && !SPIDLIB_GET_BOOLEAN (buffer))
- || ((cco_new != MME_DRV_STATUS_CCO_MAIN) && SPIDLIB_GET_BOOLEAN (buffer))))
+ && (((MME_DRV_STATUS_CCO_MAIN == cco_new) && !LIBSPID_GET_BOOLEAN (buffer))
+ || ((cco_new != MME_DRV_STATUS_CCO_MAIN) && LIBSPID_GET_BOOLEAN (buffer))))
{
/* WAS_CCO update needed */
- spidlib_config_write_item (ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_WAS_CCO, MME_DRV_STATUS_CCO_MAIN == cco_new ? boolean_table[SPIDLIB_TRUE] : boolean_table[SPIDLIB_FALSE]);
- *is_save_conf_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_WAS_CCO, MME_DRV_STATUS_CCO_MAIN == cco_new ? boolean_table[LIBSPID_TRUE] : boolean_table[LIBSPID_FALSE]);
+ *is_save_conf_needed = LIBSPID_TRUE;
}
}
/* check new cco preferred status with current one, and update
then save it if they are different */
mme_pull (status_ctx, &cco_preferred_new, sizeof(cco_preferred_new), &len);
- spidlib_config_read_item (ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_CCO_PREFERRED, buffer, sizeof(buffer));
- if((cco_preferred_new <= SPIDLIB_TRUE) && (cco_preferred_new != SPIDLIB_GET_BOOLEAN (buffer)))
+ libspid_config_read_item (ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_CCO_PREFERRED, buffer, sizeof(buffer));
+ if((cco_preferred_new <= LIBSPID_TRUE) && (cco_preferred_new != LIBSPID_GET_BOOLEAN (buffer)))
{
- spidlib_config_write_item (ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_CCO_PREFERRED, boolean_table[cco_preferred_new]);
- *is_save_conf_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_CCO_PREFERRED, boolean_table[cco_preferred_new]);
+ *is_save_conf_needed = LIBSPID_TRUE;
}
mme_pull (status_ctx, &cco_backup_new, sizeof(cco_backup_new), &len);
- spidlib_config_read_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_BACKUP_CCO, buffer, sizeof(buffer));
- if((cco_backup_new <= SPIDLIB_TRUE) && (cco_backup_new != SPIDLIB_GET_BOOLEAN (buffer)))
+ libspid_config_read_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_BACKUP_CCO, buffer, sizeof(buffer));
+ if((cco_backup_new <= LIBSPID_TRUE) && (cco_backup_new != LIBSPID_GET_BOOLEAN (buffer)))
{
- spidlib_config_write_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_BACKUP_CCO, boolean_table [cco_backup_new]);
- *is_info_manager_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_BACKUP_CCO, boolean_table [cco_backup_new]);
+ *is_info_manager_needed = LIBSPID_TRUE;
}
mme_pull (status_ctx, &sc_new, sizeof(sc_new), &len);
- spidlib_config_read_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_SC, buffer, sizeof(buffer));
- if((sc_new <= SPIDLIB_TRUE) && (sc_new != SPIDLIB_GET_BOOLEAN (buffer)))
+ libspid_config_read_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_SC, buffer, sizeof(buffer));
+ if((sc_new <= LIBSPID_TRUE) && (sc_new != LIBSPID_GET_BOOLEAN (buffer)))
{
- spidlib_config_write_item (ctx->hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_SC, boolean_table [sc_new]);
- *is_info_manager_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_info_path, LIBSPID_HPAV_INFO_LABEL_SC, boolean_table [sc_new]);
+ *is_info_manager_needed = LIBSPID_TRUE;
}
return 0;
@@ -126,7 +126,7 @@ static int refresh_status (plcd_ctx_t *ctx, mme_ctx_t *status_ctx, int *is_save_
static int refresh_hfid (plcd_ctx_t *ctx, mme_ctx_t *hfid_ctx, int *is_save_conf_needed)
{
char buffer[256], hfid[HFID_LEN];
- int len, is_avln = SPIDLIB_FALSE;
+ int len, is_avln = LIBSPID_FALSE;
assert (ctx != NULL);
assert (hfid_ctx != NULL);
assert (((MME_TYPE_DRV_STA_SET_U_STA_HFID | MME_TYPE_IND) == hfid_ctx->mmtype)
@@ -140,11 +140,11 @@ static int refresh_hfid (plcd_ctx_t *ctx, mme_ctx_t *hfid_ctx, int *is_save_conf
hfid[HFID_LEN - 1] = '\0';
/* compare to current config value */
- spidlib_config_read_item (ctx->hpav_conf_path, is_avln ? SPIDLIB_HPAV_CONF_LABEL_AVLN_HFID : SPIDLIB_HPAV_CONF_LABEL_USER_HFID, buffer, sizeof(buffer));
+ libspid_config_read_item (ctx->hpav_conf_path, is_avln ? LIBSPID_HPAV_CONF_LABEL_AVLN_HFID : LIBSPID_HPAV_CONF_LABEL_USER_HFID, buffer, sizeof(buffer));
if(strncmp (hfid, buffer, HFID_LEN))
{
- spidlib_config_write_item (ctx->hpav_conf_path, is_avln ? SPIDLIB_HPAV_CONF_LABEL_AVLN_HFID : SPIDLIB_HPAV_CONF_LABEL_USER_HFID, hfid);
- *is_save_conf_needed = SPIDLIB_TRUE;
+ libspid_config_write_item (ctx->hpav_conf_path, is_avln ? LIBSPID_HPAV_CONF_LABEL_AVLN_HFID : LIBSPID_HPAV_CONF_LABEL_USER_HFID, hfid);
+ *is_save_conf_needed = LIBSPID_TRUE;
}
return 0;
@@ -160,7 +160,7 @@ int event_process (plcd_ctx_t *ctx)
fd_set readfds;
int result;
mme_ctx_t *mme_ctx;
- int is_save_conf_needed = SPIDLIB_FALSE, is_info_manager_needed = SPIDLIB_FALSE;
+ int is_save_conf_needed = LIBSPID_FALSE, is_info_manager_needed = LIBSPID_FALSE;
assert (ctx != NULL);
FD_ZERO (&readfds);
@@ -238,7 +238,7 @@ int event_process (plcd_ctx_t *ctx)
/*check if hpav.conf save is needed */
if(is_save_conf_needed)
{
- spidlib_system_save_file (ctx->hpav_conf_path);
+ libspid_system_save_file (ctx->hpav_conf_path);
}
/* check if manager daemon needs to be informed */
if(is_info_manager_needed)
diff --git a/cleopatre/devkit/plcd/src/hpav.c b/cleopatre/devkit/plcd/src/hpav.c
index ffdebbf703..bce6a56b0f 100644
--- a/cleopatre/devkit/plcd/src/hpav.c
+++ b/cleopatre/devkit/plcd/src/hpav.c
@@ -22,7 +22,7 @@
#include <assert.h>
#include <arpa/inet.h> /* for htons() */
#include "libmme.h"
-#include "spidlib.h"
+#include "libspid.h"
#include "plcd.h"
#ifdef __UTESTS__
@@ -58,7 +58,7 @@ int hpav_compute_dak (const char *dpw, unsigned char *dak)
{
assert (dpw);
assert (dak);
- spidlib_secu_pbkdf1 (dpw, strlen (dpw), SPIDLIB_SECU_SALT_TYPE_DAK, SPIDLIB_SECU_PBKDF1_ITERATION, dak, SPIDLIB_SECU_OUTPUT_KEY_SIZE);
+ libspid_secu_pbkdf1 (dpw, strlen (dpw), LIBSPID_SECU_SALT_TYPE_DAK, LIBSPID_SECU_PBKDF1_ITERATION, dak, LIBSPID_SECU_OUTPUT_KEY_SIZE);
return 0;
}
@@ -240,7 +240,7 @@ int hpav_send_key (const plcd_ctx_t *plcd_ctx, const unsigned char *nmk, const u
{
/* put choose sl */
nid_sl[0] = 0x01;
- if(!strcmp (sl, SPIDLIB_HPAV_CONF_VALUE_SL_HS))
+ if(!strcmp (sl, LIBSPID_HPAV_CONF_VALUE_SL_HS))
nid_sl[8] = 0x01;
}
else
@@ -253,7 +253,7 @@ int hpav_send_key (const plcd_ctx_t *plcd_ctx, const unsigned char *nmk, const u
int hpav_send_dak (const plcd_ctx_t *plcd_ctx, const unsigned char *dak)
{
- return hpav_send_single_value (plcd_ctx, MME_TYPE_DRV_STA_SET_DAK, dak, SPIDLIB_SECU_OUTPUT_KEY_SIZE);
+ return hpav_send_single_value (plcd_ctx, MME_TYPE_DRV_STA_SET_DAK, dak, LIBSPID_SECU_OUTPUT_KEY_SIZE);
}
int hpav_send_mfg_hfid (const plcd_ctx_t *plcd_ctx, const char *mfg_hfid)
@@ -284,9 +284,9 @@ int hpav_send_start (const plcd_ctx_t *plcd_ctx)
int hpav_init (plcd_ctx_t *plcd_ctx)
{
char buffer[1024];
- unsigned char nmk[SPIDLIB_SECU_OUTPUT_KEY_SIZE];
+ unsigned char nmk[LIBSPID_SECU_OUTPUT_KEY_SIZE];
unsigned char nid[7];
- unsigned char dak[SPIDLIB_SECU_OUTPUT_KEY_SIZE];
+ unsigned char dak[LIBSPID_SECU_OUTPUT_KEY_SIZE];
assert (NULL != plcd_ctx);
assert (NULL != plcd_ctx->nvram);
@@ -296,21 +296,21 @@ int hpav_init (plcd_ctx_t *plcd_ctx)
return -1;
/* get the CCO_PREFERRED and send it to AV stack */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_CCO_PREFERRED, buffer, sizeof(buffer));
- if( 0 > hpav_send_cco_preferred (plcd_ctx, SPIDLIB_GET_BOOLEAN (buffer)))
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_CCO_PREFERRED, buffer, sizeof(buffer));
+ if( 0 > hpav_send_cco_preferred (plcd_ctx, LIBSPID_GET_BOOLEAN (buffer)))
return -1;
/* get the WAS_CCO and send it to AV stack */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_WAS_CCO, buffer , sizeof(buffer));
- if( 0 > hpav_send_was_cco (plcd_ctx, SPIDLIB_GET_BOOLEAN (buffer)))
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_WAS_CCO, buffer , sizeof(buffer));
+ if( 0 > hpav_send_was_cco (plcd_ctx, LIBSPID_GET_BOOLEAN (buffer)))
return -1;
/* get the NMK, and compute it if necessary */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_NMK, buffer , sizeof(buffer));
- if(!strcmp (buffer, SPIDLIB_HPAV_CONF_VALUE_NONE))
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_NMK, buffer , sizeof(buffer));
+ if(!strcmp (buffer, LIBSPID_HPAV_CONF_VALUE_NONE))
{
/* compute the NMK from NPW */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_NPW, buffer , sizeof(buffer));
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_NPW, buffer , sizeof(buffer));
hpav_compute_nmk (buffer, nmk);
}
else
@@ -320,11 +320,11 @@ int hpav_init (plcd_ctx_t *plcd_ctx)
}
/* get the NID from hpav.conf */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_NID, buffer , sizeof(buffer));
- if(!strcmp (buffer, SPIDLIB_HPAV_CONF_VALUE_NONE))
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_NID, buffer , sizeof(buffer));
+ if(!strcmp (buffer, LIBSPID_HPAV_CONF_VALUE_NONE))
{
/* get SL */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_SL, buffer , sizeof(buffer));
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_SL, buffer , sizeof(buffer));
/* send NMK and SL */
if(0 > hpav_send_key (plcd_ctx, nmk, NULL, buffer))
return -1;
@@ -349,12 +349,12 @@ int hpav_init (plcd_ctx_t *plcd_ctx)
return -1;
/* get user HFID from hpav config file end send it */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_USER_HFID, buffer , sizeof(buffer));
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_USER_HFID, buffer , sizeof(buffer));
if(0 > hpav_send_user_hfid (plcd_ctx, buffer))
return -1;
/* get avln HFID from hpav config file end send it */
- spidlib_config_read_item (plcd_ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_LABEL_AVLN_HFID, buffer , sizeof(buffer));
+ libspid_config_read_item (plcd_ctx->hpav_conf_path, LIBSPID_HPAV_CONF_LABEL_AVLN_HFID, buffer , sizeof(buffer));
if(0 > hpav_send_avln_hfid (plcd_ctx, buffer))
return -1;
diff --git a/cleopatre/devkit/plcd/src/plcd.c b/cleopatre/devkit/plcd/src/plcd.c
index 0b94c1f7ab..e3340c9406 100644
--- a/cleopatre/devkit/plcd/src/plcd.c
+++ b/cleopatre/devkit/plcd/src/plcd.c
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <unistd.h> /* for getpid() */
#include "libmme.h"
-#include "spidlib.h"
+#include "libspid.h"
#include "plcd.h"
#ifdef __UTESTS__
@@ -47,9 +47,9 @@ int plcd_init (plcd_ctx_t *ctx)
{
assert(ctx != NULL);
memset (ctx, '\0', sizeof(plcd_ctx_t));
- ctx->hardware_info_path = SPIDLIB_HARDWARE_INFO_PATH;
- ctx->hpav_info_path = SPIDLIB_HPAV_INFO_PATH;
- ctx->hpav_conf_path = SPIDLIB_HPAV_CONF_PATH;
+ ctx->hardware_info_path = LIBSPID_HARDWARE_INFO_PATH;
+ ctx->hpav_info_path = LIBSPID_HPAV_INFO_PATH;
+ ctx->hpav_conf_path = LIBSPID_HPAV_CONF_PATH;
/* open netlink socket */
if(0 > (ctx->plc_sock = socket(PF_NETLINK, SOCK_RAW, NETLINK_PLC)))
@@ -70,9 +70,9 @@ int plcd_init (plcd_ctx_t *ctx)
/* get NVRAM data */
ctx->nvram = &g_nvram;
#ifdef __UTESTS__
- if(SPIDLIB_SUCCESS != utests_spidlib_system_get_nvram (ctx->nvram))
+ if(LIBSPID_SUCCESS != utests_libspid_system_get_nvram (ctx->nvram))
#else
- if(SPIDLIB_SUCCESS != spidlib_system_get_nvram (ctx->nvram))
+ if(LIBSPID_SUCCESS != libspid_system_get_nvram (ctx->nvram))
#endif
{
perror ("NVRAM content read");
@@ -136,7 +136,7 @@ void plcd_uninit(plcd_ctx_t *ctx)
/* set the current PID to info file */
sprintf (buffer, "%d", getpid ());
- if(SPIDLIB_SUCCESS != spidlib_config_write_item (ctx.hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_PLCD_PID, buffer))
+ if(LIBSPID_SUCCESS != libspid_config_write_item (ctx.hpav_info_path, LIBSPID_HPAV_INFO_LABEL_PLCD_PID, buffer))
{
syslog (LOG_WARNING, "plcd: write pid to %s failed", ctx.hpav_info_path);
}
diff --git a/cleopatre/devkit/tests/spidlib/ftests/Makefile b/cleopatre/devkit/tests/libspid/ftests/Makefile
index ef3cb8293a..30746afdca 100644
--- a/cleopatre/devkit/tests/spidlib/ftests/Makefile
+++ b/cleopatre/devkit/tests/libspid/ftests/Makefile
@@ -1,6 +1,6 @@
BASE := $(CURDIR)/../../../..
OBJPATH := ./obj
-PRJPATH := $(BASE)/application/spidlib
+PRJPATH := $(BASE)/application/libspid
INC_PRJPATH := $(PRJPATH)/inc
LINUX_PATH := $(BASE)/linux-2.6.25.10-spc300
###################################################
@@ -8,21 +8,21 @@ LINUX_PATH := $(BASE)/linux-2.6.25.10-spc300
# Common stuff
CC := arm-linux-gcc
CFLAGS := -Wall -g3 -DLINUX -I. -I./inc -I$(INC_PRJPATH) -I$(LINUX_PATH)/include/asm-arm/arch-spc300
-LIBS := -L$(PRJPATH) -lspidlib
+LIBS := -L$(PRJPATH) -lspid
SRCS=$(wildcard *.c)
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
# Rules
-all: $(PRJPATH)/libspidlib.a
+all: $(PRJPATH)/libspid.a
mkdir -p $(OBJPATH)
- $(MAKE) $(OBJPATH)/spidlib_ftests
+ $(MAKE) $(OBJPATH)/libspid_ftests
-$(LIBPATH)/libspidlib.a:
- $(MAKE) -C $(LIBPATH) libspidlib.a
+$(LIBPATH)/libspid.a:
+ $(MAKE) -C $(LIBPATH) libspid.a
-$(OBJPATH)/spidlib_ftests : $(OBJS)
+$(OBJPATH)/libspid_ftests : $(OBJS)
$(CC) $(CFLAGS) -static -o $@ $^ $(LIBS)
$(OBJPATH)/%.o : %.c
diff --git a/cleopatre/devkit/tests/spidlib/ftests/spidlib_ftests.c b/cleopatre/devkit/tests/libspid/ftests/spidlib_ftests.c
index 647f4d4b32..17038824b8 100644
--- a/cleopatre/devkit/tests/spidlib/ftests/spidlib_ftests.c
+++ b/cleopatre/devkit/tests/libspid/ftests/spidlib_ftests.c
@@ -4,7 +4,7 @@
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
-#include "spidlib.h"
+#include "libspid.h"
#include "nvram.h"
#include "spid_img_desc.h"
@@ -21,7 +21,7 @@ int main()
char value[BUFF_LEN];
int buffer_len;
const char* delimiters = "= \t";
- char key[SPIDLIB_KEY_MAX_LEN];
+ char key[LIBSPID_KEY_MAX_LEN];
char *elt[ELT_NUMBER];
unsigned int elt_number = sizeof(elt)/sizeof(elt[0]);
char buffer[BUFF_LEN];
@@ -33,7 +33,7 @@ int main()
unsigned int total_s;
unsigned int idle_s;
spc300_nvram_t nvram;
- spidlib_ip_t ip;
+ libspid_ip_t ip;
unsigned char mac[32];
char mtd_name[32];
spidcom_image_desc_t image_desc;
@@ -45,32 +45,32 @@ int main()
* --- config_item.c ---
*/
buffer_len = sizeof(value)/sizeof(value[0]);
- spidlib_config_read_item (filename, label, value, buffer_len);
- printf("*** spidlib_config_read_item ***\n");
+ libspid_config_read_item (filename, label, value, buffer_len);
+ printf("*** libspid_config_read_item ***\n");
printf("read value : %s\n", value);
printf("\n");
- printf("*** spidlib_config_write_item ***\n");
+ printf("*** libspid_config_write_item ***\n");
memset (value, '3', 1022);
value[1023] = '\0';
- if ( SPIDLIB_SUCCESS == ( rc = spidlib_config_write_item(filename, label, value) ) )
+ if ( LIBSPID_SUCCESS == ( rc = libspid_config_write_item(filename, label, value) ) )
{
printf("gpio815 was set to : %s\n", value);
}
else
{
- printf("Error %d in spidlib_config_write_item()\n", rc);
+ printf("Error %d in libspid_config_write_item()\n", rc);
}
strcpy(label, "gpio815");
strcpy(value, "0x777 <--- WE CHANGED IT!");
- if ( SPIDLIB_SUCCESS == ( rc = spidlib_config_write_item(filename, label, value) ) )
+ if ( LIBSPID_SUCCESS == ( rc = libspid_config_write_item(filename, label, value) ) )
{
}
else
{
- printf("Error %d in spidlib_config_write_item()\n", rc);
+ printf("Error %d in libspid_config_write_item()\n", rc);
}
/*
@@ -78,7 +78,7 @@ int main()
*/
buffer_len = sizeof(buffer)/sizeof(buffer[0]);
strcpy(key, "gpio815");
- if ( SPIDLIB_SUCCESS == (rc = spidlib_config_read_line(filename, delimiters, key, &elt_number, elt, buffer, buffer_len) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_config_read_line(filename, delimiters, key, &elt_number, elt, buffer, buffer_len) ) )
{
printf("Elements read from line:\n");
for (i=0; i<elt_number; i++)
@@ -88,28 +88,28 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_config_read_line()\n", rc);
+ printf ("ERROR %d in libspid_config_read_line()\n", rc);
}
elt[0] = elt0;
elt[1] = elt1;
elt[2] = elt2;
- if ( SPIDLIB_SUCCESS == (rc = spidlib_config_write_line(filename, '@', "ethernet", 3, elt) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_config_write_line(filename, '@', "ethernet", 3, elt) ) )
{
}
else
{
- printf ("ERROR %d in spidlib_config_write_line()\n", rc);
+ printf ("ERROR %d in libspid_config_write_line()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_config_remove_line(filename, "= \t", "phy") ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_config_remove_line(filename, "= \t", "phy") ) )
{
}
else
{
- printf ("ERROR %d in spidlib_config_remove_line()\n", rc);
+ printf ("ERROR %d in libspid_config_remove_line()\n", rc);
}
/*
@@ -117,7 +117,7 @@ int main()
*/
buffer[0] = '\0';
buffer_len = sizeof(buffer)/sizeof(buffer[0]);
- if ( SPIDLIB_SUCCESS == (rc = spidlib_system_get_kernel_version(buffer, buffer_len) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_system_get_kernel_version(buffer, buffer_len) ) )
{
printf("----------\n");
@@ -129,12 +129,12 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_system_get_kernel_version()\n", rc);
+ printf ("ERROR %d in libspid_system_get_kernel_version()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_system_get_uptime(&total_s, &idle_s) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_system_get_uptime(&total_s, &idle_s) ) )
{
printf("----------\n");
@@ -146,13 +146,13 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_system_get_uptime()\n", rc);
+ printf ("ERROR %d in libspid_system_get_uptime()\n", rc);
}
buffer[0] = '\0';
buffer_len = sizeof(buffer)/sizeof(buffer[0]);
- if ( SPIDLIB_SUCCESS == (rc = spidlib_system_get_meminfo(buffer, buffer_len) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_system_get_meminfo(buffer, buffer_len) ) )
{
printf("----------\n");
@@ -164,21 +164,21 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_system_get_meminfo()\n", rc);
+ printf ("ERROR %d in libspid_system_get_meminfo()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_system_save() ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_system_save() ) )
{
printf("\nConfiguration saved successfully.\n");
}
else
{
- printf ("ERROR %d in spidlib_system_save()\n", rc);
+ printf ("ERROR %d in libspid_system_save()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_system_get_nvram(&nvram) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_system_get_nvram(&nvram) ) )
{
int i;
@@ -194,14 +194,14 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_system_get_nvram()\n", rc);
+ printf ("ERROR %d in libspid_system_get_nvram()\n", rc);
}
/*
* --- network.c ---
*/
- if ( SPIDLIB_SUCCESS == (rc = spidlib_network_get_ip("eth0", &ip) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_network_get_ip("eth0", &ip) ) )
{
printf("\nGot this configuration :\n");
printf("mode=%d\n", ip.mode);
@@ -212,16 +212,16 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_network_get_ip()\n", rc);
+ printf ("ERROR %d in libspid_network_get_ip()\n", rc);
}
- ip.mode = SPIDLIB_IP_MODE_DHCP;
+ ip.mode = LIBSPID_IP_MODE_DHCP;
strcpy(ip.address, "123.45.678.9");
strcpy(ip.netmask, "44.444.5.555");
strcpy(ip.broadcast, "987.6.54.321");
strcpy(ip.gateway, "01.01.10.10");
- if ( SPIDLIB_SUCCESS == (rc = spidlib_network_set_ip("eth0", &ip) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_network_set_ip("eth0", &ip) ) )
{
printf("\nSet this configuration :\n");
printf("mode=%d\n", ip.mode);
@@ -232,16 +232,16 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_network_set_ip()\n", rc);
+ printf ("ERROR %d in libspid_network_set_ip()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_network_get_mac("eth0", mac) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_network_get_mac("eth0", mac) ) )
{
printf("\nFound MAC addr=%s\n", mac);
}
else
{
- printf ("ERROR %d in spidlib_network_get_mac()\n", rc);
+ printf ("ERROR %d in libspid_network_get_mac()\n", rc);
}
#endif
@@ -250,7 +250,7 @@ int main()
/*
* --- image.c ---
*/
- if ( SPIDLIB_SUCCESS == (rc = spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_CURRENT, id, mtd_name) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_CURRENT, id, mtd_name) ) )
{
int i;
@@ -272,10 +272,10 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_image_get_desc()\n", rc);
+ printf ("ERROR %d in libspid_image_get_desc()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_image_get_desc(SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE, id, mtd_name) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_image_get_desc(LIBSPID_IMAGE_DESC_TYPE_ALTERNATE, id, mtd_name) ) )
{
int i;
@@ -297,16 +297,16 @@ int main()
}
else
{
- printf ("ERROR %d in spidlib_image_get_desc()\n", rc);
+ printf ("ERROR %d in libspid_image_get_desc()\n", rc);
}
- if ( SPIDLIB_SUCCESS == (rc = spidlib_image_select(SPIDLIB_IMAGE_SELECT_SWITCH) ) )
+ if ( LIBSPID_SUCCESS == (rc = libspid_image_select(LIBSPID_IMAGE_SELECT_SWITCH) ) )
{
printf("Active image switched.\n");
}
else
{
- printf ("ERROR %d in spidlib_image_get_desc()\n", rc);
+ printf ("ERROR %d in libspid_image_get_desc()\n", rc);
}
return 0;
diff --git a/cleopatre/devkit/tests/spidlib/ftests/test.cnf b/cleopatre/devkit/tests/libspid/ftests/test.cnf
index dbae518c6e..dbae518c6e 100644
--- a/cleopatre/devkit/tests/spidlib/ftests/test.cnf
+++ b/cleopatre/devkit/tests/libspid/ftests/test.cnf
diff --git a/cleopatre/devkit/tests/spidlib/utests/Makefile b/cleopatre/devkit/tests/libspid/utests/Makefile
index 341d6d2ca6..dd2d54d8ca 100644
--- a/cleopatre/devkit/tests/spidlib/utests/Makefile
+++ b/cleopatre/devkit/tests/libspid/utests/Makefile
@@ -1,9 +1,9 @@
-PRJ_BASE = ../../../../application/spidlib
+PRJ_BASE = ../../../../application/libspid
FILES = system network config_item config_line image
-SPIDLIB_DIR=../../../../application/spidlib
+LIBSPID_DIR=../../../../application/libspid
LINUX_DIR=../../../../linux-2.6.25.10-spc300
-EXTRA_CFLAGS = -I$(SPIDLIB_DIR)/inc -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -MMD
+EXTRA_CFLAGS = -I$(LIBSPID_DIR)/inc -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -MMD
include ../../utests_makerules
diff --git a/cleopatre/devkit/tests/spidlib/utests/inc/config_item_utests.h b/cleopatre/devkit/tests/libspid/utests/inc/config_item_utests.h
index c60518b3eb..e08df1b978 100644
--- a/cleopatre/devkit/tests/spidlib/utests/inc/config_item_utests.h
+++ b/cleopatre/devkit/tests/libspid/utests/inc/config_item_utests.h
@@ -17,7 +17,7 @@
*/
#include <sys/types.h>
-#include "spidlib.h"
+#include "libspid.h"
/* VARIABLE STUB */
/* none */
@@ -32,6 +32,6 @@ inline static int isblank(int c)
/* PLCD FUNCTION DECLARATIONS */
/* system.c */
-spidlib_error_t spidlib_config_read_item (const char *filename, const char *label, char *value, int buffer_len);
-spidlib_error_t spidlib_config_write_item(const char *filename, const char *label, const char *value);
+libspid_error_t libspid_config_read_item (const char *filename, const char *label, char *value, int buffer_len);
+libspid_error_t libspid_config_write_item(const char *filename, const char *label, const char *value);
#endif /* system_utests_h */
diff --git a/cleopatre/devkit/tests/spidlib/utests/inc/config_line_utests.h b/cleopatre/devkit/tests/libspid/utests/inc/config_line_utests.h
index 02fa76778c..b217a1c021 100644
--- a/cleopatre/devkit/tests/spidlib/utests/inc/config_line_utests.h
+++ b/cleopatre/devkit/tests/libspid/utests/inc/config_line_utests.h
@@ -17,7 +17,7 @@
*/
#include <sys/types.h>
-#include "spidlib.h"
+#include "libspid.h"
/* VARIABLE STUB */
/* none */
@@ -26,7 +26,7 @@
/* PLCD FUNCTION DECLARATIONS */
/* system.c */
-spidlib_error_t spidlib_config_read_line (const char *filename, const char *label, char *value, int buffer_len);
-spidlib_error_t spidlib_config_write_line(const char *filename, const char *label, const char *value);
-pidlib_error_t spidlib_config_remove_line(const char *filename, const char *delimiters, const char *key);
+libspid_error_t libspid_config_read_line (const char *filename, const char *label, char *value, int buffer_len);
+libspid_error_t libspid_config_write_line(const char *filename, const char *label, const char *value);
+pidlib_error_t libspid_config_remove_line(const char *filename, const char *delimiters, const char *key);
#endif /* system_utests_h */
diff --git a/cleopatre/devkit/tests/spidlib/utests/inc/image_utests.h b/cleopatre/devkit/tests/libspid/utests/inc/image_utests.h
index 63ac2ade96..2492f52931 100644
--- a/cleopatre/devkit/tests/spidlib/utests/inc/image_utests.h
+++ b/cleopatre/devkit/tests/libspid/utests/inc/image_utests.h
@@ -9,15 +9,15 @@
* }}} */
/**
* \file image_utests.h
- * \brief interfaces for unitary tests of spidlib
- * \ingroup Cleopatre - spidlib
+ * \brief interfaces for unitary tests of libspid
+ * \ingroup Cleopatre - libspid
*
* this file content interfaces and exported macros, variables... For the
- * unitary tests of spidlib
+ * unitary tests of libspid
*/
#include <sys/types.h>
-#include "spidlib.h"
+#include "libspid.h"
/* VARIABLE STUB */
/* none */
diff --git a/cleopatre/devkit/tests/spidlib/utests/inc/network_utests.h b/cleopatre/devkit/tests/libspid/utests/inc/network_utests.h
index 60959ee226..85a00727c3 100644
--- a/cleopatre/devkit/tests/spidlib/utests/inc/network_utests.h
+++ b/cleopatre/devkit/tests/libspid/utests/inc/network_utests.h
@@ -17,7 +17,7 @@
*/
#include <sys/types.h>
-#include "spidlib.h"
+#include "libspid.h"
/* VARIABLE STUB */
/* none */
@@ -26,8 +26,8 @@
/* PLCD FUNCTION DECLARATIONS */
/* system.c */
-spidlib_error_t spidlib_network_get_ip (const char *interface, spidlib_ip_t *ip);
-spidlib_error_t spidlib_network_set_ip (const char *interface, const spidlib_ip_t *ip);
-spidlib_error_t spidlib_network_get_mac (const char *interface, unsigned char *mac);
+libspid_error_t libspid_network_get_ip (const char *interface, libspid_ip_t *ip);
+libspid_error_t libspid_network_set_ip (const char *interface, const libspid_ip_t *ip);
+libspid_error_t libspid_network_get_mac (const char *interface, unsigned char *mac);
#endif /* system_utests_h */
diff --git a/cleopatre/devkit/tests/spidlib/utests/inc/system_utests.h b/cleopatre/devkit/tests/libspid/utests/inc/system_utests.h
index fa6a1fd08d..8b6ee97c8a 100644
--- a/cleopatre/devkit/tests/spidlib/utests/inc/system_utests.h
+++ b/cleopatre/devkit/tests/libspid/utests/inc/system_utests.h
@@ -17,7 +17,7 @@
*/
#include <sys/types.h>
-#include "spidlib.h"
+#include "libspid.h"
/* VARIABLE STUB */
/* none */
@@ -26,14 +26,14 @@
/* PLCD FUNCTION DECLARATIONS */
/* system.c */
-spidlib_error_t spidlib_system_get_kernel_version(char *buffer, int buffer_len);
-spidlib_error_t spidlib_system_get_plc_version (char *buffer, const int buffer_len);
-spidlib_error_t spidlib_system_get_av_version (char *buffer, const int buffer_len);
-spidlib_error_t spidlib_system_get_uptime(unsigned int *total_s, unsigned int *idle_s);
-spidlib_error_t spidlib_system_get_meminfo(char *buffer, int buffer_len);
-spidlib_error_t spidlib_system_save(void);
-spidlib_error_t spidlib_system_factory(void);
-spidlib_error_t spidlib_system_get_nvram(spc300_nvram_t *nvram);
-spidlib_error_t spidlib_system_get_date (char *buffer, const int buffer_len);
+libspid_error_t libspid_system_get_kernel_version(char *buffer, int buffer_len);
+libspid_error_t libspid_system_get_plc_version (char *buffer, const int buffer_len);
+libspid_error_t libspid_system_get_av_version (char *buffer, const int buffer_len);
+libspid_error_t libspid_system_get_uptime(unsigned int *total_s, unsigned int *idle_s);
+libspid_error_t libspid_system_get_meminfo(char *buffer, int buffer_len);
+libspid_error_t libspid_system_save(void);
+libspid_error_t libspid_system_factory(void);
+libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram);
+libspid_error_t libspid_system_get_date (char *buffer, const int buffer_len);
#endif /* system_utests_h */
diff --git a/cleopatre/devkit/tests/spidlib/utests/src/config_item_utests.c b/cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c
index 8c00f1d59e..d20c34ca6f 100644
--- a/cleopatre/devkit/tests/spidlib/utests/src/config_item_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/config_item_utests.c
@@ -7,8 +7,8 @@
* }}} */
/**
* \file config_item_utests.c
- * \brief Unitary tests for spidlib
- * \ingroup Cleopatre - spidlib
+ * \brief Unitary tests for libspid
+ * \ingroup Cleopatre - libspid
*
* This file content all the unitary tests for plcd,
* (interface between the PLC driver and the Linux filesystem).
@@ -40,7 +40,7 @@
#ifdef DEBUG
-#define TRACE(...) printf("SPIDLIB_CONFIG_ITEM UTESTS: " __VA_ARGS__)
+#define TRACE(...) printf("LIBSPID_CONFIG_ITEM UTESTS: " __VA_ARGS__)
#else
#define TRACE(...)
#endif
@@ -81,7 +81,7 @@ void teardown(void)
START_TEST (test_read_param)
{
int ret = 7;
- char buffer[SPIDLIB_LINE_MAX_LEN] = {0};
+ char buffer[LIBSPID_LINE_MAX_LEN] = {0};
char key[32] = "key";
char filename[128];
@@ -89,38 +89,38 @@ START_TEST (test_read_param)
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(ITEM_CNF));
/* filename = NULL */
- ret = spidlib_config_read_item( NULL, key, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "filename = NULL");
+ ret = libspid_config_read_item( NULL, key, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "filename = NULL");
/* key = NULL */
- ret = spidlib_config_read_item( filename, NULL, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = NULL");
+ ret = libspid_config_read_item( filename, NULL, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = NULL");
/* buffer = NULL */
- ret = spidlib_config_read_item( filename, key, NULL, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "buffer = NULL");
+ ret = libspid_config_read_item( filename, key, NULL, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "buffer = NULL");
/* buffer_len = 0 */
- ret = spidlib_config_read_item( filename, key, buffer, 0 );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "buffer_len = 0");
+ ret = libspid_config_read_item( filename, key, buffer, 0 );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "buffer_len = 0");
/* file does not exist */
remove(CONFIG_FILE_DONT_EXIST);
- ret = spidlib_config_read_item( CONFIG_FILE_DONT_EXIST, key, buffer, SPIDLIB_LINE_MAX_LEN);
- fail_unless( ret == SPIDLIB_ERROR_SYSTEM, "file does not exist");
+ ret = libspid_config_read_item( CONFIG_FILE_DONT_EXIST, key, buffer, LIBSPID_LINE_MAX_LEN);
+ fail_unless( ret == LIBSPID_ERROR_SYSTEM, "file does not exist");
/* key not found */
- ret = spidlib_config_read_item( filename, "nokey", buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_NOT_FOUND, "key doesn't exist");
+ ret = libspid_config_read_item( filename, "nokey", buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_NOT_FOUND, "key doesn't exist");
/* LIMIT USAGE */
/* get a big element with a shorter buffer */
- ret = spidlib_config_read_item( filename, "spidcom", buffer, 4 );
- fail_unless( ret == SPIDLIB_ERROR_NO_SPACE, "buf_len too small");
+ ret = libspid_config_read_item( filename, "spidcom", buffer, 4 );
+ fail_unless( ret == LIBSPID_ERROR_NO_SPACE, "buf_len too small");
/* label is an empty string */
- ret = spidlib_config_read_item( filename, "", buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_NOT_FOUND, "label is a empty string");
+ ret = libspid_config_read_item( filename, "", buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_NOT_FOUND, "label is a empty string");
}
END_TEST
@@ -129,28 +129,28 @@ START_TEST (test_write_param)
int ret;
char key[128] = "key";
char filename[128];
- char buffer[SPIDLIB_LINE_MAX_LEN] = {0};
+ char buffer[LIBSPID_LINE_MAX_LEN] = {0};
system("cp " ITEM_CNF " " UTESTS_TMP_DIR);
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(ITEM_CNF));
/* filename = NULL */
- ret = spidlib_config_write_item(NULL, key, buffer);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "filename = NULL");
+ ret = libspid_config_write_item(NULL, key, buffer);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "filename = NULL");
/* key = NULL */
- ret = spidlib_config_write_item(filename, NULL, buffer);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = NULL");
+ ret = libspid_config_write_item(filename, NULL, buffer);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = NULL");
/* key = "" */
strcpy(key, "");
- ret = spidlib_config_write_item(filename, key, buffer);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "label");
+ ret = libspid_config_write_item(filename, key, buffer);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "label");
/* key contains delimiter */
- strcpy(key, "ke"SPIDLIB_CONFIG_DELIMITER"y"); /* key <- "ke=y" */
- ret = spidlib_config_write_item(filename, key, buffer);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key contains delimiter");
+ strcpy(key, "ke"LIBSPID_CONFIG_DELIMITER"y"); /* key <- "ke=y" */
+ ret = libspid_config_write_item(filename, key, buffer);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key contains delimiter");
}
END_TEST
@@ -165,31 +165,31 @@ tc_param (void)
/* TEST THAT SHOULD PASS */
/** test procedures */
-START_TEST (test_spidlib_config_read_item)
+START_TEST (test_libspid_config_read_item)
{
int ret;
- char buffer[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
char filename[128];
system("cp " ITEM_CNF " " UTESTS_TMP_DIR);
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(ITEM_CNF));
- ret = spidlib_config_read_item (filename, "spidcom", buffer, SPIDLIB_LINE_MAX_LEN);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_item fail");
- fail_if( strcmp(buffer, "malika") != 0, "spidlib_config_read_item gets wrong value");
+ ret = libspid_config_read_item (filename, "spidcom", buffer, LIBSPID_LINE_MAX_LEN);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_item fail");
+ fail_if( strcmp(buffer, "malika") != 0, "libspid_config_read_item gets wrong value");
- ret = spidlib_config_read_item (filename, "eth", buffer, SPIDLIB_LINE_MAX_LEN);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_item fail");
- fail_if( strcmp(buffer, "11:aa:22:bb:33:cc") != 0, "spidlib_config_read_item gets wrong value");
+ ret = libspid_config_read_item (filename, "eth", buffer, LIBSPID_LINE_MAX_LEN);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_item fail");
+ fail_if( strcmp(buffer, "11:aa:22:bb:33:cc") != 0, "libspid_config_read_item gets wrong value");
- ret = spidlib_config_read_item (filename, "", buffer, SPIDLIB_LINE_MAX_LEN);
- fail_if( ret != SPIDLIB_ERROR_NOT_FOUND, "spidlib_config_read_item do not detect failure as expected");
+ ret = libspid_config_read_item (filename, "", buffer, LIBSPID_LINE_MAX_LEN);
+ fail_if( ret != LIBSPID_ERROR_NOT_FOUND, "libspid_config_read_item do not detect failure as expected");
}
END_TEST
-START_TEST (test_spidlib_config_write_item)
+START_TEST (test_libspid_config_write_item)
{
int ret;
- char line[SPIDLIB_LINE_MAX_LEN];
+ char line[LIBSPID_LINE_MAX_LEN];
FILE *fp;
char filename[128];
char *p = NULL;
@@ -198,37 +198,37 @@ START_TEST (test_spidlib_config_write_item)
system("cp " ITEM_CNF " " UTESTS_TMP_DIR);
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(ITEM_CNF));
- ret = spidlib_config_write_item(filename, "spidcom", "arizona");
- fail_if(ret != SPIDLIB_SUCCESS, " spidlib_config_write_item fail");
+ ret = libspid_config_write_item(filename, "spidcom", "arizona");
+ fail_if(ret != LIBSPID_SUCCESS, " libspid_config_write_item fail");
- ret = spidlib_config_write_item(filename, "eth", "77:cc:22:FF:33:EE");
- fail_if(ret != SPIDLIB_SUCCESS, " spidlib_config_write_item fail");
+ ret = libspid_config_write_item(filename, "eth", "77:cc:22:FF:33:EE");
+ fail_if(ret != LIBSPID_SUCCESS, " libspid_config_write_item fail");
fp = fopen(filename, "r");
- while ( fgets(line, SPIDLIB_LINE_MAX_LEN, fp) != NULL )
+ while ( fgets(line, LIBSPID_LINE_MAX_LEN, fp) != NULL )
{
- p = strtok(line, " \t" SPIDLIB_CONFIG_DELIMITER);
+ p = strtok(line, " \t" LIBSPID_CONFIG_DELIMITER);
if (strstr(p, "eth"))
{
- p = strtok(NULL, " \t" SPIDLIB_CONFIG_DELIMITER);
+ p = strtok(NULL, " \t" LIBSPID_CONFIG_DELIMITER);
strcpy(value, p);
}
}
fclose(fp);
- fail_if( strcmp(value, "77:cc:22:FF:33:EE\n") != 0, "spidlib_config_write_item get wrong data");
+ fail_if( strcmp(value, "77:cc:22:FF:33:EE\n") != 0, "libspid_config_write_item get wrong data");
}
END_TEST
-extern Suite* spidlib_config_item_suite(void)
+extern Suite* libspid_config_item_suite(void)
{
- Suite *s = suite_create("SPIDLIB_CONFIG_ITEM");
+ Suite *s = suite_create("LIBSPID_CONFIG_ITEM");
TCase *tc_core = tcase_create("Core");
tcase_add_checked_fixture (tc_core, setup, teardown);
//Test config_item
- tcase_add_test(tc_core, test_spidlib_config_read_item);
- tcase_add_test(tc_core, test_spidlib_config_write_item);
+ tcase_add_test(tc_core, test_libspid_config_read_item);
+ tcase_add_test(tc_core, test_libspid_config_write_item);
suite_add_tcase(s, tc_core);
suite_add_tcase(s, tc_param());
@@ -241,7 +241,7 @@ int main(void)
Suite *s;
//Run config_item tests
- s = spidlib_config_item_suite();
+ s = libspid_config_item_suite();
SRunner *sr = srunner_create(s);
srunner_set_fork_status (sr, CK_NOFORK);
diff --git a/cleopatre/devkit/tests/spidlib/utests/src/config_line_utests.c b/cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c
index 3e9c5fc70e..1fd2d7eee2 100644
--- a/cleopatre/devkit/tests/spidlib/utests/src/config_line_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/config_line_utests.c
@@ -7,8 +7,8 @@
* }}} */
/**
* \file config_item_utests.c
- * \brief Unitary tests for spidlib
- * \ingroup Cleopatre - spidlib
+ * \brief Unitary tests for libspid
+ * \ingroup Cleopatre - libspid
*
* This file content all the unitary tests for plcd,
* (interface between the PLC driver and the Linux filesystem).
@@ -40,7 +40,7 @@
#ifdef DEBUG
-#define TRACE(...) printf("SPIDLIB_CONFIG_ITEM UTESTS: " __VA_ARGS__)
+#define TRACE(...) printf("LIBSPID_CONFIG_ITEM UTESTS: " __VA_ARGS__)
#else
#define TRACE(...)
#endif
@@ -85,7 +85,7 @@ START_TEST (test_read_param)
{
int ret = 7;
char delimiters[32] = " :";
- char buffer[SPIDLIB_LINE_MAX_LEN] = {0};
+ char buffer[LIBSPID_LINE_MAX_LEN] = {0};
char *elt[8];
unsigned int elt_nb = 2;
char key[32] = "key";
@@ -96,65 +96,65 @@ START_TEST (test_read_param)
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(LINE_CNF));
/* filename = NULL */
- ret = spidlib_config_read_line( NULL, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "filename = NULL");
+ ret = libspid_config_read_line( NULL, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "filename = NULL");
/* delimiters = NULL */
- ret = spidlib_config_read_line( filename, NULL, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "delimiters = NULL");
+ ret = libspid_config_read_line( filename, NULL, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "delimiters = NULL");
/* delimiters = "" */
strcpy(delimiters, "");
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "delimiters = empty string");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "delimiters = empty string");
strcpy(delimiters, " :"); /* correct for next test */
/* key = NULL */
- ret = spidlib_config_read_line( filename, delimiters, NULL,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = NULL");
-
- /* elt_nb > SPIDLIB_ELT_MAX_NB */
- elt_nb = SPIDLIB_ELT_MAX_NB + 1;
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "elt_nb = 0");
+ ret = libspid_config_read_line( filename, delimiters, NULL,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = NULL");
+
+ /* elt_nb > LIBSPID_ELT_MAX_NB */
+ elt_nb = LIBSPID_ELT_MAX_NB + 1;
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "elt_nb = 0");
elt_nb = 2; /* correct for next test */
/* elt = NULL */
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, NULL, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "elt = NULL");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, NULL, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "elt = NULL");
/* buffer = NULL */
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, NULL, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "buffer = NULL");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, NULL, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "buffer = NULL");
/* buffer_len = 0 */
- ret = spidlib_config_read_line( filename, delimiters, key,
+ ret = libspid_config_read_line( filename, delimiters, key,
&elt_nb, elt, buffer, 0 );
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "buffer_len = 0");
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "buffer_len = 0");
/* file does not exist */
remove(CONFIG_FILE_DONT_EXIST);
- ret = spidlib_config_read_line( CONFIG_FILE_DONT_EXIST, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN);
- fail_unless( ret == SPIDLIB_ERROR_SYSTEM, "file does not exist");
+ ret = libspid_config_read_line( CONFIG_FILE_DONT_EXIST, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN);
+ fail_unless( ret == LIBSPID_ERROR_SYSTEM, "file does not exist");
/* key not found */
- ret = spidlib_config_read_line( filename, delimiters, "nokey",
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_unless( ret == SPIDLIB_ERROR_NOT_FOUND, "key doesn't exist");
+ ret = libspid_config_read_line( filename, delimiters, "nokey",
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_unless( ret == LIBSPID_ERROR_NOT_FOUND, "key doesn't exist");
/* LIMIT USAGE */
/* get a big element with a shorter buffer */
strcpy(key, "key3");
elt_nb = 10;
- fail_unless(((spidlib_config_read_line(filename, " ", key, &elt_nb, elt, buffer, 32) >= 0)
+ fail_unless(((libspid_config_read_line(filename, " ", key, &elt_nb, elt, buffer, 32) >= 0)
&& (elt_nb == 3)
&& !strcmp(elt[2], "very_very_very")),
"get limited size element: key=%s, elt_nb=%d, elt[2]='%s'\n", key, elt_nb, elt[2]);
@@ -162,7 +162,7 @@ START_TEST (test_read_param)
/* ask for no element */
strcpy(key, "key2");
elt_nb = 0;
- fail_unless(((spidlib_config_read_line(filename, " ", key, &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN) >= 0)
+ fail_unless(((libspid_config_read_line(filename, " ", key, &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN) >= 0)
&& !strcmp(key, "key3")
&& (elt_nb == 0)),
"get 0 element");
@@ -170,7 +170,7 @@ START_TEST (test_read_param)
/* other delimiter */
strcpy(key, "key4");
elt_nb = 10;
- fail_unless(((spidlib_config_read_line(filename, ":", key, &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN) >= 0)
+ fail_unless(((libspid_config_read_line(filename, ":", key, &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN) >= 0)
&& (elt_nb == 8)
&& !strcmp(elt[3], "elt54 elt")),
"other delimiter");
@@ -178,7 +178,7 @@ START_TEST (test_read_param)
/* 2 delimiters */
strcpy(key, "key4");
elt_nb = 10;
- fail_unless(((spidlib_config_read_line(filename, " :", key, &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN) >= 0)
+ fail_unless(((libspid_config_read_line(filename, " :", key, &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN) >= 0)
&& !strcmp(key, "key5")
&& (elt_nb == 9)
&& !strcmp(elt[3], "elt54")
@@ -200,50 +200,50 @@ START_TEST (test_write_param)
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(LINE_CNF));
/* filename = NULL */
- ret = spidlib_config_write_line(NULL, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "filename = NULL");
+ ret = libspid_config_write_line(NULL, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "filename = NULL");
/* delimiter = '\n' */
delimiter = '\n';
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "delimiter = '\n'");
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "delimiter = '\n'");
delimiter = 'a'; /* correct for next test */
/* delimiter = '\r' */
delimiter ='\r';
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "delimiter = '\r'");
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "delimiter = '\r'");
delimiter = 'a'; /* correct for next test */
/* key = NULL */
- ret = spidlib_config_write_line(filename, delimiter, NULL, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = NULL");
+ ret = libspid_config_write_line(filename, delimiter, NULL, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = NULL");
- /* elt_nb > SPIDLIB_ELT_MAX_NB */
- elt_nb = SPIDLIB_ELT_MAX_NB + 1;
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "elt_nb = 0");
+ /* elt_nb > LIBSPID_ELT_MAX_NB */
+ elt_nb = LIBSPID_ELT_MAX_NB + 1;
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "elt_nb = 0");
elt_nb = 2; /* correct for nex test */
/* elt = NULL */
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, NULL);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "elt = NULL");
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, NULL);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "elt = NULL");
/* key too long */
strcpy(key, "very_very_very_very_very_very_very_very_very_very_very_very_very_long_key");
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key too long");
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key too long");
/* key = "" */
strcpy(key, "");
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = empty string");
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = empty string");
/* key contains delimiter */
delimiter = ':';
strcpy(key, "ke:y");
- ret = spidlib_config_write_line(filename, delimiter, key, elt_nb, elt);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key contains delimiter");
+ ret = libspid_config_write_line(filename, delimiter, key, elt_nb, elt);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key contains delimiter");
}
END_TEST
@@ -258,38 +258,38 @@ START_TEST (test_remove_param)
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(LINE_CNF));
/* filename = NULL */
- ret = spidlib_config_remove_line(NULL, delimiters, key);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "filename = NULL");
+ ret = libspid_config_remove_line(NULL, delimiters, key);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "filename = NULL");
/* delimiter = '\n' */
sprintf(delimiters, "%s", "\n");
- ret = spidlib_config_remove_line(filename, delimiters, key);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "delimiter = '\n'");
+ ret = libspid_config_remove_line(filename, delimiters, key);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "delimiter = '\n'");
/* delimiter = '\r' */
sprintf(delimiters, "%s", "\r");
- ret = spidlib_config_remove_line(filename, delimiters, key);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "delimiter = '\r'");
+ ret = libspid_config_remove_line(filename, delimiters, key);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "delimiter = '\r'");
/* key = NULL */
- ret = spidlib_config_remove_line(filename, delimiters, NULL);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = NULL");
+ ret = libspid_config_remove_line(filename, delimiters, NULL);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = NULL");
/* key too long */
strcpy(key, "very_very_very_very_very_very_very_very_very_very_very_very_very_long_key");
- ret = spidlib_config_remove_line(filename, delimiters, key);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key too long");
+ ret = libspid_config_remove_line(filename, delimiters, key);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key too long");
/* key = "" */
strcpy(key, "");
- ret = spidlib_config_remove_line(filename, delimiters, key);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key = empty string");
+ ret = libspid_config_remove_line(filename, delimiters, key);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key = empty string");
/* key contains delimiter */
sprintf(delimiters, "%s", ":");
sprintf(key, "ke%sy", delimiters);
- ret = spidlib_config_remove_line(filename, delimiters, key);
- fail_unless( ret == SPIDLIB_ERROR_PARAM, "key contains delimiter");
+ ret = libspid_config_remove_line(filename, delimiters, key);
+ fail_unless( ret == LIBSPID_ERROR_PARAM, "key contains delimiter");
}
END_TEST
@@ -304,12 +304,12 @@ tc_param (void)
}
/** test procedures */
-START_TEST (test_spidlib_config_read_line)
+START_TEST (test_libspid_config_read_line)
{
int ret;
char filename[128];
char delimiters[32] = " :";
- char buffer[SPIDLIB_LINE_MAX_LEN] = {0};
+ char buffer[LIBSPID_LINE_MAX_LEN] = {0};
char *elt[8];
unsigned int elt_nb;
char key[32];
@@ -318,24 +318,24 @@ START_TEST (test_spidlib_config_read_line)
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(LINE_CNF));
elt_nb = 8;
strcpy(key, "eth");
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_line fail");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_line fail");
fail_if(elt_nb != 6);
- fail_if( strcmp(elt[3], "bb") != 0, "spidlib_config_read_line gets wrong data");
+ fail_if( strcmp(elt[3], "bb") != 0, "libspid_config_read_line gets wrong data");
/* check the same, but for DOS format cfg file */
system("cp " LINE_DOS_CNF " " UTESTS_TMP_DIR);
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(LINE_DOS_CNF));
elt_nb = 8;
strcpy(key, "eth");
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_line fail");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_line fail");
fail_if(elt_nb != 6);
- fail_if( strcmp(elt[3], "bb") != 0, "spidlib_config_read_line gets wrong data");
+ fail_if( strcmp(elt[3], "bb") != 0, "libspid_config_read_line gets wrong data");
system("cp " LINE_CNF " " UTESTS_TMP_DIR);
@@ -343,31 +343,31 @@ START_TEST (test_spidlib_config_read_line)
strcpy(delimiters, "*");
strcpy(key, "spidcom");
elt_nb = 8;
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_if(ret != SPIDLIB_ERROR_NOT_FOUND, "spidlib_config_read_line fail");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_if(ret != LIBSPID_ERROR_NOT_FOUND, "libspid_config_read_line fail");
strcpy(delimiters, ", ");
strcpy(key, "mode");
elt_nb = 8;
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_line fail");
- fail_if(elt_nb != 4, "spidlib_config_read_line gets wrong data");
- fail_if( strcmp(elt[2], "something") != 0, "spidlib_config_read_line gets wrong data");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_line fail");
+ fail_if(elt_nb != 4, "libspid_config_read_line gets wrong data");
+ fail_if( strcmp(elt[2], "something") != 0, "libspid_config_read_line gets wrong data");
/* find the first key */
key[0] = '\0';
strcpy(delimiters, ", ");
elt_nb = 8;
- ret = spidlib_config_read_line( filename, delimiters, key,
- &elt_nb, elt, buffer, SPIDLIB_LINE_MAX_LEN );
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_line fail");
- fail_if( strcmp(key, "mode") != 0, "spidlib_config_read_line gets wrong first key");
+ ret = libspid_config_read_line( filename, delimiters, key,
+ &elt_nb, elt, buffer, LIBSPID_LINE_MAX_LEN );
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_line fail");
+ fail_if( strcmp(key, "mode") != 0, "libspid_config_read_line gets wrong first key");
}
END_TEST
-START_TEST (test_spidlib_config_write_line)
+START_TEST (test_libspid_config_write_line)
{
int ret;
char filename[128];
@@ -376,7 +376,7 @@ START_TEST (test_spidlib_config_write_line)
unsigned int elt_nb;
char key[32];
FILE *fp;
- char line[SPIDLIB_LINE_MAX_LEN];
+ char line[LIBSPID_LINE_MAX_LEN];
char el0[32] = {0};
char el1[32] = {0};
char *p;
@@ -387,8 +387,8 @@ START_TEST (test_spidlib_config_write_line)
elt[0] = strdup("el_0");
elt[1] = strdup("el_1");
strcpy(key, "tst_key");
- ret = spidlib_config_write_line( filename, delimiter, key, elt_nb, elt);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_read_line fail");
+ ret = libspid_config_write_line( filename, delimiter, key, elt_nb, elt);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_read_line fail");
fp = fopen(filename, "r");
if (fp == NULL)
@@ -396,7 +396,7 @@ START_TEST (test_spidlib_config_write_line)
perror("fopen())");
exit(EXIT_FAILURE);
}
- while ( fgets(line, SPIDLIB_LINE_MAX_LEN, fp) != NULL )
+ while ( fgets(line, LIBSPID_LINE_MAX_LEN, fp) != NULL )
{
p = strtok(line, ":");
if ( !strcmp(p, key) )
@@ -417,12 +417,12 @@ START_TEST (test_spidlib_config_write_line)
}
fclose(fp);
- fail_if( strcmp(el0, "el_0") != 0, "spidlib_config_write_line writes wrong data" );
- fail_if( strcmp(el1, "el_1") != 0, "spidlib_config_write_line writes wrong data" );
+ fail_if( strcmp(el0, "el_0") != 0, "libspid_config_write_line writes wrong data" );
+ fail_if( strcmp(el1, "el_1") != 0, "libspid_config_write_line writes wrong data" );
}
END_TEST
-START_TEST (test_spidlib_config_remove_line)
+START_TEST (test_libspid_config_remove_line)
{
int ret;
char filename[128];
@@ -436,8 +436,8 @@ START_TEST (test_spidlib_config_remove_line)
sprintf(filename, "%s/%s", UTESTS_TMP_DIR, basename(LINE_CNF));
elt_nb = 8;
strcpy(key, "eth");
- ret = spidlib_config_remove_line( filename, delimiters, key );
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_config_remove_line fail");
+ ret = libspid_config_remove_line( filename, delimiters, key );
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_config_remove_line fail");
sprintf( cmd, "diff %s %s > result.tmp", filename, LINE_REMOVE_CNF );
fail_unless( (system(cmd) == 0)
@@ -447,16 +447,16 @@ START_TEST (test_spidlib_config_remove_line)
}
END_TEST
-extern Suite* spidlib_config_line_suite(void)
+extern Suite* libspid_config_line_suite(void)
{
- Suite *s = suite_create("SPIDLIB_CONFIG_LINE");
+ Suite *s = suite_create("LIBSPID_CONFIG_LINE");
TCase *tc_core = tcase_create("Core");
tcase_add_checked_fixture (tc_core, setup, teardown);
//Test config_item
- tcase_add_test(tc_core, test_spidlib_config_read_line);
- tcase_add_test(tc_core, test_spidlib_config_write_line);
- tcase_add_test(tc_core, test_spidlib_config_remove_line);
+ tcase_add_test(tc_core, test_libspid_config_read_line);
+ tcase_add_test(tc_core, test_libspid_config_write_line);
+ tcase_add_test(tc_core, test_libspid_config_remove_line);
suite_add_tcase(s, tc_core);
suite_add_tcase(s, tc_param());
@@ -469,7 +469,7 @@ int main(void)
Suite *s;
//Run config_item tests
- s = spidlib_config_line_suite();
+ s = libspid_config_line_suite();
SRunner *sr = srunner_create(s);
srunner_set_fork_status (sr, CK_NOFORK);
diff --git a/cleopatre/devkit/tests/libspid/utests/src/image_utests.c b/cleopatre/devkit/tests/libspid/utests/src/image_utests.c
new file mode 100644
index 0000000000..ab54d0b7c5
--- /dev/null
+++ b/cleopatre/devkit/tests/libspid/utests/src/image_utests.c
@@ -0,0 +1,396 @@
+/* Cleopatre project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file system_utests.c
+ * \brief Unitary tests for libspid
+ * \ingroup Cleopatre - libspid
+ *
+ * This file content all the unitary tests for libspid system.c,
+ */
+
+/* CREATED WITH: mksimage -s 100 -ver "0.5" -ldaddr 0x12345 > image.tst */
+
+#include <check.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "image_utests.h"
+
+//#define DEBUG 1
+
+
+#ifdef DEBUG
+#define TRACE(...) printf("LIBSPID_SYSTEM UTESTS: " __VA_ARGS__)
+#else
+#define TRACE(...)
+#endif
+
+#define IMAGE1 "testfiles/image1.tst"
+#define IMAGE2 "testfiles/image2.tst"
+
+#define NVRAM1 "testfiles/nvram1.tst"
+#define NVRAM2 "testfiles/nvram2.tst"
+#define MTD_TST "testfiles/mtd.tst"
+
+
+/** local variables */
+
+
+/* fixtures - run before and after each unit test */
+void setup(void)
+{
+ int ret;
+ char buf[256];
+ struct dirent *d;
+ DIR *dir;
+ struct stat st;
+
+ /* initialize - delete testing dir if it exists */
+ if ( (stat (UTESTS_TMP_DIR, &st) == 0) )
+ {
+ system ("rm -r " UTESTS_TMP_DIR);
+ }
+
+ ret = mkdir(UTESTS_TMP_DIR, 0770);
+ if (ret < 0 && errno != EEXIST)
+ {
+ perror("mkdir(UTESTS_TMP_DIR, 0770)");
+ exit(EXIT_FAILURE);
+ }
+
+ /* initialize - delete all files which have left from previous testing */
+ dir = opendir(UTESTS_TMP_DIR);
+
+ while ( (d = readdir(dir)) != NULL )
+ {
+ //printf("%s\n",d->d_name);
+ sprintf(buf, "%s/%s", "/tmp/utests", d->d_name);
+ remove(buf);
+ }
+
+ /* create other subdirs */
+ sprintf(buf, "%s/etc", UTESTS_TMP_DIR);
+ ret = mkdir(buf, 0770);
+ if (ret < 0 && errno != EEXIST)
+ {
+ perror("mkdir(UTESTS_TMP_DIR/etc, 0770)");
+ exit(EXIT_FAILURE);
+ }
+
+ sprintf(buf, "%s/proc", UTESTS_TMP_DIR);
+ ret = mkdir(buf, 0770);
+ if (ret < 0 && errno != EEXIST)
+ {
+ perror("mkdir(UTESTS_TMP_DIR/proc, 0770)");
+ exit(EXIT_FAILURE);
+ }
+
+ sprintf(buf, "%s/local", UTESTS_TMP_DIR);
+ ret = mkdir(buf, 0770);
+ if (ret < 0 && errno != EEXIST)
+ {
+ perror("mkdir(UTESTS_TMP_DIR, 0770)");
+ exit(EXIT_FAILURE);
+ }
+
+ sprintf(buf, "%s/factory", UTESTS_TMP_DIR);
+ ret = mkdir(buf, 0770);
+ if (ret < 0 && errno != EEXIST)
+ {
+ perror("mkdir(UTESTS_TMP_DIR, 0770)");
+ exit(EXIT_FAILURE);
+ }
+
+ sprintf(buf, "%s/dev", UTESTS_TMP_DIR);
+ ret = mkdir(buf, 0770);
+ if (ret < 0 && errno != EEXIST)
+ {
+ perror("mkdir(UTESTS_TMP_DIR, 0770)");
+ exit(EXIT_FAILURE);
+ }
+}
+
+void teardown(void)
+{
+}
+
+
+/* --- TEST PROCEDURES --- */
+
+/* TESTING FALSE PARAMS */
+START_TEST (param_get_desc)
+{
+ int ret = 0;
+ spidcom_image_desc_t image_desc;
+ int type = LIBSPID_IMAGE_DESC_TYPE_0;
+ char mtd_name[32] = {0};
+
+ system("cp " MTD_TST " " LIBSPID_SYSTEM_MTD_PATH);
+ system("cp " NVRAM1 " " LIBSPID_DEV_PATH"/mtd1");
+ system("cp " IMAGE1 " " LIBSPID_DEV_PATH"/mtd3");
+ system("cp " IMAGE2 " " LIBSPID_DEV_PATH"/mtd4");
+
+ /* image_desc = NULL */
+ ret = libspid_image_get_desc(type, NULL, mtd_name);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "image_desc is NULL");
+
+ /* mtd_name NULL */
+ ret = libspid_image_get_desc(type, &image_desc, NULL);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "mtd_name is NULL");
+
+ /* type < 0 */
+ type = -5;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "type < 0");
+
+ /* type > LIBSPID_IMAGE_DESC_TYPE_NB */
+ type = LIBSPID_IMAGE_DESC_TYPE_NB + 1;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "type > LIBSPID_IMAGE_DESC_TYPE_NB");
+
+ /* nvram.nb_images == 1 && type == LIBSPID_IMAGE_DESC_TYPE_1 */
+ type = LIBSPID_IMAGE_DESC_TYPE_1;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "nvram.nb_images == 1 && type == LIBSPID_IMAGE_DESC_TYPE_1");
+}
+END_TEST
+
+START_TEST (param_select)
+{
+ int ret;
+ int type;
+
+ system("cp " MTD_TST " " LIBSPID_SYSTEM_MTD_PATH);
+ system("cp " NVRAM1 " " LIBSPID_DEV_PATH"/mtd1");
+ system("cp " IMAGE1 " " LIBSPID_DEV_PATH"/mtd3");
+ system("cp " IMAGE2 " " LIBSPID_DEV_PATH"/mtd4");
+
+ /* type < LIBSPID_IMAGE_SELECT_0 */
+ type = LIBSPID_IMAGE_SELECT_0 - 1;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "type < LIBSPID_IMAGE_SELECT_0");
+
+ /* type > LIBSPID_IMAGE_SELECT_NB */
+ type = LIBSPID_IMAGE_SELECT_NB + 1;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "type > LIBSPID_IMAGE_SELECT_NB");
+
+ /* nvram.nb_images == 1 && type == LIBSPID_IMAGE_SELECT_1 */
+ type = LIBSPID_IMAGE_SELECT_1;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "nvram.nb_images == 1 && type == LIBSPID_IMAGE_SELECT_1");
+}
+END_TEST
+
+
+TCase *
+tc_param (void)
+{
+ TCase *tc_param = tcase_create ("param");
+ tcase_add_test (tc_param, param_get_desc);
+ tcase_add_test (tc_param, param_select);
+ return tc_param;
+}
+
+/** test procedures */
+START_TEST (test_libspid_image_get_desc)
+{
+ int ret;
+ libspid_image_desc_type_t type;
+ spidcom_image_desc_t image_desc;
+ char mtd_name[32] = {0};
+
+ system("cp " MTD_TST " " LIBSPID_SYSTEM_MTD_PATH);
+ system("cp " NVRAM1 " " LIBSPID_DEV_PATH"/mtd1");
+ system("cp " IMAGE1 " " LIBSPID_DEV_PATH"/mtd3");
+ system("cp " IMAGE2 " " LIBSPID_DEV_PATH"/mtd4");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_0;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_get_desc fail");
+ fail_if(image_desc.index != 1, "libspid_image_get_desc gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_get_desc gets wrong description");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_1;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "libspid_image_get_desc fail");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_CURRENT;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_get_desc fail");
+ fail_if(image_desc.index != 1, "libspid_image_get_desc gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_get_desc gets wrong description");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_ALTERNATE;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "libspid_image_get_desc fail");
+
+ /* two images */
+ system("cp " NVRAM2 " " LIBSPID_DEV_PATH"/mtd1");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_0;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_get_desc fail");
+ fail_if(image_desc.index != 1, "libspid_image_get_desc gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_get_desc gets wrong description");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_1;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_get_desc fail");
+ fail_if(image_desc.index != 2, "libspid_image_get_desc gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_get_desc gets wrong description");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_CURRENT;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_get_desc fail");
+ fail_if(image_desc.index != 2, "libspid_image_get_desc gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_get_desc gets wrong description");
+
+ type = LIBSPID_IMAGE_DESC_TYPE_ALTERNATE;
+ ret = libspid_image_get_desc(type, &image_desc, mtd_name);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_get_desc fail");
+ fail_if(image_desc.index != 1, "libspid_image_get_desc gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_get_desc gets wrong description");
+}
+END_TEST
+
+START_TEST (test_libspid_image_select)
+{
+ int ret;
+ libspid_image_desc_type_t type;
+ spidcom_image_desc_t image_desc;
+ FILE* fp;
+
+ system("cp " MTD_TST " " LIBSPID_SYSTEM_MTD_PATH);
+ system("cp " NVRAM1 " " LIBSPID_DEV_PATH"/mtd1");
+ system("cp " IMAGE1 " " LIBSPID_DEV_PATH"/mtd3");
+ system("cp " IMAGE2 " " LIBSPID_DEV_PATH"/mtd4");
+
+ type = LIBSPID_IMAGE_SELECT_0;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_select fail");
+
+ fp = fopen(LIBSPID_DEV_PATH"/mtd3", "r");
+ if (fp == NULL)
+ {
+ perror("fopen");
+ exit(EXIT_FAILURE);
+ }
+ fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
+ fclose(fp);
+ fail_if(image_desc.index != 1, "libspid_image_select gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_select gets wrong description");
+
+ type = LIBSPID_IMAGE_SELECT_1;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "libspid_image_select fail");
+
+ type = LIBSPID_IMAGE_SELECT_SWITCH;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "libspid_image_select fail");
+
+ /* two images */
+ system("cp " NVRAM2 " " LIBSPID_DEV_PATH"/mtd1");
+
+ type = LIBSPID_IMAGE_SELECT_0;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_select fail");
+ fp = fopen(LIBSPID_DEV_PATH"/mtd3", "r");
+ if (fp == NULL)
+ {
+ perror("fopen");
+ exit(EXIT_FAILURE);
+ }
+ fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
+ fclose(fp);
+ fail_if(image_desc.index != 3, "libspid_image_select gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_select gets wrong description");
+
+ type = LIBSPID_IMAGE_SELECT_1;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_select fail");
+ fp = fopen(LIBSPID_DEV_PATH"/mtd4", "r");
+ if (fp == NULL)
+ {
+ perror("fopen");
+ exit(EXIT_FAILURE);
+ }
+ fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
+ fclose(fp);
+ fail_if(image_desc.index != 4, "libspid_image_select gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_select gets wrong description");
+
+ type = LIBSPID_IMAGE_SELECT_SWITCH;
+ ret = libspid_image_select(type);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_image_select fail");
+ fp = fopen(LIBSPID_DEV_PATH"/mtd3", "r");
+ if (fp == NULL)
+ {
+ perror("fopen");
+ exit(EXIT_FAILURE);
+ }
+ fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
+ fclose(fp);
+ fail_if(image_desc.index != 5, "libspid_image_select gets wrong index");
+ fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "libspid_image_select gets wrong description");
+}
+END_TEST
+
+#if 0
+START_TEST (test_libspid_system_get_date)
+{
+}
+END_TEST
+#endif
+
+extern Suite* libspid_system_suite(void)
+{
+ Suite *s = suite_create("LIBSPID_SYSTEM");
+ TCase *tc_core = tcase_create("Core");
+ tcase_add_checked_fixture (tc_core, setup, teardown);
+
+ //Test system_init
+ tcase_add_test(tc_core, test_libspid_image_get_desc);
+ tcase_add_test(tc_core, test_libspid_image_select);
+
+ suite_add_tcase(s, tc_core);
+ suite_add_tcase(s, tc_param());
+ return s;
+}
+
+int main(void)
+{
+ int number_failed = 0;
+ Suite *s;
+
+ //Run system tests
+ s = libspid_system_suite();
+
+ SRunner *sr = srunner_create(s);
+ srunner_set_fork_status (sr, CK_NOFORK);
+ //srunner_set_fork_status (sr, CK_FORK);
+ srunner_run_all(sr, CK_NORMAL);
+ number_failed = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ /* clean behind */
+ system("rm -r "UTESTS_TMP_DIR);
+
+ return (number_failed == 0) ? 0 : -1;
+}
+
diff --git a/cleopatre/devkit/tests/spidlib/utests/src/network_utests.c b/cleopatre/devkit/tests/libspid/utests/src/network_utests.c
index 0a3f6b33e5..83ad6c4bda 100644
--- a/cleopatre/devkit/tests/spidlib/utests/src/network_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/network_utests.c
@@ -7,10 +7,10 @@
* }}} */
/**
* \file network_utests.c
- * \brief Unitary tests for spidlib
- * \ingroup Cleopatre - spidlib
+ * \brief Unitary tests for libspid
+ * \ingroup Cleopatre - libspid
*
- * This file content all the unitary tests for spidlib network.c
+ * This file content all the unitary tests for libspid network.c
*/
@@ -37,7 +37,7 @@
//#define DEBUG 1
#ifdef DEBUG
-#define TRACE(...) printf("SPIDLIB_NETWORK UTESTS: " __VA_ARGS__)
+#define TRACE(...) printf("LIBSPID_NETWORK UTESTS: " __VA_ARGS__)
#else
#define TRACE(...)
#endif
@@ -99,35 +99,35 @@ START_TEST (test_get_mac_param)
unsigned char mac[24];
/* initerface is NULL */
- ret = spidlib_network_get_mac(NULL, mac);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "interface is NULL");
+ ret = libspid_network_get_mac(NULL, mac);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "interface is NULL");
/* mac is NULL */
- ret = spidlib_network_get_mac("tap0", NULL);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "mac is NULL");
+ ret = libspid_network_get_mac("tap0", NULL);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "mac is NULL");
/* initerface is an empty string */
- ret = spidlib_network_get_mac("", mac);
- fail_if(ret != SPIDLIB_ERROR_SYSTEM, "spidlib_network_get_ip fail");
+ ret = libspid_network_get_mac("", mac);
+ fail_if(ret != LIBSPID_ERROR_SYSTEM, "libspid_network_get_ip fail");
/* initerface does not exist */
- ret = spidlib_network_get_mac("eth123", mac);
- fail_if(ret != SPIDLIB_ERROR_SYSTEM, "spidlib_network_get_ip fail");
+ ret = libspid_network_get_mac("eth123", mac);
+ fail_if(ret != LIBSPID_ERROR_SYSTEM, "libspid_network_get_ip fail");
}
END_TEST
START_TEST (test_get_ip)
{
int ret;
- spidlib_ip_t ip;
+ libspid_ip_t ip;
/* initerface is NULL */
- ret = spidlib_network_get_ip(NULL, &ip);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "interface is NULL");
+ ret = libspid_network_get_ip(NULL, &ip);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "interface is NULL");
/* ip is NULL */
- ret = spidlib_network_get_ip("eth0", NULL);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "ip is NULL");
+ ret = libspid_network_get_ip("eth0", NULL);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "ip is NULL");
}
END_TEST
@@ -135,15 +135,15 @@ END_TEST
START_TEST (test_set_ip)
{
int ret;
- spidlib_ip_t ip;
+ libspid_ip_t ip;
/* initerface is NULL */
- ret = spidlib_network_set_ip(NULL, &ip);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "interface is NULL");
+ ret = libspid_network_set_ip(NULL, &ip);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "interface is NULL");
/* ip is NULL */
- ret = spidlib_network_set_ip("eth0", NULL);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "ip is NULL");
+ ret = libspid_network_set_ip("eth0", NULL);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "ip is NULL");
}
END_TEST
@@ -159,45 +159,45 @@ tc_param (void)
}
/** test procedures */
-START_TEST (test_spidlib_network_get_ip)
+START_TEST (test_libspid_network_get_ip)
{
int ret;
- spidlib_ip_t ip;
+ libspid_ip_t ip;
/* prepare testing content */
- system("cp " NETWORK_TST " " SPIDLIB_NETWORK_CONF_PATH );
+ system("cp " NETWORK_TST " " LIBSPID_NETWORK_CONF_PATH );
- memset( &ip, 0x0, sizeof(spidlib_ip_t) );
- ret = spidlib_network_get_ip ("eth1", &ip);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_network_get_ip fail");
+ memset( &ip, 0x0, sizeof(libspid_ip_t) );
+ ret = libspid_network_get_ip ("eth1", &ip);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_network_get_ip fail");
- fail_if( ip.mode != SPIDLIB_IP_MODE_STATIC, "spidlib_network_get_ip gets wrong ip.mode" );
- fail_if( strcmp((char *)ip.address, "192.168.2.69") != 0, "spidlib_network_get_ip gets wrong ip.address" );
- fail_if( strcmp((char *)ip.netmask, "255.255.255.0") != 0, "spidlib_network_get_ip gets wrong ip.netmask" );
- fail_if( strcmp((char *)ip.broadcast, "11.22.33.456") != 0, "spidlib_network_get_ip gets wrong ip.broadcast" );
- fail_if( strcmp((char *)ip.gateway, "192.168.92.254") != 0, "spidlib_network_get_ip gets wrong ip.gateway" );
+ fail_if( ip.mode != LIBSPID_IP_MODE_STATIC, "libspid_network_get_ip gets wrong ip.mode" );
+ fail_if( strcmp((char *)ip.address, "192.168.2.69") != 0, "libspid_network_get_ip gets wrong ip.address" );
+ fail_if( strcmp((char *)ip.netmask, "255.255.255.0") != 0, "libspid_network_get_ip gets wrong ip.netmask" );
+ fail_if( strcmp((char *)ip.broadcast, "11.22.33.456") != 0, "libspid_network_get_ip gets wrong ip.broadcast" );
+ fail_if( strcmp((char *)ip.gateway, "192.168.92.254") != 0, "libspid_network_get_ip gets wrong ip.gateway" );
}
END_TEST
-START_TEST (test_spidlib_network_set_ip)
+START_TEST (test_libspid_network_set_ip)
{
int ret;
- spidlib_ip_t ip;
+ libspid_ip_t ip;
struct stat file_stat;
/* prepare testing content */
- system("cp " NETWORK_TST " " SPIDLIB_NETWORK_CONF_PATH );
+ system("cp " NETWORK_TST " " LIBSPID_NETWORK_CONF_PATH );
- ip.mode = SPIDLIB_IP_MODE_STATIC;
+ ip.mode = LIBSPID_IP_MODE_STATIC;
strcpy((char *)ip.address, "1.2.3.4");
strcpy((char *)ip.netmask, "222.222.222.3");
strcpy((char *)ip.broadcast, "a.b.c.d");
strcpy((char *)ip.gateway, "4.3.2.1");
- ret = spidlib_network_set_ip ("eth0", &ip);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_network_set_ip fail");
+ ret = libspid_network_set_ip ("eth0", &ip);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_network_set_ip fail");
- fail_unless( ( (system("diff " SPIDLIB_NETWORK_CONF_PATH " " NETWORK_EXPECTED_TST " > result.tmp") == 0) &&
+ fail_unless( ( (system("diff " LIBSPID_NETWORK_CONF_PATH " " NETWORK_EXPECTED_TST " > result.tmp") == 0) &&
(stat("result.tmp", &file_stat) >= 0) &&
(file_stat.st_size == 0) ), "label = value" );
@@ -205,7 +205,7 @@ START_TEST (test_spidlib_network_set_ip)
}
END_TEST
-START_TEST (test_spidlib_network_get_mac)
+START_TEST (test_libspid_network_get_mac)
{
int ret;
unsigned char mac[24];
@@ -242,11 +242,11 @@ START_TEST (test_spidlib_network_get_mac)
sprintf(cmd, "/sbin/ifconfig tap0 hw ether %s", tst_mac);
system(cmd);
- ret = spidlib_network_get_mac("tap0", mac);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_network_get_ip fail");
+ ret = libspid_network_get_mac("tap0", mac);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_network_get_ip fail");
TRACE("mac = %s\n", mac);
- fail_if( strcmp((char *)mac, tst_mac) != 0, "spidlib_network_get_mac fail");
+ fail_if( strcmp((char *)mac, tst_mac) != 0, "libspid_network_get_mac fail");
/* close TAP */
close(fd);
@@ -255,16 +255,16 @@ END_TEST
-extern Suite* spidlib_network_suite(void)
+extern Suite* libspid_network_suite(void)
{
- Suite *s = suite_create("SPIDLIB_NETWORK");
+ Suite *s = suite_create("LIBSPID_NETWORK");
TCase *tc_core = tcase_create("Core");
tcase_add_checked_fixture (tc_core, setup, teardown);
//Test network_init
- tcase_add_test(tc_core, test_spidlib_network_get_ip);
- tcase_add_test(tc_core, test_spidlib_network_set_ip);
- tcase_add_test(tc_core, test_spidlib_network_get_mac);
+ tcase_add_test(tc_core, test_libspid_network_get_ip);
+ tcase_add_test(tc_core, test_libspid_network_set_ip);
+ tcase_add_test(tc_core, test_libspid_network_get_mac);
suite_add_tcase(s, tc_core);
suite_add_tcase(s, tc_param());
@@ -277,7 +277,7 @@ int main(void)
Suite *s;
//Run network tests
- s = spidlib_network_suite();
+ s = libspid_network_suite();
SRunner *sr = srunner_create(s);
//srunner_set_fork_status (sr, CK_NOFORK);
diff --git a/cleopatre/devkit/tests/spidlib/utests/src/system_utests.c b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
index 263d019b0c..007cda1556 100644
--- a/cleopatre/devkit/tests/spidlib/utests/src/system_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
@@ -7,10 +7,10 @@
* }}} */
/**
* \file system_utests.c
- * \brief Unitary tests for spidlib
- * \ingroup Cleopatre - spidlib
+ * \brief Unitary tests for libspid
+ * \ingroup Cleopatre - libspid
*
- * This file content all the unitary tests for spidlib system.c,
+ * This file content all the unitary tests for libspid system.c,
*/
#include <check.h>
@@ -33,7 +33,7 @@
#ifdef DEBUG
-#define TRACE(...) printf("SPIDLIB_SYSTEM UTESTS: " __VA_ARGS__)
+#define TRACE(...) printf("LIBSPID_SYSTEM UTESTS: " __VA_ARGS__)
#else
#define TRACE(...)
#endif
@@ -125,15 +125,15 @@ void teardown(void)
START_TEST (param_get_kernel_version)
{
int ret;
- char buffer[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
/* buffer is NULL */
- ret = spidlib_system_get_kernel_version(NULL, SPIDLIB_LINE_MAX_LEN);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "buffer is NULL");
+ ret = libspid_system_get_kernel_version(NULL, LIBSPID_LINE_MAX_LEN);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "buffer is NULL");
/* buffer_len is zero */
- ret = spidlib_system_get_kernel_version(buffer, 0);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "buffer_len is 0");
+ ret = libspid_system_get_kernel_version(buffer, 0);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "buffer_len is 0");
}
END_TEST
@@ -145,12 +145,12 @@ START_TEST (param_get_uptime)
unsigned int idle_s;
/* total_s is NULL */
- ret = spidlib_system_get_uptime(NULL, &idle_s);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "total_s is NULL");
+ ret = libspid_system_get_uptime(NULL, &idle_s);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "total_s is NULL");
/* idle_s is NULL */
- ret = spidlib_system_get_uptime(&total_s, NULL);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "idle_s is NULL");
+ ret = libspid_system_get_uptime(&total_s, NULL);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "idle_s is NULL");
}
END_TEST
@@ -158,15 +158,15 @@ END_TEST
START_TEST (param_get_meminfo)
{
int ret;
- char buffer[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
/* buffer is NULL */
- ret = spidlib_system_get_meminfo(NULL, SPIDLIB_LINE_MAX_LEN);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "buffer is NULL");
+ ret = libspid_system_get_meminfo(NULL, LIBSPID_LINE_MAX_LEN);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "buffer is NULL");
/* buffer_len is zero */
- ret = spidlib_system_get_meminfo(buffer, 0);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "buffer_len is 0");
+ ret = libspid_system_get_meminfo(buffer, 0);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "buffer_len is 0");
}
END_TEST
@@ -175,8 +175,8 @@ START_TEST (param_get_nvram)
int ret;
/* nvram is NULL */
- ret = spidlib_system_get_nvram(NULL);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "nvram is NULL");
+ ret = libspid_system_get_nvram(NULL);
+ fail_if(ret != LIBSPID_ERROR_PARAM, "nvram is NULL");
}
END_TEST
@@ -192,51 +192,51 @@ tc_param (void)
}
/** test procedures */
-START_TEST (test_spidlib_system_get_kernel_version)
+START_TEST (test_libspid_system_get_kernel_version)
{
int ret;
- char buffer[SPIDLIB_LINE_MAX_LEN];
- char test_string[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
+ char test_string[LIBSPID_LINE_MAX_LEN];
FILE *fp;
- system("cp " VERSION_TST " " SPIDLIB_SYSTEM_VERSION_PATH);
+ system("cp " VERSION_TST " " LIBSPID_SYSTEM_VERSION_PATH);
- ret = spidlib_system_get_kernel_version(buffer, SPIDLIB_LINE_MAX_LEN);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_system_get_kernel_version fail");
+ ret = libspid_system_get_kernel_version(buffer, LIBSPID_LINE_MAX_LEN);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_kernel_version fail");
- fp = fopen(SPIDLIB_SYSTEM_VERSION_PATH, "r");
+ fp = fopen(LIBSPID_SYSTEM_VERSION_PATH, "r");
if (fp == NULL)
{
perror("fopen(VERSION_TST, \"r\")");
exit(EXIT_FAILURE);
}
- fgets(test_string, SPIDLIB_LINE_MAX_LEN, fp);
- fail_if( strcmp(buffer, test_string) != 0, "spidlib_system_get_kernel_version gets wrong data");
+ fgets(test_string, LIBSPID_LINE_MAX_LEN, fp);
+ fail_if( strcmp(buffer, test_string) != 0, "libspid_system_get_kernel_version gets wrong data");
fclose(fp);
}
END_TEST
-START_TEST (test_spidlib_system_get_plc_version)
+START_TEST (test_libspid_system_get_plc_version)
{
}
END_TEST
-START_TEST (test_spidlib_system_get_av_version)
+START_TEST (test_libspid_system_get_av_version)
{
}
END_TEST
-START_TEST (test_spidlib_system_get_uptime)
+START_TEST (test_libspid_system_get_uptime)
{
int ret;
- char test_string[SPIDLIB_LINE_MAX_LEN];
+ char test_string[LIBSPID_LINE_MAX_LEN];
FILE *fp;
unsigned int total_s;
unsigned int idle_s;
- system("cp " UPTIME_TST " " SPIDLIB_SYSTEM_UPTIME_PATH);
- ret = spidlib_system_get_uptime(&total_s, &idle_s);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_system_get_uptime");
+ system("cp " UPTIME_TST " " LIBSPID_SYSTEM_UPTIME_PATH);
+ ret = libspid_system_get_uptime(&total_s, &idle_s);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_uptime");
fp = fopen(UPTIME_TST, "r");
if (fp == NULL)
@@ -245,26 +245,26 @@ START_TEST (test_spidlib_system_get_uptime)
exit(EXIT_FAILURE);
}
- fgets(test_string, SPIDLIB_LINE_MAX_LEN, fp);
+ fgets(test_string, LIBSPID_LINE_MAX_LEN, fp);
fclose(fp); /* flushes I/O buffer into the file */
- fail_if(total_s != 11, "spidlib_system_get_uptime gets wrong total_s");
- fail_if(idle_s != 333, "spidlib_system_get_uptime gets wrong idle_s");
+ fail_if(total_s != 11, "libspid_system_get_uptime gets wrong total_s");
+ fail_if(idle_s != 333, "libspid_system_get_uptime gets wrong idle_s");
}
END_TEST
-START_TEST (test_spidlib_system_get_meminfo)
+START_TEST (test_libspid_system_get_meminfo)
{
int ret;
- char buffer[SPIDLIB_LINE_MAX_LEN];
- char test_string[3*SPIDLIB_LINE_MAX_LEN];
- char line[SPIDLIB_LINE_MAX_LEN];
+ char buffer[LIBSPID_LINE_MAX_LEN];
+ char test_string[3*LIBSPID_LINE_MAX_LEN];
+ char line[LIBSPID_LINE_MAX_LEN];
FILE *fp;
- system("cp " MEMINFO_TST " " SPIDLIB_SYSTEM_MEMINFO_PATH);
+ system("cp " MEMINFO_TST " " LIBSPID_SYSTEM_MEMINFO_PATH);
- ret = spidlib_system_get_meminfo(buffer, SPIDLIB_LINE_MAX_LEN);
+ ret = libspid_system_get_meminfo(buffer, LIBSPID_LINE_MAX_LEN);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_system_get_meminfo fail");
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_meminfo fail");
fp = fopen(MEMINFO_TST, "r");
if (fp == NULL)
@@ -273,19 +273,19 @@ START_TEST (test_spidlib_system_get_meminfo)
exit(EXIT_FAILURE);
}
- while ( fgets(line, SPIDLIB_LINE_MAX_LEN, fp) != NULL )
+ while ( fgets(line, LIBSPID_LINE_MAX_LEN, fp) != NULL )
{
strcat(test_string, line);
}
fclose(fp);
- fail_if( strcmp(buffer, test_string) != 0, "spidlib_system_get_meminfo gets wrong data");
+ fail_if( strcmp(buffer, test_string) != 0, "libspid_system_get_meminfo gets wrong data");
}
END_TEST
-START_TEST (test_spidlib_system_save)
+START_TEST (test_libspid_system_save)
{
int ret;
- char test_string[SPIDLIB_LINE_MAX_LEN] = "test1\ntest2\n"; /* do not forget last '\n' */
+ char test_string[LIBSPID_LINE_MAX_LEN] = "test1\ntest2\n"; /* do not forget last '\n' */
FILE *fp;
char tst_file[128] = {0};
@@ -295,43 +295,43 @@ START_TEST (test_spidlib_system_save)
DIR *dir;
#endif /* DEBUG */
- sprintf(tst_file, "%s/test1", SPIDLIB_CONF_ROOT_PATH);
+ sprintf(tst_file, "%s/test1", LIBSPID_CONF_ROOT_PATH);
mknod(tst_file, 0770, S_IFREG);
- sprintf(tst_file, "%s/test2", SPIDLIB_CONF_ROOT_PATH);
+ sprintf(tst_file, "%s/test2", LIBSPID_CONF_ROOT_PATH);
mknod(tst_file, 0770, S_IFREG);
- sprintf(tst_file, "%s/test3.conf", SPIDLIB_CONF_ROOT_PATH);
+ sprintf(tst_file, "%s/test3.conf", LIBSPID_CONF_ROOT_PATH);
mknod(tst_file, 0770, S_IFREG);
- fp = fopen(SPIDLIB_SAVE_LIST_PATH, "w");
+ fp = fopen(LIBSPID_SAVE_LIST_PATH, "w");
if (fp == NULL)
{
- perror("fopen(SPIDLIB_SAVE_LIST_PATH, \"w\")");
+ perror("fopen(LIBSPID_SAVE_LIST_PATH, \"w\")");
exit(EXIT_FAILURE);
}
fputs(test_string, fp);
fclose(fp); /* flushes I/O buffer into the file */
- ret = spidlib_system_save();
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_system_get_meminfo fail");
+ ret = libspid_system_save();
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_meminfo fail");
/* test if files have been well copied */
- sprintf(tst_file, "%s/test1", SPIDLIB_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_save does not backup files well" );
- sprintf(tst_file, "%s/test2", SPIDLIB_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_save does not backup files well" );
- sprintf(tst_file, "%s/test3.conf", SPIDLIB_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_save does not backup files well" );
+ sprintf(tst_file, "%s/test1", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_save does not backup files well" );
+ sprintf(tst_file, "%s/test2", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_save does not backup files well" );
+ sprintf(tst_file, "%s/test3.conf", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_save does not backup files well" );
#ifdef DEBUG
/* print contents for debug */
- dir = opendir(SPIDLIB_SAVE_DIR_PATH);
+ dir = opendir(LIBSPID_SAVE_DIR_PATH);
if (dir == NULL)
{
perror("opendir()");
exit(1);
}
- TRACE("Listing SPIDLIB_SAVE_DIR_PATH, %s:\n", SPIDLIB_SAVE_DIR_PATH);
+ TRACE("Listing LIBSPID_SAVE_DIR_PATH, %s:\n", LIBSPID_SAVE_DIR_PATH);
while( (d = readdir(dir)) != NULL )
{
TRACE("%s\n",d->d_name);
@@ -341,7 +341,7 @@ START_TEST (test_spidlib_system_save)
}
END_TEST
-START_TEST (test_spidlib_system_factory)
+START_TEST (test_libspid_system_factory)
{
int ret;
char tst_file[128] = {0};
@@ -353,51 +353,51 @@ START_TEST (test_spidlib_system_factory)
#endif /* DEBUG */
- sprintf(tst_file, "%s/test_F1", SPIDLIB_FACTORY_PATH);
+ sprintf(tst_file, "%s/test_F1", LIBSPID_FACTORY_PATH);
mknod(tst_file, 0770, S_IFREG);
- sprintf(tst_file, "%s/test_F2", SPIDLIB_FACTORY_PATH);
+ sprintf(tst_file, "%s/test_F2", LIBSPID_FACTORY_PATH);
mknod(tst_file, 0770, S_IFREG);
- sprintf(tst_file, "%s/test_F3.conf", SPIDLIB_FACTORY_PATH);
+ sprintf(tst_file, "%s/test_F3.conf", LIBSPID_FACTORY_PATH);
mknod(tst_file, 0770, S_IFREG);
- ret = spidlib_system_factory();
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_system_get_meminfo fail");
+ ret = libspid_system_factory();
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_meminfo fail");
/* test if files have been well copied */
- sprintf(tst_file, "%s/test_F1", SPIDLIB_CONF_ROOT_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F1", SPIDLIB_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F2", SPIDLIB_CONF_ROOT_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F2", SPIDLIB_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F3.conf", SPIDLIB_CONF_ROOT_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F3.conf", SPIDLIB_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "spidlib_system_factory does not backup files well" );
+ sprintf(tst_file, "%s/test_F1", LIBSPID_CONF_ROOT_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
+ sprintf(tst_file, "%s/test_F1", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
+ sprintf(tst_file, "%s/test_F2", LIBSPID_CONF_ROOT_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
+ sprintf(tst_file, "%s/test_F2", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
+ sprintf(tst_file, "%s/test_F3.conf", LIBSPID_CONF_ROOT_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
+ sprintf(tst_file, "%s/test_F3.conf", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
#ifdef DEBUG
/* print contents for debug */
- dir = opendir(SPIDLIB_SAVE_DIR_PATH);
+ dir = opendir(LIBSPID_SAVE_DIR_PATH);
if (dir == NULL)
{
perror("opendir()");
exit(1);
}
- TRACE("Listing SPIDLIB_SAVE_DIR_PATH, %s:\n", SPIDLIB_SAVE_DIR_PATH);
+ TRACE("Listing LIBSPID_SAVE_DIR_PATH, %s:\n", LIBSPID_SAVE_DIR_PATH);
while( (d = readdir(dir)) != NULL )
{
TRACE("%s\n",d->d_name);
}
- sprintf(tst_file, "%s/test_F1", SPIDLIB_SAVE_DIR_PATH);
+ sprintf(tst_file, "%s/test_F1", LIBSPID_SAVE_DIR_PATH);
if ( stat(tst_file,&st) == 0 )
{
printf("%s is present\n", tst_file);
}
- sprintf(tst_file, "%s/test_NON_EXISTANT", SPIDLIB_SAVE_DIR_PATH);
+ sprintf(tst_file, "%s/test_NON_EXISTANT", LIBSPID_SAVE_DIR_PATH);
if ( stat(tst_file,&st) == 0 )
{
printf("%s is present\n", tst_file);
@@ -410,7 +410,7 @@ START_TEST (test_spidlib_system_factory)
}
END_TEST
-START_TEST (test_spidlib_system_get_nvram)
+START_TEST (test_libspid_system_get_nvram)
{
static spc300_nvram_t nvram;
static spc300_nvram_t ret_nvram;
@@ -431,10 +431,10 @@ START_TEST (test_spidlib_system_get_nvram)
nvram.img_0_offset = 0x140000; /* offset of first image address */
nvram.nb_images = 2; /* Max Number of Images present in flash */
- system("cp " MTD_TST " " SPIDLIB_SYSTEM_MTD_PATH);
+ system("cp " MTD_TST " " LIBSPID_SYSTEM_MTD_PATH);
/* prepare /dev/mtd1 */
- sprintf(nvram_path, "%s/mtd1", SPIDLIB_DEV_PATH);
+ sprintf(nvram_path, "%s/mtd1", LIBSPID_DEV_PATH);
fp = fopen(nvram_path, "w");
if (fp == NULL)
{
@@ -447,11 +447,11 @@ START_TEST (test_spidlib_system_get_nvram)
memset( &ret_nvram, 0x0, sizeof(spc300_nvram_t) );
- ret = spidlib_system_get_nvram(&ret_nvram);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_system_get_nvram fail");
+ ret = libspid_system_get_nvram(&ret_nvram);
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_nvram fail");
ret = memcmp ( &ret_nvram, &nvram, sizeof(spc300_nvram_t) );
- fail_if(ret != 0, "spidlib_system_get_nvram gets wrong nvram");
+ fail_if(ret != 0, "libspid_system_get_nvram gets wrong nvram");
#ifdef DEBUG
printf("ret_nvram.pkg_cfg = %#x\n", ret_nvram.pkg_cfg);
@@ -461,27 +461,27 @@ START_TEST (test_spidlib_system_get_nvram)
}
END_TEST
-START_TEST (test_spidlib_system_get_date)
+START_TEST (test_libspid_system_get_date)
{
}
END_TEST
-extern Suite* spidlib_system_suite(void)
+extern Suite* libspid_system_suite(void)
{
- Suite *s = suite_create("SPIDLIB_SYSTEM");
+ Suite *s = suite_create("LIBSPID_SYSTEM");
TCase *tc_core = tcase_create("Core");
tcase_add_checked_fixture (tc_core, setup, teardown);
//Test system_init
- tcase_add_test(tc_core, test_spidlib_system_get_kernel_version);
- tcase_add_test(tc_core, test_spidlib_system_get_plc_version);
- tcase_add_test(tc_core, test_spidlib_system_get_av_version);
- tcase_add_test(tc_core, test_spidlib_system_get_uptime);
- tcase_add_test(tc_core, test_spidlib_system_get_meminfo);
- tcase_add_test(tc_core, test_spidlib_system_save);
- tcase_add_test(tc_core, test_spidlib_system_factory);
- tcase_add_test(tc_core, test_spidlib_system_get_nvram);
- tcase_add_test(tc_core, test_spidlib_system_get_date);
+ tcase_add_test(tc_core, test_libspid_system_get_kernel_version);
+ tcase_add_test(tc_core, test_libspid_system_get_plc_version);
+ tcase_add_test(tc_core, test_libspid_system_get_av_version);
+ tcase_add_test(tc_core, test_libspid_system_get_uptime);
+ tcase_add_test(tc_core, test_libspid_system_get_meminfo);
+ tcase_add_test(tc_core, test_libspid_system_save);
+ tcase_add_test(tc_core, test_libspid_system_factory);
+ tcase_add_test(tc_core, test_libspid_system_get_nvram);
+ tcase_add_test(tc_core, test_libspid_system_get_date);
suite_add_tcase(s, tc_core);
suite_add_tcase(s, tc_param());
@@ -494,7 +494,7 @@ int main(void)
Suite *s;
//Run system tests
- s = spidlib_system_suite();
+ s = libspid_system_suite();
SRunner *sr = srunner_create(s);
//srunner_set_fork_status (sr, CK_NOFORK);
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/image1.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/image1.tst
index fc9195c261..fc9195c261 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/image1.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/image1.tst
Binary files differ
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/image2.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/image2.tst
index daed9bb907..daed9bb907 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/image2.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/image2.tst
Binary files differ
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/item.cnf b/cleopatre/devkit/tests/libspid/utests/testfiles/item.cnf
index ab5dcf42f4..ab5dcf42f4 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/item.cnf
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/item.cnf
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/line.cnf b/cleopatre/devkit/tests/libspid/utests/testfiles/line.cnf
index fdac60c747..45c5f1ea66 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/line.cnf
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/line.cnf
@@ -1,4 +1,4 @@
-# test file for spidlib_read_line()
+# test file for libspid_read_line()
mode static, dhcp, something else
big small
spidcom malika, arizona
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/line_dos.cnf b/cleopatre/devkit/tests/libspid/utests/testfiles/line_dos.cnf
index cf6cd349f6..a26891bfd3 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/line_dos.cnf
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/line_dos.cnf
@@ -1,4 +1,4 @@
-# test file for spidlib_read_line()
+# test file for libspid_read_line()
mode static, dhcp, something else
big small
spidcom malika, arizona
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/line_removed.cnf b/cleopatre/devkit/tests/libspid/utests/testfiles/line_removed.cnf
index 4cc20cf1d0..1720f8d7da 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/line_removed.cnf
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/line_removed.cnf
@@ -1,4 +1,4 @@
-# test file for spidlib_read_line()
+# test file for libspid_read_line()
mode static, dhcp, something else
big small
spidcom malika, arizona
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/meminfo.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/meminfo.tst
index 2be2f41f25..2be2f41f25 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/meminfo.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/meminfo.tst
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/mtd.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/mtd.tst
index 7f6ed8b915..7f6ed8b915 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/mtd.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/mtd.tst
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/network.expected.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/network.expected.tst
index c384464842..c384464842 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/network.expected.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/network.expected.tst
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/network.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/network.tst
index 7a847d521f..7a847d521f 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/network.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/network.tst
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/nvram1.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/nvram1.tst
index 5b27d1234e..5b27d1234e 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/nvram1.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/nvram1.tst
Binary files differ
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/nvram2.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/nvram2.tst
index 7224ddeeff..7224ddeeff 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/nvram2.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/nvram2.tst
Binary files differ
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/uptime.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/uptime.tst
index 72d88c8b90..72d88c8b90 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/uptime.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/uptime.tst
diff --git a/cleopatre/devkit/tests/spidlib/utests/testfiles/version.tst b/cleopatre/devkit/tests/libspid/utests/testfiles/version.tst
index 682b4c5ed6..682b4c5ed6 100644
--- a/cleopatre/devkit/tests/spidlib/utests/testfiles/version.tst
+++ b/cleopatre/devkit/tests/libspid/utests/testfiles/version.tst
diff --git a/cleopatre/devkit/tests/plcd/utests/Makefile b/cleopatre/devkit/tests/plcd/utests/Makefile
index d618996f11..375de18cd5 100644
--- a/cleopatre/devkit/tests/plcd/utests/Makefile
+++ b/cleopatre/devkit/tests/plcd/utests/Makefile
@@ -2,20 +2,20 @@ PRJ_BASE = ..
FILES = check_event #hpav plcd
LIBMME_DIR=../../../application/libmme
-SPIDLIB_DIR=../../../application/spidlib
+LIBSPID_DIR=../../../application/libspid
LINUX_DIR=../../../linux-2.6.25.10-spc300
-EXTRA_CFLAGS_LOCAL = -I$(LIBMME_DIR)/inc -I$(SPIDLIB_DIR)/inc -I$(LINUX_DIR)/include -I$(LINUX_DIR)/scripts/mksimage
-EXTRA_LIBS_LOCAL = -L$(shell pwd) -lmme -lspidlib
+EXTRA_CFLAGS_LOCAL = -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(LINUX_DIR)/include -I$(LINUX_DIR)/scripts/mksimage
+EXTRA_LIBS_LOCAL = -L$(shell pwd) -lmme -lspid
UTEST_MAKERULES_FLAGS = EXTRA_CFLAGS="$(EXTRA_CFLAGS_LOCAL)" EXTRA_LIBS="$(EXTRA_LIBS_LOCAL)" PRJ_BASE="$(PRJ_BASE)" FILES="$(FILES)"
-SPIDLIB_STAT_LIB = $(shell pwd)/libspidlib.a
+LIBSPID_STAT_LIB = $(shell pwd)/libspid.a
LIBMME_STAT_LIB = $(shell pwd)/libmme.a
OVERRIDE_VARS = CC=gcc AR=ar
make_libs:
-# $(MAKE) -C $(SPIDLIB_DIR) $(SPIDLIB_STAT_LIB) STAT_LIB=$(SPIDLIB_STAT_LIB) OBJPATH=$(shell pwd)/obj/lib/spidlib $(OVERRIDE_VARS)
+# $(MAKE) -C $(LIBSPID_DIR) $(LIBSPID_STAT_LIB) STAT_LIB=$(LIBSPID_STAT_LIB) OBJPATH=$(shell pwd)/obj/lib/libspid $(OVERRIDE_VARS)
# $(MAKE) -C $(LIBMME_DIR) $(LIBMME_STAT_LIB) STAT_LIB=$(LIBMME_STAT_LIB) OBJPATH=$(shell pwd)/obj/lib/libmme $(OVERRIDE_VARS)
$(MAKE) -f ../../utests_makerules $(UTEST_MAKERULES_FLAGS)
@@ -24,5 +24,5 @@ make_libs:
.PHONY: all clean make_libs
clean:
- rm -rf obj spidlib.a libmme.a
+ rm -rf obj libspid.a libmme.a
diff --git a/cleopatre/devkit/tests/plcd/utests/inc/hpav_utests.h b/cleopatre/devkit/tests/plcd/utests/inc/hpav_utests.h
index b5db1dcb5a..68c158d386 100644
--- a/cleopatre/devkit/tests/plcd/utests/inc/hpav_utests.h
+++ b/cleopatre/devkit/tests/plcd/utests/inc/hpav_utests.h
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include "libmme.h"
-#include "spidlib.h"
+#include "libspid.h"
#include "plcd.h"
/* FUNCTION STUB */
diff --git a/cleopatre/devkit/tests/plcd/utests/inc/plcd_utests.h b/cleopatre/devkit/tests/plcd/utests/inc/plcd_utests.h
index 75896f17ad..283eff559f 100644
--- a/cleopatre/devkit/tests/plcd/utests/inc/plcd_utests.h
+++ b/cleopatre/devkit/tests/plcd/utests/inc/plcd_utests.h
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include "libmme.h"
-#include "spidlib.h"
+#include "libspid.h"
#include "plcd.h"
/* VARIABLE STUB */
@@ -30,9 +30,9 @@ inline static int hpav_init (plcd_ctx_t *plcd_ctx)
return 0;
}
-static inline spidlib_error_t utests_spidlib_system_get_nvram(spc300_nvram_t *nvram)
+static inline libspid_error_t utests_libspid_system_get_nvram(spc300_nvram_t *nvram)
{
- return SPIDLIB_SUCCESS;
+ return LIBSPID_SUCCESS;
}
/* PLCD FUNCTION DECLARATIONS */
diff --git a/cleopatre/devkit/tests/plcd/utests/src/check_event.c b/cleopatre/devkit/tests/plcd/utests/src/check_event.c
index 6e01c71357..8bb405e7ce 100644
--- a/cleopatre/devkit/tests/plcd/utests/src/check_event.c
+++ b/cleopatre/devkit/tests/plcd/utests/src/check_event.c
@@ -145,8 +145,8 @@ void setup(void)
plcd_ctx->hpav_conf_path = HPAV_CONF_TMP_PATH;
plcd_ctx->hpav_info_path = HPAV_INFO_TMP_PATH;
mme_init (&mme_ctx, MME_TYPE_DRV_STA_STATUS | MME_TYPE_IND, mme_buffer, sizeof(mme_buffer));
- is_info_manager_needed = SPIDLIB_FALSE;
- is_save_conf_needed = SPIDLIB_FALSE;
+ is_info_manager_needed = LIBSPID_FALSE;
+ is_save_conf_needed = LIBSPID_FALSE;
#if 0
int i;
char pa[] = PLC_ADDR;
@@ -157,9 +157,9 @@ void setup(void)
ctx->hpav_conf_path = (char *)malloc(64);
/* initialize plcd context */
- strcpy(ctx->hardware_info_path, SPIDLIB_HARDWARE_INFO_PATH);
- strcpy(ctx->hpav_info_path, SPIDLIB_HPAV_INFO_PATH);
- strcpy(ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_PATH);
+ strcpy(ctx->hardware_info_path, LIBSPID_HARDWARE_INFO_PATH);
+ strcpy(ctx->hpav_info_path, LIBSPID_HPAV_INFO_PATH);
+ strcpy(ctx->hpav_conf_path, LIBSPID_HPAV_CONF_PATH);
ctx->plc_sock = 0;
ctx->nvram = (spc300_nvram_t *) malloc(sizeof(spc300_nvram_t));
s = pa;
@@ -285,7 +285,7 @@ START_TEST (test_refresh_status_process_1)
build_file (HPAV_INFO_TMP_PATH, "STATUS = unassociated\n");
refresh_status (&plcd_ctx, &mme_ctx, &is_save_conf_needed, &is_info_manager_needed);
- spidlib_config_read_item (plcd_ctx.hpav_info_path, SPIDLIB_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
+ libspid_config_read_item (plcd_ctx.hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
fail_unless (!strcmp (buffer, "unassociated")
&& (SPDILIB_FALSE == is_info_manager_needed),
diff --git a/cleopatre/devkit/tests/plcd/utests/src/hpav_utests.c b/cleopatre/devkit/tests/plcd/utests/src/hpav_utests.c
index e318923791..5e6c2d2f3d 100644
--- a/cleopatre/devkit/tests/plcd/utests/src/hpav_utests.c
+++ b/cleopatre/devkit/tests/plcd/utests/src/hpav_utests.c
@@ -98,9 +98,9 @@ void setup(void)
ctx->hpav_conf_path = (char *)malloc(64);
/* initialize plcd context */
- strcpy(ctx->hardware_info_path, SPIDLIB_HARDWARE_INFO_PATH);
- strcpy(ctx->hpav_info_path, SPIDLIB_HPAV_INFO_PATH);
- strcpy(ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_PATH);
+ strcpy(ctx->hardware_info_path, LIBSPID_HARDWARE_INFO_PATH);
+ strcpy(ctx->hpav_info_path, LIBSPID_HPAV_INFO_PATH);
+ strcpy(ctx->hpav_conf_path, LIBSPID_HPAV_CONF_PATH);
ctx->plc_sock = 0;
ctx->nvram = (spc300_nvram_t *) malloc(sizeof(spc300_nvram_t));
s = pa;
@@ -182,7 +182,7 @@ START_TEST (test_hpav_send_key)
nmk[i] = 0xA;
for (i=0; i<7; i++)
nid[i] = 0xE;
- strcpy(sl, SPIDLIB_HPAV_CONF_VALUE_SL_HS);
+ strcpy(sl, LIBSPID_HPAV_CONF_VALUE_SL_HS);
ret = hpav_send_key(ctx, nmk, nid, sl);
fail_if( ret != 0, " fail" );
diff --git a/cleopatre/devkit/tests/plcd/utests/src/plcd_utests.c b/cleopatre/devkit/tests/plcd/utests/src/plcd_utests.c
index e415bf9518..3e999f20e9 100644
--- a/cleopatre/devkit/tests/plcd/utests/src/plcd_utests.c
+++ b/cleopatre/devkit/tests/plcd/utests/src/plcd_utests.c
@@ -88,11 +88,11 @@ START_TEST (test_plcd_init)
TRACE("ctx->hpav_info_path=%s\n", ctx->hpav_info_path);
TRACE("ctx->hpav_conf_path=%s\n", ctx->hpav_conf_path);
- fail_if( strcmp(ctx->hardware_info_path, SPIDLIB_HARDWARE_INFO_PATH) != 0,
+ fail_if( strcmp(ctx->hardware_info_path, LIBSPID_HARDWARE_INFO_PATH) != 0,
"hardware_info_path was not correctly initialized" );
- fail_if( strcmp(ctx->hpav_info_path, SPIDLIB_HPAV_INFO_PATH) != 0,
+ fail_if( strcmp(ctx->hpav_info_path, LIBSPID_HPAV_INFO_PATH) != 0,
"hpav_info_path was not correctly initialized" );
- fail_if( strcmp(ctx->hpav_conf_path, SPIDLIB_HPAV_CONF_PATH) != 0,
+ fail_if( strcmp(ctx->hpav_conf_path, LIBSPID_HPAV_CONF_PATH) != 0,
"hpav_conf_path was not correctly initialized" );
/* close netlink fd opened in plcd_init() */
diff --git a/cleopatre/devkit/tests/spidlib/utests/src/image_utests.c b/cleopatre/devkit/tests/spidlib/utests/src/image_utests.c
deleted file mode 100644
index 6ea12231e6..0000000000
--- a/cleopatre/devkit/tests/spidlib/utests/src/image_utests.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* Cleopatre project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file system_utests.c
- * \brief Unitary tests for spidlib
- * \ingroup Cleopatre - spidlib
- *
- * This file content all the unitary tests for spidlib system.c,
- */
-
-/* CREATED WITH: mksimage -s 100 -ver "0.5" -ldaddr 0x12345 > image.tst */
-
-#include <check.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-
-#include "image_utests.h"
-
-//#define DEBUG 1
-
-
-#ifdef DEBUG
-#define TRACE(...) printf("SPIDLIB_SYSTEM UTESTS: " __VA_ARGS__)
-#else
-#define TRACE(...)
-#endif
-
-#define IMAGE1 "testfiles/image1.tst"
-#define IMAGE2 "testfiles/image2.tst"
-
-#define NVRAM1 "testfiles/nvram1.tst"
-#define NVRAM2 "testfiles/nvram2.tst"
-#define MTD_TST "testfiles/mtd.tst"
-
-
-/** local variables */
-
-
-/* fixtures - run before and after each unit test */
-void setup(void)
-{
- int ret;
- char buf[256];
- struct dirent *d;
- DIR *dir;
- struct stat st;
-
- /* initialize - delete testing dir if it exists */
- if ( (stat (UTESTS_TMP_DIR, &st) == 0) )
- {
- system ("rm -r " UTESTS_TMP_DIR);
- }
-
- ret = mkdir(UTESTS_TMP_DIR, 0770);
- if (ret < 0 && errno != EEXIST)
- {
- perror("mkdir(UTESTS_TMP_DIR, 0770)");
- exit(EXIT_FAILURE);
- }
-
- /* initialize - delete all files which have left from previous testing */
- dir = opendir(UTESTS_TMP_DIR);
-
- while ( (d = readdir(dir)) != NULL )
- {
- //printf("%s\n",d->d_name);
- sprintf(buf, "%s/%s", "/tmp/utests", d->d_name);
- remove(buf);
- }
-
- /* create other subdirs */
- sprintf(buf, "%s/etc", UTESTS_TMP_DIR);
- ret = mkdir(buf, 0770);
- if (ret < 0 && errno != EEXIST)
- {
- perror("mkdir(UTESTS_TMP_DIR/etc, 0770)");
- exit(EXIT_FAILURE);
- }
-
- sprintf(buf, "%s/proc", UTESTS_TMP_DIR);
- ret = mkdir(buf, 0770);
- if (ret < 0 && errno != EEXIST)
- {
- perror("mkdir(UTESTS_TMP_DIR/proc, 0770)");
- exit(EXIT_FAILURE);
- }
-
- sprintf(buf, "%s/local", UTESTS_TMP_DIR);
- ret = mkdir(buf, 0770);
- if (ret < 0 && errno != EEXIST)
- {
- perror("mkdir(UTESTS_TMP_DIR, 0770)");
- exit(EXIT_FAILURE);
- }
-
- sprintf(buf, "%s/factory", UTESTS_TMP_DIR);
- ret = mkdir(buf, 0770);
- if (ret < 0 && errno != EEXIST)
- {
- perror("mkdir(UTESTS_TMP_DIR, 0770)");
- exit(EXIT_FAILURE);
- }
-
- sprintf(buf, "%s/dev", UTESTS_TMP_DIR);
- ret = mkdir(buf, 0770);
- if (ret < 0 && errno != EEXIST)
- {
- perror("mkdir(UTESTS_TMP_DIR, 0770)");
- exit(EXIT_FAILURE);
- }
-}
-
-void teardown(void)
-{
-}
-
-
-/* --- TEST PROCEDURES --- */
-
-/* TESTING FALSE PARAMS */
-START_TEST (param_get_desc)
-{
- int ret = 0;
- spidcom_image_desc_t image_desc;
- int type = SPIDLIB_IMAGE_DESC_TYPE_0;
- char mtd_name[32] = {0};
-
- system("cp " MTD_TST " " SPIDLIB_SYSTEM_MTD_PATH);
- system("cp " NVRAM1 " " SPIDLIB_DEV_PATH"/mtd1");
- system("cp " IMAGE1 " " SPIDLIB_DEV_PATH"/mtd3");
- system("cp " IMAGE2 " " SPIDLIB_DEV_PATH"/mtd4");
-
- /* image_desc = NULL */
- ret = spidlib_image_get_desc(type, NULL, mtd_name);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "image_desc is NULL");
-
- /* mtd_name NULL */
- ret = spidlib_image_get_desc(type, &image_desc, NULL);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "mtd_name is NULL");
-
- /* type < 0 */
- type = -5;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "type < 0");
-
- /* type > SPIDLIB_IMAGE_DESC_TYPE_NB */
- type = SPIDLIB_IMAGE_DESC_TYPE_NB + 1;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "type > SPIDLIB_IMAGE_DESC_TYPE_NB");
-
- /* nvram.nb_images == 1 && type == SPIDLIB_IMAGE_DESC_TYPE_1 */
- type = SPIDLIB_IMAGE_DESC_TYPE_1;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "nvram.nb_images == 1 && type == SPIDLIB_IMAGE_DESC_TYPE_1");
-}
-END_TEST
-
-START_TEST (param_select)
-{
- int ret;
- int type;
-
- system("cp " MTD_TST " " SPIDLIB_SYSTEM_MTD_PATH);
- system("cp " NVRAM1 " " SPIDLIB_DEV_PATH"/mtd1");
- system("cp " IMAGE1 " " SPIDLIB_DEV_PATH"/mtd3");
- system("cp " IMAGE2 " " SPIDLIB_DEV_PATH"/mtd4");
-
- /* type < SPIDLIB_IMAGE_SELECT_0 */
- type = SPIDLIB_IMAGE_SELECT_0 - 1;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "type < SPIDLIB_IMAGE_SELECT_0");
-
- /* type > SPIDLIB_IMAGE_SELECT_NB */
- type = SPIDLIB_IMAGE_SELECT_NB + 1;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "type > SPIDLIB_IMAGE_SELECT_NB");
-
- /* nvram.nb_images == 1 && type == SPIDLIB_IMAGE_SELECT_1 */
- type = SPIDLIB_IMAGE_SELECT_1;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "nvram.nb_images == 1 && type == SPIDLIB_IMAGE_SELECT_1");
-}
-END_TEST
-
-
-TCase *
-tc_param (void)
-{
- TCase *tc_param = tcase_create ("param");
- tcase_add_test (tc_param, param_get_desc);
- tcase_add_test (tc_param, param_select);
- return tc_param;
-}
-
-/** test procedures */
-START_TEST (test_spidlib_image_get_desc)
-{
- int ret;
- spidlib_image_desc_type_t type;
- spidcom_image_desc_t image_desc;
- char mtd_name[32] = {0};
-
- system("cp " MTD_TST " " SPIDLIB_SYSTEM_MTD_PATH);
- system("cp " NVRAM1 " " SPIDLIB_DEV_PATH"/mtd1");
- system("cp " IMAGE1 " " SPIDLIB_DEV_PATH"/mtd3");
- system("cp " IMAGE2 " " SPIDLIB_DEV_PATH"/mtd4");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_0;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_get_desc fail");
- fail_if(image_desc.index != 1, "spidlib_image_get_desc gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_get_desc gets wrong description");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_1;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "spidlib_image_get_desc fail");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_CURRENT;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_get_desc fail");
- fail_if(image_desc.index != 1, "spidlib_image_get_desc gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_get_desc gets wrong description");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "spidlib_image_get_desc fail");
-
- /* two images */
- system("cp " NVRAM2 " " SPIDLIB_DEV_PATH"/mtd1");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_0;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_get_desc fail");
- fail_if(image_desc.index != 1, "spidlib_image_get_desc gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_get_desc gets wrong description");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_1;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_get_desc fail");
- fail_if(image_desc.index != 2, "spidlib_image_get_desc gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_get_desc gets wrong description");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_CURRENT;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_get_desc fail");
- fail_if(image_desc.index != 2, "spidlib_image_get_desc gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_get_desc gets wrong description");
-
- type = SPIDLIB_IMAGE_DESC_TYPE_ALTERNATE;
- ret = spidlib_image_get_desc(type, &image_desc, mtd_name);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_get_desc fail");
- fail_if(image_desc.index != 1, "spidlib_image_get_desc gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_get_desc gets wrong description");
-}
-END_TEST
-
-START_TEST (test_spidlib_image_select)
-{
- int ret;
- spidlib_image_desc_type_t type;
- spidcom_image_desc_t image_desc;
- FILE* fp;
-
- system("cp " MTD_TST " " SPIDLIB_SYSTEM_MTD_PATH);
- system("cp " NVRAM1 " " SPIDLIB_DEV_PATH"/mtd1");
- system("cp " IMAGE1 " " SPIDLIB_DEV_PATH"/mtd3");
- system("cp " IMAGE2 " " SPIDLIB_DEV_PATH"/mtd4");
-
- type = SPIDLIB_IMAGE_SELECT_0;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_select fail");
-
- fp = fopen(SPIDLIB_DEV_PATH"/mtd3", "r");
- if (fp == NULL)
- {
- perror("fopen");
- exit(EXIT_FAILURE);
- }
- fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
- fclose(fp);
- fail_if(image_desc.index != 1, "spidlib_image_select gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_select gets wrong description");
-
- type = SPIDLIB_IMAGE_SELECT_1;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "spidlib_image_select fail");
-
- type = SPIDLIB_IMAGE_SELECT_SWITCH;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_ERROR_PARAM, "spidlib_image_select fail");
-
- /* two images */
- system("cp " NVRAM2 " " SPIDLIB_DEV_PATH"/mtd1");
-
- type = SPIDLIB_IMAGE_SELECT_0;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_select fail");
- fp = fopen(SPIDLIB_DEV_PATH"/mtd3", "r");
- if (fp == NULL)
- {
- perror("fopen");
- exit(EXIT_FAILURE);
- }
- fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
- fclose(fp);
- fail_if(image_desc.index != 3, "spidlib_image_select gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_select gets wrong description");
-
- type = SPIDLIB_IMAGE_SELECT_1;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_select fail");
- fp = fopen(SPIDLIB_DEV_PATH"/mtd4", "r");
- if (fp == NULL)
- {
- perror("fopen");
- exit(EXIT_FAILURE);
- }
- fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
- fclose(fp);
- fail_if(image_desc.index != 4, "spidlib_image_select gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_select gets wrong description");
-
- type = SPIDLIB_IMAGE_SELECT_SWITCH;
- ret = spidlib_image_select(type);
- fail_if(ret != SPIDLIB_SUCCESS, "spidlib_image_select fail");
- fp = fopen(SPIDLIB_DEV_PATH"/mtd3", "r");
- if (fp == NULL)
- {
- perror("fopen");
- exit(EXIT_FAILURE);
- }
- fread(&image_desc, sizeof(spidcom_image_desc_t), 1, fp);
- fclose(fp);
- fail_if(image_desc.index != 5, "spidlib_image_select gets wrong index");
- fail_if( strcmp(image_desc.description, "SPiDCOM image") != 0, "spidlib_image_select gets wrong description");
-}
-END_TEST
-
-#if 0
-START_TEST (test_spidlib_system_get_date)
-{
-}
-END_TEST
-#endif
-
-extern Suite* spidlib_system_suite(void)
-{
- Suite *s = suite_create("SPIDLIB_SYSTEM");
- TCase *tc_core = tcase_create("Core");
- tcase_add_checked_fixture (tc_core, setup, teardown);
-
- //Test system_init
- tcase_add_test(tc_core, test_spidlib_image_get_desc);
- tcase_add_test(tc_core, test_spidlib_image_select);
-
- suite_add_tcase(s, tc_core);
- suite_add_tcase(s, tc_param());
- return s;
-}
-
-int main(void)
-{
- int number_failed = 0;
- Suite *s;
-
- //Run system tests
- s = spidlib_system_suite();
-
- SRunner *sr = srunner_create(s);
- srunner_set_fork_status (sr, CK_NOFORK);
- //srunner_set_fork_status (sr, CK_FORK);
- srunner_run_all(sr, CK_NORMAL);
- number_failed = srunner_ntests_failed(sr);
- srunner_free(sr);
-
- /* clean behind */
- system("rm -r "UTESTS_TMP_DIR);
-
- return (number_failed == 0) ? 0 : -1;
-}
-
diff --git a/cleopatre/doc/Doxyfile b/cleopatre/doc/Doxyfile
index 4dad6401e6..a36e5c36c4 100644
--- a/cleopatre/doc/Doxyfile
+++ b/cleopatre/doc/Doxyfile
@@ -513,7 +513,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = application/libmme application/spidlib
+INPUT = application/libmme application/libspid
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is