From dc11e3bc08b1887204c42ac9737a4f2eefb32bde Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 16 Apr 2012 07:39:27 +0200
Subject: Rename peer-to-peer to forward; remove now useless peer command line
 option

---
 src/config.y | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/config.y')

diff --git a/src/config.y b/src/config.y
index 5ef30b6..e283630 100644
--- a/src/config.y
+++ b/src/config.y
@@ -87,7 +87,7 @@
 %token TOK_INFO
 %token TOK_VERBOSE
 %token TOK_DEBUG
-%token TOK_PEER_TO_PEER
+%token TOK_FORWARD
 %token TOK_YES
 %token TOK_NO
 %token TOK_PORT
@@ -107,8 +107,6 @@
 }
 
 
-%type <str> maybe_string
-
 %type <num> port
 %type <boolean> boolean
 %type <num> maybe_port
@@ -137,7 +135,7 @@ statement:	TOK_LOG log ';'
 	|	TOK_ON TOK_ESTABLISH on_establish ';'
 	|	TOK_ON TOK_DISESTABLISH on_disestablish ';'
 	|	TOK_PEER peer '{' peer_conf '}'
-	|	TOK_PEER_TO_PEER peer_to_peer ';'
+	|	TOK_FORWARD forward ';'
 	|	TOK_INCLUDE include ';'
 	;
 
@@ -235,7 +233,7 @@ on_disestablish: TOK_STRING	{
 		}
 	;
 
-peer:		maybe_string {
+peer:		TOK_STRING {
 			fastd_peer_config_new(ctx, conf);
 			conf->peers->name = strdup($1->str);
 		}
@@ -285,7 +283,7 @@ peer_include:	TOK_STRING	{
 	;
 
 
-peer_to_peer:	boolean		{ conf->peer_to_peer = $1; }
+forward:	boolean		{ conf->forward = $1; }
 	;
 
 
@@ -306,10 +304,6 @@ include:	TOK_PEER TOK_STRING maybe_as {
 	;
 
 
-maybe_string:	TOK_STRING
-	|			{ $$ = NULL; }
-	;
-
 maybe_port:	port		{ $$ = $1; }
 	|			{ $$ = 0; }
 	;
-- 
cgit v1.2.3