From 29adff2f68ce990ebaed3d0c9c1baf50ef474f4f Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Sun, 21 Aug 2016 22:53:26 +0200 Subject: tools: Add missing files --- src/tools/irm/irm_bind_ipcp.c | 80 ++++++++++++++++++++++++++++++++++++++++ src/tools/irm/irm_unbind_ipcp.c | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 src/tools/irm/irm_bind_ipcp.c create mode 100644 src/tools/irm/irm_unbind_ipcp.c diff --git a/src/tools/irm/irm_bind_ipcp.c b/src/tools/irm/irm_bind_ipcp.c new file mode 100644 index 00000000..2d517994 --- /dev/null +++ b/src/tools/irm/irm_bind_ipcp.c @@ -0,0 +1,80 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * Bind IPCP Instance to a name + * + * Dimitri Staessens + * Sander Vrijders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +#include +#include + +#include "irm_ops.h" +#include "irm_utils.h" + +static void usage() +{ + printf("Usage: irm bind ipcp name \n"); +} + +int do_bind_ipcp(int argc, char ** argv) +{ + char * ipcp = NULL; + char * name = NULL; + + pid_t * apis = NULL; + ssize_t len = 0; + + int i; + + while (argc > 0) { + if (matches(*argv, "name") == 0) { + name = *(argv + 1); + ++argv; + --argc; + } else if (matches(*argv, "ipcp") == 0) { + ipcp = *(argv + 1); + ++argv; + --argc; + } else { + printf("\"%s\" is unknown, try \"irm " + "bind ipcp\".\n", *argv); + return -1; + } + + ++argv; + --argc; + } + + if (ipcp == NULL || name == NULL) { + usage(); + return -1; + } + + len = irm_list_ipcps(ipcp, &apis); + + for (i = 0; i < len; ++i) + irm_bind_api(apis[i], name); + + free(apis); + + return 0; +} diff --git a/src/tools/irm/irm_unbind_ipcp.c b/src/tools/irm/irm_unbind_ipcp.c new file mode 100644 index 00000000..db310e05 --- /dev/null +++ b/src/tools/irm/irm_unbind_ipcp.c @@ -0,0 +1,81 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * Unbind name from IPCP Instance + * + * Dimitri Staessens + * Sander Vrijders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +#include +#include + +#include "irm_ops.h" +#include "irm_utils.h" + +static void usage() +{ + printf("Usage: irm unbind ipcp \n" + " [name , omit: remove all information.\n"); +} + +int do_unbind_ipcp(int argc, char ** argv) +{ + char * ipcp = NULL; + char * name = NULL; + + pid_t * apis = NULL; + ssize_t len = 0; + + int i; + + while (argc > 0) { + if (matches(*argv, "name") == 0) { + name = *(argv + 1); + ++argv; + --argc; + } else if (matches(*argv, "ipcp") == 0) { + ipcp = *(argv + 1); + ++argv; + --argc; + } else { + printf("\"%s\" is unknown, try \"irm " + "unbind ipcp\".\n", *argv); + return -1; + } + + ++argv; + --argc; + } + + if (ipcp == NULL) { + usage(); + return -1; + } + + len = irm_list_ipcps(ipcp, &apis); + + for (i = 0; i < len; ++i) + irm_unbind_api(apis[i], name); + + free(apis); + + return 0; +} -- cgit v1.2.3 From 9c946366fcd477b285b4421c324162a10aa300b6 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Sun, 21 Aug 2016 23:08:53 +0200 Subject: ipcpd: Fix potential memleaks --- src/ipcpd/ipcp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index cc77af89..4f3e6799 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -127,6 +127,7 @@ void * ipcp_main_loop(void * o) struct dif_config conf; char * sock_path; + char * msg_name_dup; struct timeval tv = {(SOCKET_TIMEOUT / 1000), (SOCKET_TIMEOUT % 1000) * 1000}; @@ -188,7 +189,7 @@ void * ipcp_main_loop(void * o) } conf_msg = msg->conf; conf.type = conf_msg->ipcp_type; - conf.dif_name = conf_msg->dif_name; + conf.dif_name = strdup(conf_msg->dif_name); if (conf.dif_name == NULL) { ret_msg.has_result = true; ret_msg.result = -1; @@ -217,6 +218,8 @@ void * ipcp_main_loop(void * o) ret_msg.has_result = true; ret_msg.result = _ipcp->ops->ipcp_bootstrap(&conf); + if (ret_msg.result < 0) + free(conf.dif_name); break; case IPCP_MSG_CODE__IPCP_ENROLL: if (_ipcp->ops->ipcp_enroll == NULL) { @@ -232,9 +235,12 @@ void * ipcp_main_loop(void * o) LOG_ERR("Ap_reg unsupported."); break; } + msg_name_dup = strdup(msg->name); ret_msg.has_result = true; ret_msg.result = - _ipcp->ops->ipcp_name_reg(strdup(msg->name)); + _ipcp->ops->ipcp_name_reg(msg_name_dup); + if (ret_msg.result < 0) + free(msg_name_dup); break; case IPCP_MSG_CODE__IPCP_NAME_UNREG: if (_ipcp->ops->ipcp_name_unreg == NULL) { -- cgit v1.2.3