From 4613db09fcc96fe787e44eaf2899b54d943dbe02 Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Thu, 2 Nov 2017 14:34:35 +0100 Subject: wpa_supplicant: Add lock. --- freebsd/contrib/wpa/wpa_supplicant/main.c | 6 +- libbsd.py | 1 + libbsd_waf.py | 1 + .../include/machine/rtems-bsd-wpa-supplicant.h | 55 +++++++++++++++++ rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c | 68 ++++++++++++++++++++++ 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 rtemsbsd/include/machine/rtems-bsd-wpa-supplicant.h create mode 100644 rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c diff --git a/freebsd/contrib/wpa/wpa_supplicant/main.c b/freebsd/contrib/wpa/wpa_supplicant/main.c index 40950d2c..77d6a5bb 100644 --- a/freebsd/contrib/wpa/wpa_supplicant/main.c +++ b/freebsd/contrib/wpa/wpa_supplicant/main.c @@ -23,6 +23,7 @@ #include #include #include +#include #endif /* __rtems__ */ static void usage(void) @@ -170,7 +171,10 @@ int rtems_bsd_command_wpa_supplicant(int argc, char **argv) int exit_code; rtems_status_code sc; - exit_code = rtems_bsd_program_call_main("wpa_supplicant", main, argc, argv); + rtems_bsd_wpa_supplicant_lock(); + exit_code = rtems_bsd_program_call_main("wpa_supplicant", main, + argc, argv); + rtems_bsd_wpa_supplicant_unlock(); return exit_code; } diff --git a/libbsd.py b/libbsd.py index 3e3219e8..a69c1186 100644 --- a/libbsd.py +++ b/libbsd.py @@ -119,6 +119,7 @@ def rtems(mm): 'rtems/rtems-kernel-termioskqueuepoll.c', 'rtems/rtems-kernel-thread.c', 'rtems/rtems-kernel-vprintf.c', + 'rtems/rtems-kernel-wpa-supplicant.c', 'rtems/rtems-legacy-rtrequest.c', 'rtems/rtems-legacy-newproc.c', 'rtems/rtems-legacy-mii.c', diff --git a/libbsd_waf.py b/libbsd_waf.py index 95b37d63..74da7131 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -2360,6 +2360,7 @@ def build(bld): 'rtemsbsd/rtems/rtems-kernel-thread.c', 'rtemsbsd/rtems/rtems-kernel-timesupport.c', 'rtemsbsd/rtems/rtems-kernel-vprintf.c', + 'rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c', 'rtemsbsd/rtems/rtems-kvm.c', 'rtemsbsd/rtems/rtems-legacy-mii.c', 'rtemsbsd/rtems/rtems-legacy-newproc.c', diff --git a/rtemsbsd/include/machine/rtems-bsd-wpa-supplicant.h b/rtemsbsd/include/machine/rtems-bsd-wpa-supplicant.h new file mode 100644 index 00000000..d6f6d77e --- /dev/null +++ b/rtemsbsd/include/machine/rtems-bsd-wpa-supplicant.h @@ -0,0 +1,55 @@ +/** + * @file + * + * @ingroup rtems_bsd_machine + * + * @brief TODO. + */ + +/* + * Copyright (c) 2017 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_WPA_SUPPLICANT_H_ +#define _RTEMS_BSD_MACHINE_RTEMS_BSD_WPA_SUPPLICANT_H_ + +#include + +__BEGIN_DECLS + +void +rtems_bsd_wpa_supplicant_lock(void); + +void +rtems_bsd_wpa_supplicant_unlock(void); + +__END_DECLS + +#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_WPA_SUPPLICANT_H_ */ diff --git a/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c b/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c new file mode 100644 index 00000000..0403f443 --- /dev/null +++ b/rtemsbsd/rtems/rtems-kernel-wpa-supplicant.c @@ -0,0 +1,68 @@ +/** + * @file + * + * @ingroup rtems_bsd_rtems + * + * @brief Mutex for protecting wpa_supplicant. + * + * The wpa_supplicant needs it's own mutex so it can be used in background. + */ + +/* + * Copyright (c) 2017 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include + +#include + +static struct mtx wpa_supplicant_mtx; + +MTX_SYSINIT(rtems_bsd_wpa_supplicant, &wpa_supplicant_mtx, "BSD WPA Supplicant", + MTX_DEF); + +void +rtems_bsd_wpa_supplicant_lock(void) +{ + mtx_lock(&wpa_supplicant_mtx); +} + +void +rtems_bsd_wpa_supplicant_unlock(void) +{ + mtx_unlock(&wpa_supplicant_mtx); +} + -- cgit v1.2.3