summaryrefslogtreecommitdiff
path: root/src/script.c
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-08-25 08:08:56 +0200
committerSteven Barth <steven@midlink.org>2014-08-25 08:08:56 +0200
commit0300fe7589a1701361735ac068e4b57bb1a1896f (patch)
tree4db9ca56c9c649827af7799141776f040f7bc229 /src/script.c
parent6959336df6e667145c0670f4455ca59e81f89a34 (diff)
downloadodhcp6c-0300fe7589a1701361735ac068e4b57bb1a1896f.tar.gz
Enable softwire-support by defaultv1.0
Diffstat (limited to 'src/script.c')
-rw-r--r--src/script.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/script.c b/src/script.c
index 389dc37..d443ede 100644
--- a/src/script.c
+++ b/src/script.c
@@ -209,7 +209,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
putenv(buf);
}
-#ifdef EXT_S46
+
static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp)
{
uint8_t *odata;
@@ -223,7 +223,7 @@ static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp)
}
}
}
-#endif
+
static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len)
{
@@ -237,7 +237,6 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
fputs(name, fp);
fputc('=', fp);
-#ifdef EXT_S46
const char *type = (state == STATE_S46_MAPE) ? "map-e" :
(state == STATE_S46_MAPT) ? "map-t" : "lw4o6";
@@ -327,9 +326,6 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len
fputc(' ', fp);
}
-#else
- if (data && len) {}
-#endif
fclose(fp);
putenv(str);