[pisa-src] r1094 - in trunk: pisacd pisasd
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Mon, 12 Oct 2009 16:30:43 +0200
Author: tjansen
Date: Mon Oct 12 16:30:42 2009
New Revision: 1094
Log:
Removed old settings from the default configs. Hopefully they are somewhat
easier to understand now with a bit more documentation.
Modified:
trunk/pisacd/pisacd.conf
trunk/pisasd/pisasd.conf
Modified: trunk/pisacd/pisacd.conf
==============================================================================
--- trunk/pisacd/pisacd.conf Mon Oct 12 16:22:54 2009 (r1093)
+++ trunk/pisacd/pisacd.conf Mon Oct 12 16:30:42 2009 (r1094)
@@ -1,10 +1,16 @@
+# Debugging configuration
+debuglevel = "all";
+#debugtypemask = 0; # no debug output
+debugtypemask = 16777215; # all debug output, bitmask 2^24-1
+
+# Ports
port_control=5001;
port_data=5002;
port_pasrv=5011;
+
+# Remove this option once we remove PREAUTH
make_tunnel = "yes";
-debuglevel = "all";
-#debugtypemask = 2147479487; # with PL_DATA
-debugtypemask = 2147478975; # without PL_DATA
+
interface_wlan = "wlan0";
preauth_request_interval = 6;
preauth_request_max_retry = 8;
@@ -52,61 +58,40 @@
}
);
+#
+# ************************ 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;
- }
+# {
+# 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;
- },
- {
- ssid="pisa-apollo";
- macaddr="00:0f:a3:1a:c6:5f";
- channel=6;
- quality=80;
- },
- {
- ssid="mops";
- macaddr="00:17:df:a7:e8:e0";
- channel=8;
- quality=90;
- },
- {
- ssid="eduroam";
- macaddr="00:17:df:a7:e8:e1";
- channel=8;
- quality=70;
- }
+# {
+# 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
- },
- {
- ssid="pisa-apollo";
- macaddr="00:0f:a3:1a:c6:5f";
- ipaddr="192.168.5.53";
- token="0123456789abcdefghijiklmopqrstuv"; # 32 bytes
- }
+# {
+# 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 Mon Oct 12 16:22:54 2009 (r1093)
+++ trunk/pisasd/pisasd.conf Mon Oct 12 16:30:42 2009 (r1094)
@@ -1,80 +1,7 @@
-allowed_hosts = (
- {
- hit="::1"; # localhost dongsu
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:15:dda4:4750:1035:ebcc:9d71:3c8d"; #
pisa-ares
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:1e:b63:9198:3ff7:724e:90c2:716c"; # pisa-ares
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:1d:6419:5b55:1205:a1e8:5459:6b02"; #
pisa-apollo
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:0013:37E7:B92B:F514:0B23:B286:98FE"; # PISA
Macbook
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:15:cc39:49da:9dcc:1a5d:527c:cc5b"; # PISA
NAR dongsu
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:1c:4427:eb75:4eb8:6265:7a7a:dbe4"; # HIP
client dongsu
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:15:3669:adf7:8ec5:bf57:28ba:6f96"; # PISA
Sony Vaio
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:18:d482:8655:673d:2562:2d08:eb74"; # HIP1
Wolf
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:18:a0db:3fcd:1f8:450c:7676:da8c"; # HIP2 Wolf
- expires="2009-10-25:00:43:11.23343";
- },
- {
- hit="2001:13:aef3:8ac1:105f:7c77:f950:b0ff"; # PISA3
Thomas
- expires="2009-10-25:00:43:11.23343";
- }
-# },
-# {
-# # invalid hit -
inserted for testing error handling
-# hit="This is not a valid Hit #!{}?\a\b\c\@";
-# expires="NEVER-EVER";
-# }
- );
-
-allowed_passwords=(
-{
- password="jdksjfslkd:jksdfl";
- expires="2009-10-25:00:43:11.23343";
-}
-);
-
-bootstrap_routers = (
- {
- ssid="pisa-ares";
- ipaddr="192.168.5.51";
- token="0123456789abcdefghijiklmopqrstuv"; # 32 bytes
- },
- {
- ssid="pisa-aphrodite";
- ipaddr="192.168.5.52";
- token="0123456789abcdefghijiklmopqrstuv"; # 32 bytes
- },
- {
- ssid="pisa-apollo";
- ipaddr="192.168.5.53";
- token="0123456789abcdefghijiklmopqrstuv"; # 32 bytes
- }
-);
+# Debugging configuration
+debuglevel = "all";
+#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;
@@ -87,9 +14,6 @@
waitingPeriod=10;
-debuglevel = "all";
-#debugtypemask = 2147479487; # with PL_DATA
-debugtypemask = 2147478975; # without PL_DATA
interface_eth = "eth0";
vreqtrg_timeout = 10;
vreqtrg_maxretry = 3;
@@ -121,8 +45,30 @@
# from the range of dynamic IP addresses above.
clients = (
- {
- hit = "2001:13:aef3:8ac1:105f:7c77:f950:b0ff"; # Thomas pisa3
- ipv4 = "172.16.1.66";
- }
+# {
+# hit = "2001:13:aef3:8ac1:105f:7c77:f950:b0ff";
+# ipv4 = "172.16.1.66";
+# }
+);
+
+allowed_hosts = (
+# {
+# hit="2001:13:aef3:8ac1:105f:7c77:f950:b0ff";
+# expires="2009-10-25:00:43:11.23343";
+# }
+);
+
+allowed_passwords = (
+# {
+# password="jdksjfslkd:jksdfl";
+# 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:
- » [pisa-src] r1094 - in trunk: pisacd pisasd - Thomas Jansen