From 8cef483119da184d631634bc98b5236ac54c30ae Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 30 Mar 2016 00:29:38 +0200 Subject: lib: api for handling flows moved the flow definition to the library and made it public. thread-safety implemented without compiler checks. --- src/lib/flow.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/lib/flow.c (limited to 'src/lib/flow.c') diff --git a/src/lib/flow.c b/src/lib/flow.c new file mode 100644 index 00000000..67b8e71b --- /dev/null +++ b/src/lib/flow.c @@ -0,0 +1,77 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * Flows + * + * Dimitri Staessens + * + * 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 + +#define OUROBOROS_PREFIX "ipcpd/flow" + +#include + +flow_t * flow_create(int32_t port_id) +{ + flow_t * flow = malloc(sizeof *flow); + flow->port_id = port_id; + flow->oflags = FLOW_O_DEFAULT; + flow->state = FLOW_INIT; + + pthread_mutex_init(&flow->lock, NULL); + + return flow; +} + +void flow_destroy(flow_t * flow) +{ + free(flow); +} + +int flow_set_opts(flow_t * flow, uint16_t opts) +{ + if (flow == NULL) { + LOG_ERR("Non-existing flow."); + return -1; + } + + pthread_mutex_lock(&flow->lock); + + if ((opts & FLOW_O_ACCMODE) == FLOW_O_ACCMODE) { + pthread_mutex_unlock(&flow->lock); + LOG_WARN("Invalid flow options. Setting default."); + opts = FLOW_O_DEFAULT; + } + + flow->oflags = opts; + + pthread_mutex_unlock(&flow->lock); + + return 0; +} + +uint16_t flow_get_opts(const flow_t * flow) +{ + if (flow == NULL) { + LOG_ERR("Non-existing flow."); + return FLOW_O_INVALID; + } + + return flow->oflags; +} -- cgit v1.2.3 From 8dfa06b867baac47eabc6af3549c2c6a276670b7 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 30 Mar 2016 13:29:59 +0200 Subject: lib: bugfixes in flow forgotten return statement forgotten NULL check --- src/lib/flow.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/lib/flow.c') diff --git a/src/lib/flow.c b/src/lib/flow.c index 67b8e71b..ab9ad802 100644 --- a/src/lib/flow.c +++ b/src/lib/flow.c @@ -30,6 +30,11 @@ flow_t * flow_create(int32_t port_id) { flow_t * flow = malloc(sizeof *flow); + if (flow == NULL) { + LOG_DBGF("Could not malloc flow."); + return NULL; + } + flow->port_id = port_id; flow->oflags = FLOW_O_DEFAULT; flow->state = FLOW_INIT; @@ -47,7 +52,7 @@ void flow_destroy(flow_t * flow) int flow_set_opts(flow_t * flow, uint16_t opts) { if (flow == NULL) { - LOG_ERR("Non-existing flow."); + LOG_DBGF("Non-existing flow."); return -1; } @@ -57,6 +62,7 @@ int flow_set_opts(flow_t * flow, uint16_t opts) pthread_mutex_unlock(&flow->lock); LOG_WARN("Invalid flow options. Setting default."); opts = FLOW_O_DEFAULT; + return -1; } flow->oflags = opts; @@ -69,7 +75,7 @@ int flow_set_opts(flow_t * flow, uint16_t opts) uint16_t flow_get_opts(const flow_t * flow) { if (flow == NULL) { - LOG_ERR("Non-existing flow."); + LOG_DBGF("Non-existing flow."); return FLOW_O_INVALID; } -- cgit v1.2.3 From dd20c175f10c04bf5abd0ca764ededaa7a4ac621 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 30 Mar 2016 13:48:57 +0200 Subject: lib: further fixes to flow API FLOW_O_INVALID now defined in terms of conflicting options bugfix in setopts --- include/ouroboros/flow.h | 2 +- src/lib/flow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/flow.c') diff --git a/include/ouroboros/flow.h b/include/ouroboros/flow.h index 456a85c7..7d8c311e 100644 --- a/include/ouroboros/flow.h +++ b/include/ouroboros/flow.h @@ -36,7 +36,7 @@ #define FLOW_O_NONBLOCK 00004000 #define FLOW_O_DEFAULT 00000002 -#define FLOW_O_INVALID 00037777 +#define FLOW_O_INVALID (FLOW_O_WRONLY | FLOW_O_RDWR) enum flow_state { FLOW_INIT = 0, diff --git a/src/lib/flow.c b/src/lib/flow.c index ab9ad802..04166298 100644 --- a/src/lib/flow.c +++ b/src/lib/flow.c @@ -59,9 +59,9 @@ int flow_set_opts(flow_t * flow, uint16_t opts) pthread_mutex_lock(&flow->lock); if ((opts & FLOW_O_ACCMODE) == FLOW_O_ACCMODE) { + flow->oflags = FLOW_O_DEFAULT; pthread_mutex_unlock(&flow->lock); LOG_WARN("Invalid flow options. Setting default."); - opts = FLOW_O_DEFAULT; return -1; } -- cgit v1.2.3