Skip to content

Commit

Permalink
Add wpa_supplicant_fork command.
Browse files Browse the repository at this point in the history
Add fork command for wpa supplicant
to start a new task.
  • Loading branch information
hahchenchen committed Aug 17, 2017
1 parent 001f40a commit e9a4273
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 1 deletion.
63 changes: 63 additions & 0 deletions freebsd/contrib/wpa/wpa_supplicant/main.c
Expand Up @@ -180,6 +180,69 @@ int rtems_bsd_command_wpa_supplicant(int argc, char **argv)

return exit_code;
}

struct myparams {
int argc;
char ** argv;
};

static void
new_wpa_supplicant_task(rtems_task_argument arg)
{
int argc;
char ** argv;
int i;

struct myparams *params = (struct myparams *)arg;
argc = params->argc;
argv = params->argv;

rtems_bsd_command_wpa_supplicant(argc, argv);

for (i = 0; i < params->argc; i++) {
free(params->argv[i]);
}
free(params->argv);
free(params);

rtems_task_delete( RTEMS_SELF );
}

int rtems_bsd_command_wpa_supplicant_fork(int argc, char **argv)
{
rtems_status_code sc;
rtems_id id;
int i;

struct myparams *params = malloc(sizeof(struct myparams));
if (params == NULL)
return NULL;

params->argc = argc;
params->argv = malloc((argc + 1) * sizeof(argv[0]));
if (params->argv == NULL)
return NULL;

for (i = 0; i < argc; i++) {
params->argv[i] = strdup(argv[i]);
if (params->argv[i] == NULL)
return NULL;
}
params->argv[argc] = NULL;

sc = rtems_task_create(
rtems_build_name('W', 'P', 'A', 'S'),
RTEMS_MAXIMUM_PRIORITY - 1,
8 * RTEMS_MINIMUM_STACK_SIZE,
RTEMS_DEFAULT_MODES,
RTEMS_FLOATING_POINT,
&id
);
assert(sc == RTEMS_SUCCESSFUL);

sc = rtems_task_start(id, new_wpa_supplicant_task, params);
assert(sc == RTEMS_SUCCESSFUL);
}
#endif /* __rtems__ */

int main(int argc, char *argv[])
Expand Down
1 change: 1 addition & 0 deletions libbsd.py
Expand Up @@ -4238,6 +4238,7 @@ def usr_sbin_wpa_supplicant(mm):
[
'rtems/rtems-bsd-shell-wpa_supplicant.c',
'rtems/rtems-wpa_supplicant_mutex.c',
'rtems/rtems-bsd-shell-wpa_supplicant_fork.c',
],
mm.generator['source']()
)
Expand Down
1 change: 1 addition & 0 deletions libbsd_waf.py
Expand Up @@ -2288,6 +2288,7 @@ def build(bld):
'rtemsbsd/rtems/rtems-bsd-shell-vmstat.c',
'rtemsbsd/rtems/rtems-bsd-shell-wlanstats.c',
'rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant.c',
'rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant_fork.c',
'rtemsbsd/rtems/rtems-bsd-syscall-api.c',
'rtemsbsd/rtems/rtems-kernel-assert.c',
'rtemsbsd/rtems/rtems-kernel-autoconf.c',
Expand Down
2 changes: 2 additions & 0 deletions rtemsbsd/include/machine/rtems-bsd-commands.h
Expand Up @@ -64,6 +64,8 @@ int rtems_bsd_command_dhcpcd(int argc, char **argv);

int rtems_bsd_command_wpa_supplicant(int argc, char **argv);

int rtems_bsd_command_wpa_supplicant_fork(int argc, char **argv);

int rtems_bsd_command_tcpdump(int argc, char **argv);

int rtems_bsd_command_sysctl(int argc, char **argv);
Expand Down
2 changes: 2 additions & 0 deletions rtemsbsd/include/rtems/netcmds-config.h
Expand Up @@ -41,6 +41,8 @@ extern rtems_shell_cmd_t rtems_shell_TCPDUMP_Command;

extern rtems_shell_cmd_t rtems_shell_WPA_SUPPLICANT_Command;

extern rtems_shell_cmd_t rtems_shell_WPA_SUPPLICANT_FORK_Command;

extern rtems_shell_cmd_t rtems_shell_SYSCTL_Command;

extern rtems_shell_cmd_t rtems_shell_VMSTAT_Command;
Expand Down
36 changes: 36 additions & 0 deletions rtemsbsd/rtems/rtems-bsd-shell-wpa_supplicant_fork.c
@@ -0,0 +1,36 @@
/*
* Copyright (c) 2017 Sichen Zhao. All rights reserved.
*
* <zsc19940506@gmail.com>
*
* 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 <rtems/netcmds-config.h>
#include <machine/rtems-bsd-commands.h>

rtems_shell_cmd_t rtems_shell_WPA_SUPPLICANT_FORK_Command = {
.name = "wpa_supplicant_fork",
.usage = "wpa_supplicant_fork [args]",
.topic = "net",
.command = rtems_bsd_command_wpa_supplicant_fork
};
3 changes: 2 additions & 1 deletion testsuite/media01/test_main.c
Expand Up @@ -205,7 +205,8 @@ early_initialization(void)
&rtems_shell_SYSCTL_Command, \
&rtems_shell_IFCONFIG_Command, \
&rtems_shell_VMSTAT_Command, \
&rtems_shell_WPA_SUPPLICANT_Command
&rtems_shell_WPA_SUPPLICANT_Command, \
&rtems_shell_WPA_SUPPLICANT_FORK_Command

#define CONFIGURE_SHELL_COMMAND_CPUINFO
#define CONFIGURE_SHELL_COMMAND_CPUUSE
Expand Down

0 comments on commit e9a4273

Please sign in to comment.