Skip to content

Commit

Permalink
Adapt offline message test cases for the new configuration module.
Browse files Browse the repository at this point in the history
  • Loading branch information
@stiartsly
kunshanyu authored and stiartsly committed May 28, 2019
1 parent 8adb09a commit 20bdf0f
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 394 deletions.
4 changes: 3 additions & 1 deletion tests/offmsg/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ endif()

set(SRC
main.c
config.c)
config.c
../../config/carrier_config.c)

add_definitions(-DLIBCONFIG_STATIC)

Expand Down Expand Up @@ -68,6 +69,7 @@ endif()
include_directories(
.
../../src/carrier
../../config
${CARRIER_INT_DIST_DIR}/include)

link_directories(
Expand Down
302 changes: 13 additions & 289 deletions tests/offmsg/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,310 +32,34 @@
#include <libconfig.h>
#include <crystal.h>

#include "carrier_config.h"
#include "config.h"

static int get_str(config_t *cfg, const char *name, const char *default_value,
char *value, size_t len)
static int extra_config_parser(void *p, ElaOptions *options)
{
const char *stropt;
int rc;
config_t *cfg = (config_t *)p;
TestConfig *config = (TestConfig *)options;

rc = config_lookup_string(cfg, name, &stropt);
if (!rc) {
if (!default_value) {
fprintf(stderr, "Missing '%s' option.\n", name);
config_destroy(cfg);
exit(-1);
} else {
stropt = default_value;
}
}
config_lookup_int(cfg, "sender.loglevel", &config->sender_log_level);
config_lookup_int(cfg, "receiver.loglevel", &config->receiver_log_level);

if (strlen(stropt) >= len) {
fprintf(stderr, "Option '%s' too long.\n", name);
config_destroy(cfg);
exit(-1);
}

strcpy(value, stropt);
return 0;
}

static int get_int(config_t *cfg, const char *name, int default_value)
{
int intopt;
int rc;

rc = config_lookup_int(cfg, name, &intopt);
return rc ? intopt : default_value;
}

#if defined(_WIN32) || defined(_WIN64)
#define PATH_SEP "\\"
#define HOME_ENV "USERPROFILE"
#else
#define PATH_SEP "/"
#define HOME_ENV "HOME"
#endif

static void qualified_path(const char *path, const char *ref, char *qualified)
TestConfig *load_config(const char *config_file, TestConfig *config)
{
if (*path == PATH_SEP[0] || path[1] == ':') {
strcpy(qualified, path);
} else if (*path == '~') {
sprintf(qualified, "%s%s", getenv(HOME_ENV), path+1);
} else {
if (ref) {
const char *p = strrchr(ref, PATH_SEP[0]);
if (!p) p = ref;

if (p - ref > 0)
strncpy(qualified, ref, p - ref);
else
*qualified = 0;
} else {
getcwd(qualified, PATH_MAX);
}
memset(config, 0, sizeof(TestConfig));

if (*qualified)
strcat(qualified, PATH_SEP);

strcat(qualified, path);
}
return (TestConfig *)carrier_config_load(config_file, extra_config_parser,
(ElaOptions *)config);
}

static void config_destructor(void *p)
void free_config(TestConfig *config)
{
TestConfig *config = (TestConfig *)p;

if (!config)
return;

if (config->bootstraps) {
int i;

for (i = 0; i < config->bootstraps_size; i++)
deref(config->bootstraps[i]);

free(config->bootstraps);
}

if (config->hive_bootstraps) {
int i;

for (i = 0; i < config->hive_bootstraps_size; i++)
deref(config->hive_bootstraps[i]);

free(config->hive_bootstraps);
}
}

static void dht_bootstrap_destructor(void *p)
{
BootstrapNode *node = (BootstrapNode *)p;

if (!node)
return;

if (node->ipv4)
free((void *)node->ipv4);

if (node->ipv6)
free((void *)node->ipv6);

if (node->port)
free((void *)node->port);

if (node->public_key)
free((void *)node->public_key);
}

static void hive_bootstrap_destructor(void *p)
{
HiveBootstrapNode *node = (HiveBootstrapNode *)p;

if (!node)
return;

if (node->ipv4)
free((void *)node->ipv4);

if (node->ipv6)
free((void *)node->ipv6);

if (node->port)
free((void *)node->port);
}

TestConfig *load_config(const char *config_file)
{
TestConfig *config;
config_t cfg;
config_setting_t *bootstraps;
const char *stropt;
char number[64];
char path[PATH_MAX];
int intopt;
int entries;
int i;
int rc;

config_init(&cfg);
rc = config_read_file(&cfg, config_file);
if (!rc) {
fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg),
config_error_line(&cfg), config_error_text(&cfg));
config_destroy(&cfg);
return NULL;
}

config = (TestConfig *)rc_zalloc(sizeof(TestConfig), config_destructor);
if (!config) {
fprintf(stderr, "Load configuration failed, out of memory.\n");
config_destroy(&cfg);
return NULL;
}

rc = config_lookup_bool(&cfg, "udp_enabled", &intopt);
if (rc && !intopt)
config->udp_enabled = false;
else
config->udp_enabled = true;

get_str(&cfg, "datadir", "~/.offmsg_tests", path, sizeof(path));
qualified_path(path, config_file, config->data_location);

config->sender_log_level = (int)get_int(&cfg, "sender.loglevel", 4);
config->receiver_log_level = (int)get_int(&cfg, "receiver.loglevel", 4);

bootstraps = config_lookup(&cfg, "bootstraps");
if (!bootstraps) {
fprintf(stderr, "Missing dht_bootstraps section.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

entries = config_setting_length(bootstraps);
if (entries <= 0) {
fprintf(stderr, "Empty dht_bootstraps option.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

config->bootstraps_size = entries;
config->bootstraps = (BootstrapNode **)calloc(1, config->bootstraps_size *
sizeof(BootstrapNode *));
if (!config->bootstraps) {
fprintf(stderr, "Out of memory.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

for (i = 0; i < entries; i++) {
BootstrapNode *node;

node = rc_zalloc(sizeof(BootstrapNode), dht_bootstrap_destructor);
if (!node) {
fprintf(stderr, "Out of memory.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

config_setting_t *bs = config_setting_get_elem(bootstraps, i);

rc = config_setting_lookup_string(bs, "ipv4", (const char **)&stropt);
if (rc && *stropt)
node->ipv4 = (const char *)strdup(stropt);
else
node->ipv4 = NULL;

rc = config_setting_lookup_string(bs, "ipv6", (const char **)&stropt);
if (rc && *stropt)
node->ipv6 = (const char *)strdup(stropt);
else
node->ipv6 = NULL;

rc = config_setting_lookup_int(bs, "port", &intopt);
if (rc && intopt) {
sprintf(number, "%d", intopt);
node->port = (const char *)strdup(number);
} else
node->port = NULL;

rc = config_setting_lookup_string(bs, "public_key", (const char **)&stropt);
if (rc && *stropt)
node->public_key = (const char *)strdup(stropt);
else
node->public_key = NULL;

config->bootstraps[i] = node;
}

bootstraps = config_lookup(&cfg, "hive_bootstraps");
if (!bootstraps) {
fprintf(stderr, "Missing hive_bootstraps section.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

entries = config_setting_length(bootstraps);
if (entries <= 0) {
fprintf(stderr, "Empty hive_bootstraps option.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

config->hive_bootstraps_size = entries;
config->hive_bootstraps = (HiveBootstrapNode **)calloc(1, config->hive_bootstraps_size *
sizeof(HiveBootstrapNode *));
if (!config->hive_bootstraps) {
fprintf(stderr, "Out of memory.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

for (i = 0; i < entries; i++) {
HiveBootstrapNode *node;

node = rc_zalloc(sizeof(HiveBootstrapNode), hive_bootstrap_destructor);
if (!node) {
fprintf(stderr, "Out of memory.\n");
config_destroy(&cfg);
deref(config);
return NULL;
}

config_setting_t *bs = config_setting_get_elem(bootstraps, i);

rc = config_setting_lookup_string(bs, "ipv4", &stropt);
if (rc && *stropt)
node->ipv4 = (const char *)strdup(stropt);
else
node->ipv4 = NULL;

rc = config_setting_lookup_string(bs, "ipv6", &stropt);
if (rc && *stropt)
node->ipv6 = (const char *)strdup(stropt);
else
node->ipv6 = NULL;

rc = config_setting_lookup_int(bs, "port", &intopt);
if (rc && intopt) {
sprintf(number, "%d", intopt);
node->port = (const char *)strdup(number);
} else
node->port = NULL;

config->hive_bootstraps[i] = node;
}
carrier_config_free(&(config->shared_options));

config_destroy(&cfg);
return config;
memset(config, 0, sizeof(TestConfig));
}
13 changes: 3 additions & 10 deletions tests/offmsg/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,12 @@
#include <ela_carrier.h>

typedef struct TestConfig {
ElaOptions shared_options;
int sender_log_level;
int receiver_log_level;

char data_location[PATH_MAX];
bool udp_enabled;

int bootstraps_size;
BootstrapNode **bootstraps;

int hive_bootstraps_size;
HiveBootstrapNode **hive_bootstraps;
} TestConfig;

TestConfig *load_config(const char *config_file);
TestConfig *load_config(const char *config_file, TestConfig *config);
void free_config(TestConfig *config);

#endif /* __TEST_CONFIG_H__ */
Loading

0 comments on commit 20bdf0f

Please sign in to comment.