summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-04-24 04:12:16 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-04-24 04:12:16 +0200
commite4e4f007e87b250d327eb222f1e44af2ffe47774 (patch)
treef8cd06d39c6959ea547bdeaac5e849ccd49c7cf9 /src
parentea609fe8c20e0310d778dfb77dee183c028d329c (diff)
downloadfastd-e4e4f007e87b250d327eb222f1e44af2ffe47774.tar
fastd-e4e4f007e87b250d327eb222f1e44af2ffe47774.zip
config: remove support for deprecated float syntax
Diffstat (limited to 'src')
-rw-r--r--src/config.c3
-rw-r--r--src/config.y12
-rw-r--r--src/peer.h1
3 files changed, 1 insertions, 15 deletions
diff --git a/src/config.c b/src/config.c
index 1c3438e..e20bc57 100644
--- a/src/config.c
+++ b/src/config.c
@@ -410,9 +410,6 @@ static void assess_peers(void) {
for (peer = conf.peers; peer; peer = peer->next) {
if (fastd_peer_config_is_floating(peer))
conf.has_floating = true;
-
- if (peer->dynamic_float_deprecated)
- pr_warn("peer `%s' uses deprecated float syntax, please update your configuration", peer->name);
}
}
diff --git a/src/config.y b/src/config.y
index 78f2f70..5ef2d1b 100644
--- a/src/config.y
+++ b/src/config.y
@@ -149,7 +149,6 @@
%type <uint64> maybe_port
%type <str> maybe_as
%type <uint64> maybe_af
-%type <boolean> maybe_float
%type <addr> bind_address
%type <str> maybe_bind_interface
%type <int64> maybe_bind_default
@@ -478,7 +477,7 @@ peer_remote: TOK_ADDR4 port {
(*remote)->address.sa.sa_family = AF_INET6;
(*remote)->address.in.sin_port = htons($2);
}
- | maybe_af TOK_STRING port maybe_float {
+ | maybe_af TOK_STRING port {
fastd_remote_config_t **remote = &conf.peers->remotes;
while (*remote)
remote = &(*remote)->next;
@@ -488,11 +487,6 @@ peer_remote: TOK_ADDR4 port {
(*remote)->hostname = strdup($2->str);
(*remote)->address.sa.sa_family = $1;
(*remote)->address.in.sin_port = htons($3);
-
- if ($4) {
- conf.peers->floating = true;
- conf.peers->dynamic_float_deprecated = true;
- }
}
;
@@ -571,10 +565,6 @@ maybe_af: TOK_IPV4 { $$ = AF_INET; }
| { $$ = AF_UNSPEC; }
;
-maybe_float: TOK_FLOAT { $$ = true; }
- | { $$ = false; }
- ;
-
sync_def_sync: sync { $$ = $1; }
| { $$ = true; }
;
diff --git a/src/peer.h b/src/peer.h
index a8ac154..8d3bc6c 100644
--- a/src/peer.h
+++ b/src/peer.h
@@ -70,7 +70,6 @@ struct fastd_peer_config {
fastd_remote_config_t *remotes;
char *key;
bool floating;
- bool dynamic_float_deprecated;
const fastd_peer_group_config_t *group;
fastd_protocol_peer_config_t *protocol_config;