diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-04-20 04:36:34 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-04-20 04:36:34 +0200 |
| commit | b9c8603931203f5d94091f7a05a5967304b62fbd (patch) | |
| tree | b10ed1db8d2a34561f0f50488af73d820ecae019 /src/shell.c | |
| parent | ab4ca17ba3dfc92932834b09afc83cf7fe002a14 (diff) | |
| download | fastd-b9c8603931203f5d94091f7a05a5967304b62fbd.tar fastd-b9c8603931203f5d94091f7a05a5967304b62fbd.zip | |
Make conf global
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shell.c b/src/shell.c index 23381e0..786dd2a 100644 --- a/src/shell.c +++ b/src/shell.c @@ -42,10 +42,10 @@ static void shell_command_setenv(fastd_context_t *ctx, pid_t pid, const fastd_pe if (ctx->ifname) { setenv("INTERFACE", ctx->ifname, 1); } - else if (ctx->conf->ifname) { + else if (conf.ifname) { char ifname[IF_NAMESIZE]; - strncpy(ifname, ctx->conf->ifname, sizeof(ifname)-1); + strncpy(ifname, conf.ifname, sizeof(ifname)-1); ifname[sizeof(ifname)-1] = 0; setenv("INTERFACE", ifname, 1); @@ -54,7 +54,7 @@ static void shell_command_setenv(fastd_context_t *ctx, pid_t pid, const fastd_pe unsetenv("INTERFACE"); } - snprintf(buf, sizeof(buf), "%u", ctx->conf->mtu); + snprintf(buf, sizeof(buf), "%u", conf.mtu); setenv("INTERFACE_MTU", buf, 1); if (peer && peer->config && peer->config->name) @@ -122,7 +122,7 @@ static void shell_command_setenv(fastd_context_t *ctx, pid_t pid, const fastd_pe unsetenv("PEER_PORT"); } - ctx->conf->protocol->set_shell_env(ctx, peer); + conf.protocol->set_shell_env(peer); } static bool shell_command_do_exec(fastd_context_t *ctx, const fastd_shell_command_t *command, const fastd_peer_t *peer, const fastd_peer_address_t *local_addr, const fastd_peer_address_t *peer_addr, pid_t *pid_ret) { |