[pisa-src] r1600 - in trunk: pisacd/pisacd.conf pisasd/pisasd.conf
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Tue, 10 Nov 2009 13:39:29 +0100
Author: tjansen
Date: Tue Nov 10 13:39:28 2009
New Revision: 1600
Log:
Cleaned up example configs and removed unused variables.
Modified:
trunk/pisacd/pisacd.conf
trunk/pisasd/pisasd.conf
Modified: trunk/pisacd/pisacd.conf
==============================================================================
--- trunk/pisacd/pisacd.conf Tue Nov 10 12:02:04 2009 (r1599)
+++ trunk/pisacd/pisacd.conf Tue Nov 10 13:39:28 2009 (r1600)
@@ -3,23 +3,14 @@
#debugtypemask = 0; # no debug output
debugtypemask = 16777215; # all debug output, bitmask 2^24-1
-# Ports
-port_control=5001;
-port_data=5002;
-port_pasrv=5011;
-
-interface_wlan = "wlan0";
-preauth_request_interval = 6;
-preauth_request_max_retry = 8;
-binding_update_request_timeout = 20;
-binding_update_request_max_retry = 3;
-maxTriesCount=3;
-timeoutTime=3;
+# These are the default ports
+port_control = 5001;
+port_data = 5002;
# Time in seconds after that idle connections (except the relay connection)
# are disconnected to save resources by no longer maintaining old connections.
# A delay of 0 disables disconnects for any type of connection.
-idle_disconnect_delay=600;
+idle_disconnect_delay = 600;
# Our local IPv4 address space
local_ipv4 = "192.168.44.1";
@@ -54,41 +45,3 @@
);
}
);
-
-#
-# ************************ OUTDATED ****************
-#
-
-# Only ssid is the mandatory field. Other ones are optional.
-default_ap = (
-# {
-# ssid="pisa-ares"; # a required field
-# macaddr="00:0f:a3:11:17:88";
-# ipaddr="10.0.11.1";
-# ndport=50551;
-# sdport=5001;
-# }
-);
-
-# For each of candidate neighbor entry, only ssid is the mandatory field.
-# Other ones are optional.
-bootstrap_cands_neighbors = (
-# {
-# ssid="pisa-ares";
-# macaddr="00:0f:a3:11:17:88";
-# channel=6;
-# quality=80;
-# }
-);
-
-# For each of handover-ready neighbor entry, only ssid is the mandatory field.
-# Other ones are optional.
-# token must be a string of 32 bytes.
-bootstrap_ready_neighbors = (
-# {
-# ssid="pisa-ares";
-# macaddr="00:0f:a3:11:17:88";
-# ipaddr="192.168.5.51";
-# token="0123456789abcdefghijiklmopqrstuv"; # 32 bytes
-# }
-);
Modified: trunk/pisasd/pisasd.conf
==============================================================================
--- trunk/pisasd/pisasd.conf Tue Nov 10 12:02:04 2009 (r1599)
+++ trunk/pisasd/pisasd.conf Tue Nov 10 13:39:28 2009 (r1600)
@@ -3,25 +3,14 @@
#debugtypemask = 0; # no debug output
debugtypemask = 16777215; # all debug output, bitmask 2^24-1
-# this option is needed only when configured without --enable-preauth option
-port=5001;
-
-# these new types of options are needed only
-# when configured with --enable-preauth option
-port_control=5001;
-port_data=5002;
-port_pstun=5003;
-
-waitingPeriod=10;
+# These are the default ports
+port_control = 5001;
+port_data = 5002;
interface_eth = "eth0";
-vreqtrg_timeout = 10;
-vreqtrg_maxretry = 3;
-binding_update_request_timeout = 20;
-binding_update_request_maxretry = 3;
server_ipaddress = "172.16.1.1";
-# Server for relay - connections?
+# Server for relay connections?
is_relay = false;
# if is_relay is true, we pass this command strings via system(3) to the system
@@ -64,11 +53,3 @@
# expires="2009-10-25:00:43:11.23343";
# }
);
-
-bootstrap_routers = (
-# {
-# ssid="pisa-ares";
-# ipaddr="192.168.5.51";
-# token="0123456789abcdefghijiklmopqrstuv"; # 32 bytes
-# }
-);
Other related posts:
