From 2423171260255a68608eca766cb1c83684402e85 Mon Sep 17 00:00:00 2001 From: Dan Staples Date: Tue, 18 Feb 2014 14:03:36 -0500 Subject: [PATCH 1/2] change olsrd-mdp param servalpath to keyringpath --- lib/mdp/README_MDP | 2 +- lib/mdp/src/olsrd_mdp.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mdp/README_MDP b/lib/mdp/README_MDP index eda5bdf9..fe9dc6c4 100644 --- a/lib/mdp/README_MDP +++ b/lib/mdp/README_MDP @@ -37,7 +37,7 @@ USAGE LoadPlugin "olsrd_mdp.so.0.1" { PlParam "sid" "" - PlParam "servalpath" "" + PlParam "keyringpath" "" PlParam "commotion_sock" "" } diff --git a/lib/mdp/src/olsrd_mdp.c b/lib/mdp/src/olsrd_mdp.c index 22f10a05..a56e7dc9 100644 --- a/lib/mdp/src/olsrd_mdp.c +++ b/lib/mdp/src/olsrd_mdp.c @@ -121,7 +121,7 @@ struct stamp { static struct stamp timestamps[HASHSIZE]; -char config_instancepath[PATH_MAX + 1] = {0}; +char config_keyringpath[PATH_MAX + 1] = {0}; char config_sid[SID_STRLEN + 1] = {0}; char config_commotionsock[PATH_MAX + 1] = {0}; unsigned char *servald_key; @@ -221,7 +221,7 @@ mdp_plugin_init(void) CHECKF(strlen(config_sid),"[MDP] Must set a SID (sid) for this plugin to work.\n\n"); - CHECKF(strlen(config_instancepath),"[MDP] Must set a Serval instance path (servalpath) for this plugin to work.\n\n"); + CHECKF(strlen(config_keyringpath),"[MDP] Must set a Serval keyring path (keyringpath) for this plugin to work.\n\n"); CHECKF(co_init() == 1,"Failed to initialize Commotion client\n\n"); @@ -230,7 +230,7 @@ mdp_plugin_init(void) CHECKF((co_conn = co_connect(config_commotionsock,strlen(config_commotionsock)+1)),"Failed to connect to Commotion socket\n\n"); - CHECKF(read_key_from_servald(co_conn, config_instancepath, config_sid) == 0,"[MDP] Could not read key from servald sid!\nExiting!\n\n"); + CHECKF(read_key_from_servald(co_conn, config_keyringpath, config_sid) == 0,"[MDP] Could not read key from servald sid!\nExiting!\n\n"); /* Register the packet transform function */ add_ptf(&add_signature); @@ -1114,13 +1114,13 @@ timeout_timestamps(void *foo __attribute__ ((unused))) } static int -read_key_from_servald(co_obj_t *co_conn, const char *instance_path, const char *sid) +read_key_from_servald(co_obj_t *co_conn, const char *keyring_path, const char *sid) { char *output = NULL; assert(co_conn); CHECKF_MEM((co_req = co_request_create())); - CO_APPEND_STR(co_req,instance_path); + CO_APPEND_STR(co_req,keyring_path); CO_APPEND_STR(co_req,sid); CHECKF(co_call(co_conn,&co_resp,"mdp-init",sizeof("mdp-init"),co_req) && (servald_key_len = co_response_get_bin(co_resp,&output,"key",sizeof("key"))),"Failed to receive signing key from commotiond"); From 462ac869b55c4774801637ea4126a549718a7895 Mon Sep 17 00:00:00 2001 From: Dan Staples Date: Wed, 19 Feb 2014 10:29:37 -0500 Subject: [PATCH 2/2] missed some instances to instancepath --- lib/mdp/src/mdp_messages.h | 2 +- lib/mdp/src/olsrd_plugin.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mdp/src/mdp_messages.h b/lib/mdp/src/mdp_messages.h index 42dc37b4..253666f0 100644 --- a/lib/mdp/src/mdp_messages.h +++ b/lib/mdp/src/mdp_messages.h @@ -73,7 +73,7 @@ #define SIGNATURE_BYTES 64 extern char config_sid[SID_STRLEN + 1]; -extern char config_instancepath[PATH_MAX + 1]; +extern char config_keyringpath[PATH_MAX + 1]; extern char config_commotionsock[PATH_MAX + 1]; #define SIGSIZE SIGNATURE_BYTES diff --git a/lib/mdp/src/olsrd_plugin.c b/lib/mdp/src/olsrd_plugin.c index f643e9b9..59e30488 100644 --- a/lib/mdp/src/olsrd_plugin.c +++ b/lib/mdp/src/olsrd_plugin.c @@ -79,7 +79,7 @@ my_init(void) /* We cannot use olsr_printf yet! */ printf("%s\n", MOD_DESC); printf("[MDP] Accepted parameter pairs: (\"sid\",)," - " (\"servalpath\",)," + " (\"keyringpath\",)," " and (\"commotion_sock\",)"); } @@ -117,7 +117,7 @@ store_sid(const char *value, void *data, set_plugin_parameter_addon addon __attr static const struct olsrd_plugin_parameters plugin_parameters[] = { {.name = "sid",.set_plugin_parameter = &store_sid,.data = config_sid}, - {.name = "servalpath",.set_plugin_parameter = &store_filename,.data = config_instancepath}, + {.name = "keyringpath",.set_plugin_parameter = &store_filename,.data = config_keyringpath}, {.name = "commotion_sock",.set_plugin_parameter = &store_filename,.data = config_commotionsock}, };