From 0b625c60310de7016f90dbf80c9d02c1b14dc375 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 14 Sep 2007 10:21:07 +0000 Subject: Add network service configuration file --- network/network.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 network/network.conf (limited to 'network/network.conf') diff --git a/network/network.conf b/network/network.conf new file mode 100644 index 00000000..f3c93bad --- /dev/null +++ b/network/network.conf @@ -0,0 +1,2 @@ +# Configuration file for the network service + -- cgit From 2033d8e42102bb6513e5ea71e147a8a7dcce1420 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:15:53 +0000 Subject: Add support for config file. --- network/network.conf | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'network/network.conf') diff --git a/network/network.conf b/network/network.conf index f3c93bad..66136002 100644 --- a/network/network.conf +++ b/network/network.conf @@ -1,2 +1,38 @@ # Configuration file for the network service +# This section contains options which are not specific to any +# particular interface +[General] + +# If we want to disable support for specific services +# Defaults to supporting all implemented services +#Disable=Connection,Server + +# Network interface name prefix for connections. default:bnep%d +# (up to 16 characters) +InterfacePrefix=bnep%d + +[Connection] + +# PAN user connection interface up script. default: +PANUScript=/usr/sbin/avahi-autoipd + +# Group Network connection interface up script. default: +GNScript=/usr/sbin/avahi-autoipd + +# Network Access Point connection interface up script. default: +NAPScript=/sbin/dhclient + +[Server] + +# Network Interface name for PAN user server. default:pan0 +PANUInterface=pan0 + +# Network Interface name for Group Network server. default:pan1 +GNInterface=pan1 + +# Network Interface name for Network Access Point server. default:pan2 +NAPInterface=pan2 + +# Disable link encryption: default=false +DisableSecurity=false -- cgit From 6113615ecfb8026a6a3ce0af38fc79ec8abec748 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:23:51 +0000 Subject: Rework configuration file to use roles. --- network/network.conf | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'network/network.conf') diff --git a/network/network.conf b/network/network.conf index 66136002..29e77fff 100644 --- a/network/network.conf +++ b/network/network.conf @@ -12,27 +12,26 @@ # (up to 16 characters) InterfacePrefix=bnep%d -[Connection] +# Disable link encryption: default=false +DisableSecurity=false -# PAN user connection interface up script. default: -PANUScript=/usr/sbin/avahi-autoipd +[PANU Role] -# Group Network connection interface up script. default: -GNScript=/usr/sbin/avahi-autoipd +# PAN user connection interface up script. default:none +Script=avahi-autoipd -# Network Access Point connection interface up script. default: -NAPScript=/sbin/dhclient +[GN Role] -[Server] +# Network Interface name for Group Network server. default:pan1 +Interface=pan0 -# Network Interface name for PAN user server. default:pan0 -PANUInterface=pan0 +# Group Network connection interface up script. default:none +Script=avahi-autoipd -# Network Interface name for Group Network server. default:pan1 -GNInterface=pan1 +[NAP Role] # Network Interface name for Network Access Point server. default:pan2 -NAPInterface=pan2 +Interface=pan1 -# Disable link encryption: default=false -DisableSecurity=false +# Network Access Point connection interface up script. default:none +Script=/sbin/dhclient -- cgit From ec7083e9e5ba28b679f231c7bc341330feddf2ce Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:25:27 +0000 Subject: Fixes codestyle, bridge creation and some code cleanup. --- network/network.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'network/network.conf') diff --git a/network/network.conf b/network/network.conf index 29e77fff..98524bfc 100644 --- a/network/network.conf +++ b/network/network.conf @@ -34,4 +34,4 @@ Script=avahi-autoipd Interface=pan1 # Network Access Point connection interface up script. default:none -Script=/sbin/dhclient +Script=dhclient -- cgit From 684fe2781c46ccfb30a4e653fad126286bddcdcb Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:29:59 +0000 Subject: Fix default configuration when config file is missing. --- network/network.conf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'network/network.conf') diff --git a/network/network.conf b/network/network.conf index 98524bfc..51a873e7 100644 --- a/network/network.conf +++ b/network/network.conf @@ -8,30 +8,30 @@ # Defaults to supporting all implemented services #Disable=Connection,Server -# Network interface name prefix for connections. default:bnep%d -# (up to 16 characters) -InterfacePrefix=bnep%d - # Disable link encryption: default=false -DisableSecurity=false +#DisableSecurity=true [PANU Role] +# Network interface name for PANU for connections. default:bnep%d +# (up to 16 characters) +#Interface= + # PAN user connection interface up script. default:none -Script=avahi-autoipd +#Script=avahi-autoipd [GN Role] -# Network Interface name for Group Network server. default:pan1 -Interface=pan0 +# Network Interface name for Group Network server. default:pan0 +#Interface= # Group Network connection interface up script. default:none -Script=avahi-autoipd +#Script=avahi-autoipd [NAP Role] -# Network Interface name for Network Access Point server. default:pan2 -Interface=pan1 +# Network Interface name for Network Access Point server. default:pan1 +#Interface= # Network Access Point connection interface up script. default:none -Script=dhclient +#Script=dhclient -- cgit From da7741d54263d6de3475b8c10db3c1dd3ebaebaf Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:32:50 +0000 Subject: Improve bridge and network interfaces manipulation. --- network/network.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'network/network.conf') diff --git a/network/network.conf b/network/network.conf index 51a873e7..8677bd7b 100644 --- a/network/network.conf +++ b/network/network.conf @@ -18,7 +18,7 @@ #Interface= # PAN user connection interface up script. default:none -#Script=avahi-autoipd +Script=avahi-autoipd [GN Role] @@ -26,7 +26,7 @@ #Interface= # Group Network connection interface up script. default:none -#Script=avahi-autoipd +Script=avahi-autoipd [NAP Role] @@ -34,4 +34,4 @@ #Interface= # Network Access Point connection interface up script. default:none -#Script=dhclient +Script=dhclient -- cgit