changeset 0:9e5a3c884de6

Initial import of the virtual testbed.
author Sebastien Decugis <sdecugis@nict.go.jp>
date Thu, 17 Jun 2010 11:00:32 +0900
parents
children 68698a98191c
files .hgignore ca/rebuild_tree.sh conf/backend.eap.testbed.aaa/ca_name conf/backend.eap.testbed.aaa/freeDiameter/CMakeFlags conf/backend.eap.testbed.aaa/freeDiameter/app_acct.conf conf/backend.eap.testbed.aaa/freeDiameter/app_acct.sql conf/backend.eap.testbed.aaa/freeDiameter/freeDiameter.conf conf/backend.eap.testbed.aaa/modules/ca conf/backend.eap.testbed.aaa/modules/freeDiameter conf/backend.eap.testbed.aaa/modules/ntp conf/backend.eap.testbed.aaa/ntp.conf conf/cli.simple.testbed.aaa/ca_name conf/cli.simple.testbed.aaa/freeDiameter/CMakeFlags conf/cli.simple.testbed.aaa/freeDiameter/freeDiameter.conf conf/cli.simple.testbed.aaa/freeDiameter/freeDiameter.conf.piotr conf/cli.simple.testbed.aaa/freeDiameter/test_app.conf conf/cli.simple.testbed.aaa/modules/ca conf/cli.simple.testbed.aaa/modules/freeDiameter conf/cli.simple.testbed.aaa/modules/ntp conf/cli.simple.testbed.aaa/modules/waaad conf/cli.simple.testbed.aaa/ntp.conf conf/cli.simple.testbed.aaa/waaad/CMakeCache.txt conf/cli.simple.testbed.aaa/waaad/app_test.conf conf/cli.simple.testbed.aaa/waaad/nosec.conf conf/cli.simple.testbed.aaa/waaad/waaad.conf conf/eapmgr.testbed.aaa/dns/dnsmasq.conf conf/eapmgr.testbed.aaa/dns/hosts conf/eapmgr.testbed.aaa/modules/dns conf/eapmgr.testbed.aaa/modules/network conf/eapmgr.testbed.aaa/modules/ntp conf/eapmgr.testbed.aaa/modules/radvd conf/eapmgr.testbed.aaa/modules/sysctl conf/eapmgr.testbed.aaa/modules/vboxtools conf/eapmgr.testbed.aaa/network/interfaces conf/eapmgr.testbed.aaa/ntp.conf conf/eapmgr.testbed.aaa/radvd.conf conf/eapmgr.testbed.aaa/sysctl.d/99-testbedaaa.conf conf/gw.eap.testbed.aaa/ca_name conf/gw.eap.testbed.aaa/freeDiameter/CMakeFlags conf/gw.eap.testbed.aaa/freeDiameter/echo_drop.rgwx.conf conf/gw.eap.testbed.aaa/freeDiameter/freeDiameter.conf conf/gw.eap.testbed.aaa/freeDiameter/rgw.conf conf/gw.eap.testbed.aaa/modules/ca conf/gw.eap.testbed.aaa/modules/freeDiameter conf/gw.eap.testbed.aaa/modules/ntp conf/gw.eap.testbed.aaa/ntp.conf conf/mgr.testbeddomain/dns/dnsmasq.conf conf/mgr.testbeddomain/dns/dnsmasq.d/_global.conf conf/mgr.testbeddomain/dns/dnsmasq.d/dsmipmgr.testbed.aaa conf/mgr.testbeddomain/dns/dnsmasq.d/eapmgr.testbed.aaa conf/mgr.testbeddomain/dns/dnsmasq.d/interopmgr.testbed.aaa conf/mgr.testbeddomain/dns/dnsmasq.d/rtmgr.testbed.aaa conf/mgr.testbeddomain/dns/dnsmasq.d/simplemgr.testbed.aaa conf/mgr.testbeddomain/dns/hosts conf/mgr.testbeddomain/modules/dns conf/mgr.testbeddomain/modules/network conf/mgr.testbeddomain/modules/ntp conf/mgr.testbeddomain/modules/quagga conf/mgr.testbeddomain/modules/radvd conf/mgr.testbeddomain/modules/squid conf/mgr.testbeddomain/modules/vboxtools conf/mgr.testbeddomain/network/interfaces conf/mgr.testbeddomain/ntp.conf conf/mgr.testbeddomain/quagga/daemons conf/mgr.testbeddomain/quagga/debian.conf conf/mgr.testbeddomain/quagga/zebra.conf conf/mgr.testbeddomain/radvd.conf conf/mgr.testbeddomain/squid/squid.conf conf/nas.a.rt.testbed.aaa/ca_name conf/nas.a.rt.testbed.aaa/freeDiameter/CMakeFlags conf/nas.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/nas.a.rt.testbed.aaa/freeDiameter/rtd.conf conf/nas.a.rt.testbed.aaa/freeDiameter/test_app.conf conf/nas.a.rt.testbed.aaa/modules/ca conf/nas.a.rt.testbed.aaa/modules/freeDiameter conf/nas.a.rt.testbed.aaa/modules/ntp conf/nas.a.rt.testbed.aaa/ntp.conf conf/opendiam.eap.testbed.aaa/ca_name conf/opendiam.eap.testbed.aaa/modules/ca conf/opendiam.eap.testbed.aaa/modules/ntp conf/opendiam.eap.testbed.aaa/modules/opendiam conf/opendiam.eap.testbed.aaa/ntp.conf conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/configuration.dtd conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/server.eap-tls.xml conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/server.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/aaa conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad.dtd conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad.xml conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_server.dtd conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_server.xml conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_eap_shared_secret.bin conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_user_db.dtd conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_user_db.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/agent.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/configuration.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diameter/configuration.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diameter/dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/isp.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/nas1.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/nas2.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameter/nas3.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/client.eap-tls.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/client.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/configuration.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/configuration.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/server.eap-tls.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/server.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/aaas_s.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/aaas_s2.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/client.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/configuration.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/configuration.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/fac.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/hac.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/has.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/hosts conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/server.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/client.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/configuration.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/configuration.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/server.local.xml conf/opendiam.eap.testbed.aaa/opendiameter/eap/client.eap-tls.xml conf/opendiam.eap.testbed.aaa/opendiameter/eap/server.eap-tls.xml conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd.xml conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_diameter_eap.xml conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_diameter_eap_dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_diameter_eap_dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_eap_shared_secret.bin conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_pana_dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_pana_dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_pana_paa.xml conf/opendiam.eap.testbed.aaa/opendiameter/pana/config.dtd conf/opendiam.eap.testbed.aaa/opendiameter/pana/dictionary.dtd conf/opendiam.eap.testbed.aaa/opendiameter/pana/dictionary.xml conf/opendiam.eap.testbed.aaa/opendiameter/pana/paa.xml conf/opendiam.eap.testbed.aaa/opendiameter/pana/pac.xml conf/opendiam.eap.testbed.aaa/opendiameter/pana/pana_auth.bat conf/opendiam.eap.testbed.aaa/opendiameter/pana/shared_secret.bin conf/opendiam.eap.testbed.aaa/opendiameter/pana/users.dtd conf/opendiam.eap.testbed.aaa/opendiameter/pana/users.xml conf/proxy.a.rt.testbed.aaa/ca_name conf/proxy.a.rt.testbed.aaa/freeDiameter/CMakeFlags conf/proxy.a.rt.testbed.aaa/freeDiameter/acl_wl.conf conf/proxy.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/proxy.a.rt.testbed.aaa/modules/ca conf/proxy.a.rt.testbed.aaa/modules/freeDiameter conf/proxy.a.rt.testbed.aaa/modules/ntp conf/proxy.a.rt.testbed.aaa/ntp.conf conf/proxy.b.rt.testbed.aaa/ca_name conf/proxy.b.rt.testbed.aaa/freeDiameter/CMakeFlags conf/proxy.b.rt.testbed.aaa/freeDiameter/CMakeFlags-altlibs conf/proxy.b.rt.testbed.aaa/freeDiameter/acl_wl.conf conf/proxy.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/proxy.b.rt.testbed.aaa/modules/ca conf/proxy.b.rt.testbed.aaa/modules/freeDiameter conf/proxy.b.rt.testbed.aaa/modules/ntp conf/proxy.b.rt.testbed.aaa/ntp.conf conf/proxy.c.rt.testbed.aaa/ca_name conf/proxy.c.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/proxy.c.rt.testbed.aaa/modules/ca conf/proxy.c.rt.testbed.aaa/modules/freeDiameter conf/proxy.c.rt.testbed.aaa/modules/ntp conf/proxy.c.rt.testbed.aaa/ntp.conf conf/relay.a.rt.testbed.aaa/ca_name conf/relay.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/relay.a.rt.testbed.aaa/modules/ca conf/relay.a.rt.testbed.aaa/modules/freeDiameter conf/relay.a.rt.testbed.aaa/modules/ntp conf/relay.a.rt.testbed.aaa/ntp.conf conf/relay.b.rt.testbed.aaa/ca_name conf/relay.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/relay.b.rt.testbed.aaa/modules/ca conf/relay.b.rt.testbed.aaa/modules/freeDiameter conf/relay.b.rt.testbed.aaa/modules/ntp conf/relay.b.rt.testbed.aaa/ntp.conf conf/relay.c.rt.testbed.aaa/ca_name conf/relay.c.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/relay.c.rt.testbed.aaa/modules/ca conf/relay.c.rt.testbed.aaa/modules/freeDiameter conf/relay.c.rt.testbed.aaa/modules/ntp conf/relay.c.rt.testbed.aaa/ntp.conf conf/rtmgr.testbed.aaa/dns/dnsmasq.conf conf/rtmgr.testbed.aaa/dns/hosts conf/rtmgr.testbed.aaa/dns/hosts.bkp conf/rtmgr.testbed.aaa/modules/dns conf/rtmgr.testbed.aaa/modules/network conf/rtmgr.testbed.aaa/modules/ntp conf/rtmgr.testbed.aaa/modules/radvd conf/rtmgr.testbed.aaa/modules/sysctl conf/rtmgr.testbed.aaa/network/interfaces conf/rtmgr.testbed.aaa/ntp.conf conf/rtmgr.testbed.aaa/radvd.conf conf/rtmgr.testbed.aaa/sysctl.d/99-testbedaaa.conf conf/serv.b.rt.testbed.aaa/ca_name conf/serv.b.rt.testbed.aaa/freeDiameter/CMakeFlags conf/serv.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf conf/serv.b.rt.testbed.aaa/freeDiameter/test_app.conf conf/serv.b.rt.testbed.aaa/modules/ca conf/serv.b.rt.testbed.aaa/modules/freeDiameter conf/serv.b.rt.testbed.aaa/modules/ntp conf/serv.b.rt.testbed.aaa/ntp.conf conf/serv.simple.testbed.aaa/ca_name conf/serv.simple.testbed.aaa/freeDiameter/CMakeFlags conf/serv.simple.testbed.aaa/freeDiameter/freeDiameter.conf conf/serv.simple.testbed.aaa/freeDiameter/freeDiameter.conf.piotr conf/serv.simple.testbed.aaa/freeDiameter/test_app.conf conf/serv.simple.testbed.aaa/modules/ca conf/serv.simple.testbed.aaa/modules/freeDiameter conf/serv.simple.testbed.aaa/modules/ntp conf/serv.simple.testbed.aaa/ntp.conf conf/simplemgr.testbed.aaa/dns/dnsmasq.conf conf/simplemgr.testbed.aaa/dns/hosts conf/simplemgr.testbed.aaa/dns/hosts.bkp conf/simplemgr.testbed.aaa/modules/dns conf/simplemgr.testbed.aaa/modules/network conf/simplemgr.testbed.aaa/modules/ntp conf/simplemgr.testbed.aaa/modules/radvd conf/simplemgr.testbed.aaa/network/interfaces conf/simplemgr.testbed.aaa/ntp.conf conf/simplemgr.testbed.aaa/radvd.conf conf/supauth.eap.testbed.aaa/ca_name conf/supauth.eap.testbed.aaa/hostapd/build.config conf/supauth.eap.testbed.aaa/hostapd/hostapd.conf conf/supauth.eap.testbed.aaa/modules/ca conf/supauth.eap.testbed.aaa/modules/hostapd conf/supauth.eap.testbed.aaa/modules/ntp conf/supauth.eap.testbed.aaa/modules/wpasupplicant conf/supauth.eap.testbed.aaa/ntp.conf conf/supauth.eap.testbed.aaa/wpasupplicant/build.config conf/supauth.eap.testbed.aaa/wpasupplicant/wpa_supplicant.conf mrb/capture.pcap mrb/capture.txt mrb/change_pw.sh mrb/clearlogs.sh mrb/eap_testbed.sh mrb/fd_rebuild.sh mrb/filtered_cap mrb/routing_testbed.sh mrb/showlogs.sh mrb/simple_testbed.sh mrb/update_all_vm.sh mrb/vm_login.sh mrb/vm_pause.sh mrb/vm_start.sh mrb/vm_stop.sh scripts/autoupdates-install.sh scripts/ca-install.sh scripts/conflink-install.sh scripts/dns-install.sh scripts/freeDiameter-install.sh scripts/freeDiameter-run.sh scripts/freeDiameter-trig.sh scripts/hostapd-install.sh scripts/hostapd-run.sh scripts/network-install.sh scripts/ntp-install.sh scripts/opendiam-install.sh scripts/opendiam-run.sh scripts/quagga-install.sh scripts/radvd-install.sh scripts/squid-install.sh scripts/sysctl-install.sh scripts/vboxtools-install.sh scripts/waaad-install.sh scripts/waaad-kill.sh scripts/waaad-run.sh scripts/waaad-trig.sh scripts/wpasupplicant-install.sh scripts/wpasupplicant-run.sh src/opendiameter-1.0.7-i-tls.patch src/opendiameter-1.0.7-i.tar.gz
diffstat 216 files changed, 29002 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,10 @@
+syntax: glob
+ca/ca_data
+ca/Makefile
+ca/openssl.cnf
+doc.txt
+installvm.sh
+logs/*
+src/*/*
+core.*
+.svn
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ca/rebuild_tree.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,42 @@
+#!/bin/bash -x
+
+rm -rf ca_data
+# The root CA
+make init topca=mgr.testbed.aaa
+
+# General-use client and server
+make newcert ca=mgr.testbed.aaa name=client
+make newcert ca=mgr.testbed.aaa name=server
+
+# Simple testbed; cli is created twice to get it revoked
+make newca ca=mgr.testbed.aaa name=simple.testbed.aaa
+make newcert ca=simple.testbed.aaa name=cli.simple.testbed.aaa
+make newcert ca=simple.testbed.aaa name=serv.simple.testbed.aaa
+make newcert ca=simple.testbed.aaa name=cli.simple.testbed.aaa
+
+# Piotr case: using IP addresses
+make init topca=CA
+make newcert ca=CA name=192.168.102.10
+make newcert ca=CA name=192.168.102.20
+
+# RT testbed
+make newca ca=mgr.testbed.aaa name=rt.testbed.aaa
+make newca ca=rt.testbed.aaa name=a.rt.testbed.aaa
+make newcert ca=a.rt.testbed.aaa name=nas.a.rt.testbed.aaa
+make newcert ca=a.rt.testbed.aaa name=relay.a.rt.testbed.aaa
+make newcert ca=a.rt.testbed.aaa name=proxy.a.rt.testbed.aaa
+
+make newca ca=rt.testbed.aaa name=b.rt.testbed.aaa
+make newcert ca=b.rt.testbed.aaa name=proxy.b.rt.testbed.aaa
+make newcert ca=b.rt.testbed.aaa name=relay.b.rt.testbed.aaa
+make newcert ca=b.rt.testbed.aaa name=serv.b.rt.testbed.aaa
+
+make newca ca=rt.testbed.aaa name=c.rt.testbed.aaa
+make newcert ca=c.rt.testbed.aaa name=relay.c.rt.testbed.aaa
+make newcert ca=c.rt.testbed.aaa name=proxy.c.rt.testbed.aaa
+
+# EAP testbed
+make newca ca=mgr.testbed.aaa name=eap.testbed.aaa
+make newcert ca=eap.testbed.aaa name=gw.eap.testbed.aaa
+make newcert ca=eap.testbed.aaa name=backend.eap.testbed.aaa
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/backend.eap.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+eap.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/backend.eap.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,5 @@
+-DBUILD_DBG_MONITOR:BOOL=ON 
+-DBUILD_APP_ACCT:BOOL=ON 
+-DSKIP_TESTS:BOOL=ON 
+-DCMAKE_BUILD_TYPE:STRING=Debug 
+-DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/backend.eap.testbed.aaa/freeDiameter/app_acct.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,62 @@
+
+ConnInfo = "user=root dbname=root";
+Table = "app_acct";
+Timestamp_field = "recorded_on";
+
+ "Origin-Host";
+ "Origin-Realm";
+ "Destination-Realm";
+ "Destination-Host";
+ "Session-Id";
+ "Origin-State-Id"; 
+ "Accounting-Record-Type";
+ "Accounting-Record-Number";
+ "User-Name";
+ "Event-Timestamp"; 
+ "Acct-Application-Id";
+ "Accounting-Sub-Session-Id";
+ "Acct-Session-Id";
+ "Acct-Multi-Session-Id";
+ "Origin-AAA-Protocol";
+ "Acct-Delay-Time"; 
+ "NAS-Identifier";
+ "NAS-IP-Address";
+ "NAS-IPv6-Address";
+ "NAS-Port";
+ "NAS-Port-Id";
+ "NAS-Port-Type";
+ "Service-Type";
+ "Termination-Cause"; 
+ "Accounting-Input-Octets";
+ "Accounting-Input-Packets";
+ "Accounting-Output-Octets";
+ "Accounting-Output-Packets";
+ "Acct-Authentic";
+ "Acct-Link-Count";
+ "Acct-Session-Time"; 
+ "Acct-Tunnel-Connection";
+ "Acct-Tunnel-Packets-Lost"; 
+ "Callback-Id";
+ "Callback-Number";
+ "Called-Station-Id";
+ "Calling-Station-Id"; 
+ "Connect-Info";
+ "Originating-Line-Info"; 
+ "Authorization-Lifetime";
+ "Session-Timeout";
+ "Idle-Timeout";
+ "Port-Limit";
+ "Accounting-Realtime-Required"; 
+ "Acct-Interim-Interval";
+ "Filter-Id";
+ "NAS-Filter-Rule";
+ "QoS-Filter-Rule"; 
+ "Login-IP-Host";
+ "Login-IPv6-Host";
+ "Login-LAT-Group";
+ "Login-LAT-Node";
+ "Login-LAT-Port"; 
+ "Login-LAT-Service";
+ "Login-Service";
+ "Login-TCP-Port"; 
+ "Route-Record" = { multi=5; }; # Record the last 5 hops of the message
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/backend.eap.testbed.aaa/freeDiameter/app_acct.sql	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,64 @@
+CREATE TABLE app_acct (
+    "Origin-Host" bytea NOT NULL,
+    "Origin-Realm" bytea NOT NULL,
+    "Destination-Realm" bytea,
+    "Destination-Host" bytea,
+    "Session-Id" bytea NOT NULL,
+    "Origin-State-Id" integer,
+    "Accounting-Record-Type" integer NOT NULL,
+    "Accounting-Record-Number" integer NOT NULL,
+    "User-Name" bytea,
+    "Event-Timestamp" bytea,
+    "Acct-Application-Id" integer,
+    "Accounting-Sub-Session-Id" bigint,
+    "Acct-Session-Id" bytea,
+    "Acct-Multi-Session-Id" bytea,
+    "Origin-AAA-Protocol" integer,
+    "Acct-Delay-Time" integer,
+    "NAS-Identifier" bytea,
+    "NAS-IP-Address" bytea,
+    "NAS-IPv6-Address" bytea,
+    "NAS-Port" integer,
+    "NAS-Port-Id" bytea,
+    "NAS-Port-Type" integer,
+    "Service-Type" integer,
+    "Termination-Cause" integer,
+    "Accounting-Input-Octets" bigint,
+    "Accounting-Input-Packets" bigint,
+    "Accounting-Output-Octets" bigint,
+    "Accounting-Output-Packets" bigint,
+    "Acct-Authentic" integer,
+    "Acct-Link-Count" integer,
+    "Acct-Session-Time" integer,
+    "Acct-Tunnel-Connection" bytea,
+    "Acct-Tunnel-Packets-Lost" integer,
+    "Callback-Id" bytea,
+    "Callback-Number" bytea,
+    "Called-Station-Id" bytea,
+    "Calling-Station-Id" bytea,
+    "Connect-Info" bytea,
+    "Originating-Line-Info" bytea,
+    "Authorization-Lifetime" integer,
+    "Session-Timeout" integer,
+    "Idle-Timeout" integer,
+    "Port-Limit" integer,
+    "Accounting-Realtime-Required" integer,
+    "Acct-Interim-Interval" integer,
+    "Filter-Id" bytea,
+    "NAS-Filter-Rule" bytea,
+    "QoS-Filter-Rule" bytea,
+    "Login-IP-Host" bytea,
+    "Login-IPv6-Host" bytea,
+    "Login-LAT-Group" bytea,
+    "Login-LAT-Node" bytea,
+    "Login-LAT-Port" bytea,
+    "Login-LAT-Service" bytea,
+    "Login-Service" integer,
+    "Login-TCP-Port" integer,
+    "Route-Record1" bytea,
+    "Route-Record2" bytea,
+    "Route-Record3" bytea,
+    "Route-Record4" bytea,
+    "Route-Record5" bytea,
+    recorded_on timestamp with time zone NOT NULL
+);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/backend.eap.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,58 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+# LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+
+LoadExtension = "/root/freeDiameter/extensions/dict_nasreq.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dict_eap.fdx";
+LoadExtension = "/root/freeDiameter/extensions/app_acct.fdx"
+		: "/root/conf/freeDiameter/app_acct.conf";
+ConnectPeer = "gw.eap.testbed.aaa" { No_TLS; };
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/backend.eap.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+simple.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+-DBUILD_TEST_APP:BOOL=ON -DBUILD_TEST_RT_ANY:BOOL=ON -DBUILD_DBG_MONITOR:BOOL=ON -DBUILD_DBG_RT:BOOL=ON -DSKIP_TESTS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,58 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+		: "/root/conf/freeDiameter/test_app.conf";
+
+ConnectPeer = "serv.simple.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/freeDiameter/freeDiameter.conf.piotr	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,11 @@
+
+Identity = "192.168.102.10";
+SCTP_streams = 3;
+TLS_Cred = "/home/aaa/ca/ca_data/CA/clients/192.168.102.10/cert.pem" , "/home/aaa/ca/ca_data/CA/clients/192.168.102.10/privkey.pem";
+TLS_CA = "/home/aaa/ca/ca_data/CA/clients/192.168.102.10/ca.pem";
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/test_app.fdx";
+
+ConnectPeer = "192.168.102.20" ;
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/freeDiameter/test_app.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+mode = client;
+
+# Test for unsupported application:
+#appli-id = 999998;
+
+# Test for unsupported command:
+#cmd-id = 16777215;
+
+# Test for unsupported avp:
+#avp-id = 345677;
+
+# Test for undeliverable message
+#dest-realm = "another.testbed.aaa";
+# or
+#dest-host = "anotherserver.simple.testbed.aaa";
+
+# Test for decorated NAI
+#user-name = "other.testbed.aaa!user@simple.testbed.aaa";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/waaad/CMakeCache.txt	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,443 @@
+# This is the CMakeCache file.
+# For build in directory: /root/waaad
+# It was generated by CMake: /usr/bin/cmake
+# You can edit this file to change values found and used by cmake.
+# If you do not want to change any of the values, simply exit the editor.
+# If you do want to change a value, simply edit, save, and exit the editor.
+# The syntax for the file is as follows:
+# KEY:TYPE=VALUE
+# KEY is the name of a variable in the cache.
+# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
+# VALUE is the current value for the KEY.
+
+########################
+# EXTERNAL cache entries
+########################
+
+//Path to a program.
+BISON_EXECUTABLE:FILEPATH=/usr/bin/bison
+
+//Build app_test? (Testing application to send dummy message to
+// another peer, for testing purpose only)
+BUILD_APP_TEST:BOOL=ON
+
+//Build Diameter EAP (RFC4072) Dictionary definitions?
+BUILD_DICT_EAP:BOOL=OFF
+
+//Build NASREQ (RFC4005) Dictionary definitions?
+BUILD_DICT_NASREQ:BOOL=OFF
+
+//Build radius_gw? (one-way RADIUS/Diameter gateway: RADIUS server,
+// Diameter client)
+BUILD_RADIUS_GW:BOOL=OFF
+
+//Build rt_any? (Routing extension sending message to any peer
+// available, for testing purpose only)
+BUILD_RT_ANY:BOOL=OFF
+
+//Build rt_debug? (Routing extension tracing routing list, for
+// debug purpose only)
+BUILD_RT_DEBUG:BOOL=OFF
+
+//Build rt_default? (Routing extension using Destination-Host,
+// Destination-Realm, and static configuration)
+BUILD_RT_DEFAULT:BOOL=ON
+
+//Build sample? (Simple extension to demonstrate extension mechanism,
+// for developpers only)
+BUILD_SAMPLE:BOOL=OFF
+
+//Build sec_nosec? (Security extension allowing direct connections
+// without encryption to specified peers)
+BUILD_SEC_NOSEC:BOOL=ON
+
+//Build sec_tls_gnutls? (Security extension for TLS connections,
+// using libgnutls (LGPL))
+BUILD_SEC_TLS_GNUTLS:BOOL=OFF
+
+//Build RADIUS Accounting sub-extension? (RFC2866)
+BUILD_SUB_ACCT:BOOL=OFF
+
+//Build RADIUS Authentication & Authorization sub-extension? (RFC2865,
+// RFC3579)
+BUILD_SUB_AUTH:BOOL=OFF
+
+//Build debug sub-extension? (display status of RADIUS and Diameter
+// messages)
+BUILD_SUB_DEBUG:BOOL=OFF
+
+//Build 'echo/drop' sub-extension? (echo or drop specific RADIUS
+// attributes, no Diameter translation)
+BUILD_SUB_ECHO_DROP:BOOL=OFF
+
+//Path to a program.
+CMAKE_AR:FILEPATH=/usr/bin/ar
+
+//No help, variable specified on the command line.
+CMAKE_BUILD_TYPE:STRING=Debug
+
+//Enable/Disable color output during build.
+CMAKE_COLOR_MAKEFILE:BOOL=ON
+
+//C compiler.
+CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc
+
+//Flags used by the compiler during all build types.
+CMAKE_C_FLAGS:STRING=
+
+//Flags used by the compiler during debug builds.
+CMAKE_C_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the compiler during release minsize builds.
+CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the compiler during release builds (/MD /Ob1 /Oi
+// /Ot /Oy /Gs will produce slightly less optimized but smaller
+// files).
+CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the compiler during Release with Debug Info builds.
+CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
+
+//Flags used by the linker.
+CMAKE_EXE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Install path prefix, prepended onto install directories.
+CMAKE_INSTALL_PREFIX:PATH=/usr/local
+
+//Path to a program.
+CMAKE_LINKER:FILEPATH=/usr/bin/ld
+
+//Path to a program.
+CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
+
+//Flags used by the linker during the creation of modules.
+CMAKE_MODULE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_NM:FILEPATH=/usr/bin/nm
+
+//Path to a program.
+CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
+
+//Path to a program.
+CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
+
+//Path to a program.
+CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
+
+//Flags used by the linker during the creation of dll's.
+CMAKE_SHARED_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//If set, runtime paths are not added when using shared libraries.
+CMAKE_SKIP_RPATH:BOOL=NO
+
+//Path to a program.
+CMAKE_STRIP:FILEPATH=/usr/bin/strip
+
+//If true, cmake will use relative paths in makefiles and projects.
+CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
+
+//If this value is on, makefiles will be generated without the
+// .SILENT directive, and all commands will be echoed to the console
+// during the make.  This is useful for debugging only. With Visual
+// Studio IDE projects all commands are done without /nologo.
+CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
+
+//Default path to configuration file?
+DEFAULT_CONF_FILE:STRING=/home/aaa/conf/cli.simple.testbed.aaa/waaad/waaad.conf
+
+//Disable SCTP support?
+DISABLE_SCTP:BOOL=OFF
+
+//Value Computed by CMake
+Default routing waaad extension_BINARY_DIR:STATIC=/root/waaad/extensions/rt_default
+
+//Value Computed by CMake
+Default routing waaad extension_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions/rt_default
+
+//Value Computed by CMake
+Diameter EAP (RFC4072) dictionary definitions_BINARY_DIR:STATIC=/root/waaad/extensions/dict_eap
+
+//Value Computed by CMake
+Diameter EAP (RFC4072) dictionary definitions_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions/dict_eap
+
+//Value Computed by CMake
+Diameter NASREQ (RFC4005) dictionary definitions_BINARY_DIR:STATIC=/root/waaad/extensions/dict_nasreq
+
+//Value Computed by CMake
+Diameter NASREQ (RFC4005) dictionary definitions_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions/dict_nasreq
+
+//Path to a program.
+FLEX_EXECUTABLE:FILEPATH=/usr/bin/flex
+
+//Value Computed by CMake
+Filtered no encryption security waaad extension_BINARY_DIR:STATIC=/root/waaad/extensions/sec_nosec
+
+//Value Computed by CMake
+Filtered no encryption security waaad extension_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions/sec_nosec
+
+//Ignore the extensions completly?
+NoExtensions:BOOL=OFF
+
+//Value Computed by CMake
+RADIUS/Diameter extensible gateway extension for waaad_BINARY_DIR:STATIC=/root/waaad/extensions/radius_gw
+
+//Value Computed by CMake
+RADIUS/Diameter extensible gateway extension for waaad_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions/radius_gw
+
+//Path to a file.
+SCTP_INCLUDE_DIR:PATH=/usr/include
+
+//Path to a library.
+SCTP_LIBRARY:FILEPATH=/usr/lib/libsctp.so
+
+//Skip compilation of the tests?
+Skip_Tests:BOOL=ON
+
+//Value Computed by CMake
+Test application waaad extension_BINARY_DIR:STATIC=/root/waaad/extensions/app_test
+
+//Value Computed by CMake
+Test application waaad extension_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions/app_test
+
+//Value Computed by CMake
+WIDE Diameter AAA daemon_BINARY_DIR:STATIC=/root/waaad
+
+//Value Computed by CMake
+WIDE Diameter AAA daemon_SOURCE_DIR:STATIC=/home/aaa/src/waaad
+
+//Enable waaad early debugging (before option parsing)?
+Waaad_Early_Debug:BOOL=OFF
+
+//Dependencies for target
+app_test_LIB_DEPENDS:STATIC=
+
+//Dependencies for target
+dict_eap_LIB_DEPENDS:STATIC=
+
+//Dependencies for target
+dict_nasreq_LIB_DEPENDS:STATIC=
+
+//Dependencies for the target
+radius_gw_LIB_DEPENDS:STATIC=general;rg_common;
+
+//Dependencies for target
+rg_common_LIB_DEPENDS:STATIC=
+
+//Dependencies for target
+rt_default_LIB_DEPENDS:STATIC=
+
+//Dependencies for target
+sec_nosec_LIB_DEPENDS:STATIC=
+
+//Dependencies for the target
+sub_acct_LIB_DEPENDS:STATIC=general;rg_common;
+
+//Dependencies for the target
+sub_auth_LIB_DEPENDS:STATIC=general;rg_common;
+
+//Dependencies for the target
+sub_debug_LIB_DEPENDS:STATIC=general;rg_common;
+
+//Dependencies for the target
+sub_echo_drop_LIB_DEPENDS:STATIC=general;rg_common;
+
+//Value Computed by CMake
+waaad extensions_BINARY_DIR:STATIC=/root/waaad/extensions
+
+//Value Computed by CMake
+waaad extensions_SOURCE_DIR:STATIC=/home/aaa/src/waaad/extensions
+
+//Value Computed by CMake
+waaad_BINARY_DIR:STATIC=/root/waaad/waaad
+
+//Value Computed by CMake
+waaad_SOURCE_DIR:STATIC=/home/aaa/src/waaad/waaad
+
+
+########################
+# INTERNAL cache entries
+########################
+
+//Advanced flag for variable: CMAKE_AR
+CMAKE_AR-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_BUILD_TOOL
+CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
+//What is the target build tool cmake is generating for.
+CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
+//This is the directory where this CMakeCahe.txt was created
+CMAKE_CACHEFILE_DIR:INTERNAL=/root/waaad
+//Major version of cmake used to create the current loaded cache
+CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
+//Minor version of cmake used to create the current loaded cache
+CMAKE_CACHE_MINOR_VERSION:INTERNAL=6
+//Major version of cmake used to create the current loaded cache
+CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4
+//Advanced flag for variable: CMAKE_COLOR_MAKEFILE
+CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
+//Path to CMake executable.
+CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
+//Path to cpack program executable.
+CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
+//Path to ctest program executable.
+CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
+//Advanced flag for variable: CMAKE_C_COMPILER
+CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
+CMAKE_C_COMPILER_WORKS:INTERNAL=1
+//Advanced flag for variable: CMAKE_C_FLAGS
+CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_C_FLAGS_DEBUG
+CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_C_FLAGS_MINSIZEREL
+CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_C_FLAGS_RELEASE
+CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
+CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//Result of TRY_COMPILE
+CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
+//Executable file format
+CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
+//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS
+CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
+CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
+CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//Name of generator.
+CMAKE_GENERATOR:INTERNAL=Unix Makefiles
+//Have library pthreads
+CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
+//Have library pthread
+CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
+//Have include CMAKE_HAVE_PTHREAD_H
+CMAKE_HAVE_PTHREAD_H:INTERNAL=1
+//Start directory with the top level CMakeLists.txt file for this
+// project
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/aaa/src/waaad
+//Install .so files without execute permission.
+CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
+//Advanced flag for variable: CMAKE_LINKER
+CMAKE_LINKER-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_MAKE_PROGRAM
+CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS
+CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
+CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
+CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_NM
+CMAKE_NM-ADVANCED:INTERNAL=1
+//number of local generators
+CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=6
+//Advanced flag for variable: CMAKE_OBJCOPY
+CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_OBJDUMP
+CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_RANLIB
+CMAKE_RANLIB-ADVANCED:INTERNAL=1
+//Path to CMake installation.
+CMAKE_ROOT:INTERNAL=/usr/share/cmake-2.6
+//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS
+CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
+CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
+CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//Result of CHECK_TYPE_SIZE
+CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=2
+//Advanced flag for variable: CMAKE_SKIP_RPATH
+CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_STRIP
+CMAKE_STRIP-ADVANCED:INTERNAL=1
+//uname command
+CMAKE_UNAME:INTERNAL=/bin/uname
+//Advanced flag for variable: CMAKE_USE_RELATIVE_PATHS
+CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
+//Advanced flag for variable: CMAKE_VERBOSE_MAKEFILE
+CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//Details about finding Threads
+FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE]
+//Have function clock_gettime
+HAVE_CLOCK_GETTIME:INTERNAL=
+//Result of TRY_COMPILE
+HAVE_CMAKE_SIZEOF_UNSIGNED_SHORT:INTERNAL=TRUE
+//Result of TRY_COMPILE
+HAVE_HOST_BIG_ENDIAN:INTERNAL=TRUE
+//Have library rt
+HAVE_LIBRT:INTERNAL=1
+//Have function getopt_long
+HAVE_LONG_OPTIONS:INTERNAL=1
+//Have include HAVE_MALLOC_H
+HAVE_MALLOC_H:INTERNAL=1
+//Have function sctp_getladdrs
+HAVE_NATIVE_SCTP:INTERNAL=
+//Have symbol ntohll
+HAVE_NTOHLL:INTERNAL=
+//Have include stddef.h
+HAVE_STDDEF_H:INTERNAL=1
+//Have include stdint.h
+HAVE_STDINT_H:INTERNAL=1
+//Have include sys/types.h
+HAVE_SYS_TYPES_H:INTERNAL=1
+//Result of TRY_COMPILE
+HAVE_WORDS_BIGENDIAN:INTERNAL=TRUE
+//Result of TEST_BIG_ENDIAN
+HOST_BIG_ENDIAN:INTERNAL=0
+//Advanced flag for variable: SCTP_INCLUDE_DIR
+SCTP_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//Advanced flag for variable: SCTP_LIBRARY
+SCTP_LIBRARY-ADVANCED:INTERNAL=1
+//Result of TEST_BIG_ENDIAN
+WORDS_BIGENDIAN:INTERNAL=0
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/waaad/app_test.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+mode = client;
+dest-realm = "simple.testbed.aaa";
+# dest-host = "serv.simple.testbed.aaa";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/waaad/nosec.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,13 @@
+# Debug_Verbosity = 1;
+
+# Default_Priority = 1;
+
+# Each Diameter peer to which no security mechanism is provided by waaad
+# must be listed explicitely here.
+# The priority may be overwriten for each peer.
+# Format: diameter_id [, priority];
+# Examples:
+# nas.domain.net;
+# home.domain.net, 10;
+serv.simple.testbed.aaa;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/cli.simple.testbed.aaa/waaad/waaad.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,11 @@
+[general]
+diameter-id = "cli.simple.testbed.aaa";
+
+[extensions]
+"/root/waaad/extensions/libsec_nosec.so":"/home/aaa/conf/cli.simple.testbed.aaa/waaad/nosec.conf";
+"/root/waaad/extensions/librt_default.so";
+"/root/waaad/extensions/libapp_test.so" :"/home/aaa/conf/cli.simple.testbed.aaa/waaad/app_test.conf";
+
+[peers]
+"serv.simple.testbed.aaa";
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/eapmgr.testbed.aaa/dns/dnsmasq.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,20 @@
+domain-needed
+bogus-priv
+
+server=/testbed.aaa/192.168.101.1
+
+local=/eap.testbed.aaa/
+
+except-interface=eth0
+
+expand-hosts
+domain=eap.testbed.aaa
+
+dhcp-range=192.168.105.50,192.168.105.150,255.255.255.0,12h
+
+dhcp-host=08:00:27:33:77:82,supauth
+dhcp-host=08:00:27:0B:78:59,backend
+dhcp-host=08:00:27:F0:A1:70,gw
+dhcp-host=08:00:27:D9:B0:9D,opendiam
+
+#conf-dir=/etc/dnsmasq.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/eapmgr.testbed.aaa/dns/hosts	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+127.0.0.1	localhost
+127.0.1.1	eapmgr.testbed.aaa	eapmgr
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+192.168.105.10	supauth
+192.168.105.20	backend
+192.168.105.30	gw
+192.168.105.40	opendiam
+fde4:2c6e:55c4:105:a00:27ff:fe33:7782	supauth
+fde4:2c6e:55c4:105:a00:27ff:fef0:a170	backend
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/eapmgr.testbed.aaa/network/interfaces	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+
+auto eth1
+iface eth1 inet static
+	address 192.168.105.1
+	netmask 255.255.255.0
+iface eth1 inet6 static
+	address fde4:2c6e:55c4:105::1
+	netmask 64
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/eapmgr.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/eapmgr.testbed.aaa/radvd.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,7 @@
+interface eth1
+{
+   AdvSendAdvert on;
+   prefix fde4:2c6e:55c4:105::/64
+   {
+   };
+};   
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/eapmgr.testbed.aaa/sysctl.d/99-testbedaaa.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+net.ipv4.ip_forward=1
+net.ipv6.conf.all.forwarding=1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/gw.eap.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+eap.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/gw.eap.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+-DBUILD_DBG_MONITOR:BOOL=ON 
+-DBUILD_APP_RADGW:BOOL=ON -DBUILD_RGWX_DEBUG:BOOL=ON -DBUILD_RGWX_AUTH:BOOL=ON -DBUILD_RGWX_ACCT:BOOL=ON -DBUILD_RGWX_ECHODROP:BOOL=ON
+-DSKIP_TESTS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/gw.eap.testbed.aaa/freeDiameter/echo_drop.rgwx.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,9 @@
+
+# ECHO code 25 ; # Class attributes
+# DROP code 18 ; # Reply-Message attribute, should not be included in requests
+# DROP code 26 vendor 9 ; # Drop any Cisco-specific attribute
+# ECHO code 26 vendor 0 ext 256 ; # Echo any extended attribute with the type 256.
+
+drop code 4 ;
+echo code 33 ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/gw.eap.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+SCTP_streams = 3;
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+NoRelay;
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+
+LoadExtension = "/root/freeDiameter/extensions/dict_nasreq.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dict_eap.fdx";
+LoadExtension = "/root/freeDiameter/extensions/app_radgw.fdx"
+		: "/root/conf/freeDiameter/rgw.conf";
+
+# "opendiam.eap.testbed.aaa" = { uri="aaa://opendiam.eap.testbed.aaa;transport=sctp"; };
+ConnectPeer = "opendiam.eap.testbed.aaa" {   #TLS_old_Method; 
+						No_TLS; };
+
+ConnectPeer = "backend.eap.testbed.aaa" { No_TLS; };
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/gw.eap.testbed.aaa/freeDiameter/rgw.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+
+# Handle some attributes
+#RGWX = "/root/freeDiameter/extensions/echo_drop.rgwx" : "/root/conf/freeDiameter/echo_drop.rgwx.conf";
+
+# Handle Accounting-Request messages received on the correct port
+RGWX = "/root/freeDiameter/extensions/acct.rgwx" : acct : 4;
+
+# Handle Access-Request messages received on the correct port
+RGWX = "/root/freeDiameter/extensions/auth.rgwx" : auth : 1;
+
+# Dump state when loop ends
+RGWX = "/root/freeDiameter/extensions/debug.rgwx";
+
+
+##################
+
+cli = 192.168.105.10 / "radiusecret" ;
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/gw.eap.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,506 @@
+# Configuration file for dnsmasq.
+#
+# Format is one option per line, legal options are the same
+# as the long options legal on the command line. See
+# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details.
+
+# The following two options make you a better netizen, since they
+# tell dnsmasq to filter out queries which the public DNS cannot
+# answer, and which load the servers (especially the root servers)
+# uneccessarily. If you have a dial-on-demand link they also stop
+# these requests from bringing up the link uneccessarily.
+
+# Never forward plain names (without a dot or domain part)
+#domain-needed
+# Never forward addresses in the non-routed address spaces.
+#bogus-priv
+
+
+# Uncomment this to filter useless windows-originated DNS requests
+# which can trigger dial-on-demand links needlessly.
+# Note that (amongst other things) this blocks all SRV requests,
+# so don't use it if you use eg Kerberos, SIP, XMMP or Google-talk.
+# This option only affects forwarding, SRV records originating for
+# dnsmasq (via srv-host= lines) are not suppressed by it.
+#filterwin2k
+
+# Change this line if you want dns to get its upstream servers from
+# somewhere other that /etc/resolv.conf
+#resolv-file=
+
+# By  default,  dnsmasq  will  send queries to any of the upstream
+# servers it knows about and tries to favour servers to are  known
+# to  be  up.  Uncommenting this forces dnsmasq to try each query
+# with  each  server  strictly  in  the  order  they   appear   in
+# /etc/resolv.conf
+#strict-order
+
+# If you don't want dnsmasq to read /etc/resolv.conf or any other
+# file, getting its servers from this file instead (see below), then
+# uncomment this.
+#no-resolv
+
+# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv
+# files for changes and re-read them then uncomment this.
+#no-poll
+
+# Add other name servers here, with domain specs if they are for
+# non-public domains.
+#server=/localnet/192.168.0.1
+
+# Example of routing PTR queries to nameservers: this will send all 
+# address->name queries for 192.168.3/24 to nameserver 10.1.2.3
+#server=/3.168.192.in-addr.arpa/10.1.2.3
+
+# Add local-only domains here, queries in these domains are answered
+# from /etc/hosts or DHCP only.
+#local=/localnet/
+
+# Add domains which you want to force to an IP address here.
+# The example below send any host in doubleclick.net to a local
+# webserver.
+#address=/doubleclick.net/127.0.0.1
+
+# --address (and --server) work with IPv6 addresses too.
+#address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83
+
+# You can control how dnsmasq talks to a server: this forces 
+# queries to 10.1.2.3 to be routed via eth1
+# --server=10.1.2.3@eth1
+
+# and this sets the source (ie local) address used to talk to
+# 10.1.2.3 to 192.168.1.1 port 55 (there must be a interface with that
+# IP on the machine, obviously).
+# --server=10.1.2.3@192.168.1.1#55
+
+# If you want dnsmasq to change uid and gid to something other
+# than the default, edit the following lines.
+#user=
+#group=
+
+# If you want dnsmasq to listen for DHCP and DNS requests only on
+# specified interfaces (and the loopback) give the name of the
+# interface (eg eth0) here.
+# Repeat the line for more than one interface.
+#interface=
+# Or you can specify which interface _not_ to listen on
+#except-interface=
+# Or which to listen on by address (remember to include 127.0.0.1 if
+# you use this.)
+#listen-address=
+# If you want dnsmasq to provide only DNS service on an interface,
+# configure it as shown above, and then use the following line to
+# disable DHCP on it.
+#no-dhcp-interface=
+
+# On systems which support it, dnsmasq binds the wildcard address,
+# even when it is listening on only some interfaces. It then discards
+# requests that it shouldn't reply to. This has the advantage of
+# working even when interfaces come and go and change address. If you
+# want dnsmasq to really bind only the interfaces it is listening on,
+# uncomment this option. About the only time you may need this is when
+# running another nameserver on the same machine.
+#bind-interfaces
+
+# If you don't want dnsmasq to read /etc/hosts, uncomment the
+# following line.
+#no-hosts
+# or if you want it to read another file, as well as /etc/hosts, use
+# this.
+#addn-hosts=/etc/banner_add_hosts
+
+# Set this (and domain: see below) if you want to have a domain
+# automatically added to simple names in a hosts-file.
+#expand-hosts
+
+# Set the domain for dnsmasq. this is optional, but if it is set, it
+# does the following things.
+# 1) Allows DHCP hosts to have fully qualified domain names, as long
+#     as the domain part matches this setting.
+# 2) Sets the "domain" DHCP option thereby potentially setting the
+#    domain of all systems configured by DHCP
+# 3) Provides the domain part for "expand-hosts"
+#domain=thekelleys.org.uk
+
+# Set a different domain for a particular subnet
+#domain=wireless.thekelleys.org.uk,192.168.2.0/24
+
+# Same idea, but range rather then subnet
+#domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200
+
+# Uncomment this to enable the integrated DHCP server, you need
+# to supply the range of addresses available for lease and optionally
+# a lease time. If you have more than one network, you will need to
+# repeat this for each network on which you want to supply DHCP
+# service.
+#dhcp-range=192.168.0.50,192.168.0.150,12h
+
+# This is an example of a DHCP range where the netmask is given. This
+# is needed for networks we reach the dnsmasq DHCP server via a relay
+# agent. If you don't know what a DHCP relay agent is, you probably
+# don't need to worry about this.
+#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h
+
+# This is an example of a DHCP range with a network-id, so that
+# some DHCP options may be set only for this network.
+#dhcp-range=red,192.168.0.50,192.168.0.150
+
+# Supply parameters for specified hosts using DHCP. There are lots
+# of valid alternatives, so we will give examples of each. Note that
+# IP addresses DO NOT have to be in the range given above, they just
+# need to be on the same network. The order of the parameters in these
+# do not matter, it's permissble to give name,adddress and MAC in any order
+
+# Always allocate the host with ethernet address 11:22:33:44:55:66
+# The IP address 192.168.0.60
+#dhcp-host=11:22:33:44:55:66,192.168.0.60
+
+# Always set the name of the host with hardware address
+# 11:22:33:44:55:66 to be "fred"
+#dhcp-host=11:22:33:44:55:66,fred
+
+# Always give the host with ethernet address 11:22:33:44:55:66
+# the name fred and IP address 192.168.0.60 and lease time 45 minutes
+#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
+
+# Give a host with ethernet address 11:22:33:44:55:66 or
+# 12:34:56:78:90:12 the IP address 192.168.0.60. Dnsmasq will assume
+# that these two ethernet interfaces will never be in use at the same
+# time, and give the IP address to the second, even if it is already
+# in use by the first. Useful for laptops with wired and wireless
+# addresses.
+#dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.60
+
+# Give the machine which says its name is "bert" IP address
+# 192.168.0.70 and an infinite lease
+#dhcp-host=bert,192.168.0.70,infinite
+
+# Always give the host with client identifier 01:02:02:04
+# the IP address 192.168.0.60
+#dhcp-host=id:01:02:02:04,192.168.0.60
+
+# Always give the host with client identifier "marjorie"
+# the IP address 192.168.0.60
+#dhcp-host=id:marjorie,192.168.0.60
+
+# Enable the address given for "judge" in /etc/hosts
+# to be given to a machine presenting the name "judge" when
+# it asks for a DHCP lease.
+#dhcp-host=judge
+
+# Never offer DHCP service to a machine whose ethernet
+# address is 11:22:33:44:55:66
+#dhcp-host=11:22:33:44:55:66,ignore
+
+# Ignore any client-id presented by the machine with ethernet
+# address 11:22:33:44:55:66. This is useful to prevent a machine
+# being treated differently when running under different OS's or
+# between PXE boot and OS boot.
+#dhcp-host=11:22:33:44:55:66,id:*
+
+# Send extra options which are tagged as "red" to
+# the machine with ethernet address 11:22:33:44:55:66
+#dhcp-host=11:22:33:44:55:66,net:red
+
+# Send extra options which are tagged as "red" to
+# any machine with ethernet address starting 11:22:33:
+#dhcp-host=11:22:33:*:*:*,net:red
+
+# Ignore any clients which are specified in dhcp-host lines
+# or /etc/ethers. Equivalent to ISC "deny unkown-clients".
+# This relies on the special "known" tag which is set when 
+# a host is matched.
+#dhcp-ignore=#known
+
+# Send extra options which are tagged as "red" to any machine whose
+# DHCP vendorclass string includes the substring "Linux"
+#dhcp-vendorclass=red,Linux
+
+# Send extra options which are tagged as "red" to any machine one
+# of whose DHCP userclass strings includes the substring "accounts"
+#dhcp-userclass=red,accounts
+
+# Send extra options which are tagged as "red" to any machine whose
+# MAC address matches the pattern.
+#dhcp-mac=red,00:60:8C:*:*:*
+
+# If this line is uncommented, dnsmasq will read /etc/ethers and act
+# on the ethernet-address/IP pairs found there just as if they had
+# been given as --dhcp-host options. Useful if you keep
+# MAC-address/host mappings there for other purposes.
+#read-ethers
+
+# Send options to hosts which ask for a DHCP lease.
+# See RFC 2132 for details of available options.
+# Common options can be given to dnsmasq by name: 
+# run "dnsmasq --help dhcp" to get a list.
+# Note that all the common settings, such as netmask and
+# broadcast address, DNS server and default route, are given
+# sane defaults by dnsmasq. You very likely will not need 
+# any dhcp-options. If you use Windows clients and Samba, there
+# are some options which are recommended, they are detailed at the
+# end of this section.
+
+# Override the default route supplied by dnsmasq, which assumes the
+# router is the same machine as the one running dnsmasq.
+#dhcp-option=3,1.2.3.4
+
+# Do the same thing, but using the option name
+#dhcp-option=option:router,1.2.3.4
+
+# Override the default route supplied by dnsmasq and send no default
+# route at all. Note that this only works for the options sent by
+# default (1, 3, 6, 12, 28) the same line will send a zero-length option 
+# for all other option numbers.
+#dhcp-option=3
+
+# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5
+#dhcp-option=option:ntp-server,192.168.0.4,10.10.0.5
+
+# Set the NTP time server address to be the same machine as
+# is running dnsmasq
+#dhcp-option=42,0.0.0.0
+
+# Set the NIS domain name to "welly"
+#dhcp-option=40,welly
+
+# Set the default time-to-live to 50
+#dhcp-option=23,50
+
+# Set the "all subnets are local" flag
+#dhcp-option=27,1
+
+# Send the etherboot magic flag and then etherboot options (a string).
+#dhcp-option=128,e4:45:74:68:00:00
+#dhcp-option=129,NIC=eepro100
+
+# Specify an option which will only be sent to the "red" network
+# (see dhcp-range for the declaration of the "red" network)
+# Note that the net: part must precede the option: part.
+#dhcp-option = net:red, option:ntp-server, 192.168.1.1
+
+# The following DHCP options set up dnsmasq in the same way as is specified
+# for the ISC dhcpcd in
+# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
+# adapted for a typical dnsmasq installation where the host running
+# dnsmasq is also the host running samba.
+# you may want to uncomment some or all of them if you use 
+# Windows clients and Samba.
+#dhcp-option=19,0           # option ip-forwarding off
+#dhcp-option=44,0.0.0.0     # set netbios-over-TCP/IP nameserver(s) aka WINS server(s)
+#dhcp-option=45,0.0.0.0     # netbios datagram distribution server
+#dhcp-option=46,8           # netbios node type
+
+# Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client
+# probably doesn't support this......
+#dhcp-option=option:domain-search,eng.apple.com,marketing.apple.com
+
+# Send RFC-3442 classless static routes (note the netmask encoding)
+#dhcp-option=121,192.168.1.0/24,1.2.3.4,10.0.0.0/8,5.6.7.8
+
+# Send vendor-class specific options encapsulated in DHCP option 43. 
+# The meaning of the options is defined by the vendor-class so
+# options are sent only when the client supplied vendor class
+# matches the class given here. (A substring match is OK, so "MSFT" 
+# matches "MSFT" and "MSFT 5.0"). This example sets the
+# mtftp address to 0.0.0.0 for PXEClients.
+#dhcp-option=vendor:PXEClient,1,0.0.0.0
+
+# Send microsoft-specific option to tell windows to release the DHCP lease
+# when it shuts down. Note the "i" flag, to tell dnsmasq to send the
+# value as a four-byte integer - that's what microsoft wants. See
+# http://technet2.microsoft.com/WindowsServer/en/library/a70f1bb7-d2d4-49f0-96d6-4b7414ecfaae1033.mspx?mfr=true
+#dhcp-option=vendor:MSFT,2,1i
+
+# Send the Encapsulated-vendor-class ID needed by some configurations of
+# Etherboot to allow is to recognise the DHCP server.
+#dhcp-option=vendor:Etherboot,60,"Etherboot"
+
+# Send options to PXELinux. Note that we need to send the options even
+# though they don't appear in the parameter request list, so we need
+# to use dhcp-option-force here. 
+# See http://syslinux.zytor.com/pxe.php#special for details.
+# Magic number - needed before anything else is recognised
+#dhcp-option-force=208,f1:00:74:7e
+# Configuration file name
+#dhcp-option-force=209,configs/common
+# Path prefix
+#dhcp-option-force=210,/tftpboot/pxelinux/files/
+# Reboot time. (Note 'i' to send 32-bit value)
+#dhcp-option-force=211,30i
+
+# Set the boot filename for BOOTP. You will only need 
+# this is you want to boot machines over the network and you will need
+# a TFTP server; either dnsmasq's built in TFTP server or an
+# external one. (See below for how to enable the TFTP server.)
+#dhcp-boot=pxelinux.0
+
+# Boot for Etherboot gPXE. The idea is to send two different
+# filenames, the first loads gPXE, and the second tells gPXE what to
+# load. The dhcp-match sets the gpxe tag for requests from gPXE.
+#dhcp-match=gpxe,175 # gPXE sends a 175 option.
+#dhcp-boot=net:#gpxe,undionly.kpxe
+#dhcp-boot=mybootimage
+ 
+# Encapsulated options for Etherboot gPXE. All the options are
+# encapsulated within option 175
+#dhcp-option=encap:175, 1, 5b         # priority code
+#dhcp-option=encap:175, 176, 1b       # no-proxydhcp 
+#dhcp-option=encap:175, 177, string   # bus-id 
+#dhcp-option=encap:175, 189, 1b       # BIOS drive code
+#dhcp-option=encap:175, 190, user     # iSCSI username
+#dhcp-option=encap:175, 191, pass     # iSCSI password
+
+# Test for the architecture of a netboot client. PXE clients are
+# supposed to send their architecture as option 93. (See RFC 4578)
+#dhcp-match=peecees, option:client-arch, 0 #x86-32
+#dhcp-match=itanics, option:client-arch, 2 #IA64
+#dhcp-match=hammers, option:client-arch, 6 #x86-64
+#dhcp-match=mactels, option:client-arch, 7 #EFI x86-64 
+
+# Enable dnsmasq's built-in TFTP server
+#enable-tftp
+
+# Set the root directory for files availble via FTP.
+#tftp-root=/var/ftpd
+
+# Make the TFTP server more secure: with this set, only files owned by
+# the user dnsmasq is running as will be send over the net.
+#tftp-secure
+
+# Set the boot file name only when the "red" tag is set.
+#dhcp-boot=net:red,pxelinux.red-net
+
+# An example of dhcp-boot with an external server: the name and IP
+# address of the server are given after the filename.
+#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
+
+# Set the limit on DHCP leases, the default is 150
+#dhcp-lease-max=150
+
+# The DHCP server needs somewhere on disk to keep its lease database.
+# This defaults to a sane location, but if you want to change it, use
+# the line below.
+#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
+
+# Set the DHCP server to authoritative mode. In this mode it will barge in
+# and take over the lease for any client which broadcasts on the network,
+# whether it has a record of the lease or not. This avoids long timeouts
+# when a machine wakes up on a new network. DO NOT enable this if there's
+# the slighest chance that you might end up accidentally configuring a DHCP
+# server for your campus/company accidentally. The ISC server uses
+# the same option, and this URL provides more information:
+# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php
+#dhcp-authoritative
+
+# Run an executable when a DHCP lease is created or destroyed.
+# The arguments sent to the script are "add" or "del", 
+# then the MAC address, the IP address and finally the hostname
+# if there is one. 
+#dhcp-script=/bin/echo
+
+# Set the cachesize here.
+#cache-size=150
+
+# If you want to disable negative caching, uncomment this.
+#no-negcache
+
+# Normally responses which come form /etc/hosts and the DHCP lease
+# file have Time-To-Live set as zero, which conventionally means
+# do not cache further. If you are happy to trade lower load on the
+# server for potentially stale date, you can set a time-to-live (in
+# seconds) here.
+#local-ttl=
+
+# If you want dnsmasq to detect attempts by Verisign to send queries
+# to unregistered .com and .net hosts to its sitefinder service and
+# have dnsmasq instead return the correct NXDOMAIN response, uncomment
+# this line. You can add similar lines to do the same for other
+# registries which have implemented wildcard A records.
+#bogus-nxdomain=64.94.110.11
+
+# If you want to fix up DNS results from upstream servers, use the
+# alias option. This only works for IPv4.
+# This alias makes a result of 1.2.3.4 appear as 5.6.7.8
+#alias=1.2.3.4,5.6.7.8
+# and this maps 1.2.3.x to 5.6.7.x
+#alias=1.2.3.0,5.6.7.0,255.255.255.0
+# and this maps 192.168.0.10->192.168.0.40 to 10.0.0.10->10.0.0.40
+#alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0
+
+# Change these lines if you want dnsmasq to serve MX records.
+
+# Return an MX record named "maildomain.com" with target
+# servermachine.com and preference 50
+#mx-host=maildomain.com,servermachine.com,50
+
+# Set the default target for MX records created using the localmx option.
+#mx-target=servermachine.com
+
+# Return an MX record pointing to the mx-target for all local
+# machines.
+#localmx
+
+# Return an MX record pointing to itself for all local machines.
+#selfmx
+
+# Change the following lines if you want dnsmasq to serve SRV
+# records.  These are useful if you want to serve ldap requests for
+# Active Directory and other windows-originated DNS requests.
+# See RFC 2782.
+# You may add multiple srv-host lines.
+# The fields are <name>,<target>,<port>,<priority>,<weight>
+# If the domain part if missing from the name (so that is just has the
+# service and protocol sections) then the domain given by the domain=
+# config option is used. (Note that expand-hosts does not need to be
+# set for this to work.)
+
+# A SRV record sending LDAP for the example.com domain to
+# ldapserver.example.com port 289
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389
+
+# A SRV record sending LDAP for the example.com domain to
+# ldapserver.example.com port 289 (using domain=)
+#domain=example.com
+#srv-host=_ldap._tcp,ldapserver.example.com,389
+
+# Two SRV records for LDAP, each with different priorities
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2
+
+# A SRV record indicating that there is no LDAP server for the domain
+# example.com
+#srv-host=_ldap._tcp.example.com
+
+# The following line shows how to make dnsmasq serve an arbitrary PTR
+# record. This is useful for DNS-SD. (Note that the
+# domain-name expansion done for SRV records _does_not
+# occur for PTR records.)
+#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services"
+
+# Change the following lines to enable dnsmasq to serve TXT records.
+# These are used for things like SPF and zeroconf. (Note that the
+# domain-name expansion done for SRV records _does_not
+# occur for TXT records.)
+
+#Example SPF.
+#txt-record=example.com,"v=spf1 a -all"
+
+#Example zeroconf
+#txt-record=_http._tcp.example.com,name=value,paper=A4
+
+# Provide an alias for a "local" DNS name. Note that this _only_ works
+# for targets which are names from DHCP or /etc/hosts. Give host
+# "bert" another name, bertrand
+#cname=bertand,bert
+
+# For debugging purposes, log each DNS query as it passes through
+# dnsmasq.
+#log-queries
+
+# Log lots of extra information about DHCP transactions.
+#log-dhcp
+
+# Include a another lot of configuration options.
+#conf-file=/etc/dnsmasq.more.conf
+conf-dir=/etc/dnsmasq.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.d/_global.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,17 @@
+domain-needed
+bogus-priv
+local=/testbed.aaa/
+except-interface=eth0
+expand-hosts
+domain=testbed.aaa
+
+# cname=proxy,mgr
+
+# Set a different domain for a particular subnet
+#domain=wireless.thekelleys.org.uk,192.168.2.0/24
+
+# Same idea, but range rather then subnet
+#domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200
+ 
+dhcp-range=192.168.101.100,192.168.101.150,255.255.255.0,12h
+  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.d/dsmipmgr.testbed.aaa	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2 @@
+dhcp-host=08:00:27:05:D5:DF,dsmipmgr
+# dhcp-host=08:00:27:05:D5:DF,dsmipmgr,192.168.101.6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.d/eapmgr.testbed.aaa	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2 @@
+dhcp-host=08:00:27:3C:58:E6,eapmgr
+# dhcp-host=08:00:27:3C:58:E6,eapmgr,192.168.101.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.d/interopmgr.testbed.aaa	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+dhcp-host=08:00:27:87:01:49,interopmgr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.d/rtmgr.testbed.aaa	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2 @@
+dhcp-host=08:00:27:A5:9E:F4,rtmgr
+# dhcp-host=08:00:27:A5:9E:F4,rtmgr,192.168.101.3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/dnsmasq.d/simplemgr.testbed.aaa	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+dhcp-host=08:00:27:ce:34:71,simplemgr
+# dhcp-host=simplemgr,192.168.101.2
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/dns/hosts	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,25 @@
+127.0.0.1	localhost
+127.0.1.1	mgr.testbeddomain	mgr
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+# All local services
+192.168.101.1	proxy
+# fde4:2c6e:55c4:101::1	proxy
+
+# Other machines in the local domain 1 (.testbed.aaa)
+192.168.101.2	simplemgr
+192.168.101.3	rtmgr
+192.168.101.5	eapmgr
+192.168.101.6	dsmipmgr
+192.168.101.10	interopmgr
+
+# winseven is also managed, but no fixed IP
+# netbsd is also managed, but no fixed IP
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/network/interfaces	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+
+auto eth1
+iface eth1 inet static
+	address 192.168.101.1
+	netmask 255.255.255.0
+iface eth1 inet6 static
+	address fde4:2c6e:55c4:101::1
+	netmask 64
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,49 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+
+# Enable this if you want statistics to be logged.
+#statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+server morbier
+server 127.127.1.1
+fudge 127.127.1.1 stratum 10
+
+# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
+# details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
+# might also be helpful.
+#
+# Note that "restrict" applies to both servers and clients, so a configuration
+# that might be intended to block requests from certain clients could also end
+# up blocking replies from your own upstream servers.
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access, but only if
+# cryptographically authenticated.
+#restrict 192.168.123.0 mask 255.255.255.0 notrust
+restrict 192.168.101.0 mask 255.255.255.0 nomodify
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+broadcast 192.168.101.255
+
+# If you want to listen to time broadcasts on your local subnet, de-comment the
+# next lines.  Please do this only if you trust everybody on the network!
+disable auth
+enable bclient
+broadcastclient
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/quagga/daemons	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,27 @@
+# This file tells the quagga package which daemons to start.
+#
+# Entries are in the format: <daemon>=(yes|no|priority)
+#   0, "no"  = disabled
+#   1, "yes" = highest priority
+#   2 .. 10  = lower priorities
+# Read /usr/share/doc/quagga/README.Debian for details.
+#
+# Sample configurations for these daemons can be found in
+# /usr/share/doc/quagga/examples/.
+#
+# ATTENTION: 
+#
+# When activation a daemon at the first time, a config file, even if it is
+# empty, has to be present *and* be owned by the user and group "quagga", else
+# the daemon will not be started by /etc/init.d/quagga. The permissions should
+# be u=rw,g=r,o=.
+# When using "vtysh" such a config file is also needed. It should be owned by
+# group "quaggavty" and set to ug=rw,o= though. Check /etc/pam.d/quagga, too.
+#
+zebra=yes
+bgpd=no
+ospfd=no
+ospf6d=no
+ripd=no
+ripngd=no
+isisd=no
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/quagga/debian.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,13 @@
+#
+# If this option is set the /etc/init.d/quagga script automatically loads
+# the config via "vtysh -b" when the servers are started. 
+# Check /etc/pam.d/quagga if you intend to use "vtysh"!
+#
+vtysh_enable=yes
+zebra_options=" --daemon -A 127.0.0.1"
+bgpd_options="  --daemon -A 127.0.0.1"
+ospfd_options=" --daemon -A 127.0.0.1"
+ospf6d_options="--daemon -A ::1"
+ripd_options="  --daemon -A 127.0.0.1"
+ripngd_options="--daemon -A ::1"
+isisd_options=" --daemon -A 127.0.0.1"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/quagga/zebra.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,24 @@
+hostname mgr.testbed.aaa
+
+interface eth0
+ description uplink morbier
+interface eth1
+ description testbed.aaa
+
+ip route 192.168.102.0/24 192.168.101.2
+ip route 192.168.103.0/24 192.168.101.3	
+ip route 192.168.104.0/24 192.168.101.3	
+ip route 192.168.115.0/24 192.168.101.3	
+ip route 192.168.105.0/24 192.168.101.5
+
+! dsmip: de 192 a 207
+ip route 192.168.192.0/20 192.168.101.6
+
+
+!
+! Static default route sample.
+!
+!ip route 0.0.0.0/0 203.181.89.241
+!
+
+!log file /var/log/quagga/zebra.log
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/radvd.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,21 @@
+interface eth1
+{
+	AdvSendAdvert on;
+	# IgnoreIfMissing on;
+
+	MinRtrAdvInterval 3;
+	MaxRtrAdvInterval 10;
+
+	AdvDefaultPreference low;
+
+	AdvHomeAgentFlag off;
+
+	prefix fde4:2c6e:55c4:101::/64
+	{
+		AdvOnLink on;
+		AdvAutonomous on;
+		AdvRouterAddr on;
+	};
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/mgr.testbeddomain/squid/squid.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,4951 @@
+
+#	WELCOME TO SQUID 2.7.STABLE3
+#	----------------------------
+#
+#	This is the default Squid configuration file. You may wish
+#	to look at the Squid home page (http://www.squid-cache.org/)
+#	for the FAQ and other documentation.
+#
+#	The default Squid config file shows what the defaults for
+#	various options happen to be.  If you don't need to change the
+#	default, you shouldn't uncomment the line.  Doing so may cause
+#	run-time problems.  In some cases "none" refers to no default
+#	setting at all, while in other cases it refers to a valid
+#	option - the comments for that keyword indicate if this is the
+#	case.
+#
+
+
+#  Configuration options can be included using the "include" directive.
+#  Include takes a list of files to include. Quoting and wildcards is
+#  supported.
+#
+#  For example,
+#
+#  include /path/to/included/file/squid.acl.config
+#
+#  Includes can be nested up to a hard-coded depth of 16 levels.
+#  This arbitrary restriction is to prevent recursive include references
+#  from causing Squid entering an infinite loop whilst trying to load
+#  configuration files.
+
+
+# OPTIONS FOR AUTHENTICATION
+# -----------------------------------------------------------------------------
+
+#  TAG: auth_param
+#	This is used to define parameters for the various authentication
+#	schemes supported by Squid.
+#
+#	format: auth_param scheme parameter [setting]
+#
+#	The order in which authentication schemes are presented to the client is
+#	dependent on the order the scheme first appears in config file. IE
+#	has a bug (it's not RFC 2617 compliant) in that it will use the basic
+#	scheme if basic is the first entry presented, even if more secure
+#	schemes are presented. For now use the order in the recommended
+#	settings section below. If other browsers have difficulties (don't
+#	recognize the schemes offered even if you are using basic) either
+#	put basic first, or disable the other schemes (by commenting out their
+#	program entry).
+#
+#	Once an authentication scheme is fully configured, it can only be
+#	shutdown by shutting squid down and restarting. Changes can be made on
+#	the fly and activated with a reconfigure. I.E. You can change to a
+#	different helper, but not unconfigure the helper completely.
+#
+#	Please note that while this directive defines how Squid processes
+#	authentication it does not automatically activate authentication.
+#	To use authentication you must in addition make use of ACLs based
+#	on login name in http_access (proxy_auth, proxy_auth_regex or
+#	external with %LOGIN used in the format tag). The browser will be
+#	challenged for authentication on the first such acl encountered
+#	in http_access processing and will also be re-challenged for new
+#	login credentials if the request is being denied by a proxy_auth
+#	type acl.
+#
+#	WARNING: authentication can't be used in a transparently intercepting
+#	proxy as the client then thinks it is talking to an origin server and
+#	not the proxy. This is a limitation of bending the TCP/IP protocol to
+#	transparently intercepting port 80, not a limitation in Squid.
+#
+#	=== Parameters for the basic scheme follow. ===
+#
+#	"program" cmdline
+#	Specify the command for the external authenticator.  Such a program
+#	reads a line containing "username password" and replies "OK" or
+#	"ERR" in an endless loop. "ERR" responses may optionally be followed
+#	by a error description available as %m in the returned error page.
+#
+#	By default, the basic authentication scheme is not used unless a
+#	program is specified.
+#
+#	If you want to use the traditional proxy authentication, jump over to
+#	the helpers/basic_auth/NCSA directory and type:
+#		% make
+#		% make install
+#
+#	Then, set this line to something like
+#
+#	auth_param basic program /usr/lib/squid/ncsa_auth /usr/etc/passwd
+#
+#	"children" numberofchildren
+#	The number of authenticator processes to spawn. If you start too few
+#	squid will have to wait for them to process a backlog of credential
+#	verifications, slowing it down. When credential verifications are
+#	done via a (slow) network you are likely to need lots of
+#	authenticator processes.
+#	auth_param basic children 5
+#
+#	"concurrency" numberofconcurrentrequests
+#	The number of concurrent requests/channels the helper supports.
+#	Changes the protocol used to include a channel number first on
+#	the request/response line, allowing multiple requests to be sent
+#	to the same helper in parallell without wating for the response.
+#	Must not be set unless it's known the helper supports this.
+#
+#	"realm" realmstring
+#	Specifies the realm name which is to be reported to the client for
+#	the basic proxy authentication scheme (part of the text the user
+#	will see when prompted their username and password).
+#	auth_param basic realm Squid proxy-caching web server
+#
+#	"credentialsttl" timetolive
+#	Specifies how long squid assumes an externally validated
+#	username:password pair is valid for - in other words how often the
+#	helper program is called for that user. Set this low to force
+#	revalidation with short lived passwords.  Note that setting this high
+#	does not impact your susceptibility to replay attacks unless you are
+#	using an one-time password system (such as SecureID). If you are using
+#	such a system, you will be vulnerable to replay attacks unless you
+#	also use the max_user_ip ACL in an http_access rule.
+#	auth_param basic credentialsttl 2 hours
+#
+#	"casesensitive" on|off
+#	Specifies if usernames are case sensitive. Most user databases are
+#	case insensitive allowing the same username to be spelled using both
+#	lower and upper case letters, but some are case sensitive. This
+#	makes a big difference for user_max_ip ACL processing and similar.
+#	auth_param basic casesensitive off
+#
+#	"blankpassword" on|off
+#	Specifies if blank passwords should be supported. Defaults to off
+#	as there is multiple authentication backends which handles blank
+#	passwords as "guest" access.
+#
+#	=== Parameters for the digest scheme follow ===
+#
+#	"program" cmdline
+#	Specify the command for the external authenticator.  Such a program
+#	reads a line containing "username":"realm" and replies with the
+#	appropriate H(A1) value hex encoded or ERR if the user (or his H(A1)
+#	hash) does not exists.  See RFC 2616 for the definition of H(A1).
+#	"ERR" responses may optionally be followed by a error description
+#	available as %m in the returned error page.
+#
+#	By default, the digest authentication scheme is not used unless a
+#	program is specified.
+#
+#	If you want to use a digest authenticator, jump over to the
+#	helpers/digest_auth/ directory and choose the authenticator to use.
+#	It it's directory type
+#		% make
+#		% make install
+#
+#	Then, set this line to something like
+#
+#	auth_param digest program /usr/lib/squid/digest_auth_pw /usr/etc/digpass
+#
+#	"children" numberofchildren
+#	The number of authenticator processes to spawn. If you start too few
+#	squid will have to wait for them to process a backlog of credential
+#	verifications, slowing it down. When credential verifications are
+#	done via a (slow) network you are likely to need lots of
+#	authenticator processes.
+#	auth_param digest children 5
+#
+#	"concurrency" numberofconcurrentrequests
+#	The number of concurrent requests/channels the helper supports.
+#	Changes the protocol used to include a channel number first on
+#	the request/response line, allowing multiple requests to be sent
+#	to the same helper in parallell without wating for the response.
+#	Must not be set unless it's known the helper supports this.
+#
+#	"realm" realmstring
+#	Specifies the realm name which is to be reported to the client for the
+#	digest proxy authentication scheme (part of the text the user will see
+#	when prompted their username and password).
+#	auth_param digest realm Squid proxy-caching web server
+#
+#	"nonce_garbage_interval" timeinterval
+#	Specifies the interval that nonces that have been issued to clients are
+#	checked for validity.
+#	auth_param digest nonce_garbage_interval 5 minutes
+#
+#	"nonce_max_duration" timeinterval
+#	Specifies the maximum length of time a given nonce will be valid for.
+#	auth_param digest nonce_max_duration 30 minutes
+#
+#	"nonce_max_count" number
+#	Specifies the maximum number of times a given nonce can be used.
+#	auth_param digest nonce_max_count 50
+#
+#	"nonce_strictness" on|off
+#	Determines if squid requires strict increment-by-1 behavior for nonce
+#	counts, or just incrementing (off - for use when useragents generate
+#	nonce counts that occasionally miss 1 (ie, 1,2,4,6)).
+#	auth_param digest nonce_strictness off
+#
+#	"check_nonce_count" on|off
+#	This directive if set to off can disable the nonce count check
+#	completely to work around buggy digest qop implementations in certain
+#	mainstream browser versions. Default on to check the nonce count to
+#	protect from authentication replay attacks.
+#	auth_param digest check_nonce_count on
+#
+#	"post_workaround" on|off
+#	This is a workaround to certain buggy browsers who sends an incorrect
+#	request digest in POST requests when reusing the same nonce as acquired
+#	earlier in response to a GET request.
+#	auth_param digest post_workaround off
+#
+#	=== NTLM scheme options follow ===
+#
+#	"program" cmdline
+#	Specify the command for the external NTLM authenticator. Such a
+#	program participates in the NTLMSSP exchanges between Squid and the
+#	client and reads commands according to the Squid NTLMSSP helper
+#	protocol. See helpers/ntlm_auth/ for details. Recommended ntlm
+#	authenticator is ntlm_auth from Samba-3.X, but a number of other
+#	ntlm authenticators is available.
+#
+#	By default, the ntlm authentication scheme is not used unless a
+#	program is specified.
+#
+#	auth_param ntlm program /usr/bin/ntlm_auth --helper-protocol=squid-2.5-ntlmssp
+#
+#	"children" numberofchildren
+#	The number of authenticator processes to spawn. If you start too few
+#	squid will have to wait for them to process a backlog of credential
+#	verifications, slowing it down. When credential verifications are
+#	done via a (slow) network you are likely to need lots of
+#	authenticator processes.
+#	auth_param ntlm children 5
+#
+#	"keep_alive" on|off
+#	This option enables the use of keep-alive on the initial
+#	authentication request. It has been reported some versions of MSIE
+#	have problems if this is enabled, but performance will be increased
+#	if enabled.
+#
+#	auth_param ntlm keep_alive on
+#
+#	=== Negotiate scheme options follow ===
+#
+#	"program" cmdline
+#	Specify the command for the external Negotiate authenticator. Such a
+#	program participates in the SPNEGO exchanges between Squid and the
+#	client and reads commands according to the Squid ntlmssp helper
+#	protocol. See helpers/ntlm_auth/ for details. Recommended SPNEGO
+#	authenticator is ntlm_auth from Samba-4.X.
+#
+#	By default, the Negotiate authentication scheme is not used unless a
+#	program is specified.
+#
+#	auth_param negotiate program /path/to/samba/bin/ntlm_auth --helper-protocol=gss-spnego
+#
+#	"children" numberofchildren
+#	The number of authenticator processes to spawn. If you start too few
+#	squid will have to wait for them to process a backlog of credential
+#	verifications, slowing it down. When credential verifications are
+#	done via a (slow) network you are likely to need lots of
+#	authenticator processes.
+#	auth_param negotiate children 5
+#
+#	"keep_alive" on|off
+#	If you experience problems with PUT/POST requests when using the
+#	Negotiate authentication scheme then you can try setting this to
+#	off. This will cause Squid to forcibly close the connection on
+#	the initial requests where the browser asks which schemes are
+#	supported by the proxy.
+#
+#	auth_param negotiate keep_alive on
+#
+#Recommended minimum configuration per scheme:
+#auth_param negotiate program <uncomment and complete this line to activate>
+#auth_param negotiate children 5
+#auth_param negotiate keep_alive on
+#auth_param ntlm program <uncomment and complete this line to activate>
+#auth_param ntlm children 5
+#auth_param ntlm keep_alive on
+#auth_param digest program <uncomment and complete this line>
+#auth_param digest children 5
+#auth_param digest realm Squid proxy-caching web server
+#auth_param digest nonce_garbage_interval 5 minutes
+#auth_param digest nonce_max_duration 30 minutes
+#auth_param digest nonce_max_count 50
+#auth_param basic program <uncomment and complete this line>
+#auth_param basic children 5
+#auth_param basic realm Squid proxy-caching web server
+#auth_param basic credentialsttl 2 hours
+#auth_param basic casesensitive off
+
+#  TAG: authenticate_cache_garbage_interval
+#	The time period between garbage collection across the username cache.
+#	This is a tradeoff between memory utilization (long intervals - say
+#	2 days) and CPU (short intervals - say 1 minute). Only change if you
+#	have good reason to.
+#
+#Default:
+# authenticate_cache_garbage_interval 1 hour
+
+#  TAG: authenticate_ttl
+#	The time a user & their credentials stay in the logged in user cache
+#	since their last request. When the garbage interval passes, all user
+#	credentials that have passed their TTL are removed from memory.
+#
+#Default:
+# authenticate_ttl 1 hour
+
+#  TAG: authenticate_ip_ttl
+#	If you use proxy authentication and the 'max_user_ip' ACL, this
+#	directive controls how long Squid remembers the IP addresses
+#	associated with each user.  Use a small value (e.g., 60 seconds) if
+#	your users might change addresses quickly, as is the case with
+#	dialups. You might be safe using a larger value (e.g., 2 hours) in a
+#	corporate LAN environment with relatively static address assignments.
+#
+#Default:
+# authenticate_ip_ttl 0 seconds
+
+#  TAG: authenticate_ip_shortcircuit_ttl
+#	Cache authentication credentials per client IP address for this
+#	long. Default is 0 seconds (disabled).
+#
+#Default:
+# authenticate_ip_shortcircuit_ttl 0 seconds
+
+
+# ACCESS CONTROLS
+# -----------------------------------------------------------------------------
+
+#  TAG: external_acl_type
+#	This option defines external acl classes using a helper program to
+#	look up the status
+#
+#	  external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..]
+#
+#	Options:
+#
+#	  ttl=n		TTL in seconds for cached results (defaults to 3600
+#			for 1 hour)
+#	  negative_ttl=n
+#			TTL for cached negative lookups (default same
+#			as ttl)
+#	  children=n	number of processes spawn to service external acl
+#			lookups of this type. (default 5).
+#	  concurrency=n	concurrency level per process. Only used with helpers
+#	  		capable of processing more than one query at a time.
+#			Note: see compatibility note below
+#	  cache=n	result cache size, 0 is unbounded (default)
+#	  grace=	Percentage remaining of TTL where a refresh of a
+#			cached entry should be initiated without needing to
+#			wait for a new reply. (default 0 for no grace period)
+#	  protocol=2.5  Compatibility mode for Squid-2.5 external acl helpers
+#
+#	FORMAT specifications
+#
+#	  %LOGIN	Authenticated user login name
+#	  %EXT_USER	Username from external acl
+#	  %IDENT	Ident user name
+#	  %SRC		Client IP
+#	  %SRCPORT	Client source port
+#	  %URI		Requested URI
+#	  %DST		Requested host
+#	  %PROTO	Requested protocol
+#	  %PORT		Requested port
+#	  %METHOD	Request method
+#	  %MYADDR	Squid interface address
+#	  %MYPORT	Squid http_port number
+#	  %PATH		Requested URL-path (including query-string if any)
+#	  %USER_CERT	SSL User certificate in PEM format
+#	  %USER_CERTCHAIN SSL User certificate chain in PEM format
+#	  %USER_CERT_xx	SSL User certificate subject attribute xx
+#	  %USER_CA_xx	SSL User certificate issuer attribute xx
+#	  %{Header}	HTTP request header
+#	  %{Hdr:member}	HTTP request header list member
+#	  %{Hdr:;member}
+#			HTTP request header list member using ; as
+#			list separator. ; can be any non-alphanumeric
+#			character.
+#	 %ACL		The ACL name
+#	 %DATA		The ACL arguments. If not used then any arguments
+#			is automatically added at the end
+#
+#	In addition to the above, any string specified in the referencing
+#	acl will also be included in the helper request line, after the
+#	specified formats (see the "acl external" directive)
+#
+#	The helper receives lines per the above format specification,
+#	and returns lines starting with OK or ERR indicating the validity
+#	of the request and optionally followed by additional keywords with
+#	more details.
+#
+#	General result syntax:
+#
+#	  OK/ERR keyword=value ...
+#
+#	Defined keywords:
+#
+#	  user=		The users name (login also understood)
+#	  password=	The users password (for PROXYPASS login= cache_peer)
+#	  message=	Error message or similar used as %o in error messages
+#			(error also understood)
+#	  log=		String to be logged in access.log. Available as
+#			%ea in logformat specifications
+#
+#	If protocol=3.0 (the default) then URL escaping is used to protect
+#	each value in both requests and responses.
+#
+#	If using protocol=2.5 then all values need to be enclosed in quotes
+#	if they may contain whitespace, or the whitespace escaped using \.
+#	And quotes or \ characters within the keyword value must be \ escaped.
+#
+#	When using the concurrency= option the protocol is changed by
+#	introducing a query channel tag infront of the request/response.
+#	The query channel tag is a number between 0 and concurrency-1.
+#
+#	Compatibility Note: The children= option was named concurrency= in
+#	Squid-2.5.STABLE3 and earlier, and was accepted as an alias for the
+#	duration of the Squid-2.5 releases to keep compatibility. However,
+#	the meaning of concurrency= option has changed in Squid-2.6 to match
+#	that of Squid-3 and the old syntax no longer works.
+#
+#Default:
+# none
+
+#  TAG: acl
+#	Defining an Access List
+#
+#    Every access list definition must begin with an aclname and acltype, 
+#    followed by either type-specific arguments or a quoted filename that
+#    they are read from.
+#
+#	acl aclname acltype argument ...
+#	acl aclname acltype "file" ...
+#
+#	when using "file", the file should contain one item per line.
+#
+#	By default, regular expressions are CASE-SENSITIVE.  To make
+#	them case-insensitive, use the -i option.
+#
+#	acl aclname src      ip-address/netmask ... (clients IP address)
+#	acl aclname src      addr1-addr2/netmask ... (range of addresses)
+#	acl aclname dst      ip-address/netmask ... (URL host's IP address)
+#	acl aclname myip     ip-address/netmask ... (local socket IP address)
+#
+#	acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
+#	  # The arp ACL requires the special configure option --enable-arp-acl.
+#	  # Furthermore, the arp ACL code is not portable to all operating systems.
+#	  # It works on Linux, Solaris, FreeBSD and some other *BSD variants.
+#	  #
+#	  # NOTE: Squid can only determine the MAC address for clients that are on
+#	  # the same subnet. If the client is on a different subnet, then Squid cannot
+#	  # find out its MAC address.
+#
+#	acl aclname srcdomain   .foo.com ...    # reverse lookup, client IP
+#	acl aclname dstdomain   .foo.com ...    # Destination server from URL
+#	acl aclname srcdom_regex [-i] xxx ...   # regex matching client name
+#	acl aclname dstdom_regex [-i] xxx ...   # regex matching server
+#	  # For dstdomain and dstdom_regex a reverse lookup is tried if a IP
+#	  # based URL is used and no match is found. The name "none" is used
+#	  # if the reverse lookup fails.
+#
+#	acl aclname time     [day-abbrevs]  [h1:m1-h2:m2]
+#	    # day-abbrevs:
+#		# S - Sunday
+#		# M - Monday
+#		# T - Tuesday
+#		# W - Wednesday
+#		# H - Thursday
+#		# F - Friday
+#		# A - Saturday
+#	    # h1:m1 must be less than h2:m2
+#	acl aclname url_regex [-i] ^http:// ...	    # regex matching on whole URL
+#	acl aclname urlpath_regex [-i] \.gif$ ...	# regex matching on URL path
+#	acl aclname urllogin [-i] [^a-zA-Z0-9] ...	# regex matching on URL login field
+#	acl aclname port     80 70 21 ...
+#	acl aclname port     0-1024 ...		# ranges allowed
+#	acl aclname myport   3128 ...		# (local socket TCP port)
+#	acl aclname myportname 3128 ...		# http(s)_port name
+#	acl aclname proto    HTTP FTP ...
+#	acl aclname method   GET POST ...
+#	acl aclname browser  [-i] regexp ...
+#	  # pattern match on User-Agent header (see also req_header below)
+#	acl aclname referer_regex  [-i] regexp ...
+#	  # pattern match on Referer header
+#	  # Referer is highly unreliable, so use with care
+#	acl aclname ident    username ...
+#	acl aclname ident_regex [-i] pattern ...
+#	  # string match on ident output.
+#	  # use REQUIRED to accept any non-null ident.
+#	acl aclname src_as   number ...
+#	acl aclname dst_as   number ...
+#	  # Except for access control, AS numbers can be used for
+#	  # routing of requests to specific caches. Here's an
+#	  # example for routing all requests for AS#1241 and only
+#	  # those to mycache.mydomain.net:
+#	  # acl asexample dst_as 1241
+#	  # cache_peer_access mycache.mydomain.net allow asexample
+#	  # cache_peer_access mycache_mydomain.net deny all
+#
+#	acl aclname proxy_auth [-i] username ...
+#	acl aclname proxy_auth_regex [-i] pattern ...
+#	  # list of valid usernames
+#	  # use REQUIRED to accept any valid username.
+#	  #
+#	  # NOTE: when a Proxy-Authentication header is sent but it is not
+#	  # needed during ACL checking the username is NOT logged
+#	  # in access.log.
+#	  #
+#	  # NOTE: proxy_auth requires a EXTERNAL authentication program
+#	  # to check username/password combinations (see
+#	  # auth_param directive).
+#	  #
+#	  # NOTE: proxy_auth can't be used in a transparent proxy as
+#	  # the browser needs to be configured for using a proxy in order
+#	  # to respond to proxy authentication.
+#
+#	acl aclname snmp_community string ...
+#	  # A community string to limit access to your SNMP Agent
+#	  # Example:
+#	  #
+#	  #	acl snmppublic snmp_community public
+#
+#	acl aclname maxconn number
+#	  # This will be matched when the client's IP address has
+#	  # more than <number> HTTP connections established.
+#
+#	acl aclname max_user_ip [-s] number
+#	  # This will be matched when the user attempts to log in from more
+#	  # than <number> different ip addresses. The authenticate_ip_ttl
+#	  # parameter controls the timeout on the ip entries.
+#	  # If -s is specified the limit is strict, denying browsing
+#	  # from any further IP addresses until the ttl has expired. Without
+#	  # -s Squid will just annoy the user by "randomly" denying requests.
+#	  # (the counter is reset each time the limit is reached and a
+#	  # request is denied)
+#	  # NOTE: in acceleration mode or where there is mesh of child proxies,
+#	  # clients may appear to come from multiple addresses if they are
+#	  # going through proxy farms, so a limit of 1 may cause user problems.
+#
+#	acl aclname req_mime_type mime-type ...
+#	  # regex match against the mime type of the request generated
+#	  # by the client. Can be used to detect file upload or some
+#	  # types HTTP tunneling requests.
+#	  # NOTE: This does NOT match the reply. You cannot use this
+#	  # to match the returned file type.
+#
+#	acl aclname req_header header-name [-i] any\.regex\.here
+#	  # regex match against any of the known request headers.  May be
+#	  # thought of as a superset of "browser", "referer" and "mime-type"
+#	  # ACLs.
+#
+#	acl aclname rep_mime_type mime-type ...
+#	  # regex match against the mime type of the reply received by
+#	  # squid. Can be used to detect file download or some
+#	  # types HTTP tunneling requests.
+#	  # NOTE: This has no effect in http_access rules. It only has
+#	  # effect in rules that affect the reply data stream such as
+#	  # http_reply_access.
+#
+#	acl aclname rep_header header-name [-i] any\.regex\.here
+#	  # regex match against any of the known reply headers. May be
+#	  # thought of as a superset of "browser", "referer" and "mime-type"
+#	  # ACLs.
+#	  #
+#	  # Example:
+#	  #
+#	  # acl many_spaces rep_header Content-Disposition -i [[:space:]]{3,}
+#
+#	acl aclname external class_name [arguments...]
+#	  # external ACL lookup via a helper class defined by the
+#	  # external_acl_type directive.
+#
+#	acl aclname urlgroup group1 ...
+#	  # match against the urlgroup as indicated by redirectors
+#
+#	acl aclname user_cert attribute values...
+#	  # match against attributes in a user SSL certificate
+#	  # attribute is one of DN/C/O/CN/L/ST
+#
+#	acl aclname ca_cert attribute values...
+#	  # match against attributes a users issuing CA SSL certificate
+#	  # attribute is one of DN/C/O/CN/L/ST
+#
+#	acl aclname ext_user username ...
+#	acl aclname ext_user_regex [-i] pattern ...
+#	  # string match on username returned by external acl helper
+#	  # use REQUIRED to accept any non-null user name.
+#
+#Examples:
+#acl macaddress arp 09:00:2b:23:45:67
+#acl myexample dst_as 1241
+#acl password proxy_auth REQUIRED
+#acl fileupload req_mime_type -i ^multipart/form-data$
+#acl javascript rep_mime_type -i ^application/x-javascript$
+#
+#Recommended minimum configuration:
+acl all src all
+acl manager proto cache_object
+acl localhost src 127.0.0.1/32
+acl to_localhost dst 127.0.0.0/8
+#
+# Example rule allowing access from your local networks.
+# Adapt to list your (internal) IP networks from where browsing
+# should be allowed
+acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
+acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
+acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
+#
+acl SSL_ports port 443		# https
+acl SSL_ports port 563		# snews
+acl SSL_ports port 873		# rsync
+acl Safe_ports port 80		# http
+acl Safe_ports port 21		# ftp
+acl Safe_ports port 443		# https
+acl Safe_ports port 70		# gopher
+acl Safe_ports port 210		# wais
+acl Safe_ports port 1025-65535	# unregistered ports
+acl Safe_ports port 280		# http-mgmt
+acl Safe_ports port 488		# gss-http
+acl Safe_ports port 591		# filemaker
+acl Safe_ports port 777		# multiling http
+acl Safe_ports port 631		# cups
+acl Safe_ports port 873		# rsync
+acl Safe_ports port 901		# SWAT
+acl purge method PURGE
+acl CONNECT method CONNECT
+
+#  TAG: http_access
+#	Allowing or Denying access based on defined access lists
+#
+#	Access to the HTTP port:
+#	http_access allow|deny [!]aclname ...
+#
+#	NOTE on default values:
+#
+#	If there are no "access" lines present, the default is to deny
+#	the request.
+#
+#	If none of the "access" lines cause a match, the default is the
+#	opposite of the last line in the list.  If the last line was
+#	deny, the default is allow.  Conversely, if the last line
+#	is allow, the default will be deny.  For these reasons, it is a
+#	good idea to have an "deny all" or "allow all" entry at the end
+#	of your access lists to avoid potential confusion.
+#
+#Default:
+# http_access deny all
+#
+#Recommended minimum configuration:
+#
+# Only allow cachemgr access from localhost
+http_access allow manager localhost
+http_access deny manager
+# Only allow purge requests from localhost
+http_access allow purge localhost
+http_access deny purge
+# Deny requests to unknown ports
+http_access deny !Safe_ports
+# Deny CONNECT to other than SSL ports
+http_access deny CONNECT !SSL_ports
+#
+# We strongly recommend the following be uncommented to protect innocent
+# web applications running on the proxy server who think the only
+# one who can access services on "localhost" is a local user
+#http_access deny to_localhost
+#
+# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+
+# Example rule allowing access from your local networks.
+# Adapt localnet in the ACL section to list your (internal) IP networks
+# from where browsing should be allowed
+http_access allow localnet
+http_access allow localhost
+
+# And finally deny all other access to this proxy
+http_access deny all
+
+#  TAG: http_access2
+#	Allowing or Denying access based on defined access lists
+#
+#	Identical to http_access, but runs after redirectors. If not set
+#	then only http_access is used.
+#
+#Default:
+# none
+
+#  TAG: http_reply_access
+#	Allow replies to client requests. This is complementary to http_access.
+#
+#	http_reply_access allow|deny [!] aclname ...
+#
+#	NOTE: if there are no access lines present, the default is to allow
+#	all replies
+#
+#	If none of the access lines cause a match the opposite of the
+#	last line will apply. Thus it is good practice to end the rules
+#	with an "allow all" or "deny all" entry.
+#
+#Default:
+# http_reply_access allow all
+
+#  TAG: icp_access
+#	Allowing or Denying access to the ICP port based on defined
+#	access lists
+#
+#	icp_access  allow|deny [!]aclname ...
+#
+#	See http_access for details
+#
+#Default:
+# icp_access deny all
+#
+#Allow ICP queries from local networks only
+icp_access allow localnet
+icp_access deny all
+
+#  TAG: htcp_access
+#	Allowing or Denying access to the HTCP port based on defined
+#	access lists
+#
+#	htcp_access  allow|deny [!]aclname ...
+#
+#	See http_access for details
+#
+#	NOTE: The default if no htcp_access lines are present is to
+#	deny all traffic. This default may cause problems with peers
+#	using the htcp or htcp-oldsquid options.
+#
+#Default:
+# htcp_access deny all
+#
+#Allow HTCP queries from local networks only
+# htcp_access allow localnet
+# htcp_access deny all
+
+#  TAG: htcp_clr_access
+#	Allowing or Denying access to purge content using HTCP based
+#	on defined access lists
+#
+#	htcp_clr_access  allow|deny [!]aclname ...
+#
+#	See http_access for details
+#
+##Allow HTCP CLR requests from trusted peers
+#acl htcp_clr_peer src 172.16.1.2
+#htcp_clr_access allow htcp_clr_peer
+#
+#Default:
+# htcp_clr_access deny all
+
+#  TAG: miss_access
+#	Use to force your neighbors to use you as a sibling instead of
+#	a parent.  For example:
+#
+#		acl localclients src 172.16.0.0/16
+#		miss_access allow localclients
+#		miss_access deny  !localclients
+#
+#	This means only your local clients are allowed to fetch
+#	MISSES and all other clients can only fetch HITS.
+#
+#	By default, allow all clients who passed the http_access rules
+#	to fetch MISSES from us.
+#
+#Default setting:
+# miss_access allow all
+
+#  TAG: ident_lookup_access
+#	A list of ACL elements which, if matched, cause an ident
+#	(RFC931) lookup to be performed for this request.  For
+#	example, you might choose to always perform ident lookups
+#	for your main multi-user Unix boxes, but not for your Macs
+#	and PCs.  By default, ident lookups are not performed for
+#	any requests.
+#
+#	To enable ident lookups for specific client addresses, you
+#	can follow this example:
+#
+#	acl ident_aware_hosts src 198.168.1.0/255.255.255.0
+#	ident_lookup_access allow ident_aware_hosts
+#	ident_lookup_access deny all
+#
+#	Only src type ACL checks are fully supported.  A src_domain
+#	ACL might work at times, but it will not always provide
+#	the correct result.
+#
+#Default:
+# ident_lookup_access deny all
+
+#  TAG: reply_body_max_size	bytes allow|deny acl acl...
+#	This option specifies the maximum size of a reply body in bytes.
+#	It can be used to prevent users from downloading very large files,
+#	such as MP3's and movies. When the reply headers are received,
+#	the reply_body_max_size lines are processed, and the first line with
+#	a result of "allow" is used as the maximum body size for this reply.
+#	This size is checked twice. First when we get the reply headers,
+#	we check the content-length value.  If the content length value exists
+#	and is larger than the allowed size, the request is denied and the
+#	user receives an error message that says "the request or reply
+#	is too large." If there is no content-length, and the reply
+#	size exceeds this limit, the client's connection is just closed
+#	and they will receive a partial reply.
+#
+#	WARNING: downstream caches probably can not detect a partial reply
+#	if there is no content-length header, so they will cache
+#	partial responses and give them out as hits.  You should NOT
+#	use this option if you have downstream caches.
+#
+#	If you set this parameter to zero (the default), there will be
+#	no limit imposed.
+#
+#Default:
+# reply_body_max_size 0 allow all
+
+#  TAG: authenticate_ip_shortcircuit_access
+#	Access list determining when shortcicuiting the authentication process
+#	based on source IP cached credentials is acceptable. Use this to deny
+#	using the ip auth cache on requests from child proxies or other source
+#	ip's having multiple users.
+#
+#Default:
+# none
+
+
+# OPTIONS FOR X-Forwarded-For
+# -----------------------------------------------------------------------------
+
+#  TAG: follow_x_forwarded_for
+#	Allowing or Denying the X-Forwarded-For header to be followed to
+#	find the original source of a request.
+#
+#	Requests may pass through a chain of several other proxies
+#	before reaching us.  The X-Forwarded-For header will contain a
+#	comma-separated list of the IP addresses in the chain, with the
+#	rightmost address being the most recent.
+#
+#	If a request reaches us from a source that is allowed by this
+#	configuration item, then we consult the X-Forwarded-For header
+#	to see where that host received the request from.  If the
+#	X-Forwarded-For header contains multiple addresses, and if
+#	acl_uses_indirect_client is on, then we continue backtracking
+#	until we reach an address for which we are not allowed to
+#	follow the X-Forwarded-For header, or until we reach the first
+#	address in the list.  (If acl_uses_indirect_client is off, then
+#	it's impossible to backtrack through more than one level of
+#	X-Forwarded-For addresses.)
+#
+#	The end result of this process is an IP address that we will
+#	refer to as the indirect client address.  This address may
+#	be treated as the client address for access control, delay
+#	pools and logging, depending on the acl_uses_indirect_client,
+#	delay_pool_uses_indirect_client and log_uses_indirect_client
+#	options.
+#
+#	SECURITY CONSIDERATIONS:
+#
+#		Any host for which we follow the X-Forwarded-For header
+#		can place incorrect information in the header, and Squid
+#		will use the incorrect information as if it were the
+#		source address of the request.  This may enable remote
+#		hosts to bypass any access control restrictions that are
+#		based on the client's source addresses.
+#
+#	For example:
+#
+#		acl localhost src 127.0.0.1
+#		acl my_other_proxy srcdomain .proxy.example.com
+#		follow_x_forwarded_for allow localhost
+#		follow_x_forwarded_for allow my_other_proxy
+#
+#Default:
+# follow_x_forwarded_for deny all
+
+#  TAG: acl_uses_indirect_client	on|off
+#	Controls whether the indirect client address
+#	(see follow_x_forwarded_for) is used instead of the
+#	direct client address in acl matching.
+#
+#Default:
+# acl_uses_indirect_client on
+
+#  TAG: delay_pool_uses_indirect_client	on|off
+#	Controls whether the indirect client address
+#	(see follow_x_forwarded_for) is used instead of the
+#	direct client address in delay pools.
+#
+#Default:
+# delay_pool_uses_indirect_client on
+
+#  TAG: log_uses_indirect_client	on|off
+#	Controls whether the indirect client address
+#	(see follow_x_forwarded_for) is used instead of the
+#	direct client address in the access log.
+#
+#Default:
+# log_uses_indirect_client on
+
+
+# SSL OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: ssl_unclean_shutdown
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	Some browsers (especially MSIE) bugs out on SSL shutdown
+#	messages.
+#
+#Default:
+# ssl_unclean_shutdown off
+
+#  TAG: ssl_engine
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	The OpenSSL engine to use. You will need to set this if you
+#	would like to use hardware SSL acceleration for example.
+#
+#Default:
+# none
+
+#  TAG: sslproxy_client_certificate
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	Client SSL Certificate to use when proxying https:// URLs
+#
+#Default:
+# none
+
+#  TAG: sslproxy_client_key
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	Client SSL Key to use when proxying https:// URLs
+#
+#Default:
+# none
+
+#  TAG: sslproxy_version
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	SSL version level to use when proxying https:// URLs
+#
+#Default:
+# sslproxy_version 1
+
+#  TAG: sslproxy_options
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	SSL engine options to use when proxying https:// URLs
+#
+#Default:
+# none
+
+#  TAG: sslproxy_cipher
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	SSL cipher list to use when proxying https:// URLs
+#
+#Default:
+# none
+
+#  TAG: sslproxy_cafile
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	file containing CA certificates to use when verifying server
+#	certificates while proxying https:// URLs
+#
+#Default:
+# none
+
+#  TAG: sslproxy_capath
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	directory containing CA certificates to use when verifying
+#	server certificates while proxying https:// URLs
+#
+#Default:
+# none
+
+#  TAG: sslproxy_flags
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	Various flags modifying the use of SSL while proxying https:// URLs:
+#	    DONT_VERIFY_PEER    Accept certificates even if they fail to
+#				verify.
+#	    NO_DEFAULT_CA       Don't use the default CA list built in
+#				to OpenSSL.
+#
+#Default:
+# none
+
+#  TAG: sslpassword_program
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	Specify a program used for entering SSL key passphrases
+#	when using encrypted SSL certificate keys. If not specified
+#	keys must either be unencrypted, or Squid started with the -N
+#	option to allow it to query interactively for the passphrase.
+#
+#Default:
+# none
+
+
+# NETWORK OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: http_port
+#	Usage:	port [options]
+#		hostname:port [options]
+#		1.2.3.4:port [options]
+#
+#	The socket addresses where Squid will listen for HTTP client
+#	requests.  You may specify multiple socket addresses.
+#	There are three forms: port alone, hostname with port, and
+#	IP address with port.  If you specify a hostname or IP
+#	address, Squid binds the socket to that specific
+#	address.  This replaces the old 'tcp_incoming_address'
+#	option.  Most likely, you do not need to bind to a specific
+#	address, so you can use the port number alone.
+#
+#	If you are running Squid in accelerator mode, you
+#	probably want to listen on port 80 also, or instead.
+#
+#	The -I command line option will override the *first* port
+#	specified here.
+#
+#	You may specify multiple socket addresses on multiple lines.
+#
+#	Options:
+#
+#	   transparent	Support for transparent interception of
+#			outgoing requests without browser settings.
+#
+#	   tproxy	Support Linux TPROXY for spoofing outgoing
+#			connections using the client IP address.
+#
+#	   accel	Accelerator mode. See also the related vhost,
+#			vport and defaultsite directives.
+#
+#	   defaultsite=domainname
+#			What to use for the Host: header if it is not present
+#			in a request. Determines what site (not origin server)
+#			accelerators should consider the default.
+#			Defaults to visible_hostname:port if not set
+#			May be combined with vport=NN to override the port number.
+#			Implies accel.
+#
+#	   vhost	Accelerator mode using Host header for virtual
+#			domain support. Implies accel.
+#
+#	   vport	Accelerator with IP based virtual host support.
+#			Implies accel.
+#
+#	   vport=NN	As above, but uses specified port number rather
+#			than the http_port number. Implies accel.
+#
+#	   allow-direct	Allow direct forwarding in accelerator mode. Normally
+#	   		accelerated requests is denied direct forwarding as it
+#			never_direct was used.
+#
+#	   urlgroup=	Default urlgroup to mark requests with (see
+#			also acl urlgroup and url_rewrite_program)
+#
+#	   protocol=	Protocol to reconstruct accelerated requests with.
+#			Defaults to http.
+#
+#	   no-connection-auth
+#			Prevent forwarding of Microsoft connection oriented
+#			authentication (NTLM, Negotiate and Kerberos)
+#
+#	   act-as-origin
+#	   		Act is if this Squid is the origin server.
+#			This currently means generate own Date: and
+#			Expires: headers. Implies accel.
+#
+#	   http11	Enables HTTP/1.1 support to clients. The HTTP/1.1
+#			support is still incomplete with an internal HTTP/1.0
+#			hop, but should work with most clients. The main
+#			HTTP/1.1 features missing due to this is forwarding
+#			of requests using chunked transfer encoding (results
+#			in 411) and forwarding of 1xx responses (silently
+#			dropped)
+#
+#	   name=	Specifies a internal name for the port. Defaults to
+#			the port specification (port or addr:port)
+#
+#	   keepalive[=idle,interval,timeout]
+#			Enable TCP keepalive probes of idle connections
+#			idle is the initial time before TCP starts probing
+#			the connection, interval how often to probe, and
+#			timeout the time before giving up.
+#
+#	If you run Squid on a dual-homed machine with an internal
+#	and an external interface we recommend you to specify the
+#	internal address:port in http_port. This way Squid will only be
+#	visible on the internal address.
+#
+# Squid normally listens to port 3128
+http_port 3128
+
+#  TAG: https_port
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-ssl option
+#
+#	Usage:  [ip:]port cert=certificate.pem [key=key.pem] [options...]
+#
+#	The socket address where Squid will listen for HTTPS client
+#	requests.
+#
+#	This is really only useful for situations where you are running
+#	squid in accelerator mode and you want to do the SSL work at the
+#	accelerator level.
+#
+#	You may specify multiple socket addresses on multiple lines,
+#	each with their own SSL certificate and/or options.
+#
+#	Options:
+#
+#	In addition to the options specified for http_port the folling
+#	SSL related options is supported:
+#
+#	   cert=	Path to SSL certificate (PEM format).
+#
+#	   key=		Path to SSL private key file (PEM format)
+#			if not specified, the certificate file is
+#			assumed to be a combined certificate and
+#			key file.
+#
+#	   version=	The version of SSL/TLS supported
+#			    1	automatic (default)
+#			    2	SSLv2 only
+#			    3	SSLv3 only
+#			    4	TLSv1 only
+#
+#	   cipher=	Colon separated list of supported ciphers.
+#
+#	   options=	Various SSL engine options. The most important
+#			being:
+#			    NO_SSLv2  Disallow the use of SSLv2
+#			    NO_SSLv3  Disallow the use of SSLv3
+#			    NO_TLSv1  Disallow the use of TLSv1
+#			    SINGLE_DH_USE Always create a new key when using
+#				      temporary/ephemeral DH key exchanges
+#			See src/ssl_support.c or OpenSSL SSL_CTX_set_options
+#			documentation for a complete list of options.
+#
+#	   clientca=	File containing the list of CAs to use when
+#			requesting a client certificate.
+#
+#	   cafile=	File containing additional CA certificates to
+#			use when verifying client certificates. If unset
+#			clientca will be used.
+#
+#	   capath=	Directory containing additional CA certificates
+#			and CRL lists to use when verifying client certificates.
+#
+#	   crlfile=	File of additional CRL lists to use when verifying
+#			the client certificate, in addition to CRLs stored in
+#			the capath. Implies VERIFY_CRL flag below.
+#
+#	   dhparams=	File containing DH parameters for temporary/ephemeral
+#			DH key exchanges.
+#
+#	   sslflags=	Various flags modifying the use of SSL:
+#			    DELAYED_AUTH
+#				Don't request client certificates
+#				immediately, but wait until acl processing
+#				requires a certificate (not yet implemented).
+#			    NO_DEFAULT_CA
+#				Don't use the default CA lists built in
+#				to OpenSSL.
+#			    NO_SESSION_REUSE
+#				Don't allow for session reuse. Each connection
+#				will result in a new SSL session.
+#			    VERIFY_CRL
+#				Verify CRL lists when accepting client
+#				certificates.
+#			    VERIFY_CRL_ALL
+#				Verify CRL lists for all certificates in the
+#				client certificate chain.
+#
+#	   sslcontext=	SSL session ID context identifier.
+#
+#
+#Default:
+# none
+
+#  TAG: tcp_outgoing_tos
+#	Allows you to select a TOS/Diffserv value to mark outgoing
+#	connections with, based on the username or source address
+#	making the request.
+#
+#	tcp_outgoing_tos ds-field [!]aclname ...
+#
+#	Example where normal_service_net uses the TOS value 0x00
+#	and good_service_net uses 0x20
+#
+#	acl normal_service_net src 10.0.0.0/255.255.255.0
+#	acl good_service_net src 10.0.1.0/255.255.255.0
+#	tcp_outgoing_tos 0x00 normal_service_net
+#	tcp_outgoing_tos 0x20 good_service_net
+#
+#	TOS/DSCP values really only have local significance - so you should
+#	know what you're specifying. For more information, see RFC2474 and
+#	RFC3260.
+#
+#	The TOS/DSCP byte must be exactly that - a octet value  0 - 255, or
+#	"default" to use whatever default your host has. Note that in
+#	practice often only values 0 - 63 is usable as the two highest bits
+#	have been redefined for use by ECN (RFC3168).
+#
+#	Processing proceeds in the order specified, and stops at first fully
+#	matching line.
+#
+#	Note: The use of this directive using client dependent ACLs is
+#	incompatible with the use of server side persistent connections. To
+#	ensure correct results it is best to set server_persisten_connections
+#	to off when using this directive in such configurations.
+#
+#Default:
+# none
+
+#  TAG: tcp_outgoing_address
+#	Allows you to map requests to different outgoing IP addresses
+#	based on the username or source address of the user making
+#	the request.
+#
+#	tcp_outgoing_address ipaddr [[!]aclname] ...
+#
+#	Example where requests from 10.0.0.0/24 will be forwarded
+#	with source address 10.1.0.1, 10.0.2.0/24 forwarded with
+#	source address 10.1.0.2 and the rest will be forwarded with
+#	source address 10.1.0.3.
+#
+#	acl normal_service_net src 10.0.0.0/24
+#	acl good_service_net src 10.0.1.0/24 10.0.2.0/24
+#	tcp_outgoing_address 10.1.0.1 normal_service_net
+#	tcp_outgoing_address 10.1.0.2 good_service_net
+#	tcp_outgoing_address 10.1.0.3
+#
+#	Processing proceeds in the order specified, and stops at first fully
+#	matching line.
+#
+#	Note: The use of this directive using client dependent ACLs is
+#	incompatible with the use of server side persistent connections. To
+#	ensure correct results it is best to set server_persistent_connections
+#	to off when using this directive in such configurations.
+#
+#Default:
+# none
+
+#  TAG: zph_mode
+#	This option enables packet level marking of HIT/MISS responses,
+#	either using IP TOS or socket priority.
+#	    off		Feature disabled
+#	    tos		Set the IP TOS field
+#	    priority	Set the socket priority (may get mapped to TOS by OS,
+#			otherwise only usable in local rulesets)
+#
+#	See also tcp_outgoing_tos for details/requirements about TOS usage.
+#
+#Default:
+# zph_mode off
+
+#  TAG: zph_local
+#	Allows you to select a TOS/Diffserv/Priority value to mark local hits.
+#	Default: 0 (disabled).
+#
+#Default:
+# zph_local 0
+
+#  TAG: zph_sibling
+#	Allows you to select a TOS/Diffserv/Priority value to mark sibling hits.
+#	Default: 0 (disabled).
+#
+#Default:
+# zph_sibling 0
+
+#  TAG: zph_parent
+#	Allows you to select a TOS/Diffserv/Priority value to mark parent hits. 
+#	Default: 0 (disabled).
+#
+#Default:
+# zph_parent 0
+
+#  TAG: zph_option
+#	The IP option to use when zph_mode is set to "option". Defaults to
+#	136 which is officially registered as "SATNET Stream ID".
+#
+#Default:
+# zph_option 136
+
+
+# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM
+# -----------------------------------------------------------------------------
+cache_peer morbier parent 3128 3130 default
+
+#  TAG: cache_peer
+#	To specify other caches in a hierarchy, use the format:
+#
+#		cache_peer hostname type http-port icp-port [options]
+#
+#	For example,
+#
+#	#                                        proxy  icp
+#	#          hostname             type     port   port  options
+#	#          -------------------- -------- ----- -----  -----------
+#	cache_peer parent.foo.net       parent    3128  3130  proxy-only default
+#	cache_peer sib1.foo.net         sibling   3128  3130  proxy-only
+#	cache_peer sib2.foo.net         sibling   3128  3130  proxy-only
+#
+#	      type:  either 'parent', 'sibling', or 'multicast'.
+#
+#	proxy-port:  The port number where the cache listens for proxy
+#		     requests.
+#
+#	  icp-port:  Used for querying neighbor caches about
+#		     objects.  To have a non-ICP neighbor
+#		     specify '7' for the ICP port and make sure the
+#		     neighbor machine has the UDP echo port
+#		     enabled in its /etc/inetd.conf file.
+#		NOTE: Also requires icp_port option enabled to send/receive
+#		      requests via this method.
+#
+#	    options: proxy-only
+#		     weight=n
+#		     ttl=n
+#		     no-query
+#		     default
+#		     round-robin
+#		     carp
+#		     multicast-responder
+#		     multicast-siblings
+#		     closest-only
+#		     no-digest
+#		     no-netdb-exchange
+#		     no-delay
+#		     login=user:password | PASS | *:password
+#		     connect-timeout=nn
+#		     digest-url=url
+#		     allow-miss
+#		     max-conn=n
+#		     htcp
+#		     htcp-oldsquid
+#		     originserver
+#		     userhash
+#		     sourcehash
+#		     name=xxx
+#		     monitorurl=url
+#		     monitorsize=sizespec
+#		     monitorinterval=seconds
+#		     monitortimeout=seconds
+#		     forceddomain=name
+#		     ssl
+#		     sslcert=/path/to/ssl/certificate
+#		     sslkey=/path/to/ssl/key
+#		     sslversion=1|2|3|4
+#		     sslcipher=...
+#		     ssloptions=...
+#		     front-end-https[=on|auto]
+#		     connection-auth[=on|off|auto]
+#		     idle=n
+#		     http11
+#
+#		     use 'proxy-only' to specify objects fetched
+#		     from this cache should not be saved locally.
+#
+#		     use 'weight=n' to affect the selection of a peer
+#		     during any weighted peer-selection mechanisms.
+#		     The weight must be an integer; default is 1,
+#		     larger weights are favored more.
+#		     This option does not affect parent selection if a peering
+#		     protocol is not in use.
+#
+#		     use 'ttl=n' to specify a IP multicast TTL to use
+#		     when sending an ICP queries to this address.
+#		     Only useful when sending to a multicast group.
+#		     Because we don't accept ICP replies from random
+#		     hosts, you must configure other group members as
+#		     peers with the 'multicast-responder' option below.
+#
+#		     use 'no-query' to NOT send ICP queries to this
+#		     neighbor.
+#
+#		     use 'default' if this is a parent cache which can
+#		     be used as a "last-resort" if a peer cannot be located
+#		     by any of the peer-selection mechanisms.
+#		     If specified more than once, only the first is used.
+#
+#		     use 'round-robin' to define a set of parents which
+#		     should be used in a round-robin fashion in the
+#		     absence of any ICP queries.
+#
+#		     use 'carp' to define a set of parents which should
+#		     be used as a CARP array. The requests will be
+#		     distributed among the parents based on the CARP load
+#		     balancing hash function based on their weight.
+#
+#		     'multicast-responder' indicates the named peer
+#		     is a member of a multicast group.  ICP queries will
+#		     not be sent directly to the peer, but ICP replies
+#		     will be accepted from it.
+#
+#		     the 'multicast-siblings' option is meant to be used
+#		     only for cache peers of type "multicast". It instructs
+#		     Squid that ALL members of this multicast group have
+#		     "sibling" relationship with it, not "parent".  This is
+#		     an optimization that avoids useless multicast queries
+#		     to a multicast group when the requested object would
+#		     be fetched only from a "parent" cache, anyway.  It's
+#		     useful, e.g., when configuring a pool of redundant
+#		     Squid proxies, being members of the same
+#		     multicast group.
+#
+#		     'closest-only' indicates that, for ICP_OP_MISS
+#		     replies, we'll only forward CLOSEST_PARENT_MISSes
+#		     and never FIRST_PARENT_MISSes.
+#
+#		     use 'no-digest' to NOT request cache digests from
+#		     this neighbor.
+#
+#		     'no-netdb-exchange' disables requesting ICMP
+#		     RTT database (NetDB) from the neighbor.
+#
+#		     use 'no-delay' to prevent access to this neighbor
+#		     from influencing the delay pools.
+#
+#		     use 'login=user:password' if this is a personal/workgroup
+#		     proxy and your parent requires proxy authentication.
+#		     Note: The string can include URL escapes (i.e. %20 for
+#		     spaces). This also means % must be written as %%.
+#
+#		     use 'login=PASS' if users must authenticate against
+#		     the upstream proxy or in the case of a reverse proxy
+#		     configuration, the origin web server.  This will pass
+#		     the users credentials as they are to the peer.
+#		     Note: To combine this with local authentication the Basic
+#		     authentication scheme must be used, and both servers must
+#		     share the same user database as HTTP only allows for
+#		     a single login (one for proxy, one for origin server).
+#		     Also be warned this will expose your users proxy
+#		     password to the peer. USE WITH CAUTION
+#
+#		     use 'login=*:password' to pass the username to the
+#		     upstream cache, but with a fixed password. This is meant
+#		     to be used when the peer is in another administrative
+#		     domain, but it is still needed to identify each user.
+#		     The star can optionally be followed by some extra
+#		     information which is added to the username. This can
+#		     be used to identify this proxy to the peer, similar to
+#		     the login=username:password option above.
+#
+#		     use 'connect-timeout=nn' to specify a peer
+#		     specific connect timeout (also see the
+#		     peer_connect_timeout directive)
+#
+#		     use 'digest-url=url' to tell Squid to fetch the cache
+#		     digest (if digests are enabled) for this host from
+#		     the specified URL rather than the Squid default
+#		     location.
+#
+#		     use 'allow-miss' to disable Squid's use of only-if-cached
+#		     when forwarding requests to siblings. This is primarily
+#		     useful when icp_hit_stale is used by the sibling. To
+#		     extensive use of this option may result in forwarding
+#		     loops, and you should avoid having two-way peerings
+#		     with this option. (for example to deny peer usage on
+#		     requests from peer by denying cache_peer_access if the
+#		     source is a peer)
+#
+#		     use 'max-conn=n' to limit the amount of connections Squid
+#		     may open to this peer.
+#
+#		     use 'htcp' to send HTCP, instead of ICP, queries
+#		     to the neighbor.  You probably also want to
+#		     set the "icp port" to 4827 instead of 3130.
+#		     You must also allow this Squid htcp_access and
+#		     http_access in the peer Squid configuration.
+#
+#		     use 'htcp-oldsquid' to send HTCP to old Squid versions
+#		     You must also allow this Squid htcp_access and
+#		     http_access in the peer Squid configuration.
+#
+#		     'originserver' causes this parent peer to be contacted as
+#		     a origin server. Meant to be used in accelerator setups.
+#
+#		     use 'userhash' to load-balance amongst a set of parents
+#		     based on the client proxy_auth or ident username.
+#
+#		     use 'sourcehash' to load-balance amongst a set of parents
+#		     based on the client source ip.
+#
+#		     use 'name=xxx' if you have multiple peers on the same
+#		     host but different ports. This name can be used to
+#		     differentiate the peers in cache_peer_access and similar
+#		     directives.
+#
+#		     use 'monitorurl=url' to have periodically request a given
+#		     URL from the peer, and only consider the peer as alive
+#		     if this monitoring is successful (default none)
+#
+#		     use 'monitorsize=min[-max]' to limit the size range of
+#		     'monitorurl' replies considered valid. Defaults to 0 to
+#		     accept any size replies as valid.
+#
+#		     use 'monitorinterval=seconds' to change frequency of
+#		     how often the peer is monitored with 'monitorurl'
+#		     (default 300 for a 5 minute interval). If set to 0
+#		     then monitoring is disabled even if a URL is defined.
+#
+#		     use 'monitortimeout=seconds' to change the timeout of
+#		     'monitorurl'. Defaults to 'monitorinterval'.
+#
+#		     use 'forceddomain=name' to forcibly set the Host header
+#		     of requests forwarded to this peer. Useful in accelerator
+#		     setups where the server (peer) expects a certain domain
+#		     name and using redirectors to feed this domain name
+#		     is not feasible.
+#
+#		     use 'ssl' to indicate connections to this peer should
+#		     be SSL/TLS encrypted.
+#
+#		     use 'sslcert=/path/to/ssl/certificate' to specify a client
+#		     SSL certificate to use when connecting to this peer.
+#
+#		     use 'sslkey=/path/to/ssl/key' to specify the private SSL
+#		     key corresponding to sslcert above. If 'sslkey' is not
+#		     specified 'sslcert' is assumed to reference a
+#		     combined file containing both the certificate and the key.
+#
+#		     Notes:
+#		     
+#		     On Debian/Ubuntu system a default snakeoil certificate is
+#		     available in /etc/ssl and users can set:
+#		     
+#		       cert=/etc/ssl/certs/ssl-cert-snakeoil.pem
+#		     
+#		     and
+#		     
+#		       key=/etc/ssl/private/ssl-cert-snakeoil.key
+#		     
+#		     for testing.
+#
+#		     use sslversion=1|2|3|4 to specify the SSL version to use
+#		     when connecting to this peer
+#			1 = automatic (default)
+#			2 = SSL v2 only
+#			3 = SSL v3 only
+#			4 = TLS v1 only
+#
+#		     use sslcipher=... to specify the list of valid SSL ciphers
+#		     to use when connecting to this peer.
+#
+#		     use ssloptions=... to specify various SSL engine options:
+#			NO_SSLv2  Disallow the use of SSLv2
+#			NO_SSLv3  Disallow the use of SSLv3
+#			NO_TLSv1  Disallow the use of TLSv1
+#		     See src/ssl_support.c or the OpenSSL documentation for
+#		     a more complete list.
+#
+#		     use sslcafile=... to specify a file containing
+#		     additional CA certificates to use when verifying the
+#		     peer certificate.
+#
+#		     use sslcapath=... to specify a directory containing
+#		     additional CA certificates to use when verifying the
+#		     peer certificate.
+#
+#		     use sslcrlfile=... to specify a certificate revocation
+#		     list file to use when verifying the peer certificate.
+#
+#		     use sslflags=... to specify various flags modifying the
+#		     SSL implementation:
+#			DONT_VERIFY_PEER
+#				Accept certificates even if they fail to
+#				verify.
+#			NO_DEFAULT_CA
+#				Don't use the default CA list built in
+#				to OpenSSL.
+#
+#		     use ssldomain= to specify the peer name as advertised
+#		     in it's certificate. Used for verifying the correctness
+#		     of the received peer certificate. If not specified the
+#		     peer hostname will be used.
+#
+#		     use front-end-https to enable the "Front-End-Https: On"
+#		     header needed when using Squid as a SSL frontend in front
+#		     of Microsoft OWA. See MS KB document Q307347 for details
+#		     on this header. If set to auto the header will
+#		     only be added if the request is forwarded as a https://
+#		     URL.
+#
+#		     use connection-auth=off to tell Squid that this peer does
+#		     not support Microsoft connection oriented authentication,
+#		     and any such challenges received from there should be
+#		     ignored. Default is auto to automatically determine the
+#		     status of the peer.
+#
+#		     use idle=n to specify a minimum number of idle connections
+#		     that should be kept open to this peer.
+#
+#		     use http11 to send requests using HTTP/1.1 to this peer.
+#		     Note: The HTTP/1.1 support is still incomplete, with an
+#		     internal HTTP/1.0 hop. As result 1xx responses will not
+#		     be forwarded.
+#
+#Default:
+# none
+
+#  TAG: cache_peer_domain
+#	Use to limit the domains for which a neighbor cache will be
+#	queried.  Usage:
+#
+#	cache_peer_domain cache-host domain [domain ...]
+#	cache_peer_domain cache-host !domain
+#
+#	For example, specifying
+#
+#		cache_peer_domain parent.foo.net	.edu
+#
+#	has the effect such that UDP query packets are sent to
+#	'bigserver' only when the requested object exists on a
+#	server in the .edu domain.  Prefixing the domain name
+#	with '!' means the cache will be queried for objects
+#	NOT in that domain.
+#
+#	NOTE:	* Any number of domains may be given for a cache-host,
+#		  either on the same or separate lines.
+#		* When multiple domains are given for a particular
+#		  cache-host, the first matched domain is applied.
+#		* Cache hosts with no domain restrictions are queried
+#		  for all requests.
+#		* There are no defaults.
+#		* There is also a 'cache_peer_access' tag in the ACL
+#		  section.
+#
+#Default:
+# none
+
+#  TAG: cache_peer_access
+#	Similar to 'cache_peer_domain' but provides more flexibility by
+#	using ACL elements.
+#
+#	cache_peer_access cache-host allow|deny [!]aclname ...
+#
+#	The syntax is identical to 'http_access' and the other lists of
+#	ACL elements.  See the comments for 'http_access' below, or
+#	the Squid FAQ (http://www.squid-cache.org/FAQ/FAQ-10.html).
+#
+#Default:
+# none
+
+#  TAG: neighbor_type_domain
+#	usage: neighbor_type_domain neighbor parent|sibling domain domain ...
+#
+#	Modifying the neighbor type for specific domains is now
+#	possible.  You can treat some domains differently than the the
+#	default neighbor type specified on the 'cache_peer' line.
+#	Normally it should only be necessary to list domains which
+#	should be treated differently because the default neighbor type
+#	applies for hostnames which do not match domains listed here.
+#
+#EXAMPLE:
+#	cache_peer cache.foo.org parent 3128 3130
+#	neighbor_type_domain cache.foo.org sibling .com .net
+#	neighbor_type_domain cache.foo.org sibling .au .de
+#
+#Default:
+# none
+
+#  TAG: dead_peer_timeout	(seconds)
+#	This controls how long Squid waits to declare a peer cache
+#	as "dead."  If there are no ICP replies received in this
+#	amount of time, Squid will declare the peer dead and not
+#	expect to receive any further ICP replies.  However, it
+#	continues to send ICP queries, and will mark the peer as
+#	alive upon receipt of the first subsequent ICP reply.
+#
+#	This timeout also affects when Squid expects to receive ICP
+#	replies from peers.  If more than 'dead_peer' seconds have
+#	passed since the last ICP reply was received, Squid will not
+#	expect to receive an ICP reply on the next query.  Thus, if
+#	your time between requests is greater than this timeout, you
+#	will see a lot of requests sent DIRECT to origin servers
+#	instead of to your parents.
+#
+#Default:
+# dead_peer_timeout 10 seconds
+
+#  TAG: hierarchy_stoplist
+#	A list of words which, if found in a URL, cause the object to
+#	be handled directly by this cache.  In other words, use this
+#	to not query neighbor caches for certain objects.  You may
+#	list this option multiple times. Note: never_direct overrides
+#	this option.
+#We recommend you to use at least the following line.
+hierarchy_stoplist cgi-bin ?
+
+
+# MEMORY CACHE OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: cache_mem	(bytes)
+#	NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE.
+#	IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL
+#	USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER
+#	THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS.
+#
+#	'cache_mem' specifies the ideal amount of memory to be used
+#	for:
+#		* In-Transit objects
+#		* Hot Objects
+#		* Negative-Cached objects
+#
+#	Data for these objects are stored in 4 KB blocks.  This
+#	parameter specifies the ideal upper limit on the total size of
+#	4 KB blocks allocated.  In-Transit objects take the highest
+#	priority.
+#
+#	In-transit objects have priority over the others.  When
+#	additional space is needed for incoming data, negative-cached
+#	and hot objects will be released.  In other words, the
+#	negative-cached and hot objects will fill up any unused space
+#	not needed for in-transit objects.
+#
+#	If circumstances require, this limit will be exceeded.
+#	Specifically, if your incoming request rate requires more than
+#	'cache_mem' of memory to hold in-transit objects, Squid will
+#	exceed this limit to satisfy the new requests.  When the load
+#	decreases, blocks will be freed until the high-water mark is
+#	reached.  Thereafter, blocks will be used to store hot
+#	objects.
+#
+#Default:
+# cache_mem 8 MB
+
+#  TAG: maximum_object_size_in_memory	(bytes)
+#	Objects greater than this size will not be attempted to kept in
+#	the memory cache. This should be set high enough to keep objects
+#	accessed frequently in memory to improve performance whilst low
+#	enough to keep larger objects from hoarding cache_mem.
+#
+#Default:
+# maximum_object_size_in_memory 8 KB
+
+#  TAG: memory_replacement_policy
+#	The memory replacement policy parameter determines which
+#	objects are purged from memory when memory space is needed.
+#
+#	See cache_replacement_policy for details.
+#
+#Default:
+# memory_replacement_policy lru
+
+
+# DISK CACHE OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: cache_replacement_policy
+#	The cache replacement policy parameter determines which
+#	objects are evicted (replaced) when disk space is needed.
+#
+#	    lru       : Squid's original list based LRU policy
+#	    heap GDSF : Greedy-Dual Size Frequency
+#	    heap LFUDA: Least Frequently Used with Dynamic Aging
+#	    heap LRU  : LRU policy implemented using a heap
+#
+#	Applies to any cache_dir lines listed below this.
+#
+#	The LRU policies keeps recently referenced objects.
+#
+#	The heap GDSF policy optimizes object hit rate by keeping smaller
+#	popular objects in cache so it has a better chance of getting a
+#	hit.  It achieves a lower byte hit rate than LFUDA though since
+#	it evicts larger (possibly popular) objects.
+#
+#	The heap LFUDA policy keeps popular objects in cache regardless of
+#	their size and thus optimizes byte hit rate at the expense of
+#	hit rate since one large, popular object will prevent many
+#	smaller, slightly less popular objects from being cached.
+#
+#	Both policies utilize a dynamic aging mechanism that prevents
+#	cache pollution that can otherwise occur with frequency-based
+#	replacement policies.
+#
+#	NOTE: if using the LFUDA replacement policy you should increase
+#	the value of maximum_object_size above its default of 4096 KB to
+#	to maximize the potential byte hit rate improvement of LFUDA.
+#
+#	For more information about the GDSF and LFUDA cache replacement
+#	policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html
+#	and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html.
+#
+#Default:
+# cache_replacement_policy lru
+
+#  TAG: cache_dir
+#	Usage:
+#
+#	cache_dir Type Directory-Name Fs-specific-data [options]
+#
+#	You can specify multiple cache_dir lines to spread the
+#	cache among different disk partitions.
+#
+#	Type specifies the kind of storage system to use. Only "ufs"
+#	is built by default. To enable any of the other storage systems
+#	see the --enable-storeio configure option.
+#
+#	'Directory' is a top-level directory where cache swap
+#	files will be stored. If you want to use an entire disk
+#	for caching, this can be the mount-point directory.
+#	The directory must exist and be writable by the Squid
+#	process. Squid will NOT create this directory for you.
+#	Only using COSS, a raw disk device or a stripe file can
+#	be specified, but the configuration of the "cache_swap_log"
+#	tag is mandatory.
+#
+#	The ufs store type:
+#
+#	"ufs" is the old well-known Squid storage format that has always
+#	been there.
+#
+#	cache_dir ufs Directory-Name Mbytes L1 L2 [options]
+#
+#	'Mbytes' is the amount of disk space (MB) to use under this
+#	directory.  The default is 100 MB.  Change this to suit your
+#	configuration.  Do NOT put the size of your disk drive here.
+#	Instead, if you want Squid to use the entire disk drive,
+#	subtract 20% and use that value.
+#
+#	'Level-1' is the number of first-level subdirectories which
+#	will be created under the 'Directory'.  The default is 16.
+#
+#	'Level-2' is the number of second-level subdirectories which
+#	will be created under each first-level directory.  The default
+#	is 256.
+#
+#	The aufs store type:
+#
+#	"aufs" uses the same storage format as "ufs", utilizing
+#	POSIX-threads to avoid blocking the main Squid process on
+#	disk-I/O. This was formerly known in Squid as async-io.
+#
+#	cache_dir aufs Directory-Name Mbytes L1 L2 [options]
+#
+#	see argument descriptions under ufs above
+#
+#	The diskd store type:
+#
+#	"diskd" uses the same storage format as "ufs", utilizing a
+#	separate process to avoid blocking the main Squid process on
+#	disk-I/O.
+#
+#	cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n]
+#
+#	see argument descriptions under ufs above
+#
+#	Q1 specifies the number of unacknowledged I/O requests when Squid
+#	stops opening new files. If this many messages are in the queues,
+#	Squid won't open new files. Default is 64
+#
+#	Q2 specifies the number of unacknowledged messages when Squid
+#	starts blocking.  If this many messages are in the queues,
+#	Squid blocks until it receives some replies. Default is 72
+#
+#	When Q1 < Q2 (the default), the cache directory is optimized
+#	for lower response time at the expense of a decrease in hit
+#	ratio.  If Q1 > Q2, the cache directory is optimized for
+#	higher hit ratio at the expense of an increase in response
+#	time.
+#
+#	The coss store type:
+#
+#	block-size=n defines the "block size" for COSS cache_dir's.
+#	Squid uses file numbers as block numbers.  Since file numbers
+#	are limited to 24 bits, the block size determines the maximum
+#	size of the COSS partition.  The default is 512 bytes, which
+#	leads to a maximum cache_dir size of 512<<24, or 8 GB.  Note
+#	you should not change the COSS block size after Squid
+#	has written some objects to the cache_dir.
+#
+#	overwrite-percent=n defines the percentage of disk that COSS
+#	must write to before a given object will be moved to the
+#	current stripe.  A value of "n" closer to 100 will cause COSS
+#	to waste less disk space by having multiple copies of an object
+#	on disk, but will increase the chances of overwriting a popular
+#	object as COSS overwrites stripes.  A value of "n" close to 0
+#	will cause COSS to keep all current objects in the current COSS
+#	stripe at the expense of the hit rate.  The default value of 50
+#	will allow any given object to be stored on disk a maximum of
+#	2 times.
+#
+#	max-stripe-waste=n defines the maximum amount of space that COSS
+#	will waste in a given stripe (in bytes).  When COSS writes data
+#	to disk, it will potentially waste up to "max-size" worth of disk
+#	space for each 1MB of data written.  If "max-size" is set to a
+#	large value (ie >256k), this could potentially result in large
+#	amounts of wasted disk space. Setting this value to a lower value
+#	(ie 64k or 32k) will result in a COSS disk refusing to cache
+#	larger objects until the COSS stripe has been filled to within
+#	"max-stripe-waste" of the maximum size (1MB).
+#
+#	membufs=n defines the number of "memory-only" stripes that COSS
+#	will use.  When an cache hit is performed on a COSS stripe before
+#	COSS has reached the overwrite-percent value for that object,
+#	COSS will use a series of memory buffers to hold the object in
+#	while the data is sent to the client.  This will define the maximum
+#	number of memory-only buffers that COSS will use.  The default value
+#	is 10, which will use a maximum of 10MB of memory for buffers.
+#
+#	maxfullbufs=n defines the maximum number of stripes a COSS partition
+#	will have in memory waiting to be freed (either because the disk is
+#	under load and the stripe is unwritten, or because clients are still
+#	transferring data from objects using the memory).  In order to try
+#	and maintain a good hit rate under load, COSS will reserve the last
+#	2 full stripes for object hits. (ie a COSS cache_dir will reject
+#	new objects when the number of full stripes is 2 less than maxfullbufs)
+#
+#	The null store type:
+#
+#	no options are allowed or required
+#
+#	Common options:
+#
+#	no-store, no new objects should be stored to this cache_dir
+#
+#	min-size=n, refers to the min object size this storedir will accept.
+#	It's used to restrict a storedir to only store large objects
+#	(e.g. aufs) while other storedirs are optimized for smaller objects
+#	(e.g. COSS). Defaults to 0.
+#
+#	max-size=n, refers to the max object size this storedir supports.
+#	It is used to initially choose the storedir to dump the object.
+#	Note: To make optimal use of the max-size limits you should order
+#	the cache_dir lines with the smallest max-size value first and the
+#	ones with no max-size specification last.
+#
+#	Note that for coss, max-size must be less than COSS_MEMBUF_SZ
+#	(hard coded at 1 MB).
+#
+#Default:
+# cache_dir ufs /var/spool/squid 100 16 256
+
+#  TAG: store_dir_select_algorithm
+#	Set this to 'round-robin' as an alternative.
+#
+#Default:
+# store_dir_select_algorithm least-load
+
+#  TAG: max_open_disk_fds
+#	To avoid having disk as the I/O bottleneck Squid can optionally
+#	bypass the on-disk cache if more than this amount of disk file
+#	descriptors are open.
+#
+#	A value of 0 indicates no limit.
+#
+#Default:
+# max_open_disk_fds 0
+
+#  TAG: minimum_object_size	(bytes)
+#	Objects smaller than this size will NOT be saved on disk.  The
+#	value is specified in kilobytes, and the default is 0 KB, which
+#	means there is no minimum.
+#
+#Default:
+# minimum_object_size 0 KB
+
+#  TAG: maximum_object_size	(bytes)
+#	Objects larger than this size will NOT be saved on disk.  The
+#	value is specified in kilobytes, and the default is 4MB.  If
+#	you wish to get a high BYTES hit ratio, you should probably
+#	increase this (one 32 MB object hit counts for 3200 10KB
+#	hits).  If you wish to increase speed more than your want to
+#	save bandwidth you should leave this low.
+#
+#	NOTE: if using the LFUDA replacement policy you should increase
+#	this value to maximize the byte hit rate improvement of LFUDA!
+#	See replacement_policy below for a discussion of this policy.
+#
+#	NOTE 2: In Debian the default is raised to 20MB allowing cache
+#	of Packages files in debian repositories. This makes squid a
+#	proper proxy for APT.
+#
+#Default:
+# maximum_object_size 20480 KB
+
+#  TAG: cache_swap_low	(percent, 0-100)
+#  TAG: cache_swap_high	(percent, 0-100)
+#
+#	The low- and high-water marks for cache object replacement.
+#	Replacement begins when the swap (disk) usage is above the
+#	low-water mark and attempts to maintain utilization near the
+#	low-water mark.  As swap utilization gets close to high-water
+#	mark object eviction becomes more aggressive.  If utilization is
+#	close to the low-water mark less replacement is done each time.
+#
+#	Defaults are 90% and 95%. If you have a large cache, 5% could be
+#	hundreds of MB. If this is the case you may wish to set these
+#	numbers closer together.
+#
+#Default:
+# cache_swap_low 90
+# cache_swap_high 95
+
+#  TAG: update_headers	on|off
+#	By default Squid updates stored HTTP headers when receiving
+#	a 304 response. Set this to off if you want to disable this
+#	for disk I/O performance reasons. Disabling this VIOLATES the
+#	HTTP standard, and could make you liable for problems which it
+#	causes.
+#
+#Default:
+# update_headers on
+
+
+# LOGFILE OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: logformat
+#	Usage:
+#
+#	logformat <name> <format specification>
+#
+#	Defines an access log format.
+#
+#	The <format specification> is a string with embedded % format codes
+#
+#	% format codes all follow the same basic structure where all but
+#	the formatcode is optional. Output strings are automatically escaped
+#	as required according to their context and the output format
+#	modifiers are usually not needed, but can be specified if an explicit
+#	output format is desired.
+#
+#		% ["|[|'|#] [-] [[0]width] [{argument}] formatcode
+#
+#		"	output in quoted string format
+#		[	output in squid text log format as used by log_mime_hdrs
+#		#	output in URL quoted format
+#		'	output as-is
+#
+#		-	left aligned
+#		width	field width. If starting with 0 the
+#			output is zero padded
+#		{arg}	argument such as header name etc
+#
+#	Format codes:
+#
+#		>a	Client source IP address
+#		>A	Client FQDN
+#		>p	Client source port
+#		<A	Server IP address or peer name
+#		la	Local IP address (http_port)
+#		lp	Local port number (http_port)
+#		oa	Our outgoing IP address (tcp_outgoing_address)
+#		ts	Seconds since epoch
+#		tu	subsecond time (milliseconds)
+#		tl	Local time. Optional strftime format argument
+#			default %d/%b/%Y:%H:%M:%S %z
+#		tg	GMT time. Optional strftime format argument
+#			default %d/%b/%Y:%H:%M:%S %z
+#		tr	Response time (milliseconds)
+#		>h	Request header. Optional header name argument
+#			on the format header[:[separator]element]
+#		<h	Reply header. Optional header name argument
+#			as for >h
+#		un	User name
+#		ul	User name from authentication
+#		ui	User name from ident
+#		us	User name from SSL
+#		ue	User name from external acl helper
+#		Hs	HTTP status code
+#		Ss	Squid request status (TCP_MISS etc)
+#		Sh	Squid hierarchy status (DEFAULT_PARENT etc)
+#		mt	MIME content type
+#		rm	Request method (GET/POST etc)
+#		ru	Request URL
+#		rp	Request URL-Path excluding hostname
+#		rv	Request protocol version
+#		ea	Log string returned by external acl
+#		<st	Reply size including HTTP headers
+#		>st	Request size including HTTP headers
+#		st	Request+Reply size including HTTP headers
+#		sn	Unique sequence number per log line entry
+#		%	a literal % character
+#
+#	The default formats available (which do not need re-defining) are:
+#
+#logformat squid %ts.%03tu %6tr %>a %Ss/%03Hs %<st %rm %ru %un %Sh/%<A %mt
+#logformat squidmime %ts.%03tu %6tr %>a %Ss/%03Hs %<st %rm %ru %un %Sh/%<A %mt [%>h] [%<h]
+#logformat common %>a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %<st %Ss:%Sh
+#logformat combined %>a %ui %un [%tl] "%rm %ru HTTP/%rv" %Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh
+#
+#Default:
+# none
+
+#  TAG: access_log
+#	These files log client request activities. Has a line every HTTP or
+#	ICP request. The format is:
+#	access_log <filepath> [<logformat name> [acl acl ...]]
+#	access_log none [acl acl ...]]
+#
+#	Will log to the specified file using the specified format (which
+#	must be defined in a logformat directive) those entries which match
+#	ALL the acl's specified (which must be defined in acl clauses).
+#	If no acl is specified, all requests will be logged to this file.
+#
+#	To disable logging of a request use the filepath "none", in which case
+#	a logformat name should not be specified.
+#
+#	To log the request via syslog specify a filepath of "syslog":
+#
+#	access_log syslog[:facility.priority] [format [acl1 [acl2 ....]]]
+#	where facility could be any of:
+#	authpriv, daemon, local0 .. local7 or user.
+#
+#	And priority could be any of:
+#	err, warning, notice, info, debug.
+access_log /var/log/squid/access.log squid
+
+#  TAG: log_access	allow|deny acl acl...
+#	This options allows you to control which requests gets logged
+#	to access.log (see access_log directive). Requests denied for
+#	logging will also not be accounted for in performance counters.
+#
+#Default:
+# none
+
+#  TAG: logfile_daemon
+#	Specify the path to the logfile-writing daemon. This daemon is
+#	used to write the access and store logs, if configured.
+#
+#Default:
+# logfile_daemon /usr/lib/squid/logfile-daemon
+
+#  TAG: cache_log
+#	Cache logging file. This is where general information about
+#	your cache's behavior goes. You can increase the amount of data
+#	logged to this file with the "debug_options" tag below.
+#
+#Default:
+# cache_log /var/log/squid/cache.log
+
+#  TAG: cache_store_log
+#	Logs the activities of the storage manager.  Shows which
+#	objects are ejected from the cache, and which objects are
+#	saved and for how long.  To disable, enter "none". There are
+#	not really utilities to analyze this data, so you can safely
+#	disable it.
+#
+#Default:
+# cache_store_log /var/log/squid/store.log
+
+#  TAG: cache_swap_state
+#	Location for the cache "swap.state" file. This index file holds
+#	the metadata of objects saved on disk.  It is used to rebuild
+#	the cache during startup.  Normally this file resides in each
+#	'cache_dir' directory, but you may specify an alternate
+#	pathname here.  Note you must give a full filename, not just
+#	a directory. Since this is the index for the whole object
+#	list you CANNOT periodically rotate it!
+#
+#	If %s can be used in the file name it will be replaced with a
+#	a representation of the cache_dir name where each / is replaced
+#	with '.'. This is needed to allow adding/removing cache_dir
+#	lines when cache_swap_log is being used.
+#
+#	If have more than one 'cache_dir', and %s is not used in the name
+#	these swap logs will have names such as:
+#
+#		cache_swap_log.00
+#		cache_swap_log.01
+#		cache_swap_log.02
+#
+#	The numbered extension (which is added automatically)
+#	corresponds to the order of the 'cache_dir' lines in this
+#	configuration file.  If you change the order of the 'cache_dir'
+#	lines in this file, these index files will NOT correspond to
+#	the correct 'cache_dir' entry (unless you manually rename
+#	them).  We recommend you do NOT use this option.  It is
+#	better to keep these index files in each 'cache_dir' directory.
+#
+#Default:
+# none
+
+#  TAG: logfile_rotate
+#	Specifies the number of logfile rotations to make when you
+#	type 'squid -k rotate'.  The default is 10, which will rotate
+#	with extensions 0 through 9.  Setting logfile_rotate to 0 will
+#	disable the file name rotation, but the logfiles are still closed
+#	and re-opened.  This will enable you to rename the logfiles
+#	yourself just before sending the rotate signal.
+#
+#	Note, the 'squid -k rotate' command normally sends a USR1
+#	signal to the running squid process.  In certain situations
+#	(e.g. on Linux with Async I/O), USR1 is used for other
+#	purposes, so -k rotate uses another signal.  It is best to get
+#	in the habit of using 'squid -k rotate' instead of 'kill -USR1
+#	<pid>'.
+#
+#	Note2, for Debian/Linux the default of logfile_rotate is
+#	zero, since it includes external logfile-rotation methods.
+#
+#Default:
+# logfile_rotate 0
+
+#  TAG: emulate_httpd_log	on|off
+#	The Cache can emulate the log file format which many 'httpd'
+#	programs use.  To disable/enable this emulation, set
+#	emulate_httpd_log to 'off' or 'on'.  The default
+#	is to use the native log format since it includes useful
+#	information Squid-specific log analyzers use.
+#
+#Default:
+# emulate_httpd_log off
+
+#  TAG: log_ip_on_direct	on|off
+#	Log the destination IP address in the hierarchy log tag when going
+#	direct. Earlier Squid versions logged the hostname here. If you
+#	prefer the old way set this to off.
+#
+#Default:
+# log_ip_on_direct on
+
+#  TAG: mime_table
+#	Pathname to Squid's MIME table. You shouldn't need to change
+#	this, but the default file contains examples and formatting
+#	information if you do.
+#
+#Default:
+# mime_table /usr/share/squid/mime.conf
+
+#  TAG: log_mime_hdrs	on|off
+#	The Cache can record both the request and the response MIME
+#	headers for each HTTP transaction.  The headers are encoded
+#	safely and will appear as two bracketed fields at the end of
+#	the access log (for either the native or httpd-emulated log
+#	formats).  To enable this logging set log_mime_hdrs to 'on'.
+#
+#Default:
+# log_mime_hdrs off
+
+#  TAG: useragent_log
+#	Squid will write the User-Agent field from HTTP requests
+#	to the filename specified here.  By default useragent_log
+#	is disabled.
+#
+#Default:
+# none
+
+#  TAG: referer_log
+#	Squid will write the Referer field from HTTP requests to the
+#	filename specified here.  By default referer_log is disabled.
+#	Note that "referer" is actually a misspelling of "referrer"
+#	however the misspelt version has been accepted into the HTTP RFCs
+#	and we accept both.
+#
+#Default:
+# none
+
+#  TAG: pid_filename
+#	A filename to write the process-id to.  To disable, enter "none".
+#
+#Default:
+# pid_filename /var/run/squid.pid
+
+#  TAG: debug_options
+#	Logging options are set as section,level where each source file
+#	is assigned a unique section.  Lower levels result in less
+#	output,  Full debugging (level 9) can result in a very large
+#	log file, so be careful.  The magic word "ALL" sets debugging
+#	levels for all sections.  We recommend normally running with
+#	"ALL,1".
+#
+#Default:
+# debug_options ALL,1
+
+#  TAG: log_fqdn	on|off
+#	Turn this on if you wish to log fully qualified domain names
+#	in the access.log. To do this Squid does a DNS lookup of all
+#	IP's connecting to it. This can (in some situations) increase
+#	latency, which makes your cache seem slower for interactive
+#	browsing.
+#
+#Default:
+# log_fqdn off
+
+#  TAG: client_netmask
+#	A netmask for client addresses in logfiles and cachemgr output.
+#	Change this to protect the privacy of your cache clients.
+#	A netmask of 255.255.255.0 will log all IP's in that range with
+#	the last digit set to '0'.
+#
+#Default:
+# client_netmask 255.255.255.255
+
+#  TAG: forward_log
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-forward-log option
+#
+#	Logs the server-side requests.
+#
+#	This is currently work in progress.
+#
+#Default:
+# none
+
+#  TAG: strip_query_terms
+#	By default, Squid strips query terms from requested URLs before
+#	logging.  This protects your user's privacy.
+#
+#Default:
+# strip_query_terms on
+
+#  TAG: buffered_logs	on|off
+#	cache.log log file is written with stdio functions, and as such
+#	it can be buffered or unbuffered. By default it will be unbuffered.
+#	Buffering it can speed up the writing slightly (though you are
+#	unlikely to need to worry unless you run with tons of debugging
+#	enabled in which case performance will suffer badly anyway..).
+#
+#Default:
+# buffered_logs off
+
+#  TAG: netdb_filename
+#	A filename where Squid stores it's netdb state between restarts.
+#	To disable, enter "none".
+#
+#Default:
+# netdb_filename /var/spool/squid/logs/netdb.state
+
+
+# OPTIONS FOR FTP GATEWAYING
+# -----------------------------------------------------------------------------
+
+#  TAG: ftp_user
+#	If you want the anonymous login password to be more informative
+#	(and enable the use of picky ftp servers), set this to something
+#	reasonable for your domain, like wwwuser@somewhere.net
+#
+#	The reason why this is domainless by default is the
+#	request can be made on the behalf of a user in any domain,
+#	depending on how the cache is used.
+#	Some ftp server also validate the email address is valid
+#	(for example perl.com).
+#
+#Default:
+# ftp_user Squid@
+
+#  TAG: ftp_list_width
+#	Sets the width of ftp listings. This should be set to fit in
+#	the width of a standard browser. Setting this too small
+#	can cut off long filenames when browsing ftp sites.
+#
+#Default:
+# ftp_list_width 32
+
+#  TAG: ftp_passive
+#	If your firewall does not allow Squid to use passive
+#	connections, turn off this option.
+#
+#Default:
+# ftp_passive on
+
+#  TAG: ftp_sanitycheck
+#	For security and data integrity reasons Squid by default performs
+#	sanity checks of the addresses of FTP data connections ensure the
+#	data connection is to the requested server. If you need to allow
+#	FTP connections to servers using another IP address for the data
+#	connection turn this off.
+#
+#Default:
+# ftp_sanitycheck on
+
+#  TAG: ftp_telnet_protocol
+#	The FTP protocol is officially defined to use the telnet protocol
+#	as transport channel for the control connection. However, many
+#	implementations are broken and does not respect this aspect of
+#	the FTP protocol.
+#
+#	If you have trouble accessing files with ASCII code 255 in the
+#	path or similar problems involving this ASCII code you can
+#	try setting this directive to off. If that helps, report to the
+#	operator of the FTP server in question that their FTP server
+#	is broken and does not follow the FTP standard.
+#
+#Default:
+# ftp_telnet_protocol on
+
+
+# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS
+# -----------------------------------------------------------------------------
+
+#  TAG: diskd_program
+#	Specify the location of the diskd executable.
+#	Note this is only useful if you have compiled in
+#	diskd as one of the store io modules.
+#
+#Default:
+# diskd_program /usr/lib/squid/diskd-daemon
+
+#  TAG: unlinkd_program
+#	Specify the location of the executable for file deletion process.
+#
+#Default:
+# unlinkd_program /usr/lib/squid/unlinkd
+
+#  TAG: pinger_program
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-icmp option
+#
+#	Specify the location of the executable for the pinger process.
+#
+#Default:
+# pinger_program /usr/lib/squid/pinger
+
+
+# OPTIONS FOR URL REWRITING
+# -----------------------------------------------------------------------------
+
+#  TAG: storeurl_rewrite_program
+#	Specify the location of the executable for the Store URL rewriter.
+#	The Store URL rewriter allows URLs to be "normalised" ; mapping
+#	multiple URLs to a single URL representation for cache operations.
+#
+#	For example, if you request an object at:
+#
+#	http://srv1.example.com/image.gif
+#
+#	and a subsequent request for:
+#
+#	http://srv2.example.com/image.gif
+#
+#	then Squid will treat these both as different URLs and cache them
+#	seperately.
+#
+#	This is almost the normal case, but an increasing number of sites
+#	distribute the same content between multiple frontend hosts.
+#	The Store URL rewriter allows you to rewrite these URLs to one URL
+#	to use for cache operations, but not -fetches-. Fetches are still
+#	made from the original site, but stored with the store URL rewritten
+#	URL as the store key.
+#
+#	For each requested URL rewriter will receive on line with the format
+#
+#	URL <SP> client_ip "/" fqdn <SP> user <SP> method <SP> urlgroup
+#	 [<SP> kvpairs] <NL>
+#
+#	In the future, the rewriter interface will be extended with
+#	key=value pairs ("kvpairs" shown above).  Rewriter programs
+#	should be prepared to receive and possibly ignore additional
+#	whitespace-separated tokens on each input line.
+#
+#	And the rewriter may return a rewritten URL. The other components of
+#	the request line does not need to be returned (ignored if they are).
+#
+#	By default, a Store URL rewriter is not used.
+#
+#	Please note - the normal URL rewriter rewrites Squid's _destination_
+#	URL - ie, what it fetches. The Store URL rewriter rewrites Squid's
+#	_store_ URL - ie, what it uses to store and retrieve objects.
+#
+#Default:
+# none
+
+#  TAG: storeurl_rewrite_children
+#
+#
+#Default:
+# storeurl_rewrite_children 5
+
+#  TAG: storeurl_rewrite_concurrency
+#
+#
+#Default:
+# storeurl_rewrite_concurrency 0
+
+#  TAG: url_rewrite_program
+#	Specify the location of the executable for the URL rewriter.
+#	Since they can perform almost any function there isn't one included.
+#
+#	For each requested URL rewriter will receive on line with the format
+#
+#	URL <SP> client_ip "/" fqdn <SP> user <SP> method <SP> urlgroup
+#	 [<SP> kvpairs] <NL>
+#
+#	In the future, the rewriter interface will be extended with
+#	key=value pairs ("kvpairs" shown above).  Rewriter programs
+#	should be prepared to receive and possibly ignore additional
+#	whitespace-separated tokens on each input line.
+#
+#	And the rewriter may return a rewritten URL. The other components of
+#	the request line does not need to be returned (ignored if they are).
+#
+#	The rewriter can also indicate that a client-side redirect should
+#	be performed to the new URL. This is done by prefixing the returned
+#	URL with "301:" (moved permanently) or 302: (moved temporarily).
+#
+#	It can also return a "urlgroup" that can subsequently be matched
+#	in cache_peer_access and similar ACL driven rules. An urlgroup is
+#	returned by prefixing the returned URL with "!urlgroup!".
+#
+#	By default, a URL rewriter is not used.
+#
+#Default:
+# none
+
+#  TAG: url_rewrite_children
+#	The number of redirector processes to spawn. If you start
+#	too few Squid will have to wait for them to process a backlog of
+#	URLs, slowing it down. If you start too many they will use RAM
+#	and other system resources.
+#
+#Default:
+# url_rewrite_children 5
+
+#  TAG: url_rewrite_concurrency
+#	The number of requests each redirector helper can handle in
+#	parallel. Defaults to 0 which indicates the redirector
+#	is a old-style single threaded redirector.
+#
+#	When this directive is set to a value >= 1 then the protocol
+#	used to communicate with the helper is modified to include
+#	a request ID in front of the request/response. The request
+#	ID from the request must be echoed back with the response
+#	to that request.
+#
+#Default:
+# url_rewrite_concurrency 0
+
+#  TAG: url_rewrite_host_header
+#	By default Squid rewrites any Host: header in redirected
+#	requests.  If you are running an accelerator this may
+#	not be a wanted effect of a redirector.
+#
+#	WARNING: Entries are cached on the result of the URL rewriting
+#	process, so be careful if you have domain-virtual hosts.
+#
+#Default:
+# url_rewrite_host_header on
+
+#  TAG: url_rewrite_access
+#	If defined, this access list specifies which requests are
+#	sent to the redirector processes.  By default all requests
+#	are sent.
+#
+#Default:
+# none
+
+#  TAG: storeurl_access
+#
+#
+#Default:
+# none
+
+#  TAG: redirector_bypass
+#	When this is 'on', a request will not go through the
+#	redirector if all redirectors are busy.  If this is 'off'
+#	and the redirector queue grows too large, Squid will exit
+#	with a FATAL error and ask you to increase the number of
+#	redirectors.  You should only enable this if the redirectors
+#	are not critical to your caching system.  If you use
+#	redirectors for access control, and you enable this option,
+#	users may have access to pages they should not
+#	be allowed to request.
+#
+#Default:
+# redirector_bypass off
+
+#  TAG: location_rewrite_program
+#	Specify the location of the executable for the Location rewriter,
+#	used to rewrite server generated redirects. Usually used in
+#	conjunction with a url_rewrite_program
+#
+#	For each Location header received the location rewriter will receive
+#	one line with the format:
+#
+#	   location URL <SP> requested URL <SP> urlgroup <NL>
+#
+#	And the rewriter may return a rewritten Location URL or a blank line.
+#	The other components of the request line does not need to be returned
+#	(ignored if they are).
+#
+#	By default, a Location rewriter is not used.
+#
+#Default:
+# none
+
+#  TAG: location_rewrite_children
+#	The number of location rewriting processes to spawn. If you start
+#	too few Squid will have to wait for them to process a backlog of
+#	URLs, slowing it down. If you start too many they will use RAM
+#	and other system resources.
+#
+#Default:
+# location_rewrite_children 5
+
+#  TAG: location_rewrite_concurrency
+#	The number of requests each Location rewriter helper can handle in
+#	parallel. Defaults to 0 which indicates that the helper
+#	is a old-style singlethreaded helper.
+#
+#Default:
+# location_rewrite_concurrency 0
+
+#  TAG: location_rewrite_access
+#	If defined, this access list specifies which requests are
+#	sent to the location rewriting processes.  By default all Location
+#	headers are sent.
+#
+#Default:
+# none
+
+
+# OPTIONS FOR TUNING THE CACHE
+# -----------------------------------------------------------------------------
+
+#  TAG: cache
+#	A list of ACL elements which, if matched, cause the request to
+#	not be satisfied from the cache and the reply to not be cached.
+#	In other words, use this to force certain objects to never be cached.
+#
+#	You must use the word 'DENY' to indicate the ACL names which should
+#	NOT be cached.
+#
+#	Default is to allow all to be cached.
+#
+#Default:
+# none
+
+#  TAG: max_stale	time-units
+#	This option puts an upper limit on how stale content Squid
+#	will serve from the cache if cache validation fails.
+#
+#Default:
+# max_stale 1 week
+
+#  TAG: refresh_pattern
+#	usage: refresh_pattern [-i] regex min percent max [options]
+#
+#	By default, regular expressions are CASE-SENSITIVE.  To make
+#	them case-insensitive, use the -i option.
+#
+#	'Min' is the time (in minutes) an object without an explicit
+#	expiry time should be considered fresh. The recommended
+#	value is 0, any higher values may cause dynamic applications
+#	to be erroneously cached unless the application designer
+#	has taken the appropriate actions.
+#
+#	'Percent' is a percentage of the objects age (time since last
+#	modification age) an object without explicit expiry time
+#	will be considered fresh.
+#
+#	'Max' is an upper limit on how long objects without an explicit
+#	expiry time will be considered fresh.
+#
+#	options: override-expire
+#		 override-lastmod
+#		 reload-into-ims
+#		 ignore-reload
+#		 ignore-no-cache
+#		 ignore-private
+#		 ignore-auth
+#		 stale-while-revalidate=NN
+#		 ignore-stale-while-revalidate
+#		 max-stale=NN
+#		 negative-ttl=NN
+#
+#		override-expire enforces min age even if the server
+#		sent an explicit expiry time (e.g., with the
+#		Expires: header or Cache-Control: max-age). Doing this
+#		VIOLATES the HTTP standard.  Enabling this feature
+#		could make you liable for problems which it causes.
+#
+#		override-lastmod enforces min age even on objects
+#		that were modified recently.
+#
+#		reload-into-ims changes client no-cache or ``reload''
+#		to If-Modified-Since requests. Doing this VIOLATES the
+#		HTTP standard. Enabling this feature could make you
+#		liable for problems which it causes.
+#
+#		ignore-reload ignores a client no-cache or ``reload''
+#		header. Doing this VIOLATES the HTTP standard. Enabling
+#		this feature could make you liable for problems which
+#		it causes.
+#
+#		ignore-no-cache ignores any ``Pragma: no-cache'' and
+#		``Cache-control: no-cache'' headers received from a server.
+#		The HTTP RFC never allows the use of this (Pragma) header
+#		from a server, only a client, though plenty of servers
+#		send it anyway.
+#
+#		ignore-private ignores any ``Cache-control: private''
+#		headers received from a server. Doing this VIOLATES
+#		the HTTP standard. Enabling this feature could make you
+#		liable for problems which it causes.
+#
+#		ignore-auth caches responses to requests with authorization,
+#		as if the originserver had sent ``Cache-control: public''
+#		in the response header. Doing this VIOLATES the HTTP standard.
+#		Enabling this feature could make you liable for problems which
+#		it causes.
+#
+#		stale-while-revalidate=NN makes Squid perform an asyncronous
+#		cache validation if the object isn't more stale than NN.
+#		Doing this VIOLATES the HTTP standard. Enabling this
+#		feature could make you liable for problems which it
+#		causes.
+#
+#		ignore-stale-while-revalidate makes Squid ignore any 'Cache-Control:
+#		stale-while-revalidate=NN' headers received from a server. Can be
+#		combined with stale-while-revalidate=NN to override the server provided
+#		value.
+#
+#		max-stale=NN provided a maximum staleness factor. Squid won't
+#		serve objects more stale than this even if it failed to
+#		validate the object.
+#
+#		negative-ttl=NN overrides the global negative_ttl parameter
+#		selectively for URLs matching this pattern (in seconds).
+#
+#	Basically a cached object is:
+#
+#		FRESH if expires < now, else STALE
+#		STALE if age > max
+#		FRESH if lm-factor < percent, else STALE
+#		FRESH if age < min
+#		else STALE
+#
+#	The refresh_pattern lines are checked in the order listed here.
+#	The first entry which matches is used.  If none of the entries
+#	match the default will be used.
+#
+#	Note, you must uncomment all the default lines if you want
+#	to change one. The default setting is only active if none is
+#	used.
+#
+#Suggested default:
+refresh_pattern ^ftp:		1440	20%	10080
+refresh_pattern ^gopher:	1440	0%	1440
+refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+refresh_pattern (Release|Package(.gz)*)$	0	20%	2880
+refresh_pattern .		0	20%	4320
+
+#  TAG: quick_abort_min	(KB)
+#  TAG: quick_abort_max	(KB)
+#  TAG: quick_abort_pct	(percent)
+#	The cache by default continues downloading aborted requests
+#	which are almost completed (less than 16 KB remaining). This
+#	may be undesirable on slow (e.g. SLIP) links and/or very busy
+#	caches.  Impatient users may tie up file descriptors and
+#	bandwidth by repeatedly requesting and immediately aborting
+#	downloads.
+#
+#	When the user aborts a request, Squid will check the
+#	quick_abort values to the amount of data transfered until
+#	then.
+#
+#	If the transfer has less than 'quick_abort_min' KB remaining,
+#	it will finish the retrieval.
+#
+#	If the transfer has more than 'quick_abort_max' KB remaining,
+#	it will abort the retrieval.
+#
+#	If more than 'quick_abort_pct' of the transfer has completed,
+#	it will finish the retrieval.
+#
+#	If you do not want any retrieval to continue after the client
+#	has aborted, set both 'quick_abort_min' and 'quick_abort_max'
+#	to '0 KB'.
+#
+#	If you want retrievals to always continue if they are being
+#	cached set 'quick_abort_min' to '-1 KB'.
+#
+#Default:
+# quick_abort_min 16 KB
+# quick_abort_max 16 KB
+# quick_abort_pct 95
+
+#  TAG: read_ahead_gap	buffer-size
+#	The amount of data the cache will buffer ahead of what has been
+#	sent to the client when retrieving an object from another server.
+#
+#Default:
+# read_ahead_gap 16 KB
+
+#  TAG: negative_ttl	time-units
+#	Time-to-Live (TTL) for failed requests.  Certain types of
+#	failures (such as "connection refused" and "404 Not Found") are
+#	negatively-cached for a configurable amount of time.  The
+#	default is 5 minutes.  Note that this is different from
+#	negative caching of DNS lookups.
+#
+#Default:
+# negative_ttl 5 minutes
+
+#  TAG: positive_dns_ttl	time-units
+#	Upper limit on how long Squid will cache positive DNS responses.
+#	Default is 6 hours (360 minutes). This directive must be set
+#	larger than negative_dns_ttl.
+#
+#Default:
+# positive_dns_ttl 6 hours
+
+#  TAG: negative_dns_ttl	time-units
+#	Time-to-Live (TTL) for negative caching of failed DNS lookups.
+#	This also sets the lower cache limit on positive lookups.
+#	Minimum value is 1 second, and it is not recommendable to go
+#	much below 10 seconds.
+#
+#Default:
+# negative_dns_ttl 1 minute
+
+#  TAG: range_offset_limit	(bytes)
+#	Sets a upper limit on how far into the the file a Range request
+#	may be to cause Squid to prefetch the whole file. If beyond this
+#	limit Squid forwards the Range request as it is and the result
+#	is NOT cached.
+#
+#	This is to stop a far ahead range request (lets say start at 17MB)
+#	from making Squid fetch the whole object up to that point before
+#	sending anything to the client.
+#
+#	A value of -1 causes Squid to always fetch the object from the
+#	beginning so it may cache the result. (2.0 style)
+#
+#	A value of 0 causes Squid to never fetch more than the
+#	client requested. (default)
+#
+#Default:
+# range_offset_limit 0 KB
+
+#  TAG: minimum_expiry_time	(seconds)
+#	The minimum caching time according to (Expires - Date)
+#	Headers Squid honors if the object can't be revalidated
+#	defaults to 60 seconds. In reverse proxy enorinments it
+#	might be desirable to honor shorter object lifetimes. It
+#	is most likely better to make your server return a
+#	meaningful Last-Modified header however.
+#
+#Default:
+# minimum_expiry_time 60 seconds
+
+#  TAG: store_avg_object_size	(kbytes)
+#	Average object size, used to estimate number of objects your
+#	cache can hold.  The default is 13 KB.
+#
+#Default:
+# store_avg_object_size 13 KB
+
+#  TAG: store_objects_per_bucket
+#	Target number of objects per bucket in the store hash table.
+#	Lowering this value increases the total number of buckets and
+#	also the storage maintenance rate.  The default is 20.
+#
+#Default:
+# store_objects_per_bucket 20
+
+
+# HTTP OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: request_header_max_size	(KB)
+#	This specifies the maximum size for HTTP headers in a request.
+#	Request headers are usually relatively small (about 512 bytes).
+#	Placing a limit on the request header size will catch certain
+#	bugs (for example with persistent connections) and possibly
+#	buffer-overflow or denial-of-service attacks.
+#
+#Default:
+# request_header_max_size 20 KB
+
+#  TAG: reply_header_max_size	(KB)
+#	This specifies the maximum size for HTTP headers in a reply.
+#	Reply headers are usually relatively small (about 512 bytes).
+#	Placing a limit on the reply header size will catch certain
+#	bugs (for example with persistent connections) and possibly
+#	buffer-overflow or denial-of-service attacks.
+#
+#Default:
+# reply_header_max_size 20 KB
+
+#  TAG: request_body_max_size	(KB)
+#	This specifies the maximum size for an HTTP request body.
+#	In other words, the maximum size of a PUT/POST request.
+#	A user who attempts to send a request with a body larger
+#	than this limit receives an "Invalid Request" error message.
+#	If you set this parameter to a zero (the default), there will
+#	be no limit imposed.
+#
+#Default:
+# request_body_max_size 0 KB
+
+#  TAG: broken_posts
+#	A list of ACL elements which, if matched, causes Squid to send
+#	an extra CRLF pair after the body of a PUT/POST request.
+#
+#	Some HTTP servers has broken implementations of PUT/POST,
+#	and rely on an extra CRLF pair sent by some WWW clients.
+#
+#	Quote from RFC2616 section 4.1 on this matter:
+#
+#	  Note: certain buggy HTTP/1.0 client implementations generate an
+#	  extra CRLF's after a POST request. To restate what is explicitly
+#	  forbidden by the BNF, an HTTP/1.1 client must not preface or follow
+#	  a request with an extra CRLF.
+#
+#Example:
+# acl buggy_server url_regex ^http://....
+# broken_posts allow buggy_server
+#
+#Default:
+# none
+
+#  TAG: upgrade_http0.9
+#	This access list controls when HTTP/0.9 responses is upgraded
+#	to our current HTTP version. The default is to always upgrade.
+#
+#	Some applications expect to be able to respond with non-HTTP
+#	responses and clients gets confused if the response is upgraded.
+#	For example SHOUTcast servers used for mp3 streaming.
+#
+#	To enable some flexibility in detection of such applications
+#	the first line of the response is available in the internal header
+#	X-HTTP09-First-Line for use in the rep_header acl.
+#
+# Don't upgrade ShoutCast responses to HTTP
+acl shoutcast rep_header X-HTTP09-First-Line ^ICY\s[0-9]
+upgrade_http0.9 deny shoutcast
+
+#  TAG: via	on|off
+#	If set (default), Squid will include a Via header in requests and
+#	replies as required by RFC2616.
+#
+#Default:
+# via on
+
+#  TAG: cache_vary
+#	When 'cache_vary' is set to off, response that have a
+#	Vary header will not be stored in the cache.
+#
+#Default:
+# cache_vary on
+
+#  TAG: broken_vary_encoding
+#	Many servers have broken support for on-the-fly Content-Encoding,
+#	returning the same ETag on both plain and gzip:ed variants.
+#	Vary replies matching this access list will have the cache split
+#	on the Accept-Encoding header of the request and not trusting the
+#	ETag to be unique.
+#
+# Apache mod_gzip and mod_deflate known to be broken so don't trust
+# Apache to signal ETag correctly on such responses
+acl apache rep_header Server ^Apache
+broken_vary_encoding allow apache
+
+#  TAG: collapsed_forwarding	(on|off)
+#	This option enables multiple requests for the same URI to be
+#	processed as one request. Normally disabled to avoid increased
+#	latency on dynamic content, but there can be benefit from enabling
+#	this in accelerator setups where the web servers are the bottleneck
+#	and reliable and returns mostly cacheable information.
+#
+#Default:
+# collapsed_forwarding off
+
+#  TAG: refresh_stale_hit	(time)
+#	This option changes the refresh algorithm to allow concurrent
+#	requests while an object is being refreshed to be processed as
+#	cache hits if the object expired less than X seconds ago. Default
+#	is 0 to disable this feature. This option is mostly interesting
+#	in accelerator setups where a few objects is accessed very
+#	frequently.
+#
+#Default:
+# refresh_stale_hit 0 seconds
+
+#  TAG: ie_refresh	on|off
+#	Microsoft Internet Explorer up until version 5.5 Service
+#	Pack 1 has an issue with transparent proxies, wherein it
+#	is impossible to force a refresh.  Turning this on provides
+#	a partial fix to the problem, by causing all IMS-REFRESH
+#	requests from older IE versions to check the origin server
+#	for fresh content.  This reduces hit ratio by some amount
+#	(~10% in my experience), but allows users to actually get
+#	fresh content when they want it.  Note because Squid
+#	cannot tell if the user is using 5.5 or 5.5SP1, the behavior
+#	of 5.5 is unchanged from old versions of Squid (i.e. a
+#	forced refresh is impossible).  Newer versions of IE will,
+#	hopefully, continue to have the new behavior and will be
+#	handled based on that assumption.  This option defaults to
+#	the old Squid behavior, which is better for hit ratios but
+#	worse for clients using IE, if they need to be able to
+#	force fresh content.
+#
+#Default:
+# ie_refresh off
+
+#  TAG: vary_ignore_expire	on|off
+#	Many HTTP servers supporting Vary gives such objects
+#	immediate expiry time with no cache-control header
+#	when requested by a HTTP/1.0 client. This option
+#	enables Squid to ignore such expiry times until
+#	HTTP/1.1 is fully implemented.
+#	WARNING: This may eventually cause some varying
+#	objects not intended for caching to get cached.
+#
+#Default:
+# vary_ignore_expire off
+
+#  TAG: extension_methods
+#	Squid only knows about standardized HTTP request methods.
+#	You can add up to 20 additional "extension" methods here.
+extension_methods REPORT MERGE MKACTIVITY CHECKOUT
+
+#  TAG: request_entities
+#	Squid defaults to deny GET and HEAD requests with request entities,
+#	as the meaning of such requests are undefined in the HTTP standard
+#	even if not explicitly forbidden.
+#
+#	Set this directive to on if you have clients which insists
+#	on sending request entities in GET or HEAD requests. But be warned
+#	that there is server software (both proxies and web servers) which
+#	can fail to properly process this kind of request which may make you
+#	vulnerable to cache pollution attacks if enabled.
+#
+#Default:
+# request_entities off
+
+#  TAG: header_access
+#	Usage: header_access header_name allow|deny [!]aclname ...
+#
+#	WARNING: Doing this VIOLATES the HTTP standard.  Enabling
+#	this feature could make you liable for problems which it
+#	causes.
+#
+#	This option replaces the old 'anonymize_headers' and the
+#	older 'http_anonymizer' option with something that is much
+#	more configurable. This new method creates a list of ACLs
+#	for each header, allowing you very fine-tuned header
+#	mangling.
+#
+#	You can only specify known headers for the header name.
+#	Other headers are reclassified as 'Other'. You can also
+#	refer to all the headers with 'All'.
+#
+#	For example, to achieve the same behavior as the old
+#	'http_anonymizer standard' option, you should use:
+#
+#		header_access From deny all
+#		header_access Referer deny all
+#		header_access Server deny all
+#		header_access User-Agent deny all
+#		header_access WWW-Authenticate deny all
+#		header_access Link deny all
+#
+#	Or, to reproduce the old 'http_anonymizer paranoid' feature
+#	you should use:
+#
+#		header_access Allow allow all
+#		header_access Authorization allow all
+#		header_access WWW-Authenticate allow all
+#		header_access Proxy-Authorization allow all
+#		header_access Proxy-Authenticate allow all
+#		header_access Cache-Control allow all
+#		header_access Content-Encoding allow all
+#		header_access Content-Length allow all
+#		header_access Content-Type allow all
+#		header_access Date allow all
+#		header_access Expires allow all
+#		header_access Host allow all
+#		header_access If-Modified-Since allow all
+#		header_access Last-Modified allow all
+#		header_access Location allow all
+#		header_access Pragma allow all
+#		header_access Accept allow all
+#		header_access Accept-Charset allow all
+#		header_access Accept-Encoding allow all
+#		header_access Accept-Language allow all
+#		header_access Content-Language allow all
+#		header_access Mime-Version allow all
+#		header_access Retry-After allow all
+#		header_access Title allow all
+#		header_access Connection allow all
+#		header_access Proxy-Connection allow all
+#		header_access All deny all
+#
+#	By default, all headers are allowed (no anonymizing is
+#	performed).
+#
+#Default:
+# none
+
+#  TAG: header_replace
+#	Usage:   header_replace header_name message
+#	Example: header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit)
+#
+#	This option allows you to change the contents of headers
+#	denied with header_access above, by replacing them with
+#	some fixed string. This replaces the old fake_user_agent
+#	option.
+#
+#	By default, headers are removed if denied.
+#
+#Default:
+# none
+
+#  TAG: relaxed_header_parser	on|off|warn
+#	In the default "on" setting Squid accepts certain forms
+#	of non-compliant HTTP messages where it is unambiguous
+#	what the sending application intended even if the message
+#	is not correctly formatted. The messages is then normalized
+#	to the correct form when forwarded by Squid.
+#
+#	If set to "warn" then a warning will be emitted in cache.log
+#	each time such HTTP error is encountered.
+#
+#	If set to "off" then such HTTP errors will cause the request
+#	or response to be rejected.
+#
+#Default:
+# relaxed_header_parser on
+
+#  TAG: server_http11	on|off
+#	This option enables the use ot HTTP/1.1 on outgoing "direct" requests.
+#	See also the http11 cache_peer option.
+#	Note: The HTTP/1.1 support is still incomplete, with an
+#	internal HTTP/1.0 hop. As result 1xx responses will not
+#	be forwarded.
+#
+#Default:
+# server_http11 off
+
+#  TAG: ignore_expect_100	on|off
+#	This option makes Squid ignore any Expect: 100-continue header present
+#	in the request.
+#	Note: Enabling this is a HTTP protocol violation, but some client may
+#	not handle it well..
+#
+#Default:
+# ignore_expect_100 off
+
+#  TAG: external_refresh_check
+#	This option defines an external helper for determining whether to
+#	refresh a stale response. It will be called when Squid receives a
+#	request for a cached response that is stale; the helper can either
+#	confirm that the response is stale with a STALE response, or
+#	extend the freshness of the response (thereby avoiding a refresh
+#	check) with a FRESH response, along with a freshness=nnn keyword.
+#
+#	  external_refresh_check [options] FORMAT.. /path/to/helper [helper_args]
+#
+#	If present, helper_args will be passed to the helper on the command
+#	line verbatim.
+#
+#	Options:
+#
+#	  children=n	Number of processes to spawn to service external
+#			refresh checks (default 5).
+#	  concurrency=n	Concurrency level per process. Only used with
+#			helpers capable of processing more than one query
+#			at a time.
+#
+#	When using the concurrency option, the protocol is changed by introducing
+#	a query channel tag infront of the request/response. The query channel
+#	tag is a number between 0 and concurrency−1.
+#
+#	FORMAT specifications:
+#
+#	  %CACHE_URI	The URI of the cached response
+#	  %RES{Header}	HTTP response header value
+#	  %AGE		The age of the cached response
+#
+#	The request sent to the helper consists of the data in the format
+#	specification in the order specified.
+#
+#	The helper receives lines per the above format specification, and
+#	returns lines starting with OK or ERR indicating the validity of
+#	the request and optionally followed by additional keywords with
+#	more details.  URL escaping is used to protect each value in both
+#	requests and responses.
+#
+#	General result syntax:
+#
+#	  FRESH / STALE keyword=value ...
+#
+#	Defined keywords:
+#
+#	  freshness=nnn	The number of seconds to extend the freshness of
+#			the response by.
+#	  log=string	String to be logged in access.log. Available as
+#			%ef in logformat specifications.
+#	  res{Header}=value
+#			Value to update response headers with. If already
+#			present, the supplied value completely replaces
+#			the cached value.
+#
+#	In the event of a helper−related error (e.g., overload), Squid
+#	will always default to STALE.
+#
+#Default:
+# none
+
+
+# TIMEOUTS
+# -----------------------------------------------------------------------------
+
+#  TAG: forward_timeout	time-units
+#	This parameter specifies how long Squid should at most attempt in
+#	finding a forwarding path for the request before giving up.
+#
+#Default:
+# forward_timeout 4 minutes
+
+#  TAG: connect_timeout	time-units
+#	This parameter specifies how long to wait for the TCP connect to
+#	the requested server or peer to complete before Squid should
+#	attempt to find another path where to forward the request.
+#
+#Default:
+# connect_timeout 1 minute
+
+#  TAG: peer_connect_timeout	time-units
+#	This parameter specifies how long to wait for a pending TCP
+#	connection to a peer cache.  The default is 30 seconds.   You
+#	may also set different timeout values for individual neighbors
+#	with the 'connect-timeout' option on a 'cache_peer' line.
+#
+#Default:
+# peer_connect_timeout 30 seconds
+
+#  TAG: read_timeout	time-units
+#	The read_timeout is applied on server-side connections.  After
+#	each successful read(), the timeout will be extended by this
+#	amount.  If no data is read again after this amount of time,
+#	the request is aborted and logged with ERR_READ_TIMEOUT.  The
+#	default is 15 minutes.
+#
+#Default:
+# read_timeout 15 minutes
+
+#  TAG: request_timeout
+#	How long to wait for an HTTP request after initial
+#	connection establishment.
+#
+#Default:
+# request_timeout 5 minutes
+
+#  TAG: persistent_request_timeout
+#	How long to wait for the next HTTP request on a persistent
+#	connection after the previous request completes.
+#
+#Default:
+# persistent_request_timeout 2 minutes
+
+#  TAG: client_lifetime	time-units
+#	The maximum amount of time a client (browser) is allowed to
+#	remain connected to the cache process.  This protects the Cache
+#	from having a lot of sockets (and hence file descriptors) tied up
+#	in a CLOSE_WAIT state from remote clients that go away without
+#	properly shutting down (either because of a network failure or
+#	because of a poor client implementation).  The default is one
+#	day, 1440 minutes.
+#
+#	NOTE:  The default value is intended to be much larger than any
+#	client would ever need to be connected to your cache.  You
+#	should probably change client_lifetime only as a last resort.
+#	If you seem to have many client connections tying up
+#	filedescriptors, we recommend first tuning the read_timeout,
+#	request_timeout, persistent_request_timeout and quick_abort values.
+#
+#Default:
+# client_lifetime 1 day
+
+#  TAG: half_closed_clients
+#	Some clients may shutdown the sending side of their TCP
+#	connections, while leaving their receiving sides open.	Sometimes,
+#	Squid can not tell the difference between a half-closed and a
+#	fully-closed TCP connection.  By default, half-closed client
+#	connections are kept open until a read(2) or write(2) on the
+#	socket returns an error.  Change this option to 'off' and Squid
+#	will immediately close client connections when read(2) returns
+#	"no more data to read."
+#
+#Default:
+# half_closed_clients on
+
+#  TAG: pconn_timeout
+#	Timeout for idle persistent connections to servers and other
+#	proxies.
+#
+#Default:
+# pconn_timeout 1 minute
+
+#  TAG: ident_timeout
+#	Maximum time to wait for IDENT lookups to complete.
+#
+#	If this is too high, and you enabled IDENT lookups from untrusted
+#	users, you might be susceptible to denial-of-service by having
+#	many ident requests going at once.
+#
+#Default:
+# ident_timeout 10 seconds
+
+#  TAG: shutdown_lifetime	time-units
+#	When SIGTERM or SIGHUP is received, the cache is put into
+#	"shutdown pending" mode until all active sockets are closed.
+#	This value is the lifetime to set for all open descriptors
+#	during shutdown mode.  Any active clients after this many
+#	seconds will receive a 'timeout' message.
+#
+#Default:
+# shutdown_lifetime 30 seconds
+
+
+# ADMINISTRATIVE PARAMETERS
+# -----------------------------------------------------------------------------
+
+#  TAG: cache_mgr
+#	Email-address of local cache manager who will receive
+#	mail if the cache dies. The default is "webmaster".
+#
+#Default:
+# cache_mgr webmaster
+
+#  TAG: mail_from
+#	From: email-address for mail sent when the cache dies.
+#	The default is to use 'appname@unique_hostname'.
+#	Default appname value is "squid", can be changed into
+#	src/globals.h before building squid.
+#
+#Default:
+# none
+
+#  TAG: mail_program
+#	Email program used to send mail if the cache dies.
+#	The default is "mail". The specified program must comply
+#	with the standard Unix mail syntax:
+#	  mail-program recipient < mailfile
+#
+#	Optional command line options can be specified.
+#
+#Default:
+# mail_program mail
+
+#  TAG: cache_effective_user
+#	If you start Squid as root, it will change its effective/real
+#	UID/GID to the user specified below.  The default is to change
+#	to UID to proxy.  If you define cache_effective_user, but not
+#	cache_effective_group, Squid sets the GID to the effective
+#	user's default group ID (taken from the password file) and
+#	supplementary group list from the from groups membership of
+#	cache_effective_user.
+#
+#Default:
+# cache_effective_user proxy
+
+#  TAG: cache_effective_group
+#	If you want Squid to run with a specific GID regardless of
+#	the group memberships of the effective user then set this
+#	to the group (or GID) you want Squid to run as. When set
+#	all other group privileges of the effective user is ignored
+#	and only this GID is effective. If Squid is not started as
+#	root the user starting Squid must be member of the specified
+#	group.
+#
+#Default:
+# none
+
+#  TAG: httpd_suppress_version_string	on|off
+#	Suppress Squid version string info in HTTP headers and HTML error pages.
+#
+#Default:
+# httpd_suppress_version_string off
+
+#  TAG: visible_hostname
+#	If you want to present a special hostname in error messages, etc,
+#	define this.  Otherwise, the return value of gethostname()
+#	will be used. If you have multiple caches in a cluster and
+#	get errors about IP-forwarding you must set them to have individual
+#	names with this setting.
+#
+#Default:
+# none
+
+#  TAG: unique_hostname
+#	If you want to have multiple machines with the same
+#	'visible_hostname' you must give each machine a different
+#	'unique_hostname' so forwarding loops can be detected.
+#
+#Default:
+# none
+
+#  TAG: hostname_aliases
+#	A list of other DNS names your cache has.
+#
+#Default:
+# none
+
+#  TAG: umask
+#	Minimum umask which should be enforced while the proxy
+#	is running, in addition to the umask set at startup.
+#
+#	Note: Should start with a 0 to indicate the normal octal
+#	representation of umasks
+#
+#Default:
+# umask 027
+
+
+# OPTIONS FOR THE CACHE REGISTRATION SERVICE
+# -----------------------------------------------------------------------------
+#
+#	This section contains parameters for the (optional) cache
+#	announcement service.  This service is provided to help
+#	cache administrators locate one another in order to join or
+#	create cache hierarchies.
+#
+#	An 'announcement' message is sent (via UDP) to the registration
+#	service by Squid.  By default, the announcement message is NOT
+#	SENT unless you enable it with 'announce_period' below.
+#
+#	The announcement message includes your hostname, plus the
+#	following information from this configuration file:
+#
+#		http_port
+#		icp_port
+#		cache_mgr
+#
+#	All current information is processed regularly and made
+#	available on the Web at http://www.ircache.net/Cache/Tracker/.
+
+#  TAG: announce_period
+#	This is how frequently to send cache announcements.  The
+#	default is `0' which disables sending the announcement
+#	messages.
+#
+#	To enable announcing your cache, just uncomment the line
+#	below.
+#
+#Default:
+# announce_period 0
+#
+#To enable announcing your cache, just uncomment the line below.
+#announce_period 1 day
+
+#  TAG: announce_host
+#  TAG: announce_file
+#  TAG: announce_port
+#	announce_host and announce_port set the hostname and port
+#	number where the registration message will be sent.
+#
+#	Hostname will default to 'tracker.ircache.net' and port will
+#	default default to 3131.  If the 'filename' argument is given,
+#	the contents of that file will be included in the announce
+#	message.
+#
+#Default:
+# announce_host tracker.ircache.net
+# announce_port 3131
+
+
+# HTTPD-ACCELERATOR OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: httpd_accel_no_pmtu_disc	on|off
+#	In many setups of transparently intercepting proxies Path-MTU
+#	discovery can not work on traffic towards the clients. This is
+#	the case when the intercepting device does not fully track
+#	connections and fails to forward ICMP must fragment messages
+#	to the cache server.
+#
+#	If you have such setup and experience that certain clients
+#	sporadically hang or never complete requests set this to on.
+#
+#Default:
+# httpd_accel_no_pmtu_disc off
+
+
+# DELAY POOL PARAMETERS
+# -----------------------------------------------------------------------------
+
+#  TAG: delay_pools
+#	This represents the number of delay pools to be used.  For example,
+#	if you have one class 2 delay pool and one class 3 delays pool, you
+#	have a total of 2 delay pools.
+#
+#Default:
+# delay_pools 0
+
+#  TAG: delay_class
+#	This defines the class of each delay pool.  There must be exactly one
+#	delay_class line for each delay pool.  For example, to define two
+#	delay pools, one of class 2 and one of class 3, the settings above
+#	and here would be:
+#
+#Example:
+# delay_pools 2      # 2 delay pools
+# delay_class 1 2    # pool 1 is a class 2 pool
+# delay_class 2 3    # pool 2 is a class 3 pool
+#
+#	The delay pool classes are:
+#
+#		class 1		Everything is limited by a single aggregate
+#				bucket.
+#
+#		class 2 	Everything is limited by a single aggregate
+#				bucket as well as an "individual" bucket chosen
+#				from bits 25 through 32 of the IP address.
+#
+#		class 3		Everything is limited by a single aggregate
+#				bucket as well as a "network" bucket chosen
+#				from bits 17 through 24 of the IP address and a
+#				"individual" bucket chosen from bits 17 through
+#				32 of the IP address.
+#
+#	NOTE: If an IP address is a.b.c.d
+#		-> bits 25 through 32 are "d"
+#		-> bits 17 through 24 are "c"
+#		-> bits 17 through 32 are "c * 256 + d"
+#
+#Default:
+# none
+
+#  TAG: delay_access
+#	This is used to determine which delay pool a request falls into.
+#
+#	delay_access is sorted per pool and the matching starts with pool 1,
+#	then pool 2, ..., and finally pool N. The first delay pool where the
+#	request is allowed is selected for the request. If it does not allow
+#	the request to any pool then the request is not delayed (default).
+#
+#	For example, if you want some_big_clients in delay
+#	pool 1 and lotsa_little_clients in delay pool 2:
+#
+#Example:
+# delay_access 1 allow some_big_clients
+# delay_access 1 deny all
+# delay_access 2 allow lotsa_little_clients
+# delay_access 2 deny all
+#
+#Default:
+# none
+
+#  TAG: delay_parameters
+#	This defines the parameters for a delay pool.  Each delay pool has
+#	a number of "buckets" associated with it, as explained in the
+#	description of delay_class.  For a class 1 delay pool, the syntax is:
+#
+#delay_parameters pool aggregate
+#
+#	For a class 2 delay pool:
+#
+#delay_parameters pool aggregate individual
+#
+#	For a class 3 delay pool:
+#
+#delay_parameters pool aggregate network individual
+#
+#	The variables here are:
+#
+#		pool		a pool number - ie, a number between 1 and the
+#				number specified in delay_pools as used in
+#				delay_class lines.
+#
+#		aggregate	the "delay parameters" for the aggregate bucket
+#				(class 1, 2, 3).
+#
+#		individual	the "delay parameters" for the individual
+#				buckets (class 2, 3).
+#
+#		network		the "delay parameters" for the network buckets
+#				(class 3).
+#
+#	A pair of delay parameters is written restore/maximum, where restore is
+#	the number of bytes (not bits - modem and network speeds are usually
+#	quoted in bits) per second placed into the bucket, and maximum is the
+#	maximum number of bytes which can be in the bucket at any time.
+#
+#	For example, if delay pool number 1 is a class 2 delay pool as in the
+#	above example, and is being used to strictly limit each host to 64kbps
+#	(plus overheads), with no overall limit, the line is:
+#
+#delay_parameters 1 -1/-1 8000/8000
+#
+#	Note that the figure -1 is used to represent "unlimited".
+#
+#	And, if delay pool number 2 is a class 3 delay pool as in the above
+#	example, and you want to limit it to a total of 256kbps (strict limit)
+#	with each 8-bit network permitted 64kbps (strict limit) and each
+#	individual host permitted 4800bps with a bucket maximum size of 64kb
+#	to permit a decent web page to be downloaded at a decent speed
+#	(if the network is not being limited due to overuse) but slow down
+#	large downloads more significantly:
+#
+#delay_parameters 2 32000/32000 8000/8000 600/8000
+#
+#	There must be one delay_parameters line for each delay pool.
+#
+#Default:
+# none
+
+#  TAG: delay_initial_bucket_level	(percent, 0-100)
+#	The initial bucket percentage is used to determine how much is put
+#	in each bucket when squid starts, is reconfigured, or first notices
+#	a host accessing it (in class 2 and class 3, individual hosts and
+#	networks only have buckets associated with them once they have been
+#	"seen" by squid).
+#
+#Default:
+# delay_initial_bucket_level 50
+
+
+# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: wccp_router
+#  TAG: wccp2_router
+#	Use this option to define your WCCP ``home'' router for
+#	Squid.
+#
+#	wccp_router supports a single WCCP(v1) router
+#
+#	wccp2_router supports multiple WCCPv2 routers
+#
+#	only one of the two may be used at the same time and defines
+#	which version of WCCP to use.
+#
+#Default:
+# wccp_router 0.0.0.0
+
+#  TAG: wccp_version
+#	This directive is only relevant if you need to set up WCCP(v1)
+#	to some very old and end-of-life Cisco routers. In all other
+#	setups it must be left unset or at the default setting.
+#	It defines an internal version in the WCCP(v1) protocol,
+#	with version 4 being the officially documented protocol.
+#
+#	According to some users, Cisco IOS 11.2 and earlier only
+#	support WCCP version 3.  If you're using that or an earlier
+#	version of IOS, you may need to change this value to 3, otherwise
+#	do not specify this parameter.
+#
+#Default:
+# wccp_version 4
+
+#  TAG: wccp2_rebuild_wait
+#	If this is enabled Squid will wait for the cache dir rebuild to finish
+#	before sending the first wccp2 HereIAm packet
+#
+#Default:
+# wccp2_rebuild_wait on
+
+#  TAG: wccp2_forwarding_method
+#	WCCP2 allows the setting of forwarding methods between the
+#	router/switch and the cache.  Valid values are as follows:
+#
+#	1 - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
+#	2 - L2 redirect (forward the packet using Layer 2/MAC rewriting)
+#
+#	Currently (as of IOS 12.4) cisco routers only support GRE.
+#	Cisco switches only support the L2 redirect assignment method.
+#
+#Default:
+# wccp2_forwarding_method 1
+
+#  TAG: wccp2_return_method
+#	WCCP2 allows the setting of return methods between the
+#	router/switch and the cache for packets that the cache
+#	decides not to handle.  Valid values are as follows:
+#
+#	1 - GRE encapsulation (forward the packet in a GRE/WCCP tunnel)
+#	2 - L2 redirect (forward the packet using Layer 2/MAC rewriting)
+#
+#	Currently (as of IOS 12.4) cisco routers only support GRE.
+#	Cisco switches only support the L2 redirect assignment.
+#
+#	If the "ip wccp redirect exclude in" command has been
+#	enabled on the cache interface, then it is still safe for
+#	the proxy server to use a l2 redirect method even if this
+#	option is set to GRE.
+#
+#Default:
+# wccp2_return_method 1
+
+#  TAG: wccp2_assignment_method
+#	WCCP2 allows the setting of methods to assign the WCCP hash
+#	Valid values are as follows:
+#
+#	1 - Hash assignment
+#	2 - Mask assignment
+#
+#	As a general rule, cisco routers support the hash assignment method
+#	and cisco switches support the mask assignment method.
+#
+#Default:
+# wccp2_assignment_method 1
+
+#  TAG: wccp2_service
+#	WCCP2 allows for multiple traffic services. There are two
+#	types: "standard" and "dynamic". The standard type defines
+#	one service id - http (id 0). The dynamic service ids can be from
+#	51 to 255 inclusive.  In order to use a dynamic service id
+#	one must define the type of traffic to be redirected; this is done
+#	using the wccp2_service_info option.
+#
+#	The "standard" type does not require a wccp2_service_info option,
+#	just specifying the service id will suffice.
+#
+#	MD5 service authentication can be enabled by adding
+#	"password=<password>" to the end of this service declaration.
+#
+#	Examples:
+#
+#	wccp2_service standard 0	# for the 'web-cache' standard service
+#	wccp2_service dynamic 80	# a dynamic service type which will be
+#					# fleshed out with subsequent options.
+#	wccp2_service standard 0 password=foo
+#
+#
+#Default:
+# wccp2_service standard 0
+
+#  TAG: wccp2_service_info
+#	Dynamic WCCPv2 services require further information to define the
+#	traffic you wish to have diverted.
+#
+#	The format is:
+#
+#	wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>..
+#	    priority=<priority> ports=<port>,<port>..
+#
+#	The relevant WCCPv2 flags:
+#	+ src_ip_hash, dst_ip_hash
+#	+ source_port_hash, dst_port_hash
+#	+ src_ip_alt_hash, dst_ip_alt_hash
+#	+ src_port_alt_hash, dst_port_alt_hash
+#	+ ports_source
+#
+#	The port list can be one to eight entries.
+#
+#	Example:
+#
+#	wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source
+#	    priority=240 ports=80
+#
+#	Note: the service id must have been defined by a previous
+#	'wccp2_service dynamic <id>' entry.
+#
+#Default:
+# none
+
+#  TAG: wccp2_weight
+#	Each cache server gets assigned a set of the destination
+#	hash proportional to their weight.
+#
+#Default:
+# wccp2_weight 10000
+
+#  TAG: wccp_address
+#  TAG: wccp2_address
+#	Use this option if you require WCCP to use a specific
+#	interface address.
+#
+#	The default behavior is to not bind to any specific address.
+#
+#Default:
+# wccp_address 0.0.0.0
+# wccp2_address 0.0.0.0
+
+
+# PERSISTENT CONNECTION HANDLING
+# -----------------------------------------------------------------------------
+#
+# Also see "pconn_timeout" in the TIMEOUTS section
+
+#  TAG: client_persistent_connections
+#  TAG: server_persistent_connections
+#	Persistent connection support for clients and servers.  By
+#	default, Squid uses persistent connections (when allowed)
+#	with its clients and servers.  You can use these options to
+#	disable persistent connections with clients and/or servers.
+#
+#Default:
+# client_persistent_connections on
+# server_persistent_connections on
+
+#  TAG: persistent_connection_after_error
+#	With this directive the use of persistent connections after
+#	HTTP errors can be disabled. Useful if you have clients
+#	who fail to handle errors on persistent connections proper.
+#
+#Default:
+# persistent_connection_after_error off
+
+#  TAG: detect_broken_pconn
+#	Some servers have been found to incorrectly signal the use
+#	of HTTP/1.0 persistent connections even on replies not
+#	compatible, causing significant delays. This server problem
+#	has mostly been seen on redirects.
+#
+#	By enabling this directive Squid attempts to detect such
+#	broken replies and automatically assume the reply is finished
+#	after 10 seconds timeout.
+#
+#Default:
+# detect_broken_pconn off
+
+
+# CACHE DIGEST OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: digest_generation
+#	This controls whether the server will generate a Cache Digest
+#	of its contents.
+#
+#Default:
+# digest_generation on
+
+#  TAG: digest_bits_per_entry
+#	This is the number of bits of the server's Cache Digest which
+#	will be associated with the Digest entry for a given HTTP
+#	Method and URL (public key) combination.  The default is 5.
+#
+#Default:
+# digest_bits_per_entry 5
+
+#  TAG: digest_rebuild_period	(seconds)
+#	This is the wait time between Cache Digest rebuilds.
+#
+#Default:
+# digest_rebuild_period 1 hour
+
+#  TAG: digest_rewrite_period	(seconds)
+#	This is the wait time between Cache Digest writes to disk.
+#
+#Default:
+# digest_rewrite_period 1 hour
+
+#  TAG: digest_swapout_chunk_size	(bytes)
+#	This is the number of bytes of the Cache Digest to write to
+#	disk at a time.  It defaults to 4096 bytes (4KB), the Squid
+#	default swap page.
+#
+#Default:
+# digest_swapout_chunk_size 4096 bytes
+
+#  TAG: digest_rebuild_chunk_percentage	(percent, 0-100)
+#	This is the percentage of the Cache Digest to be scanned at a
+#	time.  By default it is set to 10% of the Cache Digest.
+#
+#Default:
+# digest_rebuild_chunk_percentage 10
+
+
+# SNMP OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: snmp_port
+#	Squid can now serve statistics and status information via SNMP.
+#	By default it listens to port 3401 on the machine. If you don't
+#	wish to use SNMP, set this to "0".
+#
+#	Note: on Debian/Linux, the default is zero - you need to
+#	set it to 3401 to enable it.
+#
+#Default:
+# snmp_port 0
+
+#  TAG: snmp_access
+#	Allowing or denying access to the SNMP port.
+#
+#	All access to the agent is denied by default.
+#	usage:
+#
+#	snmp_access allow|deny [!]aclname ...
+#
+#Example:
+# snmp_access allow snmppublic localhost
+# snmp_access deny all
+#
+#Default:
+# snmp_access deny all
+
+#  TAG: snmp_incoming_address
+#  TAG: snmp_outgoing_address
+#	Just like 'udp_incoming_address' above, but for the SNMP port.
+#
+#	snmp_incoming_address	is used for the SNMP socket receiving
+#				messages from SNMP agents.
+#	snmp_outgoing_address	is used for SNMP packets returned to SNMP
+#				agents.
+#
+#	The default snmp_incoming_address (0.0.0.0) is to listen on all
+#	available network interfaces.
+#
+#	If snmp_outgoing_address is set to 255.255.255.255 (the default)
+#	it will use the same socket as snmp_incoming_address. Only
+#	change this if you want to have SNMP replies sent using another
+#	address than where this Squid listens for SNMP queries.
+#
+#	NOTE, snmp_incoming_address and snmp_outgoing_address can not have
+#	the same value since they both use port 3401.
+#
+#Default:
+# snmp_incoming_address 0.0.0.0
+# snmp_outgoing_address 255.255.255.255
+
+
+# ICP OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: icp_port
+#	The port number where Squid sends and receives ICP queries to
+#	and from neighbor caches.  Default is 3130.  To disable use
+#	"0".  May be overridden with -u on the command line.
+#
+#Default:
+# icp_port 3130
+
+#  TAG: htcp_port
+#	The port number where Squid sends and receives HTCP queries to
+#	and from neighbor caches.  To turn it on you want to set it 4827.
+#	By default it is set to "0" (disabled).
+#
+#Default:
+# htcp_port 0
+
+#  TAG: log_icp_queries	on|off
+#	If set, ICP queries are logged to access.log. You may wish
+#	do disable this if your ICP load is VERY high to speed things
+#	up or to simplify log analysis.
+#
+#Default:
+# log_icp_queries on
+
+#  TAG: udp_incoming_address
+#	udp_incoming_address	is used for UDP packets received from other
+#				caches.
+#
+#	The default behavior is to not bind to any specific address.
+#
+#	Only change this if you want to have all UDP queries received on
+#	a specific interface/address.
+#
+#	NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS
+#	modules. Altering it will affect all of them in the same manner.
+#
+#	see also; udp_outgoing_address
+#
+#	NOTE, udp_incoming_address and udp_outgoing_address can not
+#	have the same value since they both use the same port.
+#
+#Default:
+# udp_incoming_address 0.0.0.0
+
+#  TAG: udp_outgoing_address
+#	udp_outgoing_address	is used for UDP packets sent out to other
+#				caches.
+#
+#	The default behavior is to not bind to any specific address.
+#
+#	Instead it will use the same socket as udp_incoming_address.
+#	Only change this if you want to have UDP queries sent using another
+#	address than where this Squid listens for UDP queries from other
+#	caches.
+#
+#	NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS
+#	modules. Altering it will affect all of them in the same manner.
+#
+#	see also; udp_incoming_address
+#
+#	NOTE, udp_incoming_address and udp_outgoing_address can not
+#	have the same value since they both use the same port.
+#
+#Default:
+# udp_outgoing_address 255.255.255.255
+
+#  TAG: icp_hit_stale	on|off
+#	If you want to return ICP_HIT for stale cache objects, set this
+#	option to 'on'.  If you have sibling relationships with caches
+#	in other administrative domains, this should be 'off'.  If you only
+#	have sibling relationships with caches under your control,
+#	it is probably okay to set this to 'on'.
+#	If set to 'on', your siblings should use the option "allow-miss"
+#	on their cache_peer lines for connecting to you.
+#
+#Default:
+# icp_hit_stale off
+
+#  TAG: minimum_direct_hops
+#	If using the ICMP pinging stuff, do direct fetches for sites
+#	which are no more than this many hops away.
+#
+#Default:
+# minimum_direct_hops 4
+
+#  TAG: minimum_direct_rtt
+#	If using the ICMP pinging stuff, do direct fetches for sites
+#	which are no more than this many rtt milliseconds away.
+#
+#Default:
+# minimum_direct_rtt 400
+
+#  TAG: netdb_low
+#  TAG: netdb_high
+#	The low and high water marks for the ICMP measurement
+#	database.  These are counts, not percents.  The defaults are
+#	900 and 1000.  When the high water mark is reached, database
+#	entries will be deleted until the low mark is reached.
+#
+#Default:
+# netdb_low 900
+# netdb_high 1000
+
+#  TAG: netdb_ping_period
+#	The minimum period for measuring a site.  There will be at
+#	least this much delay between successive pings to the same
+#	network.  The default is five minutes.
+#
+#Default:
+# netdb_ping_period 5 minutes
+
+#  TAG: query_icmp	on|off
+#	If you want to ask your peers to include ICMP data in their ICP
+#	replies, enable this option.
+#
+#	If your peer has configured Squid (during compilation) with
+#	'--enable-icmp' that peer will send ICMP pings to origin server
+#	sites of the URLs it receives.  If you enable this option the
+#	ICP replies from that peer will include the ICMP data (if available).
+#	Then, when choosing a parent cache, Squid will choose the parent with
+#	the minimal RTT to the origin server.  When this happens, the
+#	hierarchy field of the access.log will be
+#	"CLOSEST_PARENT_MISS".  This option is off by default.
+#
+#Default:
+# query_icmp off
+
+#  TAG: test_reachability	on|off
+#	When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH
+#	instead of ICP_MISS if the target host is NOT in the ICMP
+#	database, or has a zero RTT.
+#
+#Default:
+# test_reachability off
+
+#  TAG: icp_query_timeout	(msec)
+#	Normally Squid will automatically determine an optimal ICP
+#	query timeout value based on the round-trip-time of recent ICP
+#	queries.  If you want to override the value determined by
+#	Squid, set this 'icp_query_timeout' to a non-zero value.  This
+#	value is specified in MILLISECONDS, so, to use a 2-second
+#	timeout (the old default), you would write:
+#
+#		icp_query_timeout 2000
+#
+#Default:
+# icp_query_timeout 0
+
+#  TAG: maximum_icp_query_timeout	(msec)
+#	Normally the ICP query timeout is determined dynamically.  But
+#	sometimes it can lead to very large values (say 5 seconds).
+#	Use this option to put an upper limit on the dynamic timeout
+#	value.  Do NOT use this option to always use a fixed (instead
+#	of a dynamic) timeout value. To set a fixed timeout see the
+#	'icp_query_timeout' directive.
+#
+#Default:
+# maximum_icp_query_timeout 2000
+
+#  TAG: minimum_icp_query_timeout	(msec)
+#	Normally the ICP query timeout is determined dynamically.  But
+#	sometimes it can lead to very small timeouts, even lower than
+#	the normal latency variance on your link due to traffic.
+#	Use this option to put an lower limit on the dynamic timeout
+#	value.  Do NOT use this option to always use a fixed (instead
+#	of a dynamic) timeout value. To set a fixed timeout see the
+#	'icp_query_timeout' directive.
+#
+#Default:
+# minimum_icp_query_timeout 5
+
+
+# MULTICAST ICP OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: mcast_groups
+#	This tag specifies a list of multicast groups which your server
+#	should join to receive multicasted ICP queries.
+#
+#	NOTE!  Be very careful what you put here!  Be sure you
+#	understand the difference between an ICP _query_ and an ICP
+#	_reply_.  This option is to be set only if you want to RECEIVE
+#	multicast queries.  Do NOT set this option to SEND multicast
+#	ICP (use cache_peer for that).  ICP replies are always sent via
+#	unicast, so this option does not affect whether or not you will
+#	receive replies from multicast group members.
+#
+#	You must be very careful to NOT use a multicast address which
+#	is already in use by another group of caches.
+#
+#	If you are unsure about multicast, please read the Multicast
+#	chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/).
+#
+#	Usage: mcast_groups 239.128.16.128 224.0.1.20
+#
+#	By default, Squid doesn't listen on any multicast groups.
+#
+#Default:
+# none
+
+#  TAG: mcast_miss_addr
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-multicast-miss option
+#
+#	If you enable this option, every "cache miss" URL will
+#	be sent out on the specified multicast address.
+#
+#	Do not enable this option unless you are are absolutely
+#	certain you understand what you are doing.
+#
+#Default:
+# mcast_miss_addr 255.255.255.255
+
+#  TAG: mcast_miss_ttl
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-multicast-miss option
+#
+#	This is the time-to-live value for packets multicasted
+#	when multicasting off cache miss URLs is enabled.  By
+#	default this is set to 'site scope', i.e. 16.
+#
+#Default:
+# mcast_miss_ttl 16
+
+#  TAG: mcast_miss_port
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-multicast-miss option
+#
+#	This is the port number to be used in conjunction with
+#	'mcast_miss_addr'.
+#
+#Default:
+# mcast_miss_port 3135
+
+#  TAG: mcast_miss_encode_key
+# Note: This option is only available if Squid is rebuilt with the
+#       --enable-multicast-miss option
+#
+#	The URLs that are sent in the multicast miss stream are
+#	encrypted.  This is the encryption key.
+#
+#Default:
+# mcast_miss_encode_key XXXXXXXXXXXXXXXX
+
+#  TAG: mcast_icp_query_timeout	(msec)
+#	For multicast peers, Squid regularly sends out ICP "probes" to
+#	count how many other peers are listening on the given multicast
+#	address.  This value specifies how long Squid should wait to
+#	count all the replies.  The default is 2000 msec, or 2
+#	seconds.
+#
+#Default:
+# mcast_icp_query_timeout 2000
+
+
+# INTERNAL ICON OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: icon_directory
+#	Where the icons are stored. These are normally kept in
+#	/usr/share/squid/icons
+#
+#Default:
+# icon_directory /usr/share/squid/icons
+
+#  TAG: global_internal_static
+#	This directive controls is Squid should intercept all requests for
+#	/squid-internal-static/ no matter which host the URL is requesting
+#	(default on setting), or if nothing special should be done for
+#	such URLs (off setting). The purpose of this directive is to make
+#	icons etc work better in complex cache hierarchies where it may
+#	not always be possible for all corners in the cache mesh to reach
+#	the server generating a directory listing.
+#
+#Default:
+# global_internal_static on
+
+#  TAG: short_icon_urls
+#	If this is enabled Squid will use short URLs for icons.
+#
+#	If off the URLs for icons will always be absolute URLs
+#	including the proxy name and port.
+#
+#Default:
+# short_icon_urls off
+
+
+# ERROR PAGE OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: error_directory
+#	If you wish to create your own versions of the default
+#	(English) error files, either to customize them to suit your
+#	language or company copy the template English files to another
+#	directory and point this tag at them.
+#
+#	The squid developers are interested in making squid available in
+#	a wide variety of languages. If you are making translations for a
+#	langauge that Squid does not currently provide please consider
+#	contributing your translation back to the project.
+#
+#Default:
+# error_directory /usr/share/squid/errors/English
+
+#  TAG: error_map
+#	Map errors to custom messages
+#
+#	    error_map message_url http_status ...
+#
+#	http_status ... is a list of HTTP status codes or Squid error
+#	messages.
+#
+#	Use in accelerators to substitute the error messages returned
+#	by servers with other custom errors.
+#
+#	    error_map http://your.server/error/404.shtml 404
+#
+#	Requests for error messages is a GET request for the configured
+#	URL with the following special headers
+#
+#	    X-Error-Status:	The received HTTP status code (i.e. 404)
+#	    X-Request-URI:	The requested URI where the error occurred
+#
+#	In Addition the following headers are forwarded from the client
+#	request:
+#
+#	    User-Agent, Cookie, X-Forwarded-For, Via, Authorization,
+#	    Accept, Referer
+#
+#	And the following headers from the server reply:
+#
+#	    Server, Via, Location, Content-Location
+#
+#	The reply returned to the client will carry the original HTTP
+#	headers from the real error message, but with the reply body
+#	of the configured error message.
+#
+#
+#Default:
+# none
+
+#  TAG: err_html_text
+#	HTML text to include in error messages.  Make this a "mailto"
+#	URL to your admin address, or maybe just a link to your
+#	organizations Web page.
+#
+#	To include this in your error messages, you must rewrite
+#	the error template files (found in the "errors" directory).
+#	Wherever you want the 'err_html_text' line to appear,
+#	insert a %L tag in the error template file.
+#
+#Default:
+# none
+
+#  TAG: deny_info
+#	Usage:   deny_info err_page_name acl
+#	or       deny_info http://... acl
+#	Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys
+#
+#	This can be used to return a ERR_ page for requests which
+#	do not pass the 'http_access' rules.  Squid remembers the last
+#	acl it evaluated in http_access, and if a 'deny_info' line exists
+#	for that ACL Squid returns a corresponding error page.
+#
+#	The acl is typically the last acl on the http_access deny line which
+#	denied access. The exceptions to this rule are:
+#	- When Squid needs to request authentication credentials. It's then
+#	  the first authentication related acl encountered
+#	- When none of the http_access lines matches. It's then the last
+#	  acl processed on the last http_access line.
+#
+#	You may use ERR_ pages that come with Squid or create your own pages
+#	and put them into the configured errors/ directory.
+#
+#	Alternatively you can specify an error URL. The browsers will
+#	get redirected (302) to the specified URL. %s in the redirection
+#	URL will be replaced by the requested URL.
+#
+#	Alternatively you can tell Squid to reset the TCP connection
+#	by specifying TCP_RESET.
+#
+#Default:
+# none
+
+
+# OPTIONS INFLUENCING REQUEST FORWARDING 
+# -----------------------------------------------------------------------------
+
+#  TAG: nonhierarchical_direct
+#	By default, Squid will send any non-hierarchical requests
+#	(matching hierarchy_stoplist or not cacheable request type) direct
+#	to origin servers.
+#
+#	If you set this to off, Squid will prefer to send these
+#	requests to parents.
+#
+#	Note that in most configurations, by turning this off you will only
+#	add latency to these request without any improvement in global hit
+#	ratio.
+#
+#	If you are inside an firewall see never_direct instead of
+#	this directive.
+#
+#Default:
+# nonhierarchical_direct on
+
+#  TAG: prefer_direct
+#	Normally Squid tries to use parents for most requests. If you for some
+#	reason like it to first try going direct and only use a parent if
+#	going direct fails set this to on.
+#
+#	By combining nonhierarchical_direct off and prefer_direct on you
+#	can set up Squid to use a parent as a backup path if going direct
+#	fails.
+#
+#	Note: If you want Squid to use parents for all requests see
+#	the never_direct directive. prefer_direct only modifies how Squid
+#	acts on cacheable requests.
+#
+#Default:
+# prefer_direct off
+
+#  TAG: ignore_ims_on_miss	on|off
+#	This options makes Squid ignore If-Modified-Since on
+#	cache misses. This is useful while the cache is
+#	mostly empty to more quickly have the cache populated.
+#
+#Default:
+# ignore_ims_on_miss off
+
+#  TAG: always_direct
+#	Usage: always_direct allow|deny [!]aclname ...
+#
+#	Here you can use ACL elements to specify requests which should
+#	ALWAYS be forwarded by Squid to the origin servers without using
+#	any peers.  For example, to always directly forward requests for
+#	local servers ignoring any parents or siblings you may have use
+#	something like:
+#
+#		acl local-servers dstdomain my.domain.net
+#		always_direct allow local-servers
+#
+#	To always forward FTP requests directly, use
+#
+#		acl FTP proto FTP
+#		always_direct allow FTP
+#
+#	NOTE: There is a similar, but opposite option named
+#	'never_direct'.  You need to be aware that "always_direct deny
+#	foo" is NOT the same thing as "never_direct allow foo".  You
+#	may need to use a deny rule to exclude a more-specific case of
+#	some other rule.  Example:
+#
+#		acl local-external dstdomain external.foo.net
+#		acl local-servers dstdomain  .foo.net
+#		always_direct deny local-external
+#		always_direct allow local-servers
+#
+#	NOTE: If your goal is to make the client forward the request
+#	directly to the origin server bypassing Squid then this needs
+#	to be done in the client configuration. Squid configuration
+#	can only tell Squid how Squid should fetch the object.
+#
+#	NOTE: This directive is not related to caching. The replies
+#	is cached as usual even if you use always_direct. To not cache
+#	the replies see no_cache.
+#
+#	This option replaces some v1.1 options such as local_domain
+#	and local_ip.
+#
+#Default:
+# none
+
+#  TAG: never_direct
+#	Usage: never_direct allow|deny [!]aclname ...
+#
+#	never_direct is the opposite of always_direct.  Please read
+#	the description for always_direct if you have not already.
+#
+#	With 'never_direct' you can use ACL elements to specify
+#	requests which should NEVER be forwarded directly to origin
+#	servers.  For example, to force the use of a proxy for all
+#	requests, except those in your local domain use something like:
+#
+#		acl local-servers dstdomain .foo.net
+#		acl all src 0.0.0.0/0.0.0.0
+#		never_direct deny local-servers
+#		never_direct allow all
+#
+#	or if Squid is inside a firewall and there are local intranet
+#	servers inside the firewall use something like:
+#
+#		acl local-intranet dstdomain .foo.net
+#		acl local-external dstdomain external.foo.net
+#		always_direct deny local-external
+#		always_direct allow local-intranet
+#		never_direct allow all
+#
+#	This option replaces some v1.1 options such as inside_firewall
+#	and firewall_ip.
+#
+#Default:
+# none
+
+
+# ADVANCED NETWORKING OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: max_filedescriptors
+#	The maximum number of filedescriptors supported.
+#
+#	The default "0" means Squid inherits the current ulimit setting.
+#
+#	Note: Changing this requires a restart of Squid. Also
+#	not all comm loops supports values larger than --with-maxfd.
+#
+#Default:
+# max_filedescriptors 0
+
+#  TAG: accept_filter
+#	FreeBSD:
+#
+#	The name of an accept(2) filter to install on Squid's
+#	listen socket(s).  This feature is perhaps specific to
+#	FreeBSD and requires support in the kernel.
+#
+#	The 'httpready' filter delays delivering new connections
+#	to Squid until a full HTTP request has been received.
+#	See the accf_http(9) man page for details.
+#
+#	The 'dataready' filter delays delivering new connections
+#	to Squid until there is some data to process.
+#	See the accf_dataready(9) man page for details.
+#
+#	Linux:
+#	
+#	The 'data' filter delays delivering of new connections
+#	to Squid until there is some data to process by TCP_ACCEPT_DEFER.
+#	You may optionally specify a number of seconds to wait by
+#	'data=N' where N is the number of seconds. Defaults to 30
+#	if not specified.  See the tcp(7) man page for details.
+#EXAMPLE:
+## FreeBSD
+#accept_filter httpready
+## Linux
+#accept_filter data
+#
+#Default:
+# none
+
+#  TAG: tcp_recv_bufsize	(bytes)
+#	Size of receive buffer to set for TCP sockets.  Probably just
+#	as easy to change your kernel's default.  Set to zero to use
+#	the default buffer size.
+#
+#Default:
+# tcp_recv_bufsize 0 bytes
+
+#  TAG: incoming_rate
+#	This directive controls how aggressive Squid should accept new
+#	connections compared to processing existing connections. 
+#	The lower number the more frequent Squid will look for new
+#	incoming requests.
+#
+#Default:
+# incoming_rate 30
+
+
+# DNS OPTIONS
+# -----------------------------------------------------------------------------
+
+#  TAG: check_hostnames
+#	For security and stability reasons Squid by default checks
+#	hostnames for Internet standard RFC compliance. If you do not want
+#	Squid to perform these checks then turn this directive off.
+#
+#Default:
+# check_hostnames on
+
+#  TAG: allow_underscore
+#	Underscore characters is not strictly allowed in Internet hostnames
+#	but nevertheless used by many sites. Set this to off if you want
+#	Squid to be strict about the standard.
+#	This check is performed only when check_hostnames is set to on.
+#
+#Default:
+# allow_underscore on
+
+#  TAG: cache_dns_program
+# Note: This option is only available if Squid is rebuilt with the
+#       --disable-internal-dns option
+#
+#	Specify the location of the executable for dnslookup process.
+#
+#Default:
+# cache_dns_program /usr/lib/squid/dnsserver
+
+#  TAG: dns_children
+# Note: This option is only available if Squid is rebuilt with the
+#       --disable-internal-dns option
+#
+#	The number of processes spawn to service DNS name lookups.
+#	For heavily loaded caches on large servers, you should
+#	probably increase this value to at least 10.  The maximum
+#	is 32.  The default is 5.
+#
+#	You must have at least one dnsserver process.
+#
+#Default:
+# dns_children 5
+
+#  TAG: dns_retransmit_interval
+#	Initial retransmit interval for DNS queries. The interval is
+#	doubled each time all configured DNS servers have been tried.
+#
+#
+#Default:
+# dns_retransmit_interval 5 seconds
+
+#  TAG: dns_timeout
+#	DNS Query timeout. If no response is received to a DNS query
+#	within this time all DNS servers for the queried domain
+#	are assumed to be unavailable.
+#
+#Default:
+# dns_timeout 2 minutes
+
+#  TAG: dns_defnames	on|off
+#	Normally the RES_DEFNAMES resolver option is disabled
+#	(see res_init(3)).  This prevents caches in a hierarchy
+#	from interpreting single-component hostnames locally.  To allow
+#	Squid to handle single-component names, enable this option.
+#
+#Default:
+# dns_defnames off
+
+#  TAG: dns_nameservers
+#	Use this if you want to specify a list of DNS name servers
+#	(IP addresses) to use instead of those given in your
+#	/etc/resolv.conf file.
+#	On Windows platforms, if no value is specified here or in
+#	the /etc/resolv.conf file, the list of DNS name servers are
+#	taken from the Windows registry, both static and dynamic DHCP
+#	configurations are supported.
+#
+#	Example: dns_nameservers 10.0.0.1 192.172.0.4
+#
+#Default:
+# none
+
+#  TAG: hosts_file
+#	Location of the host-local IP name-address associations
+#	database. Most Operating Systems have such a file on different
+#	default locations:
+#	- Un*X & Linux:    /etc/hosts
+#	- Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts
+#			   (%SystemRoot% value install default is c:\winnt)
+#	- Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts
+#			   (%SystemRoot% value install default is c:\windows)
+#	- Windows 9x/Me:   %windir%\hosts
+#			   (%windir% value is usually c:\windows)
+#	- Cygwin:          /etc/hosts
+#
+#	The file contains newline-separated definitions, in the
+#	form ip_address_in_dotted_form name [name ...] names are
+#	whitespace-separated. Lines beginning with an hash (#)
+#	character are comments.
+#
+#	The file is checked at startup and upon configuration.
+#	If set to 'none', it won't be checked.
+#	If append_domain is used, that domain will be added to
+#	domain-local (i.e. not containing any dot character) host
+#	definitions.
+#
+#Default:
+# hosts_file /etc/hosts
+#
+hosts_file /etc/hosts
+
+#  TAG: dns_testnames
+#	The DNS tests exit as soon as the first site is successfully looked up
+#
+#	This test can be disabled with the -D command line option.
+#
+#Default:
+# dns_testnames netscape.com internic.net nlanr.net microsoft.com
+
+#  TAG: append_domain
+#	Appends local domain name to hostnames without any dots in
+#	them.  append_domain must begin with a period.
+#
+#	Be warned there are now Internet names with no dots in
+#	them using only top-domain names, so setting this may
+#	cause some Internet sites to become unavailable.
+#
+#Example:
+# append_domain .yourdomain.com
+#
+#Default:
+# none
+
+#  TAG: ignore_unknown_nameservers
+#	By default Squid checks that DNS responses are received
+#	from the same IP addresses they are sent to.  If they
+#	don't match, Squid ignores the response and writes a warning
+#	message to cache.log.  You can allow responses from unknown
+#	nameservers by setting this option to 'off'.
+#
+#Default:
+# ignore_unknown_nameservers on
+
+#  TAG: ipcache_size	(number of entries)
+#  TAG: ipcache_low	(percent)
+#  TAG: ipcache_high	(percent)
+#	The size, low-, and high-water marks for the IP cache.
+#
+#Default:
+# ipcache_size 1024
+# ipcache_low 90
+# ipcache_high 95
+
+#  TAG: fqdncache_size	(number of entries)
+#	Maximum number of FQDN cache entries.
+#
+#Default:
+# fqdncache_size 1024
+
+
+# MISCELLANEOUS
+# -----------------------------------------------------------------------------
+
+#  TAG: memory_pools	on|off
+#	If set, Squid will keep pools of allocated (but unused) memory
+#	available for future use.  If memory is a premium on your
+#	system and you believe your malloc library outperforms Squid
+#	routines, disable this.
+#
+#Default:
+# memory_pools on
+
+#  TAG: memory_pools_limit	(bytes)
+#	Used only with memory_pools on:
+#	memory_pools_limit 50 MB
+#
+#	If set to a non-zero value, Squid will keep at most the specified
+#	limit of allocated (but unused) memory in memory pools. All free()
+#	requests that exceed this limit will be handled by your malloc
+#	library. Squid does not pre-allocate any memory, just safe-keeps
+#	objects that otherwise would be free()d. Thus, it is safe to set
+#	memory_pools_limit to a reasonably high value even if your
+#	configuration will use less memory.
+#
+#	If set to zero, Squid will keep all memory it can. That is, there
+#	will be no limit on the total amount of memory used for safe-keeping.
+#
+#	To disable memory allocation optimization, do not set
+#	memory_pools_limit to 0. Set memory_pools to "off" instead.
+#
+#	An overhead for maintaining memory pools is not taken into account
+#	when the limit is checked. This overhead is close to four bytes per
+#	object kept. However, pools may actually _save_ memory because of
+#	reduced memory thrashing in your malloc library.
+#
+#Default:
+# memory_pools_limit 5 MB
+
+#  TAG: forwarded_for	on|off
+#	If set, Squid will include your system's IP address or name
+#	in the HTTP requests it forwards.  By default it looks like
+#	this:
+#
+#		X-Forwarded-For: 192.1.2.3
+#
+#	If you disable this, it will appear as
+#
+#		X-Forwarded-For: unknown
+#
+#Default:
+# forwarded_for on
+
+#  TAG: cachemgr_passwd
+#	Specify passwords for cachemgr operations.
+#
+#	Usage: cachemgr_passwd password action action ...
+#
+#	Some valid actions are (see cache manager menu for a full list):
+#		5min
+#		60min
+#		asndb
+#		authenticator
+#		cbdata
+#		client_list
+#		comm_incoming
+#		config *
+#		counters
+#		delay
+#		digest_stats
+#		dns
+#		events
+#		filedescriptors
+#		fqdncache
+#		histograms
+#		http_headers
+#		info
+#		io
+#		ipcache
+#		mem
+#		menu
+#		netdb
+#		non_peers
+#		objects
+#		offline_toggle *
+#		pconn
+#		peer_select
+#		reconfigure *
+#		redirector
+#		refresh
+#		server_list
+#		shutdown *
+#		store_digest
+#		storedir
+#		utilization
+#		via_headers
+#		vm_objects
+#
+#	* Indicates actions which will not be performed without a
+#	  valid password, others can be performed if not listed here.
+#
+#	To disable an action, set the password to "disable".
+#	To allow performing an action without a password, set the
+#	password to "none".
+#
+#	Use the keyword "all" to set the same password for all actions.
+#
+#Example:
+# cachemgr_passwd secret shutdown
+# cachemgr_passwd lesssssssecret info stats/objects
+# cachemgr_passwd disable all
+#
+#Default:
+# none
+
+#  TAG: client_db	on|off
+#	If you want to disable collecting per-client statistics,
+#	turn off client_db here.
+#
+#Default:
+# client_db on
+
+#  TAG: reload_into_ims	on|off
+#	When you enable this option, client no-cache or ``reload''
+#	requests will be changed to If-Modified-Since requests.
+#	Doing this VIOLATES the HTTP standard.  Enabling this
+#	feature could make you liable for problems which it
+#	causes.
+#
+#	see also refresh_pattern for a more selective approach.
+#
+#Default:
+# reload_into_ims off
+
+#  TAG: maximum_single_addr_tries
+#	This sets the maximum number of connection attempts for a
+#	host that only has one address (for multiple-address hosts,
+#	each address is tried once).
+#
+#	The default value is one attempt, the (not recommended)
+#	maximum is 255 tries.  A warning message will be generated
+#	if it is set to a value greater than ten.
+#
+#	Note: This is in addition to the request re-forwarding which
+#	takes place if Squid fails to get a satisfying response.
+#
+#Default:
+# maximum_single_addr_tries 1
+
+#  TAG: retry_on_error
+#	If set to on Squid will automatically retry requests when
+#	receiving an error response. This is mainly useful if you
+#	are in a complex cache hierarchy to work around access
+#	control errors.
+#
+#Default:
+# retry_on_error off
+
+#  TAG: as_whois_server
+#	WHOIS server to query for AS numbers.  NOTE: AS numbers are
+#	queried only when Squid starts up, not for every request.
+#
+#Default:
+# as_whois_server whois.ra.net
+# as_whois_server whois.ra.net
+
+#  TAG: offline_mode
+#	Enable this option and Squid will never try to validate cached
+#	objects.
+#
+#Default:
+# offline_mode off
+
+#  TAG: uri_whitespace
+#	What to do with requests that have whitespace characters in the
+#	URI.  Options:
+#
+#	strip:  The whitespace characters are stripped out of the URL.
+#		This is the behavior recommended by RFC2396.
+#	deny:   The request is denied.  The user receives an "Invalid
+#		Request" message.
+#	allow:  The request is allowed and the URI is not changed.  The
+#		whitespace characters remain in the URI.  Note the
+#		whitespace is passed to redirector processes if they
+#		are in use.
+#	encode:	The request is allowed and the whitespace characters are
+#		encoded according to RFC1738.  This could be considered
+#		a violation of the HTTP/1.1
+#		RFC because proxies are not allowed to rewrite URI's.
+#	chop:	The request is allowed and the URI is chopped at the
+#		first whitespace.  This might also be considered a
+#		violation.
+#
+#Default:
+# uri_whitespace strip
+
+#  TAG: coredump_dir
+#	By default Squid leaves core files in the directory from where
+#	it was started. If you set 'coredump_dir' to a directory
+#	that exists, Squid will chdir() to that directory at startup
+#	and coredump files will be left there.
+#
+#Default:
+# coredump_dir none
+#
+# Leave coredumps in the first cache dir
+coredump_dir /var/spool/squid
+
+#  TAG: chroot
+#	Use this to have Squid do a chroot() while initializing.  This
+#	also causes Squid to fully drop root privileges after
+#	initializing.  This means, for example, if you use a HTTP
+#	port less than 1024 and try to reconfigure, you will may get an
+#	error saying that Squid can not open the port.
+#
+#Default:
+# none
+
+#  TAG: balance_on_multiple_ip
+#	Some load balancing servers based on round robin DNS have been
+#	found not to preserve user session state across requests
+#	to different IP addresses.
+#
+#	By default Squid rotates IP's per request. By disabling
+#	this directive only connection failure triggers rotation.
+#
+#Default:
+# balance_on_multiple_ip on
+
+#  TAG: pipeline_prefetch
+#	To boost the performance of pipelined requests to closer
+#	match that of a non-proxied environment Squid can try to fetch
+#	up to two requests in parallel from a pipeline.
+#
+#	Defaults to off for bandwidth management and access logging
+#	reasons.
+#
+#Default:
+# pipeline_prefetch off
+
+#  TAG: high_response_time_warning	(msec)
+#	If the one-minute median response time exceeds this value,
+#	Squid prints a WARNING with debug level 0 to get the
+#	administrators attention.  The value is in milliseconds.
+#
+#Default:
+# high_response_time_warning 0
+
+#  TAG: high_page_fault_warning
+#	If the one-minute average page fault rate exceeds this
+#	value, Squid prints a WARNING with debug level 0 to get
+#	the administrators attention.  The value is in page faults
+#	per second.
+#
+#Default:
+# high_page_fault_warning 0
+
+#  TAG: high_memory_warning
+#	If the memory usage (as determined by mallinfo) exceeds
+#	this amount, Squid prints a WARNING with debug level 0 to get
+#	the administrators attention.
+#
+#Default:
+# high_memory_warning 0 KB
+
+#  TAG: sleep_after_fork	(microseconds)
+#	When this is set to a non-zero value, the main Squid process
+#	sleeps the specified number of microseconds after a fork()
+#	system call. This sleep may help the situation where your
+#	system reports fork() failures due to lack of (virtual)
+#	memory. Note, however, if you have a lot of child
+#	processes, these sleep delays will add up and your
+#	Squid will not service requests for some amount of time
+#	until all the child processes have been started.
+#	On Windows value less then 1000 (1 milliseconds) are
+#	rounded to 1000.
+#
+#Default:
+# sleep_after_fork 0
+
+#  TAG: zero_buffers	on|off
+#	Squid by default will zero all buffers before using or reusing them.
+# 	Setting this to 'off' will result in fixed-sized temporary buffers
+#	not being zero'ed. This may give a performance boost on certain
+#	platforms but it may result in undefined behaviour at the present
+#	time.
+#
+#Default:
+# zero_buffers on
+
+#  TAG: windows_ipaddrchangemonitor	on|off
+#	On Windows Squid by default will monitor IP address changes and will 
+#	reconfigure itself after any detected event. This is very useful for
+#	proxies connected to internet with dial-up interfaces.
+#	In some cases (a Proxy server acting as VPN gateway is one) it could be
+#	desiderable to disable this behaviour setting this to 'off'.
+#	Note: after changing this, Squid service must be restarted.
+#
+#Default:
+# windows_ipaddrchangemonitor on
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/nas.a.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+a.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+-DBUILD_TEST_APP:BOOL=ON -DBUILD_TEST_RT_ANY:BOOL=ON -DBUILD_DBG_MONITOR:BOOL=ON -DBUILD_DBG_RT:BOOL=ON -DSKIP_TESTS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,63 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+		: "/root/conf/freeDiameter/test_app.conf";
+LoadExtension = "/root/freeDiameter/extensions/rt_default.fdx"
+		: "/root/conf/freeDiameter/rtd.conf";
+
+# ConnectPeer = "serv.simple.testbed.aaa" ;
+ConnectPeer = "proxy.a.rt.testbed.aaa" ;
+ConnectPeer = "proxy.b.rt.testbed.aaa" ;
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/rtd.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2 @@
+# Our local proxy is default route for all messages
+* : "proxy.a.rt.testbed.aaa" += DEFAULT;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/nas.a.rt.testbed.aaa/freeDiameter/test_app.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,16 @@
+mode = client;
+
+# Test for unsupported application:
+#appli-id = 999998;
+
+# Test for unsupported command:
+#cmd-id = 16777215;
+
+# Test for unsupported avp:
+#avp-id = 345677;
+
+dest-host = "serv.b.rt.testbed.aaa";
+dest-realm = "b.rt.testbed.aaa";
+
+# Test for decorated NAI
+#user-name = "b.rt.testbed.aaa!user@a.rt.testbed.aaa";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/nas.a.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+eap.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/configuration.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id,
+                                               (auth_application_id|acct_application_id))>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               receive_buffer_size, advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  use_sctp, tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT use_sctp (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+     <!ELEMENT dictionary (vendor*, base, application*)>
+
+     <!ELEMENT vendor EMPTY>
+     <!ATTLIST vendor
+          id CDATA #REQUIRED
+          name CDATA #REQUIRED
+     >
+
+     <!ELEMENT base (command*, typedefn+, avp+)>
+     <!ATTLIST base
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT application (command*, typedefn*, avp*)>
+     <!ATTLIST application
+          id CDATA #REQUIRED
+          name CDATA #IMPLIED
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+          application-id CDATA #IMPLIED
+          pbit CDATA #IMPLIED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          description CDATA #IMPLIED
+          code CDATA #REQUIRED
+          may-encrypt (yes | no) "yes"
+          mandatory (must | may | mustnot | shouldnot) "may"
+          protected (must | may | mustnot | shouldnot) "may"
+          vendor-id CDATA #IMPLIED
+     >
+
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1498 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+<!--
+  $Log: dictionary.xml,v $
+  Revision 1.15  2006/05/31 17:53:32  vfajardo
+  xml migration
+
+  Revision 1.14  2006/05/02 14:29:03  vfajardo
+  interop changes
+
+  Revision 1.13  2006/05/02 14:20:21  vfajardo
+  EAP dictionary
+
+  Revision 1.12  2006/04/24 20:08:56  vfajardo
+  inband security id
+
+  Revision 1.11  2006/04/19 20:36:18  vfajardo
+  1298700
+
+  Revision 1.10  2006/04/05 17:53:25  vfajardo
+  Updates to dictionary
+
+  Revision 1.9  2005/06/29 14:44:15  vfajardo
+  test changes
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="Inband-Security-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <!--
+    <avp name="Failed-AVP" code="279" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    -->
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Inband-Security-Id" code="299" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="No Security" code="0"/>
+      <enum name="TLS Security" code="1"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1" mandatory="must">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="5" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="EAP-Master-Session-Key" maximum="1"/>
+	  <avprule name="EAP-Reissued-Payload" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="462" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="463" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="464" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="465" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+
+  <!-- ************* DIAMETER BASE ACCOUNTING APPLICATION ************* --> 
+  
+  <application id="3" name="Base Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/server.eap-tls.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration file for server always starts with "configuration_server" element as root -->
+<configuration_server xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<!-- Encryption section. This section has a fixed list of elements.
+		This information is needed for OpenSSL to work -->
+	<encryption>
+		<pass_phrase></pass_phrase>
+		<key_file>/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/server/privkey.pem</key_file>
+		<cert_file>/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/server/cert.pem</cert_file>
+		<random></random>
+		<ca_path>/home/aaa/ca/ca_data/mgr.testbed.aaa/public/</ca_path>
+		<ca_cert>/home/aaa/ca/ca_data/mgr.testbed.aaa/public/cacert.pem</ca_cert>
+		<dh></dh>
+		<rsa_key>0</rsa_key>
+		<dh_key>1</dh_key>
+		<rsa_key_length>512</rsa_key_length>
+		<dh_key_length>512</dh_key_length>
+		<!-- Maximum depth for the certificate chain verification that shall be allowed -->
+		<verify_depth>1</verify_depth>
+		<!-- Type of certificates:
+			0: ASN1
+			1: PEM
+		-->
+		<file_type>1</file_type>
+	</encryption>
+	<!-- Fragmentation section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<fragmentation>
+		<!-- Initial value for lenght flag in fragmentation -->
+		<include_length>false</include_length>
+		<!-- Fragment size -->
+		<fragment_size>500</fragment_size>
+	</fragmentation>
+	<!-- Server specific section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<server>
+		<!-- Context identifier for server's OpenSSL initialization -->
+		<id_context>100</id_context>
+	</server>
+</configuration_server>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter-tls/config/server.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>5</auth_application_id>
+   </general>
+   <parser> 
+      <dictionary>/root/conf/opendiameter-tls/config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>opendiam.eap.testbed.aaa</identity>
+      <realm>eap.testbed.aaa</realm>
+      <tcp_listen_port>3868</tcp_listen_port>
+      
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>30</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>0</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>0</max_request_retransmission_count>
+      <receive_buffer_size>4096</receive_buffer_size>
+      <advertised_hostname>opendiam.eap.testbed.aaa</advertised_hostname>
+      <peer_table>
+          <expiration_time>60</expiration_time>
+          <peer>
+              <hostname>gw.eap.testbed.aaa</hostname>
+              <port>3868</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <default_route>
+             <realm>eap.testbed.aaa</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <application_id>5</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>gw.eap.testbed.aaa</server>
+                    <metric>1</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>1000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>3000</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>3000</session_timeout>
+         <interim_interval>30</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaa	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+aaad
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+     <!ELEMENT aaad (thread_count, diameter_cfg_file, applications)>
+
+     <!ELEMENT thread_count (#PCDATA)>
+     <!ELEMENT diameter_cfg_file (#PCDATA)>
+
+     <!ELEMENT applications (application_entry+)>
+
+     <!ELEMENT application_entry (name, enabled, diameter_eap?)>
+
+     <!ELEMENT name (#PCDATA)>
+     <!ELEMENT enabled (#PCDATA)>
+
+     <!ELEMENT diameter_eap (local_identity, user_db)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aaad SYSTEM "aaad.dtd">
+<aaad>
+
+    <!-- Thread count that should be started for
+         the open diameter framework -->
+    <thread_count>1</thread_count>
+
+
+    <!-- Diameter configuration file -->
+    <diameter_cfg_file>/etc/opendiameter/aaad/config/aaad_diameter_server.xml</diameter_cfg_file>
+
+    <!-- The following is a list of 
+         applications supported by this
+         diameter peer -->
+
+    <applications>
+
+        <application_entry>
+            <name>diameter_eap</name>
+            <enabled>true</enabled>
+
+            <diameter_eap>
+
+                <!-- diameter eap specific.
+                     This section is application
+                     specific. For diameter eap
+                     we only have the user database
+                     and local identity information.
+                     See aaad_user_db.xml for details.-->
+                
+                <!-- Local identity -->
+                <local_identity>diameter_eap@opendiam.testbed.aaa</local_identity>
+
+                <!-- User Db -->
+                <user_db>/etc/opendiameter/aaad/config/aaad_user_db.xml</user_db>
+
+            </diameter_eap>
+        </application_entry>
+
+    </applications>
+
+</aaad>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id+,
+                                               auth_application_id?, acct_application_id?)>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "aaad_diameter_dictionary.dtd">
+<!--
+  $Log: aaad_diameter_dictionary.xml,v $
+  Revision 1.4  2006/05/31 17:53:32  vfajardo
+  xml migration
+
+  Revision 1.14  2006/05/02 14:29:03  vfajardo
+  interop changes
+
+  Revision 1.13  2006/05/02 14:20:21  vfajardo
+  EAP dictionary
+
+  Revision 1.12  2006/04/24 20:08:56  vfajardo
+  inband security id
+
+  Revision 1.11  2006/04/19 20:36:18  vfajardo
+  1298700
+
+  Revision 1.10  2006/04/05 17:53:25  vfajardo
+  Updates to dictionary
+
+  Revision 1.9  2005/06/29 14:44:15  vfajardo
+  test changes
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="Inband-Security-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <!--
+    <avp name="Failed-AVP" code="279" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    -->
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Inband-Security-Id" code="299" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="No Security" code="0"/>
+      <enum name="TLS Security" code="1"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1" mandatory="must">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- *********** DIAMETERE MOBILEIPV4 APPLICATION ***********-->
+  <application id="2" name="Mobile IPv4" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-14.txt">
+
+    <command name="AA-Mobile-Node" code="260" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-Auth" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="MIP-FA-Challenge" maximum="1"/>
+	  <avprule name="MIP-Candidate-Home-Agent-Host" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Host" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+ 	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <command name="Home-Agent-MIP" code="262" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1"/>
+ 	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ***************** DIAMETER MOBILEIPV4 APPLICATION AVPS ************** -->
+    <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Length" code="339" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Offset" code="340" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Candidate-Home-Agent-Host" code="336" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Host" code="348" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-FA-Challenge" code="344" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Feature-Vector" code="337" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Address" code="334" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-MN-AAA-SPI" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Mobile-Node-Address" code="333" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-Reg-Request" code="320" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Reg-Reply" code="321" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-AAA-Auth" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Auth-Input-Data-Length" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Authenticator-Offset" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Algorithm-Type" code="345" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-FA-to-HA-SPI" code="318" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-SPI" code="319" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Replay-Mode" code="346" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-Session-Key" code="343" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-Key" code="326" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-HA-Key" code="328" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-FA-Key" code="329" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-MN-Key" code="332" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Key-Lifetime" code="367" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Key-Material" code="335" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-to-FA-Key" code="325" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-to-HA-Key" code="331" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="5" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="462" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="463" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="464" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="465" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+  <!-- ************* TEST APPLICATION ************* --> 
+
+  <application id="10000" name="Test-Authorization" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Test-Auth" code="300">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+  	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+	  <avprule name="Session-Timeout" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+  <application id="20000" name="Test-Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="Example-Accounting-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** TEST APPLICATION AVPS ************** -->
+    <avp name="Example-Accounting-Record" code="999997">
+      <type type-name="UTF8String"/>
+    </avp>
+  </application>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_server.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id,
+                                               (auth_application_id|acct_application_id))>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count, 
+                               receive_buffer_size, advertised_host_ip*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_host_ip (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  use_sctp,  tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT use_sctp (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_diameter_server.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "aaad_diameter_server.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>5</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+   </general>
+   <parser> 
+      <dictionary>/etc/opendiameter/aaad/config/aaad_diameter_dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>opendiam.eap.testbed.aaa</identity>
+      <realm>eap.testbed.aaa</realm>
+      <tcp_listen_port>3868</tcp_listen_port>
+      
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>30</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>0</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>0</max_request_retransmission_count>
+      <receive_buffer_size>4096</receive_buffer_size>
+      <advertised_hostname>opendiam.eap.testbed.aaa</advertised_hostname>
+      <peer_table>
+          <expiration_time>60</expiration_time>
+          <peer>
+              <hostname>gw.eap.testbed.aaa</hostname>
+              <port>3868</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <default_route>
+             <realm>eap.testbed.aaa</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <application_id>3</application_id>
+                <application_id>5</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>gw.eap.testbed.aaa</server>
+                    <metric>1</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>1000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>3000</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>3000</session_timeout>
+         <interim_interval>30</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_eap_shared_secret.bin	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+p:—œÅ×°7\×`ûQTPìežÛ5A®ØP+\;^l¿wçà[à÷°Ëƒÿ$n‡IÏÆÂÏdÆÕ³_	
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_user_db.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+     <!ELEMENT user_db (user_entry*, default_entry)>
+
+     <!ELEMENT user_entry (name_match, eap_method, archie?, md5?)>
+     <!ELEMENT default_entry (eap_method, archie?, md5?)>
+
+     <!ELEMENT name_match (#PCDATA)>
+     <!ELEMENT eap_method (#PCDATA)>
+
+     <!ELEMENT archie (shared_secret_file)>
+
+     <!ELEMENT shared_secret_file (#PCDATA)>
+
+     <!ELEMENT md5 (password_type, secret)>
+
+     <!ELEMENT password_type (#PCDATA)>
+     <!ELEMENT secret (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/aaad/config/aaad_user_db.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE user_db SYSTEM "aaad_user_db.dtd">
+<user_db>
+    <default_entry>
+       <eap_method>tls</eap_method>
+       <md5>
+          <password_type>flat</password_type>
+          <secret>himitsu</secret>
+       </md5>
+    </default_entry>
+
+</user_db>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/agent.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>10000</auth_application_id>
+      <auth_application_id>20000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>proxy.intermediate.net</identity>
+      <realm>intermediate.net</realm>
+      <tcp_listen_port>1812</tcp_listen_port>
+      <sctp_listen_port>1813</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>agent1.isp.net</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.isp.net</hostname>
+              <port>1811</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+              <hostname>nas.access1.net</hostname>
+              <port>1811</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+              <hostname>nas.access2.net</hostname>
+              <port>1811</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+              <hostname>nas.access3.net</hostname>
+              <port>1811</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>access1.net</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>0</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access1.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access1.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.access1.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.access1.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <route>
+             <realm>access2.net</realm>
+             <role>1</role> 
+             <redirect_usage>6</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access2.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <route>
+             <realm>access3.net</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>0</application_id>
+                <vendor_id>6</vendor_id>
+                <peer_entry>
+                    <server>nas.access3.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.access3.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.access3.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access3.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.access3.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.access3.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>access1.net</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>0</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access1.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/configuration.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id,
+                                               (auth_application_id|acct_application_id))>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               receive_buffer_size, advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  use_sctp, tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT use_sctp (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/configuration.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+
+<!-- Sample configuration file, version 1.0.3 and above. -->
+<!-- Configuration table starts always starts with "configuration"
+     element as root -->
+
+<configuration>
+
+   <!-- General configuration has a fixed list of elements. Note
+        that information in the general section includes to info 
+        announced by this nodes to it's peers during capabilities
+        exchange. -->
+   <general>
+
+      <!-- Product, version and vendor ID information specified
+           here will be embedded in the CER message -->
+      <product>Open Diameter</product>
+
+      <!-- Software revision number. For Open Diameter
+           this is equivalent to the Firmware-Revision AVP
+           in the CER -->
+      <version>1</version>
+
+      <!-- Vendor id of diameter entity broadcast to 
+           peers in the CER -->
+      <vendor_id>0</vendor_id>
+
+      <!-- List of locally supported vendor id's. Note
+           that advertisement of supported vendor id's
+           is needed when routing messages with vendor
+           specific application id's -->
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+
+      <!-- List of locally supported auth application 
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. To
+	   advertise this node as a relay, place a '-1'
+	   in either auth_application_id or acct_application_id -->
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+
+      <!-- List of locally supported acct application
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. To
+	   advertise this node as a relay, place a '-1'
+	   in either auth_application_id or acct_application_id -->
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+
+      <!-- List of locally supported vendor specific application
+           id's. This contains one or more vendor specific application
+           id's that will be broadcasted to peers.  Each vendor
+           specifc application id will contain one or more vendor
+           id's (RFC 3588) and exactly one auth or acct application
+           id -->
+      <vendor_specific_application_id>
+
+          <!-- Exactly one instance of the vendor id is advertized
+               by this diameter entity -->
+          <vendor_id>31</vendor_id>
+
+          <!-- Exactly one instance of the
+               vendor's auth application id -->
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <!-- Or Exactly one instance of the
+               vendor's acct application id -->
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+
+   <parser> 
+      <!-- Path and filename of dictionary file. The path MUST be
+           a full path or relative to the location of this configuration
+           file -->
+      <dictionary>config\dictionary.xml</dictionary>
+   </parser>
+
+   <!-- Transport management section. This section contains 
+        to local diameter transport information, peer table
+        and route table -->
+   <transport_mngt>
+
+      <!-- Diameter entity identity. Note that a running open
+           diameter application will use the identity string 
+           instead of calling OS dependent gethostname functions
+           to determine it's identity. Hence, users MUST enter
+           a valid resovable entry for this string -->
+      <identity>nas_server</identity>
+
+      <!-- Diameter realm. As with identity, a running open
+           diameter application uses the realm string to
+           identify its domain of reponsibility. This allows
+           virtual domains to exists within a single host
+           where multiple open diameter entities are running
+           with different realm configuration --> 
+      <realm>research.org</realm>
+
+      <!-- Diameter TCP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <tcp_listen_port>1812</tcp_listen_port>
+
+      <!-- Diameter SCTP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <sctp_listen_port>1813</sctp_listen_port>
+
+      <!-- Enables or disables IPv6 support for this stack -->
+      <use_ipv6>0</use_ipv6>
+
+      <!-- Watchdog timeout. Interval between watchdog messages 
+           -->
+      <watchdog_timeout>0</watchdog_timeout>
+
+      <!-- Retry connection interval. Amount of time in between
+           attempts to reconnect to a disconnected peer. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_interval>30</reconnect_interval>
+
+      <!-- Max re-connection attempt. Number of times a reconnection
+           attempt will be made until it gives up. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_max>30</reconnect_max>
+
+      <!-- Request retransmission interval. Retransmission of
+           pending request will be done until max_request_retransmission
+           is exceeded. Care should be taken in defining this
+           value. A high value (>60) will slow down retransmission,
+           a low value (<5) will cause performance issues. If the
+           value is 0, then no retransmission attempt will be made.
+           -->
+      <request_retransmission_interval>10</request_retransmission_interval>
+
+      <!-- Max request retransmission. Maximum number of pending
+           request retransmission. Care should be taken in defining this
+           value. A high value (>10) will cause too much traffic.
+           If the value is 0, then no retransmission attempt will be made.
+           -->
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+
+      <!-- This is the initial amount of buffer that is pre-allocated for
+           message reception. Each time a message is received that does
+           not fit this value, the buffer will be enlarged by this value
+           multiplied by increments of 1 until the message fits or up to
+           a maximum of 10 increments. A default vaule of 2048 is recommended.
+           -->
+      <receive_buffer_size>2048</receive_buffer_size>
+
+      <!-- Provides a customized list of local hostnames
+           addresses that will be advertised to other
+           peers during CER/CEA exchange. For SCTP, 
+	   the IP addresses MUST be valid addresses
+	   for all interface address present in the
+	   system. For TCP, only the first IP address
+	   will be used.
+           -->
+      <advertised_hostname>192.168.1.100</advertised_hostname>
+      <advertised_hostname>192.168.1.101</advertised_hostname>
+      <advertised_hostname>192.168.1.102</advertised_hostname>
+
+      <!-- Peer table lists peers that this open diameter 
+           application will attempt to connect to on startup.
+           Each peer entry contains host, port and tls
+           enabled information.  Internally, the peer table 
+           are currently configure statically using this section. 
+           No dynamic learning is currently available -->
+      <peer_table>
+          <!-- This defines the expiration time for dynamically
+                learned peers -->
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>tari-dhcp163.research.telcordia.com</hostname>
+              <port>1812</port>
+              <!-- This flag indicates whether this connection will
+                   be an SCTP connection. If set to 1, SCTP will be
+                   used. If set to 0, TCP will be used -->
+              <use_sctp>1</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+
+      <!-- Route table list the realm entries that this peer
+           will use to resolve message paths. Each entry
+           contains the realm name, the peer to send the
+           messaage to, the application id of the peer and
+           it role (whether a proxy, local .. etc). Note that
+           peer_reference element MUST point to an existing
+           peer in the peer_table else this route will be
+           in-active. Also, a default_route flag can be added
+           to a route entry to set the default route. If more
+           than one route has a default_route flag set then
+           the last entry with this flag set becomes the
+           default route -->
+      <route_table>
+          <!-- Defines the expiration time for dynamically
+               learned routes. A value of 0 means no expiration -->
+          <expire_time>0</expire_time>
+
+          <!-- A route entry defines a lookup information
+               for a diameter message containing destination
+               realm AVP's. For more information on diameter
+               routing, pls see "Open Diameter Routing Architecture" -->
+          <route>
+             <!-- Realm that this route serves. MUST be unique to
+                   this table --> 
+             <realm>other.research.org</realm>
+
+             <!-- The role that this diameter entity will play in
+                  resolving messages matching this realm. Valid 
+                  values for this elements are:
+                   0 (local)    - application acting as local servers
+                   1 (relay)    - application acting as relay agent                  
+                   2 (proxy)    - application acting as proxy server
+                   3 (redirect) - application acting as redirect agent -->
+             <role>0</role> 
+
+             <!-- Re-direct host usage. This provides a hint to
+                  the receiver of the redirect indication on what
+                  to do with the request. If this route is acting
+                  as a redirect agent, the Redirect-Host-Usage AVP
+                  sent in the redirect indication will have this value.
+                  Note that this is valid only if <role> is set to
+                  redirect(3). Valid values are:
+                    0  DONT_CACHE  - redirect host should not be cached.
+                    1  ALL_SESSION - All messages within the same session id
+                                     MAY be sent to the redirect host
+                    2  ALL_REALM   - All messages destined for the realm
+                                     MAY be sent to the redirect host
+                    3  REALM_AND_APPLICATION - All messages for the application
+                                     requested to the realm specified MAY be
+                                     sent to the redirect host
+                    4  ALL_APPLICATION - All messages for the application
+                                     requested MAY be sent to the redirect host
+                    5  ALL_HOST    - All messages that would be sent to the
+                                     host that generated the Redirect-Host 
+                                     MAY be sent to the redirect host
+                    6  ALL_USER    - All messages for the user requested MAY 
+                                     be sent to the redirect host -->
+             <redirect_usage>0</redirect_usage>
+
+             <!-- For each route, there is a set of applications
+                  that are supported. This is used by the base
+                  protocol library as the second index to resolving
+                  a route for a message --> 
+             <application>
+
+                  <!-- Application Id is used as a second key for 
+                       routing queries. See details above -->
+                  <application_id>1</application_id>
+
+                  <!-- For vendor specific application id's. As
+                       per RFC this should be 0 for standard
+                       track applications. Otherwise, this
+                       value is used in conjunction with
+                       application_id as a second search key -->
+                  <vendor_id>0</vendor_id>
+
+                  <!-- For each application, there can be a set
+                       of servers support it. Each server has
+                       a metric associated with it and the 
+                       routing engine chooses the server in
+                       metric order (0 being highest) -->
+                  <peer_entry>
+
+                      <!-- Diameter peer serving this realm and
+                           application id. This server name
+                           MUST exits in the peer table for
+                           this route to be active.
+                      <server>server1.research.org</server>
+ 
+                      <!-- Metric value for this server entry.
+                           The higher the value, the lower the
+                           preference. 0 is the highest value
+                           and entries with equal value will 
+                           be resolve in the order they are
+                           defined in this configuration file -->
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+
+          <!-- The definition of a default route is the same
+                as for any other route. The existance of a
+                default route means that all no-match queries
+                will result in a default route return -->
+          <default_route>
+             <realm>research.telcordia.com</realm>
+             <role>full</role> 
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>5</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+      </route_table>
+   </transport_mngt>
+
+   <!-- Session manager configuration table. This section
+        consist of fixed elements that MUST exists -->
+   <session_mngt>
+
+      <!-- Dictates the maximum number of concurrent
+           sessions that will be maintained by open
+           diameter. These include both auth and acct
+           sessions -->
+      <max_sessions>10000</max_sessions>
+
+      <!-- The following dictates default values for
+           auth sessions -->
+      <auth_sessions>
+
+         <!-- Stateful session flag. If set to 1, then
+              server will enforce stateful sessions and
+              clients will hint for stateful sessions. If
+              set to 0 or if missing then stateless sessions.
+
+              The value of auth-session state can actually 
+              negotiated between client and server. So for 
+              the server, auth-session-state is used as follows:
+
+              1. If the request message sent by the client 
+                 contains an auth-session-state, the server 
+                 check's it's own configuration. If the values 
+                 are equal then the server uses that value to 
+                 determine statefulness. If the values are not 
+                 equal and the server's configuration is set to 
+                 AAA_SESSION_STATE_MAINTAINED, then the client's 
+                 value determines the statefulness of the session. 
+                 If the values are not equal and the server's 
+                 configuration is NOT AAA_SESSION_STATE_MAINTAINED 
+                 then the server's configuration determines the 
+                 statefulness.
+              2. If the request message sent by the client does 
+                 not contain an auth-session-state, the server 
+                 check's the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a 
+                 value, it is used to determine the statefulness 
+                 of the session otherwise the configuration value 
+                 is used.
+
+              Based on the above policy, the server will return 
+              an auth-session-state avp in answer message.
+
+              For the client:
+
+              1. The initial request sent by the client can contain 
+                 an auth-session-state value as a hint to the server. 
+                 This value is taken from the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a value, 
+                 it is used to as a hint value otherwise the configuration 
+                 value is used.
+              2. If the answer message sent by the server contains 
+                 an auth-session-state, then that value will be used 
+                 by the client. If no auth-session-state avp is sent, 
+                 then the hint sent in (1) is used.
+           -->
+         <stateful>1</stateful>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication. For stateless sessions, a value
+              of zero(0) will cause the client session to be maintained
+              indefinitely. For stateless server sessions, the library
+              will ask you periodically if you want to reclaim the session
+              in ReClaimSession() method -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Timeout in seconds before a session is 
+              terminated regardless of wether it has
+              been re-authenticated -->
+         <lifetime_timeout>360</lifetime_timeout>
+
+         <!-- Grace period after lifetime timeout before
+              full termination -->
+         <grace_period_timeout>30</grace_period_timeout>
+
+         <!-- Timeout before subsequent ASR messages
+              are sent if the inital attempt fails -->
+         <abort_retry_timeout>20</abort_retry_timeout>
+
+      </auth_sessions>
+
+      <!-- The following dictates default values for
+           acct sessions -->
+      <acct_sessions>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Record interim interval dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <interim_interval>5</interim_interval>
+
+         <!-- Realtime required value dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <realtime>1</realtime>
+
+      </acct_sessions>
+
+   </session_mngt>
+
+   <!-- Log section dictates the verbose levels that
+        the library generates as well as target outputs -->
+   <log>
+
+      <!-- The following are the available log levels
+           that can be "enabled" or "disabled" -->
+      <flags>
+         <debug>disabled</debug>
+         <trace>disabled</trace>
+         <info>disabled</info>
+      </flags>
+
+      <!-- The following are the target outputs of
+           the logs. It can be a combination of
+           each entry -->
+      <target>
+         <!-- enables or disables terminal output -->
+         <console>enabled</console>
+         <!-- enables or disables syslog output -->
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+     <!ELEMENT dictionary (vendor*, base, application*)>
+
+     <!ELEMENT vendor EMPTY>
+     <!ATTLIST vendor
+          id CDATA #REQUIRED
+          name CDATA #REQUIRED
+     >
+
+     <!ELEMENT base (command*, typedefn+, avp+)>
+     <!ATTLIST base
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT application (command*, typedefn*, avp*)>
+     <!ATTLIST application
+          id CDATA #REQUIRED
+          name CDATA #IMPLIED
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+          application-id CDATA #IMPLIED
+          pbit CDATA #IMPLIED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          description CDATA #IMPLIED
+          code CDATA #REQUIRED
+          may-encrypt (yes | no) "yes"
+          mandatory (must | may | mustnot | shouldnot) "may"
+          protected (must | may | mustnot | shouldnot) "may"
+          vendor-id CDATA #IMPLIED
+     >
+
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+<!--
+  $Log: dictionary.xml,v $
+  Revision 1.15  2006/05/31 17:53:32  vfajardo
+  xml migration
+
+  Revision 1.14  2006/05/02 14:29:03  vfajardo
+  interop changes
+
+  Revision 1.13  2006/05/02 14:20:21  vfajardo
+  EAP dictionary
+
+  Revision 1.12  2006/04/24 20:08:56  vfajardo
+  inband security id
+
+  Revision 1.11  2006/04/19 20:36:18  vfajardo
+  1298700
+
+  Revision 1.10  2006/04/05 17:53:25  vfajardo
+  Updates to dictionary
+
+  Revision 1.9  2005/06/29 14:44:15  vfajardo
+  test changes
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="Inband-Security-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Inband-Security-Id" code="299" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="No Security" code="0"/>
+      <enum name="TLS Security" code="1"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1" mandatory="must">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="must">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279" mandatory="must">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- *********** DIAMETERE MOBILEIPV4 APPLICATION ***********-->
+  <application id="2" name="Mobile IPv4" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-14.txt">
+
+    <command name="AA-Mobile-Node" code="260" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-Auth" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="MIP-FA-Challenge" maximum="1"/>
+	  <avprule name="MIP-Candidate-Home-Agent-Host" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Host" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+ 	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <command name="Home-Agent-MIP" code="262" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1"/>
+ 	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ***************** DIAMETER MOBILEIPV4 APPLICATION AVPS ************** -->
+    <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Length" code="339" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Offset" code="340" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Candidate-Home-Agent-Host" code="336" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Host" code="348" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-FA-Challenge" code="344" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Feature-Vector" code="337" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Address" code="334" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-MN-AAA-SPI" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Mobile-Node-Address" code="333" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-Reg-Request" code="320" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Reg-Reply" code="321" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-AAA-Auth" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Auth-Input-Data-Length" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Authenticator-Offset" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Algorithm-Type" code="345" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-FA-to-HA-SPI" code="318" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-SPI" code="319" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Replay-Mode" code="346" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-Session-Key" code="343" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-Key" code="326" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-HA-Key" code="328" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-FA-Key" code="329" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-MN-Key" code="332" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Key-Lifetime" code="367" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Key-Material" code="335" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-to-FA-Key" code="325" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-to-HA-Key" code="331" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="5" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="462" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="463" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="464" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="465" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+  <!-- ************* TEST APPLICATION ************* --> 
+
+  <application id="10000" name="Test-Authorization" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Test-Auth" code="300">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+  	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+	  <avprule name="Session-Timeout" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+  <application id="20000" name="Test-Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="Example-Accounting-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** TEST APPLICATION AVPS ************** -->
+    <avp name="Example-Accounting-Record" code="999997">
+      <type type-name="UTF8String"/>
+    </avp>
+  </application>
+	<!-- ************* DIAMETER CC APPLICATION ************* -->
+	<application id="4" name="CC" uri="ftp://ftp.ietf.org/rfc/rfc4006.txt">
+		<command name="CC" code="272" pbit="1">
+			<requestrules>
+				<fixed>
+					<avprule name="Session-Id" maximum="1" minimum="1"/>
+				</fixed>
+				<required>
+					<avprule name="Origin-Host" maximum="1" minimum="1"/>
+					<avprule name="Origin-Realm" maximum="1" minimum="1"/>
+					<avprule name="Destination-Realm" maximum="1" minimum="1"/>
+					<avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+					<avprule name="Service-Context-Id" maximum="1" minimum="1"/>
+					<avprule name="CC-Request-Type" maximum="1" minimum="1"/>
+					<avprule name="CC-Request-Number" maximum="1" minimum="1"/>
+				</required>
+				<optional>
+					<avprule name="Destination-Host" maximum="1"/>
+					<avprule name="User-Name" maximum="1"/>
+					<avprule name="CC-Sub-Session-Id" maximum="1"/>
+					<avprule name="Acct-Multi-Session-Id" maximum="1"/>
+					<avprule name="Origin-State-Id" maximum="1"/>
+					<avprule name="Event-Timestamp" maximum="1"/>
+					<avprule name="Subscription-Id"/>
+					<avprule name="Service-Identifier" maximum="1"/>
+					<avprule name="Termination-Cause" maximum="1"/>
+					<avprule name="Requested-Service-Unit" maximum="1"/>
+					<avprule name="Requested-Action" maximum="1"/>
+					<avprule name="Used-Service-Unit"/>
+					<avprule name="Multiple-Services-Indicator" maximum="1"/>
+					<avprule name="Multiple-Services-Credit-Control"/>
+					<avprule name="Service-Parameter-Info"/>
+					<avprule name="CC-Correlation-Id" maximum="1"/>
+					<avprule name="User-Equipment-Info" maximum="1"/>
+					<avprule name="Proxy-Info"/>
+					<avprule name="Route-Record"/>
+					<avprule name="AVP"/>
+				</optional>
+			</requestrules>
+			<answerrules>
+				<fixed>
+					<avprule name="Session-Id" maximum="1" minimum="1"/>
+				</fixed>
+				<required>
+					<avprule name="Result-Code" maximum="1" minimum="1"/>
+					<avprule name="Origin-Host" maximum="1" minimum="1"/>
+					<avprule name="Origin-Realm" maximum="1" minimum="1"/>
+					<avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+					<avprule name="CC-Request-Type" maximum="1" minimum="1"/>
+					<avprule name="CC-Request-Number" maximum="1" minimum="1"/>
+				</required>
+				<optional>
+					<avprule name="User-Name" maximum="1"/>
+					<avprule name="CC-Session-Failover" maximum="1"/>
+					<avprule name="CC-Sub-Session-Id" maximum="1"/>
+					<avprule name="Acct-Multi-Session-Id" maximum="1"/>
+					<avprule name="Origin-State-Id" maximum="1"/>
+					<avprule name="Event-Timestamp" maximum="1"/>
+					<avprule name="Granted-Service-Unit" maximum="1"/>
+					<avprule name="Multiple-Services-Credit-Control"/>
+					<avprule name="Cost-Information" maximum="1"/>
+					<avprule name="Final-Unit-Indication" maximum="1"/>
+					<avprule name="Check-Balance-Result" maximum="1"/>
+					<avprule name="Credit-Control-Failure-Handling" maximum="1"/>
+					<avprule name="Direct-Debiting-Failure-Handling" maximum="1"/>
+					<avprule name="Validity-Time" maximum="1"/>
+					<avprule name="Redirect-Host"/>
+					<avprule name="Redirect-Host-Usage" maximum="1"/>
+					<avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+					<avprule name="Proxy-Info"/>
+					<avprule name="Route-Record"/>
+					<avprule name="Failed-AVP"/>
+					<avprule name="AVP"/>
+				</optional>
+			</answerrules>
+		</command>
+	</application>
+	<!-- ***************** DIAMETER CC APPLICATION AVPS ************** -->
+	<avp name="Service-Context-Id" code="461" mandatory="must" may-encrypt="yes">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="CC-Request-Type" code="416" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="INITIAL_REQUEST" code="1"/>
+		<enum name="UPDATE_REQUEST" code="2"/>
+		<enum name="TERMINATION_REQUEST" code="3"/>
+		<enum name="EVENT_REQUEST" code="4"/>
+	</avp>
+	<avp name="CC-Request-Number" code="415" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CC-Session-Failover" code="418" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="FAILOVER_NOT_SUPPORTED" code="0"/>
+		<enum name="FAILOVER_SUPPORTED" code="1"/>
+	</avp>
+	<avp name="CC-Sub-Session-Id" code="419" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="Subscription-Id-Type" code="450" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="END_USER_E164" code="0"/>
+		<enum name="END_USER_IMSI" code="1"/>
+		<enum name="END_USER_SIP_URI" code="2"/>
+		<enum name="END_USER_NAI" code="3"/>
+		<enum name="END_USER_PRIVATE" code="4"/>
+	</avp>
+	<avp name="Subscription-Id-Data" code="444" mandatory="must" may-encrypt="yes">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Subscription-Id" code="443" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Subscription-Id-Type" maximum="1" minimum="1"/>
+				<avprule name="Subscription-Id-Data" maximum="1" minimum="1"/>
+			</required>
+		</grouped>
+	</avp>
+
+	<avp name="Service-Identifier" code="439" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CC-Time" code="420" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Currency-Code" code="425" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Exponent" code="429" mandatory="must" may-encrypt="yes">
+		<type type-name="Integer32"/>
+	</avp>
+	<avp name="Value-Digits" code="447" mandatory="must" may-encrypt="yes">
+		<type type-name="Integer64"/>
+	</avp>
+	<avp name="Unit-Value" code="445" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Value-Digits" maximum="1" minimum="1"/>
+			</required>
+			<optional>
+				<avprule name="Exponent" maximum="1"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="CC-Money" code="413" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Unit-Value" maximum="1" minimum="1"/>
+			</required>
+			<optional>
+				<avprule name="Currency-Code" maximum="1"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="CC-Total-Octets" code="421" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="CC-Input-Octets" code="412" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="CC-Output-Octets" code="414" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="CC-Service-Specific-Units" code="417" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned64"/>
+	</avp>
+	<avp name="Requested-Action" code="436" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="DIRECT_DEBITING" code="0"/>
+		<enum name="REFUND_ACCOUNT" code="1"/>
+		<enum name="CHECK_BALANCE" code="2"/>
+		<enum name="PRICE_ENQUIRY" code="3"/>
+	</avp>
+	<avp name="Requested-Service-Unit" code="437" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<optional>
+				<avprule name="CC-Time" maximum="1"/>
+				<avprule name="CC-Money" maximum="1"/>
+				<avprule name="CC-Total-Octets" maximum="1"/>
+				<avprule name="CC-Input-Octets" maximum="1"/>
+				<avprule name="CC-Output-Octets" maximum="1"/>
+				<avprule name="CC-Service-Specific-Units" maximum="1"/>
+				<avprule name="AVP"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="Tariff-Change-Usage" code="452" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="UNIT_BEFORE_TARIFF_CHANGE" code="0"/>
+		<enum name="UNIT_AFTER_TARIFF_CHANGE" code="1"/>
+		<enum name="UNIT_INDETERMINATE" code="2"/>
+	</avp>
+	<avp name="Used-Service-Unit" code="446" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<optional>
+				<avprule name="Tariff-Change-Usage" maximum="1"/>
+				<avprule name="CC-Time" maximum="1"/>
+				<avprule name="CC-Money" maximum="1"/>
+				<avprule name="CC-Total-Octets" maximum="1"/>
+				<avprule name="CC-Input-Octets" maximum="1"/>
+				<avprule name="CC-Output-Octets" maximum="1"/>
+				<avprule name="CC-Service-Specific-Units" maximum="1"/>
+				<avprule name="AVP"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="Tariff-Time-Change" code="451" mandatory="must" may-encrypt="yes">
+		<type type-name="Time"/>
+	</avp>
+	<avp name="Granted-Service-Unit" code="431" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<optional>
+				<avprule name="Tariff-Time-Change" maximum="1"/>
+				<avprule name="CC-Time" maximum="1"/>
+				<avprule name="CC-Money" maximum="1"/>
+				<avprule name="CC-Total-Octets" maximum="1"/>
+				<avprule name="CC-Input-Octets" maximum="1"/>
+				<avprule name="CC-Output-Octets" maximum="1"/>
+				<avprule name="CC-Service-Specific-Units" maximum="1"/>
+				<avprule name="AVP"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="Multiple-Services-Indicator" code="455" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="MULTIPLE_SERVICES_NOT_SUPPORTED" code="0"/>
+		<enum name="MULTIPLE_SERVICES_SUPPORTED" code="1"/>
+	</avp>
+	<avp name="Rating-Group" code="432" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="G-S-U-Pool-Identifier" code="453" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="CC-Unit-Type" code="454" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="TIME" code="0"/>
+		<enum name="MONEY" code="1"/>
+		<enum name="TOTAL-OCTETC" code="2"/>
+		<enum name="INPUT-OCTETC" code="3"/>
+		<enum name="OUTPUT-OCTETC" code="4"/>
+		<enum name="SERVICE-SPECIFIC-UNITS" code="5"/>
+	</avp>	
+	<avp name="G-S-U-Pool-Reference" code="457" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="G-S-U-Pool-Identifier" minimum="1" maximum="1"/>
+				<avprule name="CC-Unit-Type"  minimum="1" maximum="1"/>
+				<avprule name="Unit-Value"  minimum="1" maximum="1"/>
+			</required>
+		</grouped>
+	</avp>
+	<avp name="Validity-Time" code="448" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Final-Unit-Action" code="449" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="TERMINATE" code="0"/>
+		<enum name="REDIRECT" code="1"/>
+		<enum name="RESTRICT_ACCESS" code="2"/>
+	</avp>
+	<avp name="Restriction-Filter-Rule" code="438" mandatory="must" may-encrypt="yes">
+		<type type-name="IPFilterRule"/>
+	</avp>
+	<avp name="Redirect-Address-Type" code="433" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="IPv4 Address" code="0"/>
+		<enum name="IPv6 Address" code="1"/>
+		<enum name="URL" code="2"/>
+		<enum name="SIP URI" code="3"/>
+	</avp>
+	<avp name="Redirect-Server-Address" code="435" mandatory="must" may-encrypt="yes">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Redirect-Server" code="434" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Redirect-Address-Type" maximum="1" minimum="1"/>
+				<avprule name="Redirect-Server-Address" maximum="1" minimum="1"/>
+			</required>
+		</grouped>
+	</avp>
+	<avp name="Check-Balance-Result" code="422" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="ENOUGH_CREDIT" code="0"/>
+		<enum name="No_CREDIT" code="1"/>
+	</avp>
+	<avp name="Credit-Control-Failure-Handling" code="427" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="TERMINATE" code="0"/>
+		<enum name="CONTINUE" code="1"/>
+		<enum name="RETRY_AND_TERMINATE" code="2"/>
+	</avp>
+	<avp name="Direct-Debiting-Failure-Handling" code="428" mandatory="must" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+		<enum name="TERMINATE_OR_BUFFER" code="0"/>
+		<enum name="CONTINUE" code="1"/>
+	</avp>
+	<avp name="Final-Unit-Indication" code="430" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Final-Unit-Action" maximum="1" minimum="1" />
+			</required>
+			<optional>
+				<avprule name="Restriction-Filter-Rule"/>
+				<avprule name="Filter-Id"/>
+				<avprule name="Redirect-Server" maximum="1"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="Multiple-Services-Credit-Control" code="456" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<optional>
+				<avprule name="Granted-Service-Unit" maximum="1"/>
+				<avprule name="Requested-Service-Unit" maximum="1"/>
+				<avprule name="Used-Service-Unit"/>
+				<avprule name="Tariff-Change-Usage" maximum="1"/>
+				<avprule name="Service-Identifier"/>
+				<avprule name="Rating-Group" maximum="1"/>
+				<avprule name="G-S-U-Pool-Reference"/>
+				<avprule name="Validity-Time" maximum="1"/>
+				<avprule name="Result-Code" maximum="1"/>
+				<avprule name="Final-Unit-Indication" maximum="1"/>
+				<avprule name="AVP"/>
+			</optional>
+		</grouped>
+	</avp>
+	<avp name="Service-Parameter-Type" code="441" mandatory="mustnot" may-encrypt="yes">
+		<type type-name="Unsigned32"/>
+	</avp>
+	<avp name="Service-Parameter-Value" code="442" mandatory="mustnot" may-encrypt="yes">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="Service-Parameter-Info" code="440" mandatory="mustnot" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Service-Parameter-Type" maximum="1"/>
+				<avprule name="Service-Parameter-Value" maximum="1"/>
+			</required>
+		</grouped>
+	</avp>
+	<avp name="CC-Correlation-Id" code="411" mandatory="may" may-encrypt="yes">
+		<type type-name="OctetString"/>
+	</avp>
+	<avp name="User-Equipment-Info-Type" code="459" mandatory="may" may-encrypt="yes">
+    <type type-name="Unsigned32"/>
+		<enum name="IMEISV" code="0"/>
+		<enum name="MAC" code="1"/>
+		<enum name="EUI64" code="2"/>
+		<enum name="MODIFIED_EUI64" code="3"/>
+	</avp>
+	<avp name="User-Equipment-Info-Value" code="460" mandatory="may" may-encrypt="yes">
+		<type type-name="OctetString"/>
+	</avp>
+ 	<avp name="User-Equipment-Info" code="458" mandatory="may" may-encrypt="yes">
+        <grouped>
+			<required>
+				<avprule name="User-Equipment-Info-Type" maximum="1" minimum="1"/>
+				<avprule name="User-Equipment-Info-Value" maximum="1" minimum="1"/>
+			</required>
+		</grouped>
+	</avp>	
+	<avp name="Cost-Unit" code="424" mandatory="must" may-encrypt="yes">
+		<type type-name="UTF8String"/>
+	</avp>
+	<avp name="Cost-Information" code="423" mandatory="must" may-encrypt="yes">
+		<grouped>
+			<required>
+				<avprule name="Unit-Value" maximum="1" minimum="1"/>
+				<avprule name="Currency-Code" maximum="1" minimum="1"/>
+			</required>
+			<optional>
+				<avprule name="Cost-Unit" maximum="1"/>
+			</optional>
+		</grouped>
+	</avp>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/isp.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>10000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <acct_application_id>20000</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser>
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>server.isp.net</identity>
+      <realm>isp.net</realm>
+      <tcp_listen_port>1812</tcp_listen_port>
+      <sctp_listen_port>1813</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>server1.isp.net</advertised_hostname>
+      <advertised_hostname>server2.isp.net</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>nas.access1.net</hostname>
+              <port>1811</port>
+              <use_sctp>1</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+              <hostname>nas.access2.net</hostname>
+              <port>1811</port>
+              <use_sctp>1</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+              <hostname>nas.access3.net</hostname>
+              <port>1811</port>
+              <use_sctp>1</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>access1.net</realm>
+             <role>0</role> 
+             <application>
+                <application_id>10000</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access2.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>10000</vendor_id>
+                <peer_entry>
+                    <server>nas.access1.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.access1.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.access1.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <route>
+             <realm>access2.net</realm>
+             <role>0</role> 
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access2.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <route>
+             <realm>access3.net</realm>
+             <role>0</role> 
+             <application>
+                <application_id>10000</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access3.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.access3.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.access3.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access3.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.access3.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.access3.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>access1.net</realm>
+             <role>0</role> 
+             <application>
+                <application_id>10000</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.access1.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/nas1.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>10000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <acct_application_id>20000</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>nas.access1.net</identity>
+      <realm>access1.net</realm>
+      <tcp_listen_port>1810</tcp_listen_port>
+      <sctp_listen_port>1811</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>nas1.access1.net</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.isp.net</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>isp.net</realm>
+             <role>1</role> 
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>10000</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>isp.net</realm>
+             <role>0</role>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/nas2.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>10000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <acct_application_id>20000</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>nas.access2.net</identity>
+      <realm>access2.net</realm>
+      <tcp_listen_port>1810</tcp_listen_port>
+      <sctp_listen_port>1811</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>nas1.access2.net</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.isp.net</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>isp.net</realm>
+             <role>1</role> 
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>10000</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>isp.net</realm>
+             <role>0</role>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameter/nas3.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>10000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <acct_application_id>20000</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>nas.access3.net</identity>
+      <realm>access3.net</realm>
+      <tcp_listen_port>1810</tcp_listen_port>
+      <sctp_listen_port>1811</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.isp.net</hostname>
+              <port>1812</port>
+              <use_sctp>1</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>isp.net</realm>
+             <role>1</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>0</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>isp.net</realm>
+             <role>0</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/client.eap-tls.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration file for client always starts with "configuration_client" element as root -->
+<configuration_client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation='eap-tls.configuration.xsd'>
+	<!-- Encryption section. This section has a fixed list of elements.
+		This information is needed for OpenSSL to work -->
+	<encryption>
+		<!-- Pass phrase for client cryptographic files -->
+		<pass_phrase>cliente</pass_phrase>
+		<!-- Key file -->
+		<key_file>./tests/tls_config/peer/clt-key.pem</key_file>
+		<!-- Certificate file -->
+		<cert_file>./tests/tls_config/peer/clt-cert.pem</cert_file>
+		<!-- File used to build ramdom numbers -->
+		<random>./tests/tls_config/auth/random</random>
+		<!-- Path for Certification Authorities -->
+		<ca_path>./tests/tls_config/peer</ca_path>
+		<!-- Certification Authority's certificate for Certification Authority that signs client certificate -->
+		<ca_cert>./tests/tls_config/peer/ca-cert.pem</ca_cert>
+		<!-- File implementation for Diffie-Hellman algorithm -->
+		<dh>./tests/tls_config/auth/dh</dh>
+		<!-- RSA Key -->
+		<rsa_key>0</rsa_key>
+		<!-- Diffie-Hellman Key -->
+		<dh_key>1</dh_key>
+		<!-- RSA key length -->
+		<rsa_key_length>512</rsa_key_length>
+		<!-- Diffie-Hellman key lenght -->
+		<dh_key_length>512</dh_key_length>
+		<!-- Maximum depth for the certificate chain verification that shall be allowed -->
+		<verify_depth>1</verify_depth>
+		<!-- Type of certificates:
+			0: ASN1
+			1: PEM
+		-->
+		<file_type>1</file_type>
+	</encryption>
+	<!-- Fragmentation section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<fragmentation>
+		<!-- Initial value for lenght flag in fragmentation -->
+		<include_length>false</include_length>
+		<!-- Fragment size -->
+		<fragment_size>600</fragment_size>
+	</fragmentation>
+</configuration_client>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/client.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>5</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>43</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>nas.research1.org</identity>
+      <realm>research1.org</realm>
+      <tcp_listen_port>1810</tcp_listen_port>
+      <sctp_listen_port>1811</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.research2.org</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>research2.org</realm>
+             <role>1</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>5</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>research2.org</realm>
+             <role>0</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/configuration.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id,
+                                               (auth_application_id|acct_application_id))>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               receive_buffer_size, advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  use_sctp, tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT use_sctp (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/configuration.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+
+<!-- Sample configuration file, version 1.0.3 and above. -->
+<!-- Configuration table starts always starts with "configuration"
+     element as root -->
+
+<configuration>
+
+   <!-- General configuration has a fixed list of elements. Note
+        that information in the general section includes to info 
+        announced by this nodes to it's peers during capabilities
+        exchange. -->
+   <general>
+
+      <!-- Product, version and vendor ID information specified
+           here will be embedded in the CER message -->
+      <product>Open Diameter</product>
+
+      <!-- Software revision number. For Open Diameter
+           this is equivalent to the Firmware-Revision AVP
+           in the CER -->
+      <version>1</version>
+
+      <!-- Vendor id of diameter entity broadcast to 
+           peers in the CER -->
+      <vendor_id>0</vendor_id>
+
+      <!-- List of locally supported vendor id's. Note
+           that advertisement of supported vendor id's
+           is needed when routing messages with vendor
+           specific application id's -->
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+
+      <!-- List of locally supported auth application 
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. -->
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+
+      <!-- List of locally supported acct application
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. -->
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+
+      <!-- List of locally supported vendor specific application
+           id's. This contains one or more vendor specific application
+           id's that will be broadcasted to peers.  Each vendor
+           specifc application id will contain one or more vendor
+           id's (RFC 3588) and exactly one auth or acct application
+           id -->
+      <vendor_specific_application_id>
+
+          <!-- vendor id advertized by this diameter
+               entity -->
+          <vendor_id>31</vendor_id>
+
+          <!-- Exactly one instance of the
+               vendor's auth application id -->  
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <!-- Or Exactly one instance of the
+               vendor's acct application id -->  
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+
+   <parser> 
+      <!-- Path and filename of dictionary file. The path MUST be
+           a full path or relative to the location of this configuration
+           file -->
+      <dictionary>config\dictionary.xml</dictionary>
+   </parser>
+
+   <!-- Transport management section. This section contains 
+        to local diameter transport information, peer table
+        and route table -->
+   <transport_mngt>
+
+      <!-- Diameter entity identity. Note that a running open
+           diameter application will use the identity string 
+           instead of calling OS dependent gethostname functions
+           to determine it's identity. Hence, users MUST enter
+           a valid resovable entry for this string -->
+      <identity>nas_server</identity>
+
+      <!-- Diameter realm. As with identity, a running open
+           diameter application uses the realm string to
+           identify its domain of reponsibility. This allows
+           virtual domains to exists within a single host
+           where multiple open diameter entities are running
+           with different realm configuration --> 
+      <realm>research.org</realm>
+
+      <!-- Diameter TCP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <tcp_listen_port>1812</tcp_listen_port>
+
+      <!-- Diameter SCTP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <sctp_listen_port>1813</sctp_listen_port>
+
+      <!-- Enables or disables IPv6 support for this stack -->
+      <use_ipv6>0</use_ipv6>
+
+      <!-- Watchdog timeout. Interval between watchdog messages 
+           -->
+      <watchdog_timeout>0</watchdog_timeout>
+
+      <!-- Retry connection interval. Amount of time in between
+           attempts to reconnect to a disconnected peer. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_interval>30</reconnect_interval>
+
+      <!-- Max re-connection attempt. Number of times a reconnection
+           attempt will be made until it gives up. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_max>30</reconnect_max>
+
+      <!-- Request retransmission interval. Retransmission of
+           pending request will be done until max_request_retransmission
+           is exceeded. Care should be taken in defining this
+           value. A high value (>60) will slow down retransmission,
+           a low value (<5) will cause performance issues. If the
+           value is 0, then no retransmission attempt will be made.
+           -->
+      <request_retransmission_interval>10</request_retransmission_interval>
+
+      <!-- Max request retransmission. Maximum number of pending
+           request retransmission. Care should be taken in defining this
+           value. A high value (>10) will cause too much traffic.
+           If the value is 0, then no retransmission attempt will be made.
+           -->
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+
+      <!-- This is the initial amount of buffer that is pre-allocated for
+           message reception. Each time a message is received that does
+           not fit this value, the buffer will be enlarged by this value
+           multiplied by increments of 1 until the message fits or up to
+           a maximum of 10 increments. A default vaule of 2048 is recommended.
+           -->
+      <receive_buffer_size>2048</receive_buffer_size>
+      
+      <!-- Provides a customized list of local host IP 
+           addresses that will be advertised to other
+           peers during CER/CEA exchange. For SCTP, 
+	   the IP addresses MUST be valid addresses
+	   for all interface address present in the
+	   system. For TCP, only the first IP address
+	   will be used.
+           -->
+      <advertised_host_ip>192.168.1.100</advertised_host_ip>
+      <advertised_host_ip>192.168.1.101</advertised_host_ip>
+      <advertised_host_ip>192.168.1.102</advertised_host_ip>
+      
+      <!-- Peer table lists peers that this open diameter 
+           application will attempt to connect to on startup.
+           Each peer entry contains host, port and tls
+           enabled information.  Internally, the peer table 
+           are currently configure statically using this section. 
+           No dynamic learning is currently available -->
+      <peer_table>
+          <!-- This defines the expiration time for dynamically
+                learned peers -->
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>tari-dhcp163.research.telcordia.com</hostname>
+              <port>1812</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+
+      <!-- Route table list the realm entries that this peer
+           will use to resolve message paths. Each entry
+           contains the realm name, the peer to send the
+           messaage to, the application id of the peer and
+           it role (whether a proxy, local .. etc). Note that
+           peer_reference element MUST point to an existing
+           peer in the peer_table else this route will be
+           in-active. Also, a default_route flag can be added
+           to a route entry to set the default route. If more
+           than one route has a default_route flag set then
+           the last entry with this flag set becomes the
+           default route -->
+      <route_table>
+          <!-- Defines the expiration time for dynamically
+               learned routes. A value of 0 means no expiration -->
+          <expire_time>0</expire_time>
+
+          <!-- A route entry defines a lookup information
+               for a diameter message containing destination
+               realm AVP's. For more information on diameter
+               routing, pls see "Open Diameter Routing Architecture" -->
+          <route>
+             <!-- Realm that this route serves. MUST be unique to
+                   this table --> 
+             <realm>other.research.org</realm>
+
+             <!-- The role that this diameter entity will play in
+                  resolving messages matching this realm. Valid 
+                  values for this elements are:
+                   0 (local)    - application acting as local servers
+                   1 (relay)    - application acting as relay agent                  
+                   2 (proxy)    - application acting as proxy server
+                   3 (redirect) - application acting as redirect agent -->
+             <role>0</role> 
+
+             <!-- Re-direct host usage. This provides a hint to
+                  the receiver of the redirect indication on what
+                  to do with the request. If this route is acting
+                  as a redirect agent, the Redirect-Host-Usage AVP
+                  sent in the redirect indication will have this value.
+                  Note that this is valid only if <role> is set to
+                  redirect(3). Valid values are:
+                    0  DONT_CACHE  - redirect host should not be cached.
+                    1  ALL_SESSION - All messages within the same session id
+                                     MAY be sent to the redirect host
+                    2  ALL_REALM   - All messages destined for the realm
+                                     MAY be sent to the redirect host
+                    3  REALM_AND_APPLICATION - All messages for the application
+                                     requested to the realm specified MAY be
+                                     sent to the redirect host
+                    4  ALL_APPLICATION - All messages for the application
+                                     requested MAY be sent to the redirect host
+                    5  ALL_HOST    - All messages that would be sent to the
+                                     host that generated the Redirect-Host 
+                                     MAY be sent to the redirect host
+                    6  ALL_USER    - All messages for the user requested MAY 
+                                     be sent to the redirect host -->
+             <redirect_usage>0</redirect_usage>
+
+             <!-- For each route, there is a set of applications
+                  that are supported. This is used by the base
+                  protocol library as the second index to resolving
+                  a route for a message --> 
+             <application>
+
+                  <!-- Application Id is used as a second key for 
+                       routing queries. See details above -->
+                  <application_id>1</application_id>
+
+                  <!-- For vendor specific application id's. As
+                       per RFC this should be 0 for standard
+                       track applications. Otherwise, this
+                       value is used in conjunction with
+                       application_id as a second search key -->
+                  <vendor_id>0</vendor_id>
+
+                  <!-- For each application, there can be a set
+                       of servers support it. Each server has
+                       a metric associated with it and the 
+                       routing engine chooses the server in
+                       metric order (0 being highest) -->
+                  <peer_entry>
+
+                      <!-- Diameter peer serving this realm and
+                           application id. This server name
+                           MUST exits in the peer table for
+                           this route to be active.
+                      <server>server1.research.org</server>
+ 
+                      <!-- Metric value for this server entry.
+                           The higher the value, the lower the
+                           preference. 0 is the highest value
+                           and entries with equal value will 
+                           be resolve in the order they are
+                           defined in this configuration file -->
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+
+          <!-- The definition of a default route is the same
+                as for any other route. The existance of a
+                default route means that all no-match queries
+                will result in a default route return -->
+          <default_route>
+             <realm>research.telcordia.com</realm>
+             <role>full</role> 
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>5</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+      </route_table>
+   </transport_mngt>
+
+   <!-- Session manager configuration table. This section
+        consist of fixed elements that MUST exists -->
+   <session_mngt>
+
+      <!-- Dictates the maximum number of concurrent
+           sessions that will be maintained by open
+           diameter. These include both auth and acct
+           sessions -->
+      <max_sessions>10000</max_sessions>
+
+      <!-- The following dictates default values for
+           auth sessions -->
+      <auth_sessions>
+
+         <!-- Stateful session flag. If set to 1, then
+              server will enforce stateful sessions and
+              clients will hint for stateful sessions. If
+              set to 0 or if missing then stateless sessions.
+
+              The value of auth-session state can actually 
+              negotiated between client and server. So for 
+              the server, auth-session-state is used as follows:
+
+              1. If the request message sent by the client 
+                 contains an auth-session-state, the server 
+                 check's it's own configuration. If the values 
+                 are equal then the server uses that value to 
+                 determine statefulness. If the values are not 
+                 equal and the server's configuration is set to 
+                 AAA_SESSION_STATE_MAINTAINED, then the client's 
+                 value determines the statefulness of the session. 
+                 If the values are not equal and the server's 
+                 configuration is NOT AAA_SESSION_STATE_MAINTAINED 
+                 then the server's configuration determines the 
+                 statefulness.
+              2. If the request message sent by the client does 
+                 not contain an auth-session-state, the server 
+                 check's the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a 
+                 value, it is used to determine the statefulness 
+                 of the session otherwise the configuration value 
+                 is used.
+
+              Based on the above policy, the server will return 
+              an auth-session-state avp in answer message.
+
+              For the client:
+
+              1. The initial request sent by the client can contain 
+                 an auth-session-state value as a hint to the server. 
+                 This value is taken from the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a value, 
+                 it is used to as a hint value otherwise the configuration 
+                 value is used.
+              2. If the answer message sent by the server contains 
+                 an auth-session-state, then that value will be used 
+                 by the client. If no auth-session-state avp is sent, 
+                 then the hint sent in (1) is used.
+           -->
+         <stateful>1</stateful>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication. For stateless sessions, a value
+              of zero(0) will cause the client session to be maintained
+              indefinitely. For stateless server sessions, the library
+              will ask you periodically if you want to reclaim the session
+              in ReClaimSession() method -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Timeout in seconds before a session is 
+              terminated regardless of wether it has
+              been re-authenticated -->
+         <lifetime_timeout>360</lifetime_timeout>
+
+         <!-- Grace period after lifetime timeout before
+              full termination -->
+         <grace_period_timeout>30</grace_period_timeout>
+
+         <!-- Timeout before subsequent ASR messages
+              are sent if the inital attempt fails -->
+         <abort_retry_timeout>20</abort_retry_timeout>
+
+      </auth_sessions>
+
+      <!-- The following dictates default values for
+           acct sessions -->
+      <acct_sessions>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Record interim interval dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <interim_interval>5</interim_interval>
+
+         <!-- Realtime required value dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <realtime>1</realtime>
+
+      </acct_sessions>
+
+   </session_mngt>
+
+   <!-- Log section dictates the verbose levels that
+        the library generates as well as target outputs -->
+   <log>
+
+      <!-- The following are the available log levels
+           that can be "enabled" or "disabled" -->
+      <flags>
+         <debug>disabled</debug>
+         <trace>disabled</trace>
+         <info>disabled</info>
+      </flags>
+
+      <!-- The following are the target outputs of
+           the logs. It can be a combination of
+           each entry -->
+      <target>
+         <!-- enables or disables terminal output -->
+         <console>enabled</console>
+         <!-- enables or disables syslog output -->
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+     <!ELEMENT dictionary (vendor*, base, application*)>
+
+     <!ELEMENT vendor EMPTY>
+     <!ATTLIST vendor
+          id CDATA #REQUIRED
+          name CDATA #REQUIRED
+     >
+
+     <!ELEMENT base (command*, typedefn+, avp+)>
+     <!ATTLIST base
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT application (command*, typedefn*, avp*)>
+     <!ATTLIST application
+          id CDATA #REQUIRED
+          name CDATA #IMPLIED
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+          application-id CDATA #IMPLIED
+          pbit CDATA #IMPLIED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          description CDATA #IMPLIED
+          code CDATA #REQUIRED
+          may-encrypt (yes | no) "yes"
+          mandatory (must | may | mustnot | shouldnot) "may"
+          protected (must | may | mustnot | shouldnot) "may"
+          vendor-id CDATA #IMPLIED
+     >
+
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+<!--
+  $Log: dictionary.xml,v $
+  Revision 1.15  2006/05/31 17:53:32  vfajardo
+  xml migration
+
+  Revision 1.14  2006/05/02 14:29:03  vfajardo
+  interop changes
+
+  Revision 1.13  2006/05/02 14:20:21  vfajardo
+  EAP dictionary
+
+  Revision 1.12  2006/04/24 20:08:56  vfajardo
+  inband security id
+
+  Revision 1.11  2006/04/19 20:36:18  vfajardo
+  1298700
+
+  Revision 1.10  2006/04/05 17:53:25  vfajardo
+  Updates to dictionary
+
+  Revision 1.9  2005/06/29 14:44:15  vfajardo
+  test changes
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="Inband-Security-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <!--
+    <avp name="Failed-AVP" code="279" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    -->
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Inband-Security-Id" code="299" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="No Security" code="0"/>
+      <enum name="TLS Security" code="1"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- *********** DIAMETERE MOBILEIPV4 APPLICATION ***********-->
+  <application id="2" name="Mobile IPv4" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-14.txt">
+
+    <command name="AA-Mobile-Node" code="260" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-Auth" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="MIP-FA-Challenge" maximum="1"/>
+	  <avprule name="MIP-Candidate-Home-Agent-Host" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Host" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+ 	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <command name="Home-Agent-MIP" code="262" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1"/>
+ 	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ***************** DIAMETER MOBILEIPV4 APPLICATION AVPS ************** -->
+    <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Length" code="339" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Offset" code="340" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Candidate-Home-Agent-Host" code="336" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Host" code="348" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-FA-Challenge" code="344" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Feature-Vector" code="337" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Address" code="334" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-MN-AAA-SPI" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Mobile-Node-Address" code="333" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-Reg-Request" code="320" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Reg-Reply" code="321" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-AAA-Auth" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Auth-Input-Data-Length" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Authenticator-Offset" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Algorithm-Type" code="345" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-FA-to-HA-SPI" code="318" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-SPI" code="319" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Replay-Mode" code="346" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-Session-Key" code="343" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-Key" code="326" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-HA-Key" code="328" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-FA-Key" code="329" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-MN-Key" code="332" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Key-Lifetime" code="367" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Key-Material" code="335" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-to-FA-Key" code="325" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-to-HA-Key" code="331" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="5" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="462" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="463" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="464" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="465" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+  <!-- ************* TEST APPLICATION ************* --> 
+
+  <application id="10000" name="Test-Authorization" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Test-Auth" code="300">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+  	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+	  <avprule name="Session-Timeout" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+  <application id="20000" name="Test-Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="Example-Accounting-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** TEST APPLICATION AVPS ************** -->
+    <avp name="Example-Accounting-Record" code="999997">
+      <type type-name="UTF8String"/>
+    </avp>
+  </application>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/server.eap-tls.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration file for server always starts with "configuration_server" element as root -->
+<configuration_server xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation='eap-tls.configuration.xsd'>
+	<!-- Encryption section. This section has a fixed list of elements.
+		This information is needed for OpenSSL to work -->
+	<encryption>
+		<!-- Pass phrase for server cryptographic files -->
+		<pass_phrase>servidor</pass_phrase>
+		<!-- Key file -->
+		<key_file>./tests/tls_config/auth/srv-key.pem</key_file>
+		<!-- Certificate file -->
+		<cert_file>./tests/tls_config/auth/srv-cert.pem</cert_file>
+		<!-- File used to build ramdom numbers -->
+		<random>./tests/tls_config/auth/random</random>
+		<!-- Path for Certification Authorities -->
+		<ca_path>./tests/tls_config/auth</ca_path>
+		<!-- Certification Authority's certificate for Certification Authority that signs server certificate -->
+		<ca_cert>./tests/tls_config/auth/ca-cert.pem</ca_cert>
+		<!-- File implementation for Diffie-Hellman algorithm -->
+		<dh>./tests/tls_config/auth/dh</dh>
+		<!-- RSA Key -->
+		<rsa_key>0</rsa_key>
+		<!-- Diffie-Hellman Key -->
+		<dh_key>1</dh_key>
+		<!-- RSA key length -->
+		<rsa_key_length>512</rsa_key_length>
+		<!-- Diffie-Hellman key lenght -->
+		<dh_key_length>512</dh_key_length>
+		<!-- Maximum depth for the certificate chain verification that shall be allowed -->
+		<verify_depth>1</verify_depth>
+		<!-- Type of certificates:
+			0: ASN1
+			1: PEM
+		-->
+		<file_type>1</file_type>
+	</encryption>
+	<!-- Fragmentation section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<fragmentation>
+		<!-- Initial value for lenght flag in fragmentation -->
+		<include_length>false</include_length>
+		<!-- Fragment size -->
+		<fragment_size>500</fragment_size>
+	</fragmentation>
+	<!-- Server specific section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<server>
+		<!-- Context identifier for server's OpenSSL initialization -->
+		<id_context>100</id_context>
+	</server>
+</configuration_server>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametereap/server.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>5</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>server.research2.org</identity>
+      <realm>research2.org</realm>
+      <tcp_listen_port>1812</tcp_listen_port>
+      <sctp_listen_port>1813</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>nas.research1.org</hostname>
+              <port>1811</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>research1.org</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.research1.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>5</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.research1.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>research1.org</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/aaas_s.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>33</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>aaaserver.homedomain.com</identity>
+      <realm>homedomain.com</realm>
+      <tcp_listen_port>1802</tcp_listen_port>
+      <sctp_listen_port>1803</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>server01.aaaserver.homedomain.com</advertised_hostname>
+      <advertised_hostname>server02.aaaserver.homedomain.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>hac.homedomain.com</hostname>
+              <port>1801</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>homedomain.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>hac.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>hac.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>homedomain.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>hac.homedomain.com</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>0</stateful>
+         <session_timeout>361</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/aaas_s2.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>aaaserver.homedomain.com</identity>
+      <realm>homedomain.com</realm>
+      <tcp_listen_port>1903</tcp_listen_port>
+      <sctp_listen_port>1904</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>server01.aaaserver.homedomain.com</advertised_hostname>
+      <advertised_hostname>server02.aaaserver.homedomain.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>has.homedomain.com</hostname>
+              <port>1904</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+              <hostname>fac.foreigndomain.com</hostname>
+              <port>1901</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+          <peer>
+               <hostname>faaaserver.foreigndomain.com</hostname>
+              <port>1902</port>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>homedomain.com</realm>
+             <role>1</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>has.homedomain.com</server>
+                    <metric>1</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <route>
+             <realm>foreigndomain.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>faaaserver.foreigndomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>fac.foreigndomain.com</server>
+                    <metric>1</metric>
+                </peer_entry>
+             </application>
+          </route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>0</stateful>
+         <session_timeout>361</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/client.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+
+<!-- check attributes: vendor_id acc_appl_id role metric , MT sep. 15 2004 -->
+
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>mhc.telcordia.com</identity>
+      <realm>telcordia.com</realm>
+      <tcp_listen_port>1800</tcp_listen_port>
+      <sctp_listen_port>1801</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>mhc01.telcordia.com</advertised_hostname>
+      <advertised_hostname>mhc02.telcordia.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>aaaserver.telcordias.com</hostname>
+              <port>1802</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>360</expire_time>
+          <route>
+             <realm>telcordias.com</realm>
+             <role>1</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.telcordias.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application> 
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.telcordias.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+     </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <stateful>1</stateful>
+      <timers>
+         <session>30</session>
+         <lifetime>360</lifetime>
+         <grace>30</grace>
+         <abort_retry>20</abort_retry>
+      </timers>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/configuration.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id,
+                                               (auth_application_id|acct_application_id))>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               receive_buffer_size, advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  use_sctp, tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT use_sctp (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/configuration.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+
+<!-- Sample configuration file, version 1.0.3 and above. -->
+<!-- Configuration table starts always starts with "configuration"
+     element as root -->
+
+<configuration>
+
+   <!-- General configuration has a fixed list of elements. Note
+        that information in the general section includes to info 
+        announced by this nodes to it's peers during capabilities
+        exchange. -->
+   <general>
+
+      <!-- Product, version and vendor ID information specified
+           here will be embedded in the CER message -->
+      <product>Open Diameter</product>
+
+      <!-- Software revision number. For Open Diameter
+           this is equivalent to the Firmware-Revision AVP
+           in the CER -->
+      <version>1</version>
+
+      <!-- Vendor id of diameter entity broadcast to 
+           peers in the CER -->
+      <vendor_id>0</vendor_id>
+
+      <!-- List of locally supported vendor id's. Note
+           that advertisement of supported vendor id's
+           is needed when routing messages with vendor
+           specific application id's -->
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+
+      <!-- List of locally supported auth application 
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. -->
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+
+      <!-- List of locally supported acct application
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. -->
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+
+      <!-- List of locally supported vendor specific application
+           id's. This contains one or more vendor specific application
+           id's that will be broadcasted to peers.  Each vendor
+           specifc application id will contain one or more vendor
+           id's (RFC 3588) and exactly one auth or acct application
+           id -->
+      <vendor_specific_application_id>
+
+          <!-- List of vendor id's advertized by this diameter
+               entity -->
+          <vendor_id>31</vendor_id>
+          <vendor_id>32</vendor_id>
+          <vendor_id>33</vendor_id>
+
+          <!-- Exactly one instance of the
+               vendor's auth application id -->  
+          <auth_application_id>1</auth_application_id>
+
+          <!-- Or Exactly one instance of the
+               vendor's acct application id -->  
+          <acct_application_id>4</acct_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <vendor_id>42</vendor_id>
+          <vendor_id>43</vendor_id>
+          <auth_application_id>5</auth_application_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+
+   <parser> 
+      <!-- Path and filename of dictionary file. The path MUST be
+           a full path or relative to the location of this configuration
+           file -->
+      <dictionary>config\dictionary.xml</dictionary>
+   </parser>
+
+   <!-- Transport management section. This section contains 
+        to local diameter transport information, peer table
+        and route table -->
+   <transport_mngt>
+
+      <!-- Diameter entity identity. Note that a running open
+           diameter application will use the identity string 
+           instead of calling OS dependent gethostname functions
+           to determine it's identity. Hence, users MUST enter
+           a valid resovable entry for this string -->
+      <identity>nas_server</identity>
+
+      <!-- Diameter realm. As with identity, a running open
+           diameter application uses the realm string to
+           identify its domain of reponsibility. This allows
+           virtual domains to exists within a single host
+           where multiple open diameter entities are running
+           with different realm configuration --> 
+      <realm>research.org</realm>
+
+      <!-- Diameter TCP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <tcp_listen_port>1812</tcp_listen_port>
+
+      <!-- Diameter SCTP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <sctp_listen_port>1813</sctp_listen_port>
+
+      <!-- Enables or disables IPv6 support for this stack -->
+      <use_ipv6>0</use_ipv6>
+
+      <!-- Watchdog timeout. Interval between watchdog messages 
+           -->
+      <watchdog_timeout>0</watchdog_timeout>
+
+      <!-- Retry connection interval. Amount of time in between
+           attempts to reconnect to a disconnected peer. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_interval>30</reconnect_interval>
+
+      <!-- Max re-connection attempt. Number of times a reconnection
+           attempt will be made until it gives up. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_max>30</reconnect_max>
+
+      <!-- Request retransmission interval. Retransmission of
+           pending request will be done until max_request_retransmission
+           is exceeded. Care should be taken in defining this
+           value. A high value (>60) will slow down retransmission,
+           a low value (<5) will cause performance issues. If the
+           value is 0, then no retransmission attempt will be made.
+           -->
+      <request_retransmission_interval>10</request_retransmission_interval>
+
+      <!-- Max request retransmission. Maximum number of pending
+           request retransmission. Care should be taken in defining this
+           value. A high value (>10) will cause too much traffic.
+           If the value is 0, then no retransmission attempt will be made.
+           -->
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+
+      <!-- This is the initial amount of buffer that is pre-allocated for
+           message reception. Each time a message is received that does
+           not fit this value, the buffer will be enlarged by this value
+           multiplied by increments of 1 until the message fits or up to
+           a maximum of 10 increments. A default vaule of 2048 is recommended.
+           -->
+      <receive_buffer_size>2048</receive_buffer_size>
+
+      <!-- Provides a customized list of local host IP 
+           addresses that will be advertised to other
+           peers during CER/CEA exchange. For SCTP, 
+	   the IP addresses MUST be valid addresses
+	   for all interface address present in the
+	   system. For TCP, only the first IP address
+	   will be used.
+           -->
+      <advertised_host_ip>192.168.1.100</advertised_host_ip>
+      <advertised_host_ip>192.168.1.101</advertised_host_ip>
+      <advertised_host_ip>192.168.1.102</advertised_host_ip>
+      
+      <!-- Peer table lists peers that this open diameter 
+           application will attempt to connect to on startup.
+           Each peer entry contains host, port and tls
+           enabled information.  Internally, the peer table 
+           are currently configure statically using this section. 
+           No dynamic learning is currently available -->
+      <peer_table>
+          <!-- This defines the expiration time for dynamically
+                learned peers -->
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>tari-dhcp163.research.telcordia.com</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+
+      <!-- Route table list the realm entries that this peer
+           will use to resolve message paths. Each entry
+           contains the realm name, the peer to send the
+           messaage to, the application id of the peer and
+           it role (whether a proxy, local .. etc). Note that
+           peer_reference element MUST point to an existing
+           peer in the peer_table else this route will be
+           in-active. Also, a default_route flag can be added
+           to a route entry to set the default route. If more
+           than one route has a default_route flag set then
+           the last entry with this flag set becomes the
+           default route -->
+      <route_table>
+          <!-- Defines the expiration time for dynamically
+               learned routes. A value of 0 means no expiration -->
+          <expire_time>0</expire_time>
+
+          <!-- A route entry defines a lookup information
+               for a diameter message containing destination
+               realm AVP's. For more information on diameter
+               routing, pls see "Open Diameter Routing Architecture" -->
+          <route>
+             <!-- Realm that this route serves. MUST be unique to
+                   this table --> 
+             <realm>other.research.org</realm>
+
+             <!-- The role that this diameter entity will play in
+                  resolving messages matching this realm. Valid 
+                  values for this elements are:
+                   0 (local)    - application acting as local servers
+                   1 (relay)    - application acting as relay agent                  
+                   2 (proxy)    - application acting as proxy server
+                   3 (redirect) - application acting as redirect agent -->
+             <role>0</role> 
+
+             <!-- Re-direct host usage. This provides a hint to
+                  the receiver of the redirect indication on what
+                  to do with the request. If this route is acting
+                  as a redirect agent, the Redirect-Host-Usage AVP
+                  sent in the redirect indication will have this value.
+                  Note that this is valid only if <role> is set to
+                  redirect(3). Valid values are:
+                    0  DONT_CACHE  - redirect host should not be cached.
+                    1  ALL_SESSION - All messages within the same session id
+                                     MAY be sent to the redirect host
+                    2  ALL_REALM   - All messages destined for the realm
+                                     MAY be sent to the redirect host
+                    3  REALM_AND_APPLICATION - All messages for the application
+                                     requested to the realm specified MAY be
+                                     sent to the redirect host
+                    4  ALL_APPLICATION - All messages for the application
+                                     requested MAY be sent to the redirect host
+                    5  ALL_HOST    - All messages that would be sent to the
+                                     host that generated the Redirect-Host 
+                                     MAY be sent to the redirect host
+                    6  ALL_USER    - All messages for the user requested MAY 
+                                     be sent to the redirect host -->
+             <redirect_usage>0</redirect_usage>
+
+             <!-- For each route, there is a set of applications
+                  that are supported. This is used by the base
+                  protocol library as the second index to resolving
+                  a route for a message --> 
+             <application>
+
+                  <!-- Application Id is used as a second key for 
+                       routing queries. See details above -->
+                  <application_id>1</application_id>
+
+                  <!-- For vendor specific application id's. As
+                       per RFC this should be 0 for standard
+                       track applications. Otherwise, this
+                       value is used in conjunction with
+                       application_id as a second search key -->
+                  <vendor_id>0</vendor_id>
+
+                  <!-- For each application, there can be a set
+                       of servers support it. Each server has
+                       a metric associated with it and the 
+                       routing engine chooses the server in
+                       metric order (0 being highest) -->
+                  <peer_entry>
+
+                      <!-- Diameter peer serving this realm and
+                           application id. This server name
+                           MUST exits in the peer table for
+                           this route to be active.
+                      <server>server1.research.org</server>
+ 
+                      <!-- Metric value for this server entry.
+                           The higher the value, the lower the
+                           preference. 0 is the highest value
+                           and entries with equal value will 
+                           be resolve in the order they are
+                           defined in this configuration file -->
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+
+          <!-- The definition of a default route is the same
+                as for any other route. The existance of a
+                default route means that all no-match queries
+                will result in a default route return -->
+          <default_route>
+             <realm>research.telcordia.com</realm>
+             <role>full</role> 
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>5</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+      </route_table>
+   </transport_mngt>
+
+   <!-- Session manager configuration table. This section
+        consist of fixed elements that MUST exists -->
+   <session_mngt>
+
+      <!-- Dictates the maximum number of concurrent
+           sessions that will be maintained by open
+           diameter. These include both auth and acct
+           sessions -->
+      <max_sessions>10000</max_sessions>
+
+      <!-- The following dictates default values for
+           auth sessions -->
+      <auth_sessions>
+
+         <!-- Stateful session flag. If set to 1, then
+              server will enforce stateful sessions and
+              clients will hint for stateful sessions. If
+              set to 0 or if missing then stateless sessions.
+
+              The value of auth-session state can actually 
+              negotiated between client and server. So for 
+              the server, auth-session-state is used as follows:
+
+              1. If the request message sent by the client 
+                 contains an auth-session-state, the server 
+                 check's it's own configuration. If the values 
+                 are equal then the server uses that value to 
+                 determine statefulness. If the values are not 
+                 equal and the server's configuration is set to 
+                 AAA_SESSION_STATE_MAINTAINED, then the client's 
+                 value determines the statefulness of the session. 
+                 If the values are not equal and the server's 
+                 configuration is NOT AAA_SESSION_STATE_MAINTAINED 
+                 then the server's configuration determines the 
+                 statefulness.
+              2. If the request message sent by the client does 
+                 not contain an auth-session-state, the server 
+                 check's the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a 
+                 value, it is used to determine the statefulness 
+                 of the session otherwise the configuration value 
+                 is used.
+
+              Based on the above policy, the server will return 
+              an auth-session-state avp in answer message.
+
+              For the client:
+
+              1. The initial request sent by the client can contain 
+                 an auth-session-state value as a hint to the server. 
+                 This value is taken from the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a value, 
+                 it is used to as a hint value otherwise the configuration 
+                 value is used.
+              2. If the answer message sent by the server contains 
+                 an auth-session-state, then that value will be used 
+                 by the client. If no auth-session-state avp is sent, 
+                 then the hint sent in (1) is used.
+           -->
+         <stateful>1</stateful>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication. For stateless sessions, a value
+              of zero(0) will cause the client session to be maintained
+              indefinitely. For stateless server sessions, the library
+              will ask you periodically if you want to reclaim the session
+              in ReClaimSession() method -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Timeout in seconds before a session is 
+              terminated regardless of wether it has
+              been re-authenticated -->
+         <lifetime_timeout>360</lifetime_timeout>
+
+         <!-- Grace period after lifetime timeout before
+              full termination -->
+         <grace_period_timeout>30</grace_period_timeout>
+
+         <!-- Timeout before subsequent ASR messages
+              are sent if the inital attempt fails -->
+         <abort_retry_timeout>20</abort_retry_timeout>
+
+      </auth_sessions>
+
+      <!-- The following dictates default values for
+           acct sessions -->
+      <acct_sessions>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Record interim interval dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <interim_interval>5</interim_interval>
+
+         <!-- Realtime required value dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <realtime>1</realtime>
+
+      </acct_sessions>
+
+   </session_mngt>
+
+   <!-- Log section dictates the verbose levels that
+        the library generates as well as target outputs -->
+   <log>
+
+      <!-- The following are the available log levels
+           that can be "enabled" or "disabled" -->
+      <flags>
+         <debug>disabled</debug>
+         <trace>disabled</trace>
+         <info>disabled</info>
+      </flags>
+
+      <!-- The following are the target outputs of
+           the logs. It can be a combination of
+           each entry -->
+      <target>
+         <!-- enables or disables terminal output -->
+         <console>enabled</console>
+         <!-- enables or disables syslog output -->
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+     <!ELEMENT dictionary (vendor*, base, application*)>
+
+     <!ELEMENT vendor EMPTY>
+     <!ATTLIST vendor
+          id CDATA #REQUIRED
+          name CDATA #REQUIRED
+     >
+
+     <!ELEMENT base (command*, typedefn+, avp+)>
+     <!ATTLIST base
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT application (command*, typedefn*, avp*)>
+     <!ATTLIST application
+          id CDATA #REQUIRED
+          name CDATA #IMPLIED
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+          application-id CDATA #IMPLIED
+          pbit CDATA #IMPLIED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          description CDATA #IMPLIED
+          code CDATA #REQUIRED
+          may-encrypt (yes | no) "yes"
+          mandatory (must | may | mustnot | shouldnot) "may"
+          protected (must | may | mustnot | shouldnot) "may"
+          vendor-id CDATA #IMPLIED
+     >
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+<!--
+  $Log: dictionary.xml,v $
+  Revision 1.15  2006/05/31 17:53:32  vfajardo
+  xml migration
+
+  Revision 1.14  2006/05/02 14:29:03  vfajardo
+  interop changes
+
+  Revision 1.13  2006/05/02 14:20:21  vfajardo
+  EAP dictionary
+
+  Revision 1.12  2006/04/24 20:08:56  vfajardo
+  inband security id
+
+  Revision 1.11  2006/04/19 20:36:18  vfajardo
+  1298700
+
+  Revision 1.10  2006/04/05 17:53:25  vfajardo
+  Updates to dictionary
+
+  Revision 1.9  2005/06/29 14:44:15  vfajardo
+  test changes
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="Inband-Security-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <!--
+    <avp name="Failed-AVP" code="279" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    -->
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Inband-Security-Id" code="299" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="No Security" code="0"/>
+      <enum name="TLS Security" code="1"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- *********** DIAMETERE MOBILEIPV4 APPLICATION ***********-->
+  <application id="2" name="Mobile IPv4" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-14.txt">
+
+    <command name="AA-Mobile-Node" code="260" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-Auth" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="MIP-FA-Challenge" maximum="1"/>
+	  <avprule name="MIP-Candidate-Home-Agent-Host" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Host" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+ 	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <command name="Home-Agent-MIP" code="262" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1"/>
+ 	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ***************** DIAMETER MOBILEIPV4 APPLICATION AVPS ************** -->
+    <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Length" code="339" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Offset" code="340" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Candidate-Home-Agent-Host" code="336" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Host" code="348" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-FA-Challenge" code="344" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Feature-Vector" code="337" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Address" code="334" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-MN-AAA-SPI" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Mobile-Node-Address" code="333" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-Reg-Request" code="320" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Reg-Reply" code="321" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-AAA-Auth" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Auth-Input-Data-Length" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Authenticator-Offset" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Algorithm-Type" code="345" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-FA-to-HA-SPI" code="318" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-SPI" code="319" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Replay-Mode" code="346" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-Session-Key" code="343" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-Key" code="326" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-HA-Key" code="328" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-FA-Key" code="329" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-MN-Key" code="332" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Key-Lifetime" code="367" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Key-Material" code="335" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-to-FA-Key" code="325" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-to-HA-Key" code="331" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="5" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="462" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="463" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="464" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="465" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+  <!-- ************* TEST APPLICATION ************* --> 
+
+  <application id="10000" name="Test-Authorization" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Test-Auth" code="300">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+  	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+	  <avprule name="Session-Timeout" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+  <application id="20000" name="Test-Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="Example-Accounting-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** TEST APPLICATION AVPS ************** -->
+    <avp name="Example-Accounting-Record" code="999997">
+      <type type-name="UTF8String"/>
+    </avp>
+  </application>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/fac.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+<!-- configuration file for MIP FA in foreigndomain.com , MT January 26 2005 -->
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>fac.foreigndomain.com</identity>
+      <realm>foreigndomain.com</realm>
+      <tcp_listen_port>1900</tcp_listen_port>
+      <sctp_listen_port>1901</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>fac01.foreigndomain.com</advertised_hostname>
+      <advertised_hostname>fac02.foreigndomain.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>aaaserver.homedomain.com</hostname>
+              <port>1903</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>360</expire_time>
+          <route>
+             <realm>homedomain.com</realm>
+             <role>1</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+     </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>361</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/hac.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+
+<!-- check attributes: vendor_id acc_appl_id role metric , MT sep. 15 2004 -->
+
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>hac.homedomain.com</identity>
+      <realm>homedomain.com</realm>
+      <tcp_listen_port>1800</tcp_listen_port>
+      <sctp_listen_port>1801</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>hac01.homedomain.com</advertised_hostname>
+      <advertised_hostname>hac02.homedomain.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>aaaserver.homedomain.com</hostname>
+              <port>1802</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>360</expire_time>
+          <route>
+             <realm>homedomain.com</realm>
+             <role>1</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application> 
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+     </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>361</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/has.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation='configuration.xsd'>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>has.homedomain.com</identity>
+      <realm>homedomain.com</realm>
+      <tcp_listen_port>1904</tcp_listen_port>
+      <sctp_listen_port>1905</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>has01.homedomain.com</advertised_hostname>
+      <advertised_hostname>has02.homedomain.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>aaaserver.homedomain.com</hostname>
+              <port>1903</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>1</expire_time>
+          <route>
+             <realm>homedomain.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>homedomain.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>2</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>aaaserver.homedomain.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>0</stateful>
+         <session_timeout>361</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/hosts	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,24 @@
+# Do not remove the following line, or various programs
+# that require network functionality will fail.
+127.0.0.1	hac.homedomain.com
+127.0.0.1	aaaserver.homedomain.com
+
+127.0.0.1	fac.foreigndomain.com
+127.0.0.1	faaaserver.foreigndomain.com
+127.0.0.1	has.homedomain.com
+
+127.0.0.1	nas.research1.org
+127.0.0.1	server.research2.org
+
+127.0.0.1	server.isp.net
+127.0.0.1	nas.access1.net
+127.0.0.1	nas.access2.net
+127.0.0.1	nas.access3.net
+
+
+#192.4.12.84	nas.research1.org
+#192.4.12.84	server.research2.org
+
+
+
+127.0.0.1		localhost.localdomain localhost
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diametermip4/server.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>2</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>aaaserver.telcordias.com</identity>
+      <realm>telcordias.com</realm>
+      <tcp_listen_port>1802</tcp_listen_port>
+      <sctp_listen_port>1803</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>aaaserver01.telcordias.com</advertised_hostname>
+      <advertised_hostname>aaaserver02.telcordias.com</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>mhc.telcordia.com</hostname>
+              <port>1801</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>telcordia.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>mhc.telcordia.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>mhc.telcordia.com</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>telcordia.com</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>mhc.telcordia.com</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <stateful>1</stateful>
+      <timers>
+         <session>30</session>
+         <lifetime>360</lifetime>
+         <grace>30</grace>
+         <abort_retry>20</abort_retry>
+      </timers>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/client.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>5</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>nas.research1.org</identity>
+      <realm>research1.org</realm>
+      <tcp_listen_port>1810</tcp_listen_port>
+      <sctp_listen_port>1811</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <advertised_hostname>nas1.research1.org</advertised_hostname>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.research2.org</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>research2.org</realm>
+             <role>1</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>research2.org</realm>
+             <role>0</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>server.research2.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/configuration.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id,
+                                               (auth_application_id|acct_application_id))>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               receive_buffer_size, advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  use_sctp, tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT use_sctp (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/configuration.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+
+<!-- Sample configuration file, version 1.0.3 and above. -->
+<!-- Configuration table starts always starts with "configuration"
+     element as root -->
+
+<configuration>
+
+   <!-- General configuration has a fixed list of elements. Note
+        that information in the general section includes to info 
+        announced by this nodes to it's peers during capabilities
+        exchange. -->
+   <general>
+
+      <!-- Product, version and vendor ID information specified
+           here will be embedded in the CER message -->
+      <product>Open Diameter</product>
+
+      <!-- Software revision number. For Open Diameter
+           this is equivalent to the Firmware-Revision AVP
+           in the CER -->
+      <version>1</version>
+
+      <!-- Vendor id of diameter entity broadcast to 
+           peers in the CER -->
+      <vendor_id>0</vendor_id>
+
+      <!-- List of locally supported vendor id's. Note
+           that advertisement of supported vendor id's
+           is needed when routing messages with vendor
+           specific application id's -->
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+
+      <!-- List of locally supported auth application 
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. -->
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+
+      <!-- List of locally supported acct application
+           id's. This contains one or more auth application
+           id's that will be broadcasted to peers. -->
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+
+      <!-- List of locally supported vendor specific application
+           id's. This contains one or more vendor specific application
+           id's that will be broadcasted to peers.  Each vendor
+           specifc application id will contain one or more vendor
+           id's (RFC 3588) and exactly one auth or acct application
+           id -->
+      <vendor_specific_application_id>
+
+          <!-- List of vendor id's advertized by this diameter
+               entity -->
+          <vendor_id>31</vendor_id>
+          <vendor_id>32</vendor_id>
+          <vendor_id>33</vendor_id>
+
+          <!-- Exactly one instance of the
+               vendor's auth application id -->  
+          <auth_application_id>1</auth_application_id>
+
+          <!-- Or Exactly one instance of the
+               vendor's acct application id -->  
+          <acct_application_id>4</acct_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <vendor_id>42</vendor_id>
+          <vendor_id>43</vendor_id>
+          <auth_application_id>5</auth_application_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+
+   <parser> 
+      <!-- Path and filename of dictionary file. The path MUST be
+           a full path or relative to the location of this configuration
+           file -->
+      <dictionary>config\dictionary.xml</dictionary>
+   </parser>
+
+   <!-- Transport management section. This section contains 
+        to local diameter transport information, peer table
+        and route table -->
+   <transport_mngt>
+
+      <!-- Diameter entity identity. Note that a running open
+           diameter application will use the identity string 
+           instead of calling OS dependent gethostname functions
+           to determine it's identity. Hence, users MUST enter
+           a valid resovable entry for this string -->
+      <identity>nas_server</identity>
+
+      <!-- Diameter realm. As with identity, a running open
+           diameter application uses the realm string to
+           identify its domain of reponsibility. This allows
+           virtual domains to exists within a single host
+           where multiple open diameter entities are running
+           with different realm configuration --> 
+      <realm>research.org</realm>
+
+      <!-- Diameter TCP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <tcp_listen_port>1812</tcp_listen_port>
+
+      <!-- Diameter SCTP listening port. Port number to listen
+           to for peer connection request. When using virtual
+           domains, make sure each entity listens to different
+           port numbers -->
+      <sctp_listen_port>1813</sctp_listen_port>
+
+      <!-- Enables or disables IPv6 support for this stack -->
+      <use_ipv6>0</use_ipv6>
+
+      <!-- Watchdog timeout. Interval between watchdog messages 
+           -->
+      <watchdog_timeout>0</watchdog_timeout>
+
+      <!-- Retry connection interval. Amount of time in between
+           attempts to reconnect to a disconnected peer. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_interval>30</reconnect_interval>
+
+      <!-- Max re-connection attempt. Number of times a reconnection
+           attempt will be made until it gives up. If the
+           value is 0, then no retry attempt will be made.
+           -->
+      <reconnect_max>30</reconnect_max>
+
+      <!-- Request retransmission interval. Retransmission of
+           pending request will be done until max_request_retransmission
+           is exceeded. Care should be taken in defining this
+           value. A high value (>60) will slow down retransmission,
+           a low value (<5) will cause performance issues. If the
+           value is 0, then no retransmission attempt will be made.
+           -->
+      <request_retransmission_interval>10</request_retransmission_interval>
+
+      <!-- Max request retransmission. Maximum number of pending
+           request retransmission. Care should be taken in defining this
+           value. A high value (>10) will cause too much traffic.
+           If the value is 0, then no retransmission attempt will be made.
+           -->
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+
+      <!-- This is the initial amount of buffer that is pre-allocated for
+           message reception. Each time a message is received that does
+           not fit this value, the buffer will be enlarged by this value
+           multiplied by increments of 1 until the message fits or up to
+           a maximum of 10 increments. A default vaule of 2048 is recommended.
+           -->
+      <receive_buffer_size>2048</receive_buffer_size>
+
+      <!-- Provides a customized list of local host IP 
+           addresses that will be advertised to other
+           peers during CER/CEA exchange. For SCTP, 
+	   the IP addresses MUST be valid addresses
+	   for all interface address present in the
+	   system. For TCP, only the first IP address
+	   will be used.
+           -->
+      <advertised_host_ip>192.168.1.100</advertised_host_ip>
+      <advertised_host_ip>192.168.1.101</advertised_host_ip>
+      <advertised_host_ip>192.168.1.102</advertised_host_ip>
+      
+      <!-- Peer table lists peers that this open diameter 
+           application will attempt to connect to on startup.
+           Each peer entry contains host, port and tls
+           enabled information.  Internally, the peer table 
+           are currently configure statically using this section. 
+           No dynamic learning is currently available -->
+      <peer_table>
+          <!-- This defines the expiration time for dynamically
+                learned peers -->
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>tari-dhcp163.research.telcordia.com</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+
+      <!-- Route table list the realm entries that this peer
+           will use to resolve message paths. Each entry
+           contains the realm name, the peer to send the
+           messaage to, the application id of the peer and
+           it role (whether a proxy, local .. etc). Note that
+           peer_reference element MUST point to an existing
+           peer in the peer_table else this route will be
+           in-active. Also, a default_route flag can be added
+           to a route entry to set the default route. If more
+           than one route has a default_route flag set then
+           the last entry with this flag set becomes the
+           default route -->
+      <route_table>
+          <!-- Defines the expiration time for dynamically
+               learned routes. A value of 0 means no expiration -->
+          <expire_time>0</expire_time>
+
+          <!-- A route entry defines a lookup information
+               for a diameter message containing destination
+               realm AVP's. For more information on diameter
+               routing, pls see "Open Diameter Routing Architecture" -->
+          <route>
+             <!-- Realm that this route serves. MUST be unique to
+                   this table --> 
+             <realm>other.research.org</realm>
+
+             <!-- The role that this diameter entity will play in
+                  resolving messages matching this realm. Valid 
+                  values for this elements are:
+                   0 (local)    - application acting as local servers
+                   1 (relay)    - application acting as relay agent                  
+                   2 (proxy)    - application acting as proxy server
+                   3 (redirect) - application acting as redirect agent -->
+             <role>0</role> 
+
+             <!-- Re-direct host usage. This provides a hint to
+                  the receiver of the redirect indication on what
+                  to do with the request. If this route is acting
+                  as a redirect agent, the Redirect-Host-Usage AVP
+                  sent in the redirect indication will have this value.
+                  Note that this is valid only if <role> is set to
+                  redirect(3). Valid values are:
+                    0  DONT_CACHE  - redirect host should not be cached.
+                    1  ALL_SESSION - All messages within the same session id
+                                     MAY be sent to the redirect host
+                    2  ALL_REALM   - All messages destined for the realm
+                                     MAY be sent to the redirect host
+                    3  REALM_AND_APPLICATION - All messages for the application
+                                     requested to the realm specified MAY be
+                                     sent to the redirect host
+                    4  ALL_APPLICATION - All messages for the application
+                                     requested MAY be sent to the redirect host
+                    5  ALL_HOST    - All messages that would be sent to the
+                                     host that generated the Redirect-Host 
+                                     MAY be sent to the redirect host
+                    6  ALL_USER    - All messages for the user requested MAY 
+                                     be sent to the redirect host -->
+             <redirect_usage>0</redirect_usage>
+
+             <!-- For each route, there is a set of applications
+                  that are supported. This is used by the base
+                  protocol library as the second index to resolving
+                  a route for a message --> 
+             <application>
+
+                  <!-- Application Id is used as a second key for 
+                       routing queries. See details above -->
+                  <application_id>1</application_id>
+
+                  <!-- For vendor specific application id's. As
+                       per RFC this should be 0 for standard
+                       track applications. Otherwise, this
+                       value is used in conjunction with
+                       application_id as a second search key -->
+                  <vendor_id>0</vendor_id>
+
+                  <!-- For each application, there can be a set
+                       of servers support it. Each server has
+                       a metric associated with it and the 
+                       routing engine chooses the server in
+                       metric order (0 being highest) -->
+                  <peer_entry>
+
+                      <!-- Diameter peer serving this realm and
+                           application id. This server name
+                           MUST exits in the peer table for
+                           this route to be active.
+                      <server>server1.research.org</server>
+ 
+                      <!-- Metric value for this server entry.
+                           The higher the value, the lower the
+                           preference. 0 is the highest value
+                           and entries with equal value will 
+                           be resolve in the order they are
+                           defined in this configuration file -->
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+
+          <!-- The definition of a default route is the same
+                as for any other route. The existance of a
+                default route means that all no-match queries
+                will result in a default route return -->
+          <default_route>
+             <realm>research.telcordia.com</realm>
+             <role>full</role> 
+             <application>
+                  <application_id>
+                       <id>1</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server2.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+             <application>
+                  <application_id>
+                       <id>5</id>
+                       <type>1</type>
+                  </application_id> 
+                  <peer_entry>
+                      <server>server1.research.org</server>
+                      <metric>1</metric>  
+                  </peer_entry>
+                  <peer_entry>
+                      <server>server6.research.org</server>
+                      <metric>5</metric>  
+                  </peer_entry>
+             </application>
+          </route>
+      </route_table>
+   </transport_mngt>
+
+   <!-- Session manager configuration table. This section
+        consist of fixed elements that MUST exists -->
+   <session_mngt>
+
+      <!-- Dictates the maximum number of concurrent
+           sessions that will be maintained by open
+           diameter. These include both auth and acct
+           sessions -->
+      <max_sessions>10000</max_sessions>
+
+      <!-- The following dictates default values for
+           auth sessions -->
+      <auth_sessions>
+
+         <!-- Stateful session flag. If set to 1, then
+              server will enforce stateful sessions and
+              clients will hint for stateful sessions. If
+              set to 0 or if missing then stateless sessions.
+
+              The value of auth-session state can actually 
+              negotiated between client and server. So for 
+              the server, auth-session-state is used as follows:
+
+              1. If the request message sent by the client 
+                 contains an auth-session-state, the server 
+                 check's it's own configuration. If the values 
+                 are equal then the server uses that value to 
+                 determine statefulness. If the values are not 
+                 equal and the server's configuration is set to 
+                 AAA_SESSION_STATE_MAINTAINED, then the client's 
+                 value determines the statefulness of the session. 
+                 If the values are not equal and the server's 
+                 configuration is NOT AAA_SESSION_STATE_MAINTAINED 
+                 then the server's configuration determines the 
+                 statefulness.
+              2. If the request message sent by the client does 
+                 not contain an auth-session-state, the server 
+                 check's the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a 
+                 value, it is used to determine the statefulness 
+                 of the session otherwise the configuration value 
+                 is used.
+
+              Based on the above policy, the server will return 
+              an auth-session-state avp in answer message.
+
+              For the client:
+
+              1. The initial request sent by the client can contain 
+                 an auth-session-state value as a hint to the server. 
+                 This value is taken from the settings of SetAuthSessionState() 
+                 function. If SetAuthSessionState() returns a value, 
+                 it is used to as a hint value otherwise the configuration 
+                 value is used.
+              2. If the answer message sent by the server contains 
+                 an auth-session-state, then that value will be used 
+                 by the client. If no auth-session-state avp is sent, 
+                 then the hint sent in (1) is used.
+           -->
+         <stateful>1</stateful>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication. For stateless sessions, a value
+              of zero(0) will cause the client session to be maintained
+              indefinitely. For stateless server sessions, the library
+              will ask you periodically if you want to reclaim the session
+              in ReClaimSession() method -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Timeout in seconds before a session is 
+              terminated regardless of wether it has
+              been re-authenticated -->
+         <lifetime_timeout>360</lifetime_timeout>
+
+         <!-- Grace period after lifetime timeout before
+              full termination -->
+         <grace_period_timeout>30</grace_period_timeout>
+
+         <!-- Timeout before subsequent ASR messages
+              are sent if the inital attempt fails -->
+         <abort_retry_timeout>20</abort_retry_timeout>
+
+      </auth_sessions>
+
+      <!-- The following dictates default values for
+           acct sessions -->
+      <acct_sessions>
+
+         <!-- Timeout in seconds before a session requires 
+              re-authentication -->
+         <session_timeout>30</session_timeout>
+
+         <!-- Record interim interval dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <interim_interval>5</interim_interval>
+
+         <!-- Realtime required value dictated to the client
+              if this entity is a server or hint to the server
+              if this is a client -->
+         <realtime>1</realtime>
+
+      </acct_sessions>
+
+   </session_mngt>
+
+   <!-- Log section dictates the verbose levels that
+        the library generates as well as target outputs -->
+   <log>
+
+      <!-- The following are the available log levels
+           that can be "enabled" or "disabled" -->
+      <flags>
+         <debug>disabled</debug>
+         <trace>disabled</trace>
+         <info>disabled</info>
+      </flags>
+
+      <!-- The following are the target outputs of
+           the logs. It can be a combination of
+           each entry -->
+      <target>
+         <!-- enables or disables terminal output -->
+         <console>enabled</console>
+         <!-- enables or disables syslog output -->
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+     <!ELEMENT dictionary (vendor*, base, application*)>
+
+     <!ELEMENT vendor EMPTY>
+     <!ATTLIST vendor
+          id CDATA #REQUIRED
+          name CDATA #REQUIRED
+     >
+
+     <!ELEMENT base (command*, typedefn+, avp+)>
+     <!ATTLIST base
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT application (command*, typedefn*, avp*)>
+     <!ATTLIST application
+          id CDATA #REQUIRED
+          name CDATA #IMPLIED
+          uri CDATA #IMPLIED
+     >
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+          application-id CDATA #IMPLIED
+          pbit CDATA #IMPLIED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          description CDATA #IMPLIED
+          code CDATA #REQUIRED
+          may-encrypt (yes | no) "yes"
+          mandatory (must | may | mustnot | shouldnot) "may"
+          protected (must | may | mustnot | shouldnot) "may"
+          vendor-id CDATA #IMPLIED
+     >
+
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+<!--
+  $Log: dictionary.xml,v $
+  Revision 1.15  2006/05/31 17:53:32  vfajardo
+  xml migration
+
+  Revision 1.14  2006/05/02 14:29:03  vfajardo
+  interop changes
+
+  Revision 1.13  2006/05/02 14:20:21  vfajardo
+  EAP dictionary
+
+  Revision 1.12  2006/04/24 20:08:56  vfajardo
+  inband security id
+
+  Revision 1.11  2006/04/19 20:36:18  vfajardo
+  1298700
+
+  Revision 1.10  2006/04/05 17:53:25  vfajardo
+  Updates to dictionary
+
+  Revision 1.9  2005/06/29 14:44:15  vfajardo
+  test changes
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="Inband-Security-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <!--
+    <avp name="Failed-AVP" code="279" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    -->
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Inband-Security-Id" code="299" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="No Security" code="0"/>
+      <enum name="TLS Security" code="1"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" pbit="1" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- *********** DIAMETERE MOBILEIPV4 APPLICATION ***********-->
+  <application id="2" name="Mobile IPv4" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-14.txt">
+
+    <command name="AA-Mobile-Node" code="260" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-Auth" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="MIP-FA-Challenge" maximum="1"/>
+	  <avprule name="MIP-Candidate-Home-Agent-Host" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Host" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+ 	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <command name="Home-Agent-MIP" code="262" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1"/>
+ 	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ***************** DIAMETER MOBILEIPV4 APPLICATION AVPS ************** -->
+    <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Length" code="339" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Offset" code="340" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Candidate-Home-Agent-Host" code="336" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Host" code="348" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-FA-Challenge" code="344" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Feature-Vector" code="337" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Address" code="334" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-MN-AAA-SPI" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Mobile-Node-Address" code="333" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-Reg-Request" code="320" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Reg-Reply" code="321" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-AAA-Auth" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Auth-Input-Data-Length" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Authenticator-Offset" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Algorithm-Type" code="345" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-FA-to-HA-SPI" code="318" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-SPI" code="319" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Replay-Mode" code="346" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-Session-Key" code="343" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-Key" code="326" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-HA-Key" code="328" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-FA-Key" code="329" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-MN-Key" code="332" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Key-Lifetime" code="367" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Key-Material" code="335" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-to-FA-Key" code="325" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-to-HA-Key" code="331" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="5" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="462" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="463" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="464" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="465" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+  <!-- ************* TEST APPLICATION ************* --> 
+
+  <application id="10000" name="Test-Authorization" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Test-Auth" code="300">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+  	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+	  <avprule name="Session-Timeout" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+          <avprule name="Tunneling"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+  <application id="20000" name="Test-Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="Example-Accounting-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** TEST APPLICATION AVPS ************** -->
+    <avp name="Example-Accounting-Record" code="999997">
+      <type type-name="UTF8String"/>
+    </avp>
+  </application>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/diameternasreq/server.local.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "configuration.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>2000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <acct_application_id>6</acct_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>server.research2.org</identity>
+      <realm>research2.org</realm>
+      <tcp_listen_port>1812</tcp_listen_port>
+      <sctp_listen_port>1813</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>4</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>nas.research1.org</hostname>
+              <port>1811</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>research1.org</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.research1.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.research1.org</server>
+                    <metric>2</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas2.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>research1.org</realm>
+             <role>0</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>3</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>nas.research1.org</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>nas3.research1.org</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>enabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/eap/client.eap-tls.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration file for client always starts with "configuration_client" element as root -->
+<configuration_client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation='eap-tls.configuration.xsd'>
+	<!-- Encryption section. This section has a fixed list of elements.
+		This information is needed for OpenSSL to work -->
+	<encryption>
+		<!-- Pass phrase for client cryptographic files -->
+		<pass_phrase>cliente</pass_phrase>
+		<!-- Key file -->
+		<key_file>./tests/tls_config/peer/clt-key.pem</key_file>
+		<!-- Certificate file -->
+		<cert_file>./tests/tls_config/peer/clt-cert.pem</cert_file>
+		<!-- File used to build ramdom numbers -->
+		<random>./tests/tls_config/auth/random</random>
+		<!-- Path for Certification Authorities -->
+		<ca_path>./tests/tls_config/peer</ca_path>
+		<!-- Certification Authority's certificate for Certification Authority that signs client certificate -->
+		<ca_cert>./tests/tls_config/peer/ca-cert.pem</ca_cert>
+		<!-- File implementation for Diffie-Hellman algorithm -->
+		<dh>./tests/tls_config/auth/dh</dh>
+		<!-- RSA Key -->
+		<rsa_key>0</rsa_key>
+		<!-- Diffie-Hellman Key -->
+		<dh_key>1</dh_key>
+		<!-- RSA key length -->
+		<rsa_key_length>512</rsa_key_length>
+		<!-- Diffie-Hellman key lenght -->
+		<dh_key_length>512</dh_key_length>
+		<!-- Maximum depth for the certificate chain verification that shall be allowed -->
+		<verify_depth>1</verify_depth>
+		<!-- Type of certificates:
+			0: ASN1
+			1: PEM
+		-->
+		<file_type>1</file_type>
+	</encryption>
+	<!-- Fragmentation section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<fragmentation>
+		<!-- Initial value for lenght flag in fragmentation -->
+		<include_length>false</include_length>
+		<!-- Fragment size -->
+		<fragment_size>600</fragment_size>
+	</fragmentation>
+</configuration_client>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/eap/server.eap-tls.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration file for server always starts with "configuration_server" element as root -->
+<configuration_server xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation='eap-tls.configuration.xsd'>
+	<!-- Encryption section. This section has a fixed list of elements.
+		This information is needed for OpenSSL to work -->
+	<encryption>
+		<!-- Pass phrase for server cryptographic files -->
+		<pass_phrase>servidor</pass_phrase>
+		<!-- Key file -->
+		<key_file>./tests/tls_config/auth/srv-key.pem</key_file>
+		<!-- Certificate file -->
+		<cert_file>./tests/tls_config/auth/srv-cert.pem</cert_file>
+		<!-- File used to build ramdom numbers -->
+		<random>./tests/tls_config/auth/random</random>
+		<!-- Path for Certification Authorities -->
+		<ca_path>./tests/tls_config/auth</ca_path>
+		<!-- Certification Authority's certificate for Certification Authority that signs server certificate -->
+		<ca_cert>./tests/tls_config/auth/ca-cert.pem</ca_cert>
+		<!-- File implementation for Diffie-Hellman algorithm -->
+		<dh>./tests/tls_config/auth/dh</dh>
+		<!-- RSA Key -->
+		<rsa_key>0</rsa_key>
+		<!-- Diffie-Hellman Key -->
+		<dh_key>1</dh_key>
+		<!-- RSA key length -->
+		<rsa_key_length>512</rsa_key_length>
+		<!-- Diffie-Hellman key lenght -->
+		<dh_key_length>512</dh_key_length>
+		<!-- Maximum depth for the certificate chain verification that shall be allowed -->
+		<verify_depth>1</verify_depth>
+		<!-- Type of certificates:
+			0: ASN1
+			1: PEM
+		-->
+		<file_type>1</file_type>
+	</encryption>
+	<!-- Fragmentation section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<fragmentation>
+		<!-- Initial value for lenght flag in fragmentation -->
+		<include_length>false</include_length>
+		<!-- Fragment size -->
+		<fragment_size>500</fragment_size>
+	</fragmentation>
+	<!-- Server specific section. This section has a fixed list of elements.
+		This information is needed in packet fragmentation -->
+	<server>
+		<!-- Context identifier for server's OpenSSL initialization -->
+		<id_context>100</id_context>
+	</server>
+</configuration_server>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE call_management SYSTEM "nasd.dtd">
+<call_management>
+
+    <!-- Thread count that should be started for
+         the open diameter framework -->
+    <thread_count>5</thread_count>
+
+    <!-- The nasd deamon supports the NAS model
+         described in RFC2881 -->
+
+    <!-- Call management section contains a list of
+        all the available access technology that
+        this deamon supports. Each access protocols
+        will have thier own specific configuration
+        entries. Currently supported access protocols
+        are:
+            1. PANA: call entry name is "pana"
+        Future access protocols to be supported are:
+            1. 802.1X: call entry name is "8021X"
+        -->
+    <access_protocols>
+
+        <access_entry>
+            <name>pana</name>
+            <enabled>true</enabled>
+            <pana>
+                <!-- protocol specific configuration entry -->
+                <cfg_file>/etc/opendiameter/nas/config/nasd_pana_paa.xml</cfg_file>
+                <ep_script>/etc/opendiameter/nas/scripts/script_pana_paa_ep.sh</ep_script>
+                <dhcp_bootstrap>true</dhcp_bootstrap>
+            </pana>
+        </access_entry>
+
+        <access_entry>
+            <name>eap_8021X</name>
+            <enabled>false</enabled>
+            <eap_8021X>
+            </eap_8021X>
+        </access_entry>
+
+    </access_protocols>
+
+    <!-- Call management section contains a list
+        of all available AAA technology supported
+        by this deamon. Each protocol has thier
+        own specific configuration information.
+        Currently supported access protocols 
+        are:
+            1. Standalone EAP auth: protocol name is
+                "standalone-eap". This is for localized 
+                authentication only and generally should 
+                not be used. This uses a pre-shared key 
+                for ALL eap access.
+            2. Diameter EAP: protocol name is "diameter-eap".
+                Uses diameter eap for backend authorization
+                and authentication. This is compliant with 
+                draft-ietf-aaa-eap-10.txt.
+        Future protocol support are:
+            1. RADIUS: Uses EAP radius 
+        -->
+    <aaa_protocols>
+        <aaa_entry>
+            <name>local_eap_auth</name>
+            <enabled>true</enabled>
+            <!-- protocol specific configuration entry -->             
+            <local_eap_auth>
+                <shared_secret_file>/etc/opendiameter/nas/config/nasd_eap_shared_secret.bin</shared_secret_file>
+                <identity>user1@isp.net</identity>
+            </local_eap_auth>
+        </aaa_entry>
+        <aaa_entry>
+            <name>diameter_eap</name>
+            <enabled>false</enabled>
+            <diameter_eap>
+                <!-- protocol specific configuration entry -->             
+                <diameter_cfg_file>/etc/opendiameter/nas/config/nasd_diameter_eap.xml</diameter_cfg_file>
+            </diameter_eap>
+        </aaa_entry>
+    </aaa_protocols>
+
+    <!-- Call management section contains a list
+        of policies that can be applied to a call.
+        A policy dictates whether the call should
+        continue or not. They can also be used to
+        perform specific functions. These policies 
+        are applied to each call attempt while
+        they perform very specific functions such 
+        as network filtering, auditing, qos ... etc. 
+        Currently supported policy are:
+            1. Scripts: policy name is "script".
+                This policy simply invokes a local
+                system script. This policy will
+                always allow the call to attempt
+                completion.
+        Future supported policy are:
+            1. Accounting
+            2. QoS
+            3. EP-filter
+    -->
+        
+    <access_policies>
+        <policy_entry>
+            <name>script</name>
+            <!-- policy specific configuration entry -->
+            <script>
+                <file>/etc/opendiameter/nas/scripts/script_policy</file>
+            </script>
+        </policy_entry>
+        <policy_entry>
+            <name>ep-filter</name>
+            <!-- policy specific configuration entry -->
+        </policy_entry>
+        <policy_entry>
+            <name>qos</name>
+            <!-- policy specific configuration entry -->
+        </policy_entry>
+        <policy_entry>
+            <name>accounting</name>
+            <!-- policy specific configuration entry -->
+        </policy_entry>
+        <policy_entry>
+            <name>bridging</name>
+            <!-- policy specific configuration entry -->
+        </policy_entry>
+    </access_policies>
+
+    <!-- Call management section also contains a
+        simple routing rule set. This routing rule
+        works as follows. Each call is identified an 
+        NAI (RFC2486). The route table lists a set
+        of NAI that may match the call's NAI. If a
+        match is made, the access policies is applied
+        to that call. If the access policy succeeds
+        then the call can proceed. If not the call
+        is dropped. The routing entry also specifies
+        the aaa protocol to be used if the call is
+        allowed to proceed. A default route is also 
+        used as a catch all entry. Note that NAI
+        matching is done using the following rules:
+            1. Full NAI text takes precedence. i.e.
+                if an entry has user@domain.com then
+                this is tested first. If succeeding
+                entries has domain.com then that
+                will be tested next.
+            2. Domain only test. An entry can contain
+                only the domain name of the NAI and
+                can be used to apply policy for all
+                users in that domain.
+        -->
+    <call_routing>
+        <call_route_entry>
+            <!-- route entry is specific to user1@isp.net -->
+            <nai>user1@isp.net</nai>
+            <access_policy>script</access_policy>
+            <access_policy>ep-filter</access_policy>
+            <access_policy>accouting</access_policy>
+            <aaa_protocol>local_eap_auth</aaa_protocol>
+        </call_route_entry>
+        <call_route_entry>
+            <!-- route entry is specific to local_nas@opendiameter.org -->
+            <nai>local_nas@opendiameter.org</nai>
+            <access_policy>script</access_policy>
+            <access_policy>ep-filter</access_policy>
+            <access_policy>accouting</access_policy>
+            <aaa_protocol>local_eap_auth</aaa_protocol>
+        </call_route_entry>
+        <call_route_entry>
+            <nai>isp1.net</nai>
+            <access_policy>script</access_policy>
+            <access_policy>script</access_policy>
+            <aaa_protocol>local_eap_auth</aaa_protocol>
+        </call_route_entry>
+        <call_route_entry>
+            <nai>isp.net</nai>
+            <access_policy>script</access_policy>
+            <access_policy>script</access_policy>
+            <aaa_protocol>diameter_eap</aaa_protocol>
+        </call_route_entry>
+        <call_route_default>
+            <!-- this will catch all nai not listed above -->
+            <access_policy>script</access_policy>
+            <aaa_protocol>diameter_eap</aaa_protocol>
+        </call_route_default>
+    </call_routing>
+
+</call_management>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_diameter_eap.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration SYSTEM "nasd_diameter_eap.dtd">
+<configuration>
+   <general>
+      <product>Open Diameter</product>
+      <version>1</version>
+      <vendor_id>0</vendor_id>
+      <supported_vendor_id>0</supported_vendor_id>
+      <supported_vendor_id>1</supported_vendor_id>
+      <auth_application_id>1</auth_application_id>
+      <auth_application_id>2</auth_application_id>
+      <auth_application_id>2000</auth_application_id>
+      <auth_application_id>10000</auth_application_id>
+      <acct_application_id>3</acct_application_id>
+      <acct_application_id>4</acct_application_id>
+      <acct_application_id>20000</acct_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>31</vendor_id>
+          <auth_application_id>1</auth_application_id>
+      </vendor_specific_application_id>
+      <vendor_specific_application_id>
+          <vendor_id>41</vendor_id>
+          <auth_application_id>5</auth_application_id>
+      </vendor_specific_application_id>
+   </general>
+   <parser> 
+      <dictionary>config/nasd_diameter_eap_dictionary.xml</dictionary>
+   </parser>
+   <transport_mngt>
+      <identity>nas.access1.net</identity>
+      <realm>access1.net</realm>
+      <tcp_listen_port>1810</tcp_listen_port>
+      <sctp_listen_port>1811</sctp_listen_port>
+      <use_ipv6>0</use_ipv6>
+      <watchdog_timeout>3</watchdog_timeout>
+      <reconnect_interval>30</reconnect_interval>
+      <reconnect_max>3</reconnect_max>
+      <request_retransmission_interval>10</request_retransmission_interval>
+      <max_request_retransmission_count>3</max_request_retransmission_count>
+      <receive_buffer_size>2048</receive_buffer_size>
+      <peer_table>
+          <expiration_time>1</expiration_time>
+          <peer>
+              <hostname>server.isp.net</hostname>
+              <port>1812</port>
+              <use_sctp>0</use_sctp>
+              <tls_enabled>0</tls_enabled>
+          </peer>
+      </peer_table>
+      <route_table>
+          <expire_time>0</expire_time>
+          <route>
+             <realm>isp.net</realm>
+             <role>1</role> 
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+             <application>
+                <application_id>2000</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>2</metric>
+                </peer_entry>
+             </application>
+          </route>
+          <default_route>
+             <realm>isp.net</realm>
+             <role>0</role>
+             <redirect_usage>0</redirect_usage>
+             <application>
+                <application_id>1</application_id>
+                <vendor_id>0</vendor_id>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>4</metric>
+                </peer_entry>
+                <peer_entry>
+                    <server>server.isp.net</server>
+                    <metric>5</metric>
+                </peer_entry>
+             </application>
+          </default_route>
+      </route_table>
+   </transport_mngt>
+   <session_mngt>
+      <max_sessions>10000</max_sessions>
+      <auth_sessions>
+         <stateful>1</stateful>
+         <session_timeout>30</session_timeout>
+         <lifetime_timeout>360</lifetime_timeout>
+         <grace_period_timeout>30</grace_period_timeout>
+         <abort_retry_timeout>20</abort_retry_timeout>
+      </auth_sessions>
+      <acct_sessions>
+         <session_timeout>30</session_timeout>
+         <interim_interval>5</interim_interval>
+         <realtime>1</realtime>
+      </acct_sessions>
+   </session_mngt>
+   <log>
+      <flags>
+         <debug>enabled</debug>
+         <trace>enabled</trace>
+         <info>enabled</info>
+      </flags>
+      <target>
+         <console>enabled</console>
+         <syslog>disabled</syslog>
+      </target>
+   </log>
+</configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_diameter_eap_dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+    <!ELEMENT configuration (general, parser, transport_mngt, session_mngt, log)>
+
+     <!ELEMENT general (product, version, vendor_id, supported_vendor_id*,
+                                      auth_application_id+, acct_application_id+,
+                                      vendor_specific_application_id*)>
+
+     <!ELEMENT product (#PCDATA)>
+     <!ELEMENT version (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+     <!ELEMENT supported_vendor_id (#PCDATA)>
+     <!ELEMENT auth_application_id (#PCDATA)>
+     <!ELEMENT acct_application_id (#PCDATA)>
+
+     <!ELEMENT vendor_specific_application_id (vendor_id+,
+                                               auth_application_id?, acct_application_id?)>
+
+     <!ELEMENT parser (dictionary)>
+
+     <!ELEMENT dictionary (#PCDATA)>
+
+     <!ELEMENT transport_mngt (identity, realm, tcp_listen_port, sctp_listen_port, use_ipv6,
+                               port, watchdog_timeout, reconnect_interval, reconnect_max,
+                               request_retransmission_interval, max_request_retransmission_count,
+                               advertised_hostname*, peer_table, route_table)>
+
+     <!ELEMENT identity (#PCDATA)>
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT tcp_listen_port (#PCDATA)>
+     <!ELEMENT sctp_listen_port (#PCDATA)>
+     <!ELEMENT use_ipv6 (#PCDATA)>
+     <!ELEMENT watchdog_timeout (#PCDATA)>
+     <!ELEMENT reconnect_interval (#PCDATA)>
+     <!ELEMENT reconnect_max (#PCDATA)>
+     <!ELEMENT request_retransmission_interval (#PCDATA)>
+     <!ELEMENT max_request_retransmission_count (#PCDATA)>
+     <!ELEMENT advertised_hostname (#PCDATA)>
+
+     <!ELEMENT peer_table (expiration_time,  peer+)>
+
+     <!ELEMENT expiration_time (#PCDATA)>
+
+     <!ELEMENT peer (hostname,  port,  tls_enabled)>
+
+     <!ELEMENT hostname (#PCDATA)>
+     <!ELEMENT port (#PCDATA)>
+     <!ELEMENT tls_enabled (#PCDATA)>
+
+     <!ELEMENT route_table (expire_time, route*, default_route)>
+
+     <!ELEMENT expire_time (#PCDATA)>
+
+     <!ELEMENT route (realm,  role, application+)>
+     <!ELEMENT default_route (realm,  role, application+)>
+
+     <!ELEMENT realm (#PCDATA)>
+     <!ELEMENT role (#PCDATA)>
+
+     <!ELEMENT application (application_id, vendor_id, peer_entry+)>
+
+     <!ELEMENT application_id (#PCDATA)>
+     <!ELEMENT vendor_id (#PCDATA)>
+
+     <!ELEMENT peer_entry (server, metric)>
+
+     <!ELEMENT server (#PCDATA)>
+     <!ELEMENT metric (#PCDATA)>
+
+     <!ELEMENT session_mngt (max_sessions, auth_sessions, acct_sessions)>
+
+     <!ELEMENT max_sessions (#PCDATA)>
+
+     <!ELEMENT auth_sessions (stateful, session_timeout, lifetime_timeout,
+                                     grace_period_timeout, abort_retry_timeout)>
+
+     <!ELEMENT stateful (#PCDATA)>
+     <!ELEMENT session_timeout (#PCDATA)>
+     <!ELEMENT lifetime_timeout (#PCDATA)>
+     <!ELEMENT grace_period_timeout (#PCDATA)>
+     <!ELEMENT abort_retry_timeout (#PCDATA)>
+
+     <!ELEMENT acct_sessions (session_timeout, interim_interval,
+                                    realtime)>
+
+     <!ELEMENT interim_interval (#PCDATA)>
+     <!ELEMENT realtime (#PCDATA)>
+
+     <!ELEMENT log (flags, target)>
+
+     <!ELEMENT flags (debug, trace, info)>
+
+     <!ELEMENT debug (#PCDATA)>
+     <!ELEMENT trace (#PCDATA)>
+     <!ELEMENT info (#PCDATA)>
+
+     <!ELEMENT target (console, syslog)>
+
+     <!ELEMENT console (#PCDATA)>
+     <!ELEMENT syslog (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_diameter_eap_dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1847 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "nasd_diameter_eap_dictionary.dtd">
+<!--
+  $Log: nasd_diameter_eap_dictionary.xml,v $
+  Revision 1.3  2006/04/19 20:37:16  vfajardo
+  1298700
+
+  Revision 1.2  2006/04/05 17:52:16  vfajardo
+  Updates to dictionary
+
+  Revision 1.1  2005/03/11 20:37:12  vfajardo
+  New nas version
+
+  Revision 1.8  2004/12/23 17:08:41  vfajardo
+  more fixes
+
+  Revision 1.7  2004/12/22 22:08:20  vfajardo
+  interim checkin
+
+  Revision 1.6  2004/12/10 22:53:03  vfajardo
+  next gen
+
+  Revision 1.5  2004/12/02 23:32:27  vfajardo
+  next gen bugs
+
+  Revision 1.4  2004/05/18 01:14:56  yohba
+  *** empty log message ***
+
+  Revision 1.18  2004/05/18 01:13:38  yohba
+  *** empty log message ***
+
+  Revision 1.17  2004/04/20 01:45:22  vfajardo
+  diameter_address_t changes
+
+  Revision 1.16  2004/04/08 14:19:53  vfajardo
+  Added protocol id parser to header
+
+  Revision 1.15  2004/01/04 12:01:55  yohba
+  added IPFilter-Rule type parser
+
+  Revision 1.14  2003/12/16 02:39:12  yohba
+  Bug fix to 858312.
+
+  Revision 1.13  2003/12/09 03:48:10  yohba
+  Minor change.
+
+  Revision 1.12  2003/12/04 21:20:28  yohba
+  *** empty log message ***
+
+  Revision 1.11  2003/12/04 20:10:28  yohba
+  *** empty log message ***
+
+  Revision 1.10  2003/11/27 00:03:46  vfajardo
+  Added test for multiple instance grouped AVP
+
+  Revision 1.9  2003/11/25 21:13:46  vfajardo
+  Added multiple proxy-info instance
+
+  Revision 1.8  2003/11/25 05:28:32  yohba
+  *** empty log message ***
+
+  Revision 1.6  2003/10/01 01:35:13  yohba
+  Added NASREQ dictionary.
+
+  Revision 1.5  2003/09/30 23:37:42  yohba
+  Added Mobile IPv4 Application dictionary.
+
+  Revision 1.4  2003/08/05 16:32:08  yohba
+  More efficient AAAMessageBlock management.
+
+  Revision 1.3  2003/07/09 17:58:40  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.3  2003/07/09 17:57:48  vfajardo
+  Fixed accounting commands and AVP's, added Event-timestamp and removed RADUIS session
+
+  Revision 1.2  2003/03/13 21:01:12  vfajardo
+  Formalize dictionary XML files into one
+
+  Revision 1.1.1.1  2002/11/06 21:19:49  frascone
+  Imported sources
+
+  Revision 1.1.1.1  2002/09/19 00:57:42  ohba
+  no message
+
+  Revision 1.1.1.1  2002/09/18 13:51:53  ohba
+  no message
+
+  Revision 1.7  2002/09/17 14:03:13  ohba
+  no message
+
+  Revision 1.6  2002/08/02 18:41:07  victorf
+  spelling
+
+  Revision 1.5  2002/06/28 21:01:02  ohba
+  *** empty log message ***
+
+  Revision 1.4  2002/05/24 15:25:50  ohba
+  no message
+
+  Revision 1.3  2002/05/10 15:23:45  ohba
+  no message
+
+  Revision 1.2  2002/05/03 14:45:49  ohba
+  no message
+
+  Revision 1.1  2002/04/30 21:23:40  ohba
+  no message
+
+  Revision 1.15  2001/12/13 23:07:26  dave
+  Updated DTD and dictionary files with new changes.  Please review
+  and send me e-mail with any comments.
+
+  Revision 1.14  2001/09/26 19:55:21  mjones
+  Added type-parent for Time.
+  Moved User-Name, Class and Session-Timeout AVPs from nasreq.xml to dictionary.xml
+  Corrected Proxy-Info to be Grouped instead of OctetString.
+  Corrected data types for Accounting-Multi-Session-Id and Accounting-Session-Id from Unsigned32 to UTF8String.
+  Corrected data type for Authorization-Lifetime from Integer32 to Unsigned32.
+  Corrected numerous data types from Integer32 to Unsigned32 in nasreq.xml
+
+  Revision 1.13  2001/09/26 13:58:56  mjones
+  Typo vendir instead of vendor in AVP 266.
+
+  Revision 1.12  2001/09/21 01:13:16  mjones
+  Corrected replacement of vendor-id with vendor-label in some AVPs
+
+  Revision 1.11  2001/09/20 18:27:58  mjones
+  Removed vendor-bit attribute from elements.
+
+  Revision 1.10  2001/09/19 21:38:57  mjones
+  Removed #PCDATA from command element.
+
+  Revision 1.9  2001/09/19 19:46:38  mjones
+  Moved the vendor element to be the same level as base and application.
+  Modified vendor-id to be SMI Private Enterprise Code instead of a label.
+  Removed vendor-id="None" since vendor-id was IMPLIED.
+  Added type attribute to command (request or answer).
+  Removed duplicate AVPs from nasreq.xml (Acct-Session-Id, Acct-Multi-Session-Id)
+  Corrected typos in enum codes for Auth-Session-State and Disconnect-Cause.
+
+  Revision 1.4  2001/09/19 00:49:48  mjones
+  Removed vendor-label.
+
+  Revision 1.3  2001/09/18 00:08:02  mjones
+  Fixed command parsing and moved some parsing logic around.
+
+  Revision 1.2  2001/09/14 00:40:35  mjones
+  Moved Vendor to root in DTD
+
+  Revision 1.1  2001/09/08 23:46:45  mjones
+  Initial commit of renamed dictionary classes.
+
+  Revision 1.2  2001/09/07 23:59:54  mjones
+  Daily commit: added test harness
+
+  Revision 1.1  2001/09/07 13:15:48  mjones
+  Complete remaining classes and add dictionary files.
+
+  Revision 1.8  2001/08/28 21:33:56  chaos
+  Added a couple of AVPs, and fixed a typo
+
+  Revision 1.7  2001/08/24 18:03:24  chaos
+  Mark's Changes
+
+  Revision 1.6  2001/07/31 19:13:55  chaos
+  Missed a couple of MIP AVPs
+
+  Revision 1.5  2001/07/31 19:09:22  chaos
+  Added Mobile-Ip and Sun Ping Extension
+
+  Revision 1.4  2001/07/31 17:43:25  chaos
+  Oops, forgot to turn on validity checking.  Fixed some errors found with validity checking turned on
+
+  Revision 1.3  2001/07/31 16:56:31  chaos
+  Added commands, and validated with xmllint
+
+  Revision 1.2  2001/07/31 16:29:34  chaos
+  Checking in some changes to verify log and ident strings
+
+-->
+
+<dictionary>
+  <!-- ************************* Vendors **************************** -->
+  <vendor id="61" name="Merit Networks"/>
+  <vendor id="42" name="Sun Microsystems, Inc."/>
+  <vendor id="429" name="US Robotics Corp."/>
+  <!-- *********************** End Vendors ************************** -->
+
+  <!-- ***************** Base Protocol Definition ******************* -->
+  <base uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-08.txt">
+
+    <!-- *********************** Commands *************************** -->
+    <!-- Diameter Base Protocol Command Codes -->
+    <command name="PROXYABLE-ERROR" code="0" pbit="1">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1" minimum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="NON-PROXYABLE-ERROR" code="0">
+      <answerrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Result-Code" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Origin-State-Id" maximum="1"/>
+          <avprule name="Error-Reporting-Host" maximum="1"/>
+          <avprule name="Redirect-Host"/>
+          <avprule name="Redirect-Host-Usage" maximum="1"/>
+          <avprule name="Proxy-Info" maximum="1"/>
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Example" code="9999999" pbit="1">
+      <requestrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </requestrules>
+      <answerrules>
+        <required>
+          <avprule name="Destination-Host" maximum="1" minimum="1"/>
+        </required>
+        <optional>
+          <avprule name="Acct-Application-Id" minimum="0"/>
+          <avprule name="Proxy-Info" minimum="0" maximum="10" />
+	  <avprule name="Route-Record"/>
+          <avprule name="Example-URI" maximum="1" />
+          <avprule name="Example-IPFilterRule" maximum="1" />
+          <avprule name="AVP"/>
+	</optional>
+      </answerrules>
+    </command>
+
+    <command name="Abort-Session" code="274" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Capabilities-Exchange" code="257">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Host-IP-Address" minimum="1"/>
+	  <avprule name="Vendor-Id" maximum="1" minimum="1"/>
+	  <avprule name="Product-Name" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Supported-Vendor-Id"/>
+	  <avprule name="Auth-Application-Id"/>
+	  <avprule name="Acct-Application-Id"/>
+	  <avprule name="Vendor-Specific-Application-Id"/>
+	  <avprule name="Firmware-Revision" maximum="1"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Device-Watchdog" code="280">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Disconnect-Peer" code="282">
+      <requestrules>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Disconnect-Cause" maximum="1" minimum="1"/>
+	</required>
+      </requestrules>
+      <answerrules>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Re-Auth" code="258">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Host" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <command name="Session-Termination" code="275">
+      <requestrules>
+        <fixed>
+          <avprule name="Session-Id" maximum="1" minimum="1"/>
+        </fixed>
+        <required>
+          <avprule name="Origin-Host" maximum="1" minimum="1"/>
+          <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+          <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+          <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+          <avprule name="Termination-Cause" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Class"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ********************** End Commands ************************ -->
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Enumerated" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+    
+    <!-- ***************** DIAMETER BASE PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Acct-Interim-Interval" code="482" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Realtime-Required" code="483" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Multi-Session-Id" code="50" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Accounting-Record-Number" code="485" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Accounting-Record-Type" code="480" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+      <enum name="Event Record" code="1"/>
+      <enum name="Start Record" code="2"/>
+      <enum name="Interim Record" code="3"/>
+      <enum name="Stop Record" code="4"/>
+    </avp>
+    <avp name="Accounting-Session-Id" code="44" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Sub-Session-Id" code="287" mandatory="must"
+	 protected="may" may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Application-Id" code="259" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Alternate-Peer" code="275" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Auth-Application-Id" code="258" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Type" code="274" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Authenticate Only" code="1"/>
+      <enum name="Authorize Only" code="2"/>
+      <enum name="Authorize Authenticate" code="3"/>
+    </avp>
+    <avp name="Authorization-Lifetime" code="291" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Grace-Period" code="276" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Auth-Session-State" code="277" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="Enumerated"/>
+      <enum name="State Maintained" code="0"/>
+      <enum name="No State Maintained" code="1"/>
+    </avp>
+    <avp name="Class" code="25">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Destination-Host" code="293" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Destination-Realm" code="283" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Disconnect-Cause" code="273" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+      <enum name="Rebooting" code="0"/>
+      <enum name="Busy" code="2"/>
+      <enum name="Do not want to talk to you" code="3"/>
+    </avp>
+    <avp name="Error-Message" code="281" mandatory="mustnot"
+	 protected="may" may-encrypt="no">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Error-Reporting-Host" code="294" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Event-Timestamp" code="55" mandatory="must"
+	 protected="may" may-encrypt="no">
+      <type type-name="Time"/>
+    </avp>
+    <!--
+    <avp name="Failed-AVP" code="279" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="OctetString"/>
+    </avp>
+    -->
+    <avp name="Firmware-Revision" code="267" mandatory="mustnot"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Host-IP-Address" code="257" mandatory="must"
+	 protected="mustnot" may-encrypt="no">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="Multi-Round-Time-Out" code="272" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Origin-Host" code="264" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-Realm" code="296" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Origin-State-Id" code="278" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Product-Name" code="269" mandatory="mustnot"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Proxy-Host" code="280" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Proxy-State" code="33" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Proxy-Info" code="284" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <grouped>
+	<required>
+	  <avprule name="Proxy-Host" maximum="1" minimum="1"/>
+	  <avprule name="Proxy-State" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Redirect-Host" code="292" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Redirect-Host-Usage" code="261" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Don't Care" code="0"/>
+      <enum name="All Session" code="1"/>
+      <enum name="All Realm" code="2"/>
+      <enum name="Realm and Application" code="3"/>
+      <enum name="All Application" code="4"/>
+      <enum name="All Host" code="5"/>
+    </avp>
+    <avp name="Redirect-Max-Cache-Time" code="262" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Result-Code" code="268" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Route-Record" code="282" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Session-Id" code="263" mandatory="must"
+	 protected="mustnot">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Session-Timeout" code="27">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Binding" code="270" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Server-Failover" code="271" mandatory="must"
+	 protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Refuse Service" code="0"/>
+      <enum name="Try Again" code="1"/>
+      <enum name="Allow Service" code="2"/>
+      <enum name="Try Again / Allow Service" code="3"/>
+    </avp>
+    <avp name="Source-Route" code="286" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="Supported-Vendor-Id" code="265" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="295" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Service Not Provided" code="2"/>
+      <enum name="Bad Answer" code="3"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Link Broken" code="5"/>
+    </avp>
+    <avp name="User-Name" code="1">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Vendor-Id" code="266" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Vendor-Specific-Application-Id" code="260"
+	 mandatory="must" may-encrypt="no" protected="mustnot">
+      <grouped>
+	<fixed>
+	  <avprule name="Vendor-Id" minimum="1"/>
+	</fixed>
+	<required>
+  	  <avprule name="Auth-Application-Id" maximum="1"/>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	</required>
+      </grouped>
+    </avp>
+    <avp name="Auth-Request-Type" code="274" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHENTICATE_ONLY" code="1"/>
+      <enum name="AUTHORIZE_ONLY" code="2"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="3"/>
+    </avp>
+    <avp name="Re-Auth-Request-Type" code="285" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Enumerated"/>
+      <enum name="AUTHORIZE_ONLY" code="0"/>
+      <enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
+    </avp>
+
+    <avp name="Failed-AVP" code="279">
+      <grouped>
+        <optional>
+	  <avprule name="AVP" minimum="1"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result" code="297">
+      <grouped>
+        <required>
+	  <avprule name="Vendor-Id"/>
+	  <avprule name="Experimental-Result-Code"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Experimental-Result-Code" code="298" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Example-AVP" code="999999" mandatory="mustnot">
+      <grouped>
+        <required>
+	  <avprule name="Origin-Host"/>
+	  <avprule name="Host-IP-Address"/>
+        </required>
+      </grouped>
+    </avp>
+    <avp name="Example-URI" code="999998" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="DiameterURI"/>
+    </avp>
+    <avp name="Example-IPFilterRule" code="999997" mandatory="must"
+	 may-encrypt="no" protected="mustnot">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <!-- ************** END DIAMETER BASE PROTOCOL AVPS ************* -->
+
+  </base>
+  
+  <!-- ************* DIAMETER NASREQ APPLICATION ************* -->
+  <application id="1" name="NASREQ" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-nasreq-12.txt">
+    <command name="AA" code="265" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="User-Password" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="CHAP-Auth" maximum="1" />
+	  <avprule name="CHAP-Challenge" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="ARAP-Password" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Termination-Action" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Password-Retry" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Prompt" maximum="1" />
+	  <avprule name="ARAP-Challenge-Response" maximum="1" />
+	  <avprule name="ARAP-Features" maximum="1" />
+	  <avprule name="ARAP-Security" maximum="1" />
+	  <avprule name="ARAP-Security-Data"/>
+	  <avprule name="ARAP-Zone-Access" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="Login-IP-Host"/>
+	  <avprule name="Login-IPv6-Host"/>
+	  <avprule name="Login-LAT-Group" maximum="1" />
+	  <avprule name="Login-LAT-Node" maximum="1" />
+	  <avprule name="Login-LAT-Port" maximum="1" />
+	  <avprule name="Login-LAT-Service" maximum="1" />
+	  <avprule name="Login-Service" maximum="1" />
+	  <avprule name="Login-TCP-Port" maximum="1" />
+	  <!--avprule name="NAS-Filter-Rule"/--> <!-- TBD -->
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER NASREQ APPLICATION AVPS ************** -->
+    <avp name="NAS-Port" code="5" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Port-Id" code="87" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-Port-Type" code="61" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Called-Station-Id" code="30" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Calling-Station-Id" code="31" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Connect-Info" code="77" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Originating-Line-Info" code="94" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Reply-Message" code="18" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Termination-Action" code="29" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="User-Password" code="2" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Password-Retry" code="75" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Prompt" code="76" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Auth" code="402" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="CHAP-Algorithm" maximum="1" minimum="1"/>
+	  <avprule name="CHAP-Ident" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="CHAP-Response" maximum="1" />
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="CHAP-Algorithm" code="403" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="CHAP-Ident" code="404" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Response" code="405" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="CHAP-Challenge" code="60" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Password" code="70" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Challenge-Response" code="84" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Security" code="73" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="ARAP-Security-Data" code="74" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Service-Type" code="6" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Callback-Number" code="19" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Callback-Id" code="20" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Idle-Timeout" code="28" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Port-Limit" code="62" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Filter-Rule" code="400" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="IPFilterRule"/>
+    </avp>
+    <avp name="Filter-Id" code="11" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Configuration-Token" code="78" mandatory="must" 
+      protected="mustnot" may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Protocol" code="7" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-Routing" code="10" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-MTU" code="12" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Compression" code="13" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Framed-IP-Address" code="8" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IP-Netmask" code="9" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Route" code="22" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Pool" code="88" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-Interface-Id" code="96" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Framed-IPv6-Prefix" code="97" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPv6-Route" code="99" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-IPv6-Pool" code="100" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Framed-IPX-Network" code="23" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Framed-Appletalk-Link" code="37" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Network" code="38" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Framed-Appletalk-Zone" code="39" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Features" code="71" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="ARAP-Zone-Access" code="72" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-IP-Host" code="14" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-IPv6-Host" code="98" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-Service" code="15" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Login-TCP-Port" code="16" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Login-LAT-Service" code="34" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Node" code="35" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Group" code="36" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Login-LAT-Port" code="63" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunneling" code="401" mandatory="must"
+	 may-encrypt="no">
+      <grouped>
+	<required>
+	  <avprule name="Tunnel-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Medium-Type" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Client-Endpoint" maximum="1" minimum="1"/>
+	  <avprule name="Tunnel-Server-Endpoint" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="Tunnel-Preference" maximum="1" />
+	  <avprule name="Tunnel-Client-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Server-Auth-Id" maximum="1" />
+	  <avprule name="Tunnel-Assignment-Id" maximum="1" />
+	  <avprule name="Tunnel-Password" maximum="1" />
+	  <avprule name="Tunnel-Private-Group-Id" maximum="1" />
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="Tunnel-Type" code="64" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Medium-Type" code="65" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Tunnel-Client-Endpoint" code="66" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Server-Endpoint" code="67" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Password" code="69" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Private-Group-Id" code="81" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="Tunnel-Assignment-Id" code="82" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Tunnel-Preference" code="83" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Client-Auth-Id" code="90" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Tunnel-Server-Auth-Id" code="91" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-Input-Octets" code="363" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Octets" code="364" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Input-Packets" code="365" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Accounting-Output-Packets" code="366" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+    <avp name="Acct-Session-Time" code="46" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Authentic" code="45" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="Acct-Delay-Time" code="41" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Link-Count" code="51" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Acct-Tunnel-Connection" code="68" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Acct-Tunnel-Packets-Lost" code="86" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="NAS-Identifier" code="32" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="UTF8String"/>
+    </avp>
+    <avp name="NAS-IP-Address" code="4" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="NAS-IPv6-Address" code="95" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="State" code="24" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- *********** DIAMETERE MOBILEIPV4 APPLICATION ***********-->
+  <application id="2" name="Mobile IPv4" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-diameter-mobileip-14.txt">
+
+    <command name="AA-Mobile-Node" code="260" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-Auth" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id " maximum="1"/>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="MIP-FA-Challenge" maximum="1"/>
+	  <avprule name="MIP-Candidate-Home-Agent-Host" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Host" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+ 	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <command name="Home-Agent-MIP" code="262" >
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Session-State" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Reg-Request" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="User-Name" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Feature-Vector" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="MIP-MN-to-HA-Key" maximum="1"/>
+	  <avprule name="MIP-MN-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-MN-Key" maximum="1"/>
+	  <avprule name="MIP-HA-to-FA-Key" maximum="1"/>
+	  <avprule name="MIP-Key-Lifetime" maximum="1"/>
+	  <avprule name="MIP-Originating-Foreign-AAA" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <!--avprule name="MIP-Filter-Rule"/-->
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="MIP-Reg-Reply" maximum="1"/>
+	  <avprule name="MIP-Home-Agent-Address" maximum="1"/>
+	  <avprule name="MIP-Mobile-Node-Address" maximum="1"/>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1"/>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1"/>
+ 	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+
+    <!-- ***************** DIAMETER MOBILEIPV4 APPLICATION AVPS ************** -->
+    <avp name="MIP-Auth-Input-Data-Length" code="338" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Length" code="339" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Authenticator-Offset" code="340" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Candidate-Home-Agent-Host" code="336" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Host" code="348" mandatory="must"
+	 may-encrypt="no">
+      <type type-name="DiameterIdentity"/>
+    </avp>
+    <avp name="MIP-FA-Challenge" code="344" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Feature-Vector" code="337" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Home-Agent-Address" code="334" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-MN-AAA-Auth" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Auth-Input-Data-Length" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Authenticator-Offset" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-AAA-SPI" code="322" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Mobile-Node-Address" code="333" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Address"/>
+    </avp>
+    <avp name="MIP-Reg-Request" code="320" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Reg-Reply" code="321" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-Originating-Foreign-AAA" code="347" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Algorithm-Type" code="345" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-FA-to-HA-Key" code="328" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-HA-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-HA-SPI" code="318" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-FA-to-MN-Key" code="326" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-FA-to-MN-SPI" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-FA-to-MN-SPI" code="319" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-HA-to-FA-Key" code="329" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-HA-to-MN-Key" code="332" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Session-Key" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Key-Lifetime" code="367" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="MIP-Key-Material" code="335" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="MIP-MN-to-FA-Key" code="325" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-MN-to-HA-Key" code="331" mandatory="must"
+	 may-encrypt="yes">
+      <grouped>
+	<required>
+	  <avprule name="MIP-Algorithm-Type" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Replay-Mode" maximum="1" minimum="1"/>
+	  <avprule name="MIP-Key-Material" maximum="1" minimum="1"/>
+	  <avprule name="MIP-MN-AAA-SPI" maximum="1" minimum="1"/>
+        </required>
+	<optional>
+	  <avprule name="AVP"/>
+        </optional>
+      </grouped>
+    </avp>
+    <avp name="MIP-Replay-Mode" code="346" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Enumerated"/>
+    </avp>
+    <avp name="MIP-Session-Key" code="343" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+  </application>
+
+  <!-- ************* DIAMETER EAP APPLICATION ************* --> 
+
+  <!-- Note: The Application Identifier value, Command Code value and
+  AVP Type values for the EAP application are temporary assigned
+  values and are subject to change once IANA assigned values are
+  obtained. -->
+
+  <application id="2000" name="EAP" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Diameter-EAP" code="268" pbit="1">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="EAP-Payload" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="NAS-Port" maximum="1"/>
+	  <avprule name="NAS-Port-Id" maximum="1" />
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Destination-Host" maximum="1" />
+	  <avprule name="NAS-Identifier" maximum="1" />
+	  <avprule name="NAS-IP-Address" maximum="1" />
+	  <avprule name="NAS-IPv6-Address" maximum="1" />
+	  <avprule name="NAS-Port-Type" maximum="1" />
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Called-Station-Id" maximum="1" />
+	  <avprule name="Calling-Station-Id" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Originating-Line-Info" maximum="1" />
+	  <avprule name="Connect-Info" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Tunneling"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Request-Type" maximum="1" minimum="1"/>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="User-Name" maximum="1" />
+	  <avprule name="EAP-Payload" maximum="1"/>
+	  <avprule name="Multi-Round-Time-Out" maximum="1"/>
+	  <avprule name="Service-Type" maximum="1" />
+	  <avprule name="Class"/>
+	  <avprule name="Configuration-Token"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1" />
+	  <avprule name="Error-Message" maximum="1" />
+	  <avprule name="Error-Reporting-Host" maximum="1" />
+	  <avprule name="Idle-Timeout" maximum="1" />
+	  <avprule name="Authorization-Lifetime" maximum="1" />
+	  <avprule name="Auth-Grace-Period" maximum="1" />
+	  <avprule name="Auth-Session-State" maximum="1" />
+	  <avprule name="Re-Auth-Request-Type" maximum="1" />
+	  <avprule name="Session-Timeout" maximum="1" />
+	  <avprule name="State" maximum="1" />
+	  <avprule name="Reply-Message"/>
+	  <avprule name="Origin-State-Id" maximum="1" />
+	  <avprule name="Filter-Id"/>
+	  <avprule name="Port-Limit" maximum="1" />
+	  <avprule name="Callback-Id" maximum="1" />
+	  <avprule name="Callback-Number" maximum="1" />
+	  <avprule name="Framed-Appletalk-Link" maximum="1" />
+	  <avprule name="Framed-Appletalk-Network"/>
+	  <avprule name="Framed-Appletalk-Zone" maximum="1" />
+	  <avprule name="Framed-Compression"/>
+	  <avprule name="Framed-Interface-Id" maximum="1" />
+	  <avprule name="Framed-IP-Address" maximum="1" />
+	  <avprule name="Framed-IPv6-Prefix"/>
+	  <avprule name="Framed-IPv6-Pool" maximum="1" />
+	  <avprule name="Framed-IPv6-Route"/>
+	  <avprule name="Framed-IP-Netmask" maximum="1" />
+	  <avprule name="Framed-Route"/>
+	  <avprule name="Framed-Pool" maximum="1" />
+	  <avprule name="Framed-IPX-Network" maximum="1" />
+	  <avprule name="Framed-MTU" maximum="1" />
+	  <avprule name="Framed-Protocol" maximum="1" />
+	  <avprule name="Framed-Routing" maximum="1" />
+	  <avprule name="NAS-Filter-Rule"/>
+	  <avprule name="Tunneling"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1" />
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1" />
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/> <!-- to be added in -13 draft. -->
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** DIAMETER EAP APPLICATION AVPS ************** -->
+    <avp name="EAP-Payload" code="2001" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Reissued-Payload" code="2002" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Master-Session-Key" code="2003" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Accounting-EAP-Auth-Method" code="2004" mandatory="must"
+	 may-encrypt="yes">
+      <type type-name="Unsigned64"/>
+    </avp>
+  </application>
+
+  <!-- ************* TEST APPLICATION ************* --> 
+
+  <application id="10000" name="Test-Authorization" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Test-Auth" code="300">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Auth-Application-Id" maximum="1" minimum="1"/>
+	  <avprule name="Re-Auth-Request-Type" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+  	  <avprule name="Destination-Host" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="AVP"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Auth-Session-State" maximum="1"/>
+	  <avprule name="Authorization-Lifetime" maximum="1"/>
+	  <avprule name="Auth-Grace-Period" maximum="1"/>
+	  <avprule name="Session-Timeout" maximum="1"/>
+	  <avprule name="Error-Message" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Failed-AVP"/>
+	  <avprule name="Redirect-Host"/>
+	  <avprule name="Redirect-Host-Usage" maximum="1"/>
+	  <avprule name="Redirect-Max-Cache-Time" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+  </application>
+  <application id="20000" name="Test-Accounting" 
+    uri="ftp://ftp.ietf.org/internet-drafts/draft-ietf-aaa-eap-03.txt">
+    <command name="Accounting" code="271">
+      <requestrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Destination-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="Route-Record"/>
+	  <avprule name="Example-Accounting-Record"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </requestrules>
+      <answerrules>
+        <fixed>
+	  <avprule name="Session-Id" maximum="1" minimum="1"/>
+	</fixed>
+        <required>
+	  <avprule name="Result-Code" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Host" maximum="1" minimum="1"/>
+	  <avprule name="Origin-Realm" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Type" maximum="1" minimum="1"/>
+	  <avprule name="Accounting-Record-Number" maximum="1" minimum="1"/>
+	</required>
+        <optional>
+	  <avprule name="Acct-Application-Id" maximum="1"/>
+	  <avprule name="Vendor-Specific-Application-Id" maximum="1"/>
+	  <avprule name="User-Name" maximum="1"/>
+	  <avprule name="Accounting-Sub-Session-Id" maximum="1"/>
+	  <avprule name="Accounting-Session-Id" maximum="1"/>
+	  <avprule name="Acct-Multi-Session-Id" maximum="1"/>
+	  <avprule name="Error-Reporting-Host" maximum="1"/>
+	  <avprule name="Acct-Interim-Interval" maximum="1"/>
+	  <avprule name="Accounting-Realtime-Required" maximum="1"/>
+	  <avprule name="Origin-State-Id" maximum="1"/>
+	  <avprule name="Event-Timestamp" maximum="1"/>
+	  <avprule name="Proxy-Info"/>
+	  <avprule name="AVP"/>
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ***************** TEST APPLICATION AVPS ************** -->
+    <avp name="Example-Accounting-Record" code="999997">
+      <type type-name="UTF8String"/>
+    </avp>
+  </application>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_eap_shared_secret.bin	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+p:—œÅ×°7\×`ûQTPìežÛ5A®ØP+\;^l¿wçà[à÷°Ëƒÿ$n‡IÏÆÂÏdÆÕ³_	
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_pana_dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+     <!ELEMENT dictionary (command*, typedefn+, avp+)>
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          code CDATA #REQUIRED
+          vendor-id CDATA #IMPLIED
+     >
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_pana_dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+
+<dictionary>
+    <!-- *********************** Message types *************************** -->
+    <command name="PANA-Client-Initiation" code="1">
+      <answerrules>
+      </answerrules>
+    </command>
+    <command name="PANA-Start" code="2">
+      <requestrules>
+        <optional>
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+           <avprule name="Algorithm" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Auth" code="3">
+      <requestrules>
+        <fixed>
+           <avprule name="EAP-Payload" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="Nonce" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="Nonce" maximum="1" minimum="0" />
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Reauth" code="4">
+      <requestrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Bind" code="5">
+      <requestrules>
+        <fixed>
+           <avprule name="Result-Code" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+           <avprule name="Session-Lifetime" maximum="1" minimum="0" />
+           <avprule name="Key-Id" maximum="1" minimum="0" />
+           <avprule name="Algorithm" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="Key-Id" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Ping" code="6">
+      <requestrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Termination" code="7">
+      <requestrules>
+        <fixed>
+           <avprule name="Termination-Cause" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Error" code="8">
+      <requestrules>
+        <fixed>
+           <avprule name="Result-Code" maximum="1" minimum="1" />
+           <avprule name="Failed-Message-Header" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="Failed-AVP" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Update" code="9">
+      <requestrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ********************** End Message types ************************ -->
+
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+
+    <!-- ***************** PANA PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Algorithm" code="1" mandatory="must">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="AUTH" code="2" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Payload" code="3" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Failed-AVP" code="4" mandatory="must">
+      <grouped>
+         <optional>
+            <avprule name="AVP"/>
+         </optional>
+      </grouped>
+    </avp>
+    <avp name="Failed-Message-Header" code="5" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Key-Id" code="6" mandatory="must">
+      <type type-name="Integer32"/>
+    </avp>
+    <avp name="Nonce" code="7" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Result-Code" code="8" mandatory="must">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Lifetime" code="9" mandatory="must">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="10" mandatory="must">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Session Timeout" code="8"/>
+    </avp>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/nasd/config/nasd_pana_paa.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pana_configuration SYSTEM "nasd_pana_paa.dtd">
+<pana_configuration>
+
+    <general>
+
+        <!-- UDP port that the PAA will listen to
+             for Pac messages. Note that this
+             does not bind to any address or interface
+             so it will receive Pac messages on any
+             interface -->
+        <listen_port>3001</listen_port>
+
+        <!-- Filename of the parser dictionary -->
+        <dictionary_filename>config/dictionary.xml</dictionary_filename>
+
+        <!-- Configurable retransmission parameters
+             as specified in the PANA draft. See
+             Sec 10 of the draft for rules govering
+             message retranmission -->
+        <retransmission_param>
+            <!-- Initial retransmission timeout -->
+            <initial_rt_timeout>10</initial_rt_timeout>
+
+            <!-- Maximum retransmission count -->
+            <max_rt_count>3</max_rt_count>
+
+            <!-- Maximum retransmission timeout -->
+            <max_rt_timeout>120</max_rt_timeout>
+
+            <!-- Maximum retransmission duration -->
+            <max_rt_duration>120</max_rt_duration>
+        </retransmission_param>
+
+        <!-- WPA (802.11i) bootstrap support 
+             A 256-bit PMK key will be generated during the
+             Authorize method (and passed to authorization
+             script) when this option is enabled. 
+             -->
+        <wpa_bootstrap>1</wpa_bootstrap>
+
+        <!-- Session lifetime enforces when this PANA
+             session will end. Note that this can controls
+             the deletion of the PANA session whether
+             the session was auth successfully or not -->
+        <session_lifetime>10</session_lifetime>
+
+    </general>
+
+    <agent>
+
+        <!-- When this options is enabled, the PAA will
+             attempt to carry the first EAP request in
+             the PANA-Start-Request message -->
+        <optimized_handshake>0</optimized_handshake>
+
+        <!-- This tells the PAA whether the session lifetime
+             AVP will be carried in the PANA-Bind-Rquest
+             message. If enabled, the session lifetime
+             defined previously will be sent to the PaC -->
+        <carry_lifetime>1</carry_lifetime>
+
+        <!-- This tells the PAA whether the PANA-Start-Request
+             will be retransmitted. This aids in keeping
+             a more stateless PAA if disabled -->
+        <retry_psr>0</retry_psr>
+
+    </agent>
+
+</pana_configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/config.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+     <!ELEMENT pana_configuration (general, (client|agent))>
+
+     <!ELEMENT general (listen_port, dictionary_filename,
+                        retransmission_param, wpa_bootstrap,
+                        session_lifetime)>
+
+     <!ELEMENT listen_port (#PCDATA)>
+     <!ELEMENT dictionary_filename (#PCDATA)>
+     <!ELEMENT retransmission_param (initial_rt_timeout, max_rt_count,
+                                     max_rt_timeout, max_rt_duration)>
+     <!ELEMENT wpa_bootstrap (#PCDATA)>
+     <!ELEMENT session_lifetime (#PCDATA)>
+
+     <!ELEMENT initial_rt_timeout (#PCDATA)>
+     <!ELEMENT max_rt_count (#PCDATA)>
+     <!ELEMENT max_rt_timeout (#PCDATA)>
+     <!ELEMENT max_rt_duration (#PCDATA)>
+
+     <!ELEMENT client (paa_ip_address, paa_port_number,
+                       eap_response_timeout, eap_piggyback)>
+
+     <!ELEMENT paa_ip_address (#PCDATA)>
+     <!ELEMENT paa_port_number (#PCDATA)>
+     <!ELEMENT eap_response_timeout (#PCDATA)>
+     <!ELEMENT eap_piggyback (#PCDATA)>
+
+     <!ELEMENT agent (optimized_handshake, carry_lifetime, retry_psr)>
+
+     <!ELEMENT optimized_handshake (#PCDATA)>
+     <!ELEMENT carry_lifetime (#PCDATA)>
+     <!ELEMENT retry_psr (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/dictionary.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+     <!ELEMENT dictionary (command*, typedefn+, avp+)>
+
+     <!ELEMENT command (requestrules*, answerrules*)>
+     <!ATTLIST command
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT typedefn EMPTY>
+     <!ATTLIST typedefn
+          type-name ID #REQUIRED
+          type-parent IDREF #IMPLIED
+          description CDATA #IMPLIED
+     >
+
+     <!ELEMENT avp ((type | grouped), (enum*))>
+     <!ATTLIST avp
+          name ID #REQUIRED
+          code CDATA #REQUIRED
+          vendor-id CDATA #IMPLIED
+     >
+     <!ELEMENT type EMPTY>
+     <!ATTLIST type
+          type-name IDREF #REQUIRED
+     >
+
+     <!ELEMENT grouped (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT enum EMPTY>
+     <!ATTLIST enum
+          name CDATA #REQUIRED
+          code CDATA #REQUIRED
+     >
+
+     <!ELEMENT requestrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT answerrules (fixed*, required*, optional*, fixed*)>
+
+     <!ELEMENT fixed (avprule+)>
+     <!ELEMENT required (avprule+)>
+     <!ELEMENT optional (avprule+)>
+
+     <!ELEMENT avprule EMPTY>
+     <!ATTLIST avprule
+          name IDREF #REQUIRED
+             maximum CDATA "none"
+             minimum CDATA "0"
+     >
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/dictionary.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "dictionary.dtd">
+
+<dictionary>
+    <!-- *********************** Message types *************************** -->
+    <command name="PANA-Client-Initiation" code="1">
+      <answerrules>
+      </answerrules>
+    </command>
+    <command name="PANA-Start" code="2">
+      <requestrules>
+        <optional>
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+           <avprule name="Algorithm" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Auth" code="3">
+      <requestrules>
+        <fixed>
+           <avprule name="EAP-Payload" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="Nonce" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="Nonce" maximum="1" minimum="0" />
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Reauth" code="4">
+      <requestrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Bind" code="5">
+      <requestrules>
+        <fixed>
+           <avprule name="Result-Code" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="EAP-Payload" maximum="1" minimum="0" />
+           <avprule name="Session-Lifetime" maximum="1" minimum="0" />
+           <avprule name="Key-Id" maximum="1" minimum="0" />
+           <avprule name="Algorithm" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="Key-Id" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Ping" code="6">
+      <requestrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Termination" code="7">
+      <requestrules>
+        <fixed>
+           <avprule name="Termination-Cause" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Error" code="8">
+      <requestrules>
+        <fixed>
+           <avprule name="Result-Code" maximum="1" minimum="1" />
+           <avprule name="Failed-Message-Header" maximum="1" minimum="1" />
+        </fixed>
+        <optional>
+           <avprule name="Failed-AVP" maximum="1" minimum="0" />
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <command name="PANA-Update" code="9">
+      <requestrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </requestrules>
+      <answerrules>
+        <optional>
+           <avprule name="AUTH" maximum="1" minimum="0" />
+        </optional>
+      </answerrules>
+    </command>
+    <!-- ********************** End Message types ************************ -->
+
+    <!-- ************************ typedefn's ************************ -->
+    <typedefn type-name="Any"/> <!-- Added by Ohba-->
+    <typedefn type-name="OctetString"/>
+    <typedefn type-name="UTF8String" type-parent="OctetString"/>
+    <typedefn type-name="Address" type-parent="OctetString"/>
+    <typedefn type-name="DiameterIdentity" type-parent="OctetString"/>
+    <typedefn type-name="DiameterURI" type-parent="UTF8String"/>
+    <typedefn type-name="IPFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="QOSFilterRule" type-parent="OctetString"/>
+    <typedefn type-name="Integer32"/>
+    <typedefn type-name="Integer64"/>
+    <typedefn type-name="Unsigned32"/>
+    <typedefn type-name="Time" type-parent="Unsigned32"/>
+    <typedefn type-name="Unsigned64"/>
+    <!-- *********************** End Typedefns ********************** -->
+
+    <!-- ***************** PANA PROTOCOL AVPS ************** -->
+    <avp name="AVP" code="0"> <!-- Added by Ohba -->
+      <type type-name="Any"/>
+    </avp>
+    <avp name="Algorithm" code="1" mandatory="must">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="AUTH" code="2" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="EAP-Payload" code="3" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Failed-AVP" code="4" mandatory="must">
+      <grouped>
+         <optional>
+            <avprule name="AVP"/>
+         </optional>
+      </grouped>
+    </avp>
+    <avp name="Failed-Message-Header" code="5" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Key-Id" code="6" mandatory="must">
+      <type type-name="Integer32"/>
+    </avp>
+    <avp name="Nonce" code="7" mandatory="must">
+      <type type-name="OctetString"/>
+    </avp>
+    <avp name="Result-Code" code="8" mandatory="must">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Session-Lifetime" code="9" mandatory="must">
+      <type type-name="Unsigned32"/>
+    </avp>
+    <avp name="Termination-Cause" code="10" mandatory="must">
+      <type type-name="Unsigned32"/>
+      <enum name="Logout" code="1"/>
+      <enum name="Administrative" code="4"/>
+      <enum name="Session Timeout" code="8"/>
+    </avp>
+</dictionary>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/paa.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pana_configuration SYSTEM "config.dtd">
+<pana_configuration>
+
+    <general>
+
+        <!-- UDP port that the PAA will listen to
+             for Pac messages. Note that this
+             does not bind to any address or interface
+             so it will receive Pac messages on any
+             interface -->
+        <listen_port>3001</listen_port>
+
+        <!-- Filename of the parser dictionary -->
+        <dictionary_filename>config/dictionary.xml</dictionary_filename>
+
+        <!-- Configurable retransmission parameters
+             as specified in the PANA draft. See
+             Sec 10 of the draft for rules govering
+             message retranmission -->
+        <retransmission_param>
+            <!-- Initial retransmission timeout -->
+            <initial_rt_timeout>10</initial_rt_timeout>
+
+            <!-- Maximum retransmission count -->
+            <max_rt_count>3</max_rt_count>
+
+            <!-- Maximum retransmission timeout -->
+            <max_rt_timeout>120</max_rt_timeout>
+
+            <!-- Maximum retransmission duration -->
+            <max_rt_duration>120</max_rt_duration>
+        </retransmission_param>
+
+        <!-- WPA (802.11i) bootstrap support 
+             A 256-bit PMK key will be generated during the
+             Authorize method (and passed to authorization
+             script) when this option is enabled. 
+             -->
+        <wpa_bootstrap>1</wpa_bootstrap>
+
+        <!-- Session lifetime enforces when this PANA
+             session will end. Note that this can controls
+             the deletion of the PANA session whether
+             the session was auth successfully or not -->
+        <session_lifetime>60</session_lifetime>
+
+    </general>
+
+    <agent>
+
+        <!-- When this options is enabled, the PAA will
+             attempt to carry the first EAP request in
+             the PANA-Start-Request message -->
+        <optimized_handshake>0</optimized_handshake>
+
+        <!-- This tells the PAA whether the session lifetime
+             AVP will be carried in the PANA-Bind-Rquest
+             message. If enabled, the session lifetime
+             defined previously will be sent to the PaC -->
+        <carry_lifetime>1</carry_lifetime>
+
+        <!-- This tells the PAA whether the PANA-Start-Request
+             will be retransmitted. This aids in keeping
+             a more stateless PAA if disabled -->
+        <retry_psr>0</retry_psr>
+
+    </agent>
+
+</pana_configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/pac.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pana_configuration SYSTEM "config.dtd">
+<pana_configuration>
+
+    <general>
+
+        <!-- UDP port that the PaC will listen to
+             for PAA messages. Note that this
+             does not bind to any address or interface
+             so it will receive Pac messages on any
+             interface -->
+        <listen_port>3002</listen_port>
+
+        <!-- Filename of the parser dictionary -->
+        <dictionary_filename>config/dictionary.xml</dictionary_filename>
+
+        <!-- Configurable retransmission parameters
+             as specified in the PANA draft. See
+             Sec 10 of the draft for rules govering
+             message retranmission -->
+        <retransmission_param>
+           <!-- Initial retransmission timeout -->
+           <initial_rt_timeout>10</initial_rt_timeout>
+
+           <!-- Maximum retransmission count -->
+           <max_rt_count>3</max_rt_count>
+
+           <!-- Maximum retransmission timeout -->
+           <max_rt_timeout>5</max_rt_timeout>
+
+           <!-- Maximum retransmission duration -->
+           <max_rt_duration>360</max_rt_duration>
+        </retransmission_param>
+
+        <!-- WPA (802.11i) bootstrap support
+             A 256-bit PMK key will be generated during the
+             Authorize method (and passed to authorization
+             script) when this option is enabled.
+          -->
+        <wpa_bootstrap>1</wpa_bootstrap>
+
+        <!-- Session lifetime enforces when this PANA
+             session will end. Note that this can controls
+             the deletion of the PANA session whether
+             the session was auth successfully or not -->
+        <session_lifetime>360</session_lifetime>
+
+    </general>
+
+    <client>
+
+        <!-- Pre-configure IP address or hostname of the PAA.
+             Note that the library automatically detects whether
+             your are going to use IPv6 or IPv4 based on
+             this address -->
+        <paa_ip_address>localhost</paa_ip_address>
+
+        <!-- PAA port number used in conjuction with paa_ip_address -->
+        <paa_port_number>3001</paa_port_number>
+
+        <!-- eap response timeout. Number of seconds the EAP layer
+             is allowed to send an EAP response before an EAP_RESP_TIMEOUT
+             event occurs -->
+        <eap_response_timeout>3</eap_response_timeout>
+
+        <!-- Controls wether EAP payload will be sent
+             in the PANA-Auth-Answer message during auth phase --> 
+        <eap_piggyback>0</eap_piggyback>
+
+    </client>
+
+</pana_configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/pana_auth.bat	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,28 @@
+REM Dis-associate from current AP
+wpactl disable "Intel(R) PRO/Wireless"
+
+REM Check to make sure auth is adding.
+IF %1 == del GOTO OPEN_MODE
+
+REM Argument format: <add|del> 'PaC MAC ADDR' 'unused' 'unused' 'unused' 'unused' 'unused' 'PMK(1)' 'PMK(2)' 'PMK(n) 'ISP info(including VID)' 'unused' 'EP IP addr(1)' 'EP IP addr(2)' 'EP IP addr(n)'
+REM Note: This batch file only support up to two (2) PMK installs
+REM Re-associate using authentication keys
+REM Let the interface renew dhcp
+
+SET KEY0=%8
+SET PMK0=%KEY0:~0,64%
+wpactl enable "Intel(R) PRO/Wireless" wa7000-net0 %PMK0%
+
+SET KEY1=%9
+SET PMK1=%KEY1:~0,64%
+wpactl enable "Intel(R) PRO/Wireless" wa7000-net1 %PMK1%
+
+rem ipconfig /release
+GOTO DONE
+
+REM Use open mode authentication
+:OPEN_MODE
+wpactl enable "Intel(R) PRO/Wireless" wa7000-net
+
+REM Exit
+:DONE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/shared_secret.bin	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+p:—œÅ×°7\×`ûQTPìežÛ5A®ØP+\;^l¿wçà[à÷°Ëƒÿ$n‡IÏÆÂÏdÆÕ³_	
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/users.dtd	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+     <!ELEMENT user_dbase (user+)>
+     <!ELEMENT user (name, pass, auth)>
+     
+     <!ELEMENT name (#PCDATA)>
+     <!ELEMENT pass (#PCDATA)>
+     <!ELEMENT auth (#PCDATA)>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/opendiam.eap.testbed.aaa/opendiameter/pana/users.xml	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE user_dbase SYSTEM "users.dtd">
+<user_dbase>
+   <user>
+      <name>user1</name>
+      <pass>12345</pass>
+      <auth>md5</auth>
+   </user>
+   <user>
+      <name>user1@isp.net</name>
+      <pass>12345</pass>
+      <auth>archie</auth>
+   </user>
+   <user>
+      <name>local_nas@opendiameter.org</name>
+      <pass>12345</pass>
+      <auth>archie</auth>
+   </user>
+   <user>
+      <name>user3</name>
+      <pass>12345</pass>
+      <auth>md5</auth>
+   </user>
+   <user>
+      <name>user4</name>
+      <pass>12345</pass>
+      <auth>archie</auth>
+   </user>
+   <user>
+      <name>user5</name>
+      <pass>12345</pass>
+      <auth>md5</auth>
+   </user>
+</user_dbase>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.a.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+a.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.a.rt.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,6 @@
+-DBUILD_TEST_RT_ANY:BOOL=ON \
+-DBUILD_DBG_MONITOR:BOOL=ON \
+-DBUILD_DBG_RT:BOOL=ON \
+-DSKIP_TESTS:BOOL=ON \
+-DCMAKE_BUILD_TYPE:STRING=Debug \
+-DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.a.rt.testbed.aaa/freeDiameter/acl_wl.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2 @@
+# Whitelist all peers in the routing testbed
+*.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,59 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+#NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+LoadExtension = "/root/freeDiameter/extensions/acl_wl.fdx"
+		: "/root/conf/freeDiameter/acl_wl.conf";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+
+ConnectPeer = "proxy.b.rt.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.a.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.b.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+b.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.b.rt.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,7 @@
+-DBUILD_DBG_MONITOR:BOOL=ON \
+-DBUILD_DBG_RT:BOOL=ON \
+-DBUILD_DICT_EAP:BOOL=OFF \
+-DBUILD_DICT_NASREQ:BOOL=OFF \
+-DSKIP_TESTS:BOOL=ON \
+-DCMAKE_BUILD_TYPE:STRING=Debug \
+-DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.b.rt.testbed.aaa/freeDiameter/CMakeFlags-altlibs	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,10 @@
+-DGNUTLS_INCLUDE_DIR:PATH=/usr/local/include \
+-DGCRYPT_INCLUDE_DIR:PATH=/usr/local/include \
+-DGNUTLS_LIBRARY:FILEPATH=/usr/local/lib/libgnutls.so \
+-DBUILD_DBG_MONITOR:BOOL=ON \
+-DBUILD_DBG_RT:BOOL=ON \
+-DBUILD_DICT_EAP:BOOL=OFF \
+-DBUILD_DICT_NASREQ:BOOL=OFF \
+-DSKIP_TESTS:BOOL=ON \
+-DCMAKE_BUILD_TYPE:STRING=Debug \
+-DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.b.rt.testbed.aaa/freeDiameter/acl_wl.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+# Whitelist all peers in the routing testbed
+*.rt.testbed.aaa
+*.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,59 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+#NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+LoadExtension = "/root/freeDiameter/extensions/acl_wl.fdx"
+		: "/root/conf/freeDiameter/acl_wl.conf";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+
+ConnectPeer = "proxy.a.rt.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.b.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.c.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+c.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.c.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,58 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+#NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+#LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+#		: "/root/conf/freeDiameter/test_app.conf";
+
+ConnectPeer = "proxy.a.rt.testbed.aaa";
+#ConnectPeer = "serv.b.rt.testbed.aaa";
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/proxy.c.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.a.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+a.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.a.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,58 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+#NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+#LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+#		: "/root/conf/freeDiameter/test_app.conf";
+
+# ConnectPeer = "serv.simple.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.a.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.b.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+b.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,58 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+#NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+#LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+#		: "/root/conf/freeDiameter/test_app.conf";
+
+# ConnectPeer = "serv.simple.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.b.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.c.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+c.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.c.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,58 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+#NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+#LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+#		: "/root/conf/freeDiameter/test_app.conf";
+
+# ConnectPeer = "serv.simple.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/relay.c.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/dns/dnsmasq.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,21 @@
+domain-needed
+bogus-priv
+server=/testbed.aaa/192.168.101.1
+local=/rt.testbed.aaa/
+except-interface=eth0
+expand-hosts
+domain=rt.testbed.aaa
+dhcp-range=a,192.168.103.50,192.168.103.100,255.255.255.0,12h
+dhcp-range=b,192.168.104.50,192.168.104.100,255.255.255.0,12h
+dhcp-range=c,192.168.115.50,192.168.115.100,255.255.255.0,12h
+
+dhcp-host=08:00:27:2B:31:31,192.168.103.10 # nas
+dhcp-host=08:00:27:B4:8B:87,192.168.103.20 # relay a
+dhcp-host=08:00:27:B9:ED:45,192.168.103.30 # proxy a
+dhcp-host=08:00:27:B4:8B:88,192.168.104.20 # relay b
+dhcp-host=08:00:27:D2:ED:E1,192.168.104.25 # proxy b
+dhcp-host=08:00:27:2B:31:32,192.168.104.30 # serv
+dhcp-host=08:00:27:B6:E3:F8,192.168.115.10 # relay c
+dhcp-host=08:00:27:DB:2C:B2,192.168.115.30 # proxy c
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/dns/hosts	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,32 @@
+127.0.0.1	localhost
+127.0.1.1	rtmgr.testbed.aaa	rtmgr
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+192.168.103.10	nas.a.rt.testbed.aaa
+192.168.103.20	relay.a.rt.testbed.aaa
+192.168.103.30	proxy.a.rt.testbed.aaa
+
+192.168.104.20	relay.b.rt.testbed.aaa
+192.168.104.25	proxy.b.rt.testbed.aaa
+192.168.104.30	serv.b.rt.testbed.aaa
+
+192.168.115.10	relay.c.rt.testbed.aaa
+192.168.115.30	proxy.c.rt.testbed.aaa
+
+fde4:2c6e:55c4:103:a00:27ff:fe2b:3131	nas.a.rt.testbed.aaa
+fde4:2c6e:55c4:103:a00:27ff:feb4:8b87	relay.a.rt.testbed.aaa
+fde4:2c6e:55c4:103:a00:27ff:feb9:ed45	proxy.a.rt.testbed.aaa
+
+fde4:2c6e:55c4:104:a00:27ff:fed2:ede1	proxy.b.rt.testbed.aaa
+fde4:2c6e:55c4:104:a00:27ff:feb4:8b88	relay.b.rt.testbed.aaa
+fde4:2c6e:55c4:104:a00:27ff:fe2b:3132	serv.b.rt.testbed.aaa
+
+fde4:2c6e:55c4:115:a00:27ff:feb6:e3f8	relay.c.rt.testbed.aaa
+fde4:2c6e:55c4:115:a00:27ff:fedb:2cb2	proxy.c.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/dns/hosts.bkp	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,26 @@
+127.0.0.1	localhost
+127.0.1.1	rtmgr.testbed.aaa	rtmgr
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+192.168.103.10	nas.a.rt.testbed.aaa
+192.168.103.20	relay.a.rt.testbed.aaa
+
+192.168.104.20	relay.b.rt.testbed.aaa
+192.168.104.30	serv.b.rt.testbed.aaa
+
+192.168.115.10	relay.c.rt.testbed.aaa
+
+fde4:2c6e:55c4:103:a00:27ff:fe2b:3131	nas.a.rt.testbed.aaa
+fde4:2c6e:55c4:103:a00:27ff:feb4:8b87	relay.a.rt.testbed.aaa
+
+fde4:2c6e:55c4:104:a00:27ff:feb4:8b88	relay.b.rt.testbed.aaa
+fde4:2c6e:55c4:104:a00:27ff:fe2b:3132	serv.b.rt.testbed.aaa
+
+fde4:2c6e:55c4:115:a00:27ff:feb6:e3f8	relay.c.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/network/interfaces	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,35 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+
+auto eth1
+iface eth1 inet static
+	address 192.168.103.1
+	netmask 255.255.255.0
+iface eth1 inet6 static
+	address fde4:2c6e:55c4:103::1
+	netmask 64
+
+auto eth2
+iface eth2 inet static
+	address 192.168.104.1
+	netmask 255.255.255.0
+iface eth2 inet6 static
+	address fde4:2c6e:55c4:104::1
+	netmask 64
+
+auto eth3
+iface eth3 inet static
+	address 192.168.115.1
+	netmask 255.255.255.0
+iface eth3 inet6 static
+	address fde4:2c6e:55c4:115::1
+	netmask 64
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/radvd.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,22 @@
+interface eth1
+{
+   AdvSendAdvert on;
+   prefix fde4:2c6e:55c4:103::/64
+   {
+   };
+};   
+interface eth2
+{
+   AdvSendAdvert on;
+   prefix fde4:2c6e:55c4:104::/64
+   {
+   };
+};   
+interface eth3
+{
+   AdvSendAdvert on;
+   prefix fde4:2c6e:55c4:115::/64
+   {
+   };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/rtmgr.testbed.aaa/sysctl.d/99-testbedaaa.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+net.ipv4.ip_forward=1
+net.ipv6.conf.all.forwarding=1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.b.rt.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+b.rt.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.b.rt.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+-DBUILD_TEST_APP:BOOL=ON -DBUILD_RT_DEFAULT:BOOL=OFF -DBUILD_DBG_MONITOR:BOOL=ON -DBUILD_DBG_RT:BOOL=ON -DSKIP_TESTS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.b.rt.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,59 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/dbg_rt.fdx";
+# LoadExtension = "/root/freeDiameter/extensions/test_rt_any.fdx";
+LoadExtension = "/root/freeDiameter/extensions/test_app.fdx"
+		: "/root/conf/freeDiameter/test_app.conf";
+
+ConnectPeer = "proxy.b.rt.testbed.aaa" ;
+ConnectPeer = "proxy.a.rt.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.b.rt.testbed.aaa/freeDiameter/test_app.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+mode = server;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.b.rt.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.simple.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+simple.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.simple.testbed.aaa/freeDiameter/CMakeFlags	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+-DBUILD_TEST_APP:BOOL=ON -DBUILD_TEST_RT_ANY:BOOL=ON -DBUILD_DBG_MONITOR:BOOL=ON -DBUILD_DBG_RT:BOOL=ON -DSKIP_TESTS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_PATH:PATH=/root/conf/freeDiameter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.simple.testbed.aaa/freeDiameter/freeDiameter.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,56 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+##############################################################
+#Identity = "aaa.koganei.wide.ad.jp";
+#Realm = "wide.ad.jp";
+
+##############################################################
+#Port = 3868;
+#SecPort = 3869;
+#TLS_old_method;
+#No_TCP;
+#No_SCTP;
+#Prefer_TCP;
+#SCTP_streams = 30;
+SCTP_streams = 3;
+
+##############################################################
+#No_IP;
+#No_IPv6;
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+
+##############################################################
+TLS_Cred = "/root/ca_data/cert.pem" , "/root/ca_data/privkey.pem";
+TLS_CA = "/root/ca_data/ca.pem";
+# TLS_CRL = "/root/ca_data/crl.pem";
+
+#TLS_Prio = "NORMAL";
+#TLS_DH_Bits = 1024;
+
+##############################################################
+#TcTimer = 30;
+#TwTimer = 30;
+
+##############################################################
+NoRelay;
+
+##############################################################
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+
+##############################################################
+#ConnectPeer = "diameterid" [ params... ] ;
+#   params: No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; No_TLS;
+#           Port = 3868; TcTimer = 30; TwTimer = 30; ConnectTo = "202.249.37.5"; TLS_Prio = "NORMAL";
+
+
+##############################################################
+# -------- Test configuration ---------
+
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/test_app.fdx" 
+		: "/root/conf/freeDiameter/test_app.conf";
+
+ConnectPeer = "cli.simple.testbed.aaa" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.simple.testbed.aaa/freeDiameter/freeDiameter.conf.piotr	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,11 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+Identity = "192.168.102.20";
+SCTP_streams = 3;
+TLS_Cred = "/home/aaa/ca/ca_data/CA/clients/192.168.102.20/cert.pem" , "/home/aaa/ca/ca_data/CA/clients/192.168.102.20/privkey.pem";
+TLS_CA = "/home/aaa/ca/ca_data/CA/clients/192.168.102.20/ca.pem";
+LoadExtension = "/root/freeDiameter/extensions/dbg_monitor.fdx";
+LoadExtension = "/root/freeDiameter/extensions/test_app.fdx";
+
+ConnectPeer = "192.168.102.10" ;
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.simple.testbed.aaa/freeDiameter/test_app.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+mode = server;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/serv.simple.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/simplemgr.testbed.aaa/dns/dnsmasq.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,13 @@
+domain-needed
+bogus-priv
+server=/testbed.aaa/192.168.101.1
+local=/simple.testbed.aaa/
+except-interface=eth0
+expand-hosts
+domain=simple.testbed.aaa
+dhcp-range=192.168.102.50,192.168.102.150,255.255.255.0,12h
+
+dhcp-host=08:00:27:2D:8C:79,cli
+dhcp-host=08:00:27:20:FE:BA,serv
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/simplemgr.testbed.aaa/dns/hosts	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,16 @@
+127.0.0.1	localhost
+127.0.1.1	simplemgr.testbed.aaa	simplemgr
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+192.168.102.10	cli
+fde4:2c6e:55c4:102:a00:27ff:fe2d:8c79	cli
+192.168.102.20	serv
+fde4:2c6e:55c4:102:a00:27ff:fe20:feba	serv
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/simplemgr.testbed.aaa/dns/hosts.bkp	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,16 @@
+127.0.0.1	localhost
+127.0.1.1	simplemgr.testbed.aaa	simplemgr
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+192.168.102.10	cli
+fde4:2c6e:55c4:102:a00:27ff:fe2d:8c79	cli
+192.168.102.20	serv
+fde4:2c6e:55c4:102:a00:27ff:fe20:feba	serv
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/simplemgr.testbed.aaa/network/interfaces	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+
+auto eth1
+iface eth1 inet static
+	address 192.168.102.1
+	netmask	255.255.255.0
+iface eth1 inet6 static
+	address fde4:2c6e:55c4:102::1
+	netmask 64
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/simplemgr.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/simplemgr.testbed.aaa/radvd.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,7 @@
+interface eth1
+{
+   AdvSendAdvert on;
+   prefix fde4:2c6e:55c4:102::/64
+   {
+   };
+};   
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/supauth.eap.testbed.aaa/ca_name	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,1 @@
+eap.testbed.aaa
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/supauth.eap.testbed.aaa/hostapd/build.config	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,8 @@
+# Build-time configuration for hostapd on supauth: authentication role.
+
+# Driver interface for drivers using the nl80211 kernel interface
+CONFIG_DRIVER_NL80211=y
+
+# Build IPv6 support for RADIUS operations
+CONFIG_IPV6=y
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/supauth.eap.testbed.aaa/hostapd/hostapd.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,30 @@
+interface=wlan0
+driver=nl80211
+
+logger_stdout=-1
+logger_stdout_level=2
+dump_file=/tmp/hostapd.dump
+
+ctrl_interface=/var/run/hostapd
+
+hw_mode=g
+channel=1
+ssid=mac80211 test
+
+wpa=2
+wpa_key_mgmt=WPA-EAP
+wpa_pairwise=CCMP
+
+ieee8021x=1
+eapol_version=2
+eap_message=hello\0nasid=supauth,portid=0,NAIRealms=eap.testbed.aaa
+
+# Configuration for external RADIUS server
+own_ip_addr=192.168.105.10
+nas_identifier=supauth.eap.testbed.aaa
+auth_server_addr=192.168.105.30
+auth_server_port=1812
+auth_server_shared_secret=radiusecret
+acct_server_addr=192.168.105.30
+acct_server_port=1813
+acct_server_shared_secret=radiusecret
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/supauth.eap.testbed.aaa/ntp.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+server proxy.testbed.aaa
+
+# By default, exchange time with everybody, but don't allow configuration.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/supauth.eap.testbed.aaa/wpasupplicant/build.config	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,26 @@
+# Config file for compilation wpa_supplicant sur supauth.eap.testbed.aaa
+
+# We use the WEXT generic driver with mac80211_hwsim hardware
+CONFIG_DRIVER_WEXT=y
+
+# EAP and EAPoL
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_TTLS=y
+# CONFIG_EAP_FAST=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_SIM=y
+# ETC...
+CONFIG_EAP_IKEV2=y
+CONFIG_PKCS12=y
+
+CONFIG_EAPOL_TEST=y
+
+CONFIG_CTRL_IFACE=y
+CONFIG_BACKEND=file
+CONFIG_DEBUG_FILE=y
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/supauth.eap.testbed.aaa/wpasupplicant/wpa_supplicant.conf	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+ctrl_interface=/var/run/wpa_supplicant
+
+network={
+        ssid="mac80211 test"
+        key_mgmt=WPA-EAP
+        proto=WPA2
+        pairwise=CCMP
+        group=CCMP
+#	eap=MD5
+#	password="himitsu"
+
+	eap=TLS
+	identity="client"
+	ca_cert="/home/aaa/ca/ca_data/mgr.testbed.aaa/public/cacert.pem"
+	client_cert="/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/client/cert.pem"
+	private_key="/home/aaa/ca/ca_data/mgr.testbed.aaa/clients/client/privkey.pem"
+}
+
Binary file mrb/capture.pcap has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/capture.txt	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,2 @@
+To enable network dump:
+# VBoxManage modifyvm VM --nictrace<1-N>  on|off --nictracefile<1-N>  <filename>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/change_pw.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,93 @@
+#!/bin/bash 
+
+echo ""
+
+if [ ! -f /home/thedoc/priv/newpass ];
+then echo Missing new password file; exit 1;
+fi
+
+# The root of the testbed, which provides internet access
+MGR="__mgr.testbed.aaa"
+# Root of each testbed which isolates the VMs from the other testbeds
+MGRS=""
+# The list of all VMs
+VMS=""
+
+for testb in "$@"; do
+ case "$testb" in
+   simple)
+	# The simple testbed
+	MGRS="$MGRS simple-simplemgr.testbed.aaa"
+	VMS="$VMS simple-cli.simple.testbed.aaa"
+	VMS="$VMS simple-serv.simple.testbed.aaa"
+	;;
+
+   rt)
+	# The routing testbed
+	MGRS="$MGRS rt-rtmgr.testbed.aaa"
+	VMS="$VMS rt-nas.a.rt.testbed.aaa rt-proxy.a.rt.testbed.aaa"
+	VMS="$VMS rt-proxy.b.rt.testbed.aaa rt-serv.b.rt.testbed.aaa"
+	;;
+	
+   rtsup)
+	# The routing testbed
+	VMS="$VMS rt-relay.a.rt.testbed.aaa"
+#	VMS="$VMS rt-relay.b.rt.testbed.aaa"
+	VMS="$VMS rt-proxy.c.rt.testbed.aaa rt-relay.c.rt.testbed.aaa"
+	;;
+	
+   *)
+   	echo "Unknown testbed subset $testb"
+	;;
+ esac
+done
+
+if [ -z "$VMS" ]; 
+then echo "Please specify a VM subset such as: rt, rtsup, simple, ...";
+exit 1;
+fi
+
+# OK let's start the VMS now.
+echo "Starting all VMs"
+
+# The keyboard scancodes for "aptitude update && aptitude dist-upgrade -y &&"
+PASSWD_SC="19 99 1e 9e 1f 9f 1f 9f 11 91 20 a0"
+
+change_passwd() {
+	# Send "passwd" command
+	VBoxManage controlvm "$1" keyboardputscancode $PASSWD_SC 1c 9c >/dev/null &
+	sleep 1;
+	# Send new password
+	VBoxManage controlvm "$1" keyboardputscancode `cat /home/thedoc/priv/newpass | grep -v //` 1c 9c > /dev/null
+	sleep 1
+	# Confirm new password
+	VBoxManage controlvm "$1" keyboardputscancode `cat /home/thedoc/priv/newpass | grep -v //` 1c 9c > /dev/null
+	sleep 1
+}	
+
+# Start the VMs by hierarchical order
+./vm_start.sh "$MGR"
+	sleep 15
+for VM in $MGRS; do
+	./vm_start.sh "$VM" &
+	sleep 15
+done
+wait
+for VM in $VMS; do
+	./vm_start.sh "$VM" &
+	sleep 15
+done
+wait
+
+# Change all the passwords
+for VM in $VMS $MGRS $MGR; do
+	change_passwd "$VM" &
+done
+wait
+
+# Now, move the newpass as active pass
+mv -f /home/thedoc/priv/pass /home/thedoc/priv/pass.`date +%Y%m%d-%H%M%S`
+mv -f /home/thedoc/priv/newpass /home/thedoc/priv/pass 
+
+#All done!
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/clearlogs.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+#!/bin/bash -x
+
+rm -f ../logs/*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/eap_testbed.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,56 @@
+#!/bin/bash 
+
+echo ""
+
+case "$1" in
+  start)
+	# On a besoin de mgr
+	./vm_start.sh "__mgr.testbed.aaa" || {
+		echo "Echec au demarrage de mgr, abandon."
+		exit 1
+	}
+
+	# On a besoin ensuite de rtmgr
+	./vm_start.sh "eap-eapmgr.testbed.aaa" || {
+		echo "Echec au demarrage de rtmgr, abandon."
+		exit 1
+	}
+	
+	# Maintenant on peut demarrer les autres VM en paralelle
+	./vm_start.sh "eap-supauth.eap.testbed.aaa" &
+	sleep 3
+	./vm_start.sh "eap-gw.eap.testbed.aaa" &
+	sleep 3
+	./vm_start.sh "eap-backend.eap.testbed.aaa" &
+	sleep 3
+	./vm_start.sh "eap-opendiam.eap.testbed.aaa" &
+	
+	# Done
+	#wait
+	;;
+  pause)
+	# On arrete toutes ces machines en sauvant leur etat
+	./vm_pause.sh "__mgr.testbed.aaa" &
+	./vm_pause.sh "eap-eapmgr.testbed.aaa" &
+	./vm_pause.sh "eap-supauth.eap.testbed.aaa" &
+	./vm_pause.sh "eap-gw.eap.testbed.aaa" &
+	./vm_pause.sh "eap-backend.eap.testbed.aaa" &
+	./vm_pause.sh "eap-opendiam.eap.testbed.aaa" &
+	wait
+	;;
+  stop)
+	# On arrete toutes ces machines en envoyant un shutdown
+	./vm_stop.sh "__mgr.testbed.aaa" &
+	./vm_stop.sh "eap-eapmgr.testbed.aaa" &
+	./vm_stop.sh "eap-supauth.eap.testbed.aaa" &
+	./vm_stop.sh "eap-gw.eap.testbed.aaa" &
+	./vm_stop.sh "eap-backend.eap.testbed.aaa" &
+	./vm_stop.sh "eap-opendiam.eap.testbed.aaa" &
+	wait
+	;;
+  *)
+	echo "Usage: $0 [start|pause|stop]"
+	exit 1
+esac
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/fd_rebuild.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,3 @@
+#!/bin/bash -x
+
+cd ../src/freeDiameter && hg pull && hg update 
Binary file mrb/filtered_cap has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/routing_testbed.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,56 @@
+#!/bin/bash 
+
+echo ""
+
+case "$1" in
+  start)
+	# On a besoin de mgr
+	./vm_start.sh "__mgr.testbed.aaa" || {
+		echo "Echec au demarrage de mgr, abandon."
+		exit 1
+	}
+
+	# On a besoin ensuite de rtmgr
+	./vm_start.sh "rt-rtmgr.testbed.aaa" || {
+		echo "Echec au demarrage de rtmgr, abandon."
+		exit 1
+	}
+	
+	# Maintenant on peut demarrer les autres VM en paralelle
+	./vm_start.sh "rt-nas.a.rt.testbed.aaa" &
+	sleep 3
+	./vm_start.sh "rt-proxy.a.rt.testbed.aaa" &
+	sleep 3
+	./vm_start.sh "rt-proxy.b.rt.testbed.aaa" &
+	sleep 3
+	./vm_start.sh "rt-serv.b.rt.testbed.aaa" &
+	
+	# Done
+	wait
+	;;
+  pause)
+	# On arrete toutes ces machines en sauvant leur etat
+	./vm_pause.sh "__mgr.testbed.aaa" &
+	./vm_pause.sh "rt-rtmgr.testbed.aaa" &
+	./vm_pause.sh "rt-nas.a.rt.testbed.aaa" &
+	./vm_pause.sh "rt-proxy.a.rt.testbed.aaa" &
+	./vm_pause.sh "rt-proxy.b.rt.testbed.aaa" &
+	./vm_pause.sh "rt-serv.b.rt.testbed.aaa" &
+	wait
+	;;
+  stop)
+	# On arrete toutes ces machines en envoyant un shutdown
+	./vm_stop.sh "__mgr.testbed.aaa" &
+	./vm_stop.sh "rt-rtmgr.testbed.aaa" &
+	./vm_stop.sh "rt-nas.a.rt.testbed.aaa" &
+	./vm_stop.sh "rt-proxy.a.rt.testbed.aaa" &
+	./vm_stop.sh "rt-proxy.b.rt.testbed.aaa" &
+	./vm_stop.sh "rt-serv.b.rt.testbed.aaa" &
+	wait
+	;;
+  *)
+	echo "Usage: $0 [start|pause|stop]"
+	exit 1
+esac
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/showlogs.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,14 @@
+#!/bin/bash -x
+
+if test x`hostname --fqdn` != xmorbier.koganei.wide.ad.jp; 
+then if test x`hostname --fqdn` != xmorbier; 
+then echo "Can be executed only on Morbier";
+exit 2;
+fi;
+fi;
+
+
+for LAT in `ls -1 /home/thedoc/testbed.aaa/logs/LATEST*`;
+do nedit /home/thedoc/testbed.aaa/logs/`cat $LAT` &
+done
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/simple_testbed.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,47 @@
+#!/bin/bash 
+
+echo ""
+
+case "$1" in
+  start)
+	# On a besoin de mgr
+	./vm_start.sh "__mgr.testbed.aaa" || {
+		echo "Echec au demarrage de mgr, abandon."
+		exit 1
+	}
+
+	# On a besoin ensuite du mgr local
+	./vm_start.sh "simple-simplemgr.testbed.aaa" || {
+		echo "Echec au demarrage de simplemgr, abandon."
+		exit 1
+	}
+	
+	# Maintenant on peut demarrer les autres VM en paralelle
+	./vm_start.sh "simple-cli.simple.testbed.aaa" &
+	./vm_start.sh "simple-serv.simple.testbed.aaa" &
+	
+	# Done
+	wait
+	;;
+  pause)
+	# On arrete toutes ces machines en sauvant leur etat
+	./vm_pause.sh "__mgr.testbed.aaa" &
+	./vm_pause.sh "simple-simplemgr.testbed.aaa" &
+	./vm_pause.sh "simple-cli.simple.testbed.aaa" &
+	./vm_pause.sh "simple-serv.simple.testbed.aaa" &
+	wait
+	;;
+  stop)
+	# On arrete toutes ces machines en envoyant un shutdown
+	./vm_stop.sh "__mgr.testbed.aaa" &
+	./vm_stop.sh "simple-simplemgr.testbed.aaa" &
+	./vm_stop.sh "simple-cli.simple.testbed.aaa" &
+	./vm_stop.sh "simple-serv.simple.testbed.aaa" &
+	wait
+	;;
+  *)
+	echo "Usage: $0 [start|pause|stop]"
+	exit 1
+esac
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/update_all_vm.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,99 @@
+#!/bin/bash 
+
+echo ""
+
+# The root of the testbed, which provides internet access
+MGR="__mgr.testbed.aaa"
+# Root of each testbed which isolates the VMs from the other testbeds
+MGRS=""
+# The list of all VMs
+VMS=""
+
+for testb in "$@"; do
+ case "$testb" in
+   simple)
+	# The simple testbed
+	MGRS="$MGRS simple-simplemgr.testbed.aaa"
+	VMS="$VMS simple-cli.simple.testbed.aaa"
+	VMS="$VMS simple-serv.simple.testbed.aaa"
+	;;
+
+   rt)
+	# The routing testbed
+	MGRS="$MGRS rt-rtmgr.testbed.aaa"
+	VMS="$VMS rt-nas.a.rt.testbed.aaa rt-proxy.a.rt.testbed.aaa"
+	VMS="$VMS rt-proxy.b.rt.testbed.aaa rt-serv.b.rt.testbed.aaa"
+	;;
+	
+   rtsup)
+	# The routing testbed
+	VMS="$VMS rt-relay.a.rt.testbed.aaa"
+#	VMS="$VMS rt-relay.b.rt.testbed.aaa"
+	VMS="$VMS rt-proxy.c.rt.testbed.aaa rt-relay.c.rt.testbed.aaa"
+	;;
+	
+   eap)
+	# The EAP testbed
+	MGRS="$MGRS eap-eapmgr.testbed.aaa"
+	VMS="$VMS supauth.eap.testbed.aaa gw.eap.testbed.aaa"
+	VMS="$VMS backend.eap.testbed.aaa opendiam.eap.testbed.aaa"
+	;;
+	
+   *)
+   	echo "Unknown testbed subset $testb"
+	;;
+ esac
+done
+
+if [ -z "$VMS" ]; 
+then echo "Please specify a VM subset such as: rt, rtsup, simple, ...";
+exit 1;
+fi
+
+# OK let's start the VMS now.
+echo "Starting all VMs"
+
+# The keyboard scancodes for "aptitude update && aptitude dist-upgrade -y &&"
+UPDATE_SC="1e 9e 19 99 14 94 17 97 14 94 16 96 20 a0 12 92 39 b9"
+UPDATE_SC="$UPDATE_SC 16 96 19 99 20 a0 1e 9e 14 12 92 39 b9"
+UPDATE_SC="$UPDATE_SC 1c 9c"
+UPGRADE_SC="1e 9e 19 99 14 94 17 97 14 94 16 96 20 a0 12 92 39 b9"
+UPGRADE_SC="$UPGRADE_SC 20 a0 17 97 1f 9f 14 94 0c 8c 16 96 19 99 22 a2 13 93 1e 9e 20 a0 12 92 39 b9 0c 8c 15 95 39 b9"
+UPGRADE_SC="$UPGRADE_SC 2a 07 87 07 87 aa 39 b9"
+
+start_and_update() {
+	./vm_start.sh "$1"
+	VBoxManage controlvm "$1" keyboardputscancode $UPDATE_SC >/dev/null 
+}
+
+upgrade_and_stop() {
+	VBoxManage controlvm "$1" keyboardputscancode $UPGRADE_SC >/dev/null &
+	./vm_stop.sh "$1" nochgcns waitterm
+}	
+
+# Start the VMs by hierarchical order
+start_and_update "$MGR"
+for VM in $MGRS; do
+	start_and_update "$VM" &
+	sleep 15
+done
+wait
+for VM in $VMS; do
+	start_and_update "$VM" &
+	sleep 15
+done
+wait
+
+# upgrade and stop in reverse order
+for VM in $VMS; do
+	upgrade_and_stop "$VM" &
+done
+wait
+for VM in $MGRS; do
+	upgrade_and_stop "$VM" &
+done
+wait
+upgrade_and_stop "$MGR"
+
+#All done!
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/vm_login.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,30 @@
+#!/bin/bash +x
+
+# Check params
+if [ -z "$1" ]; then echo "Donnez le nom de la VM en parametre"; exit 1; fi
+
+# Check if the user is already logged
+if [  "$2" != "force" ]; then
+VBoxManage guestproperty get "$1" /VirtualBox/GuestInfo/OS/NoLoggedInUsers| grep "^Value:\s*true" >/dev/null || {
+	echo $1 already has a user logged in.
+	exit 0
+}
+fi
+
+# Scancodes for "root"
+ROOT_SC="13 93 18 98 18 98 14 94"
+
+# OK, now send "root" then enter
+VBoxManage controlvm "$1" keyboardputscancode $ROOT_SC 1c 9c > /dev/null
+sleep 1
+# Sent the password
+VBoxManage controlvm "$1" keyboardputscancode `cat /home/thedoc/priv/pass | grep -v //` 1c 9c > /dev/null
+sleep 1
+
+# Now check we are logged in
+#VBoxManage guestproperty get "$1" /VirtualBox/GuestInfo/OS/NoLoggedInUsers | grep "^Value:\s*false" > /dev/null || {
+#        echo Failed to login on $1
+#        exit 1
+#}
+
+# Done!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/vm_pause.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,17 @@
+#!/bin/bash 
+
+# Check params
+if [ -z "$1" ]; then echo "Donnez le nom de la VM en parametre"; exit 1; fi
+
+# First, start the VM if needed
+VBoxManage showvminfo "$1" |grep "^State:\s*running" >/dev/null || {
+	echo $1 already stopped.
+	exit 0
+}
+
+echo "Saving and stopping $1 for resuming later"
+
+# Change console to the 5th (alt-F5)
+VBoxManage controlvm "$1" savestate >/dev/null
+
+# Done
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/vm_start.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Check params
+if [ -z "$1" ]; then echo "Donnez le nom de la VM en parametre"; exit 1; fi
+
+# Simply resume if the VM was saved
+VBoxManage showvminfo "$1" |grep "^State:\s*saved" >/dev/null && {
+	echo "Resuming $1 ..."
+        VBoxManage startvm "$1" >/dev/null || {
+                echo Erreur au demarrage de $1
+                exit 1
+        }
+	sleep 5
+	exit 0
+}
+
+# Now, start the VM if needed
+VBoxManage showvminfo "$1" |grep "^State:\s*running" >/dev/null || {
+	# Start the VM
+	echo "Starting $1 ..."
+	VBoxManage startvm "$1" >/dev/null || {
+		echo Erreur au demarrage de $1
+		exit 1
+	}
+	# Wait for status "running" to appear
+        while ! ( VBoxManage showvminfo "$1" |grep "^State:\s*running" >/dev/null );
+        do sleep 1;
+        done;
+
+	# Now wait for the guest extension to load, but not more that 5 minutes
+	VBoxManage guestproperty wait "$1" /VirtualBox/GuestInfo/OS/NoLoggedInUsers --timeout 300000 --fail-on-timeout >/dev/null || {
+		echo Impossible de detecter le demarrage de la VM $1
+		exit 1
+	}
+
+	# Leave a few additional seconds for login prompt to appear
+	sleep 10
+}
+
+# Login in the VM
+./vm_login.sh "$1"
+
+# Now, check the network is started // Finally, we force it in any case...
+#VBoxManage guestproperty get "$1" /VirtualBox/GuestInfo/Net/0/V4/IP | grep "^Value:\s*192.168" >/dev/null || {
+	# Issue a dhclient eth0 in this case
+	VBoxManage controlvm "$1" keyboardputscancode 20 a0 23 a3 2e ae 26 a6 17 97 12 92 31 b1 14 94 39 b9 12 92 14 94 23 a3 0b 8b 1c 9c >/dev/null
+	sleep 5
+# }
+
+# Done
+echo "$1 should be running fine now"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mrb/vm_stop.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,41 @@
+#!/bin/bash 
+
+# Check params
+if [ -z "$1" ]; then echo "Donnez le nom de la VM en parametre"; exit 1; fi
+
+VM=$1
+shift
+
+# First, check the VM is running
+VBoxManage showvminfo "$VM" |grep "^State:\s*running" >/dev/null || {
+	echo $VM already stopped.
+	exit 0
+}
+
+echo "Shutting down $VM..."
+
+if [ "$1" = "nochgcns" ];
+then
+	shift
+else
+	# Change console to the 5th (alt-F5)
+	VBoxManage controlvm "$VM" keyboardputscancode 38 3f bf b8 >/dev/null
+	
+	sleep 2
+
+	# Login in the VM
+	./vm_login.sh "$VM" force
+fi
+
+# Issue a "shutdown -h now" order
+VBoxManage controlvm "$VM" keyboardputscancode 1f 9f 23 a3 16 96 14 94 20 a0 18 98 11 91 31 b1 39 b9 0c 8c 23 a3 39 b9 31 b1 18 98 11 91 1c 9c >/dev/null
+
+# Wait for shutdown complete if told to
+if [ "$1" = "waitterm" ]; then
+	while ( VBoxManage showvminfo "$VM" |grep "^State:\s*running" >/dev/null );
+	do sleep 1;
+	done
+	echo $VM was shutdown
+fi
+# Done
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/autoupdates-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,16 @@
+#!/bin/bash -x
+
+if [ -z "$1" ]; then echo "Usage: $0 Release; where Release = karmic or else"; exit 1; fi
+
+aptitude install unattended-upgrades 
+dpkg-reconfigure -plow unattended-upgrades
+mv /etc/apt/apt.conf.d/50unattended-upgrades /etc/apt/apt.conf.d/50unattended-upgrades.in
+head -n3 /etc/apt/apt.conf.d/50unattended-upgrades.in > /etc/apt/apt.conf.d/50unattended-upgrades
+echo "	\"Ubuntu $1-updates\";" >> /etc/apt/apt.conf.d/50unattended-upgrades
+awk 'NR > 3 { print; }' /etc/apt/apt.conf.d/50unattended-upgrades.in >> /etc/apt/apt.conf.d/50unattended-upgrades
+rm /etc/apt/apt.conf.d/50unattended-upgrades.in
+
+if [ -L autoupdates-install.sh ]; then echo "Removing the link"; rm autoupdates-install.sh; fi 
+
+echo "Installation terminee"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/ca-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+HOST=`hostname --fqdn`;
+DATE=`date +%Y%m%d-%H%M%S`
+
+# Check the CA name
+if [ ! -e /home/aaa/conf/$HOST/ca_name ]; then
+  echo "Configuration error: missing /home/aaa/conf/$HOST/ca_name";
+  exit 1;
+fi
+
+CA=`cat /home/aaa/conf/$HOST/ca_name`;
+
+rm -rf /root/ca_data
+mkdir /root/ca_data
+
+# Simply install a link to the CA material for this peer.
+ln -sf /home/aaa/ca/ca_data/$CA /root/ca_data/ca
+
+# Links.
+ln -s /root/ca_data/ca/clients/$HOST/certchain.pem /root/ca_data/cert.pem
+ln -s /root/ca_data/ca/clients/$HOST/ca.pem /root/ca_data/
+ln -s /root/ca_data/ca/clients/$HOST/privkey.pem /root/ca_data/
+cat /root/ca_data/ca/clients/$HOST/crl/* > /root/ca_data/crl-$DATE.pem
+ln -s /root/ca_data/crl-$DATE.pem /root/ca_data/crl.pem
+
+
+# Done!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/conflink-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+HOST=`hostname --fqdn`;
+
+rm -f /root/conf
+
+# Simply install a link to the CA material for this peer.
+ln -sf /home/aaa/conf/$HOST /root/conf
+
+# Done!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/dns-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,28 @@
+#!/bin/bash -x
+
+# Check configuration file is there
+if [ ! -d "/home/aaa/conf/`hostname --fqdn`/dns" ]; 
+then echo "Missing configuration files"; exit 1;
+fi
+
+# Display the changes
+echo "The following changes are applied to your host configuration"
+diff -Nur /etc/hosts /home/aaa/conf/`hostname --fqdn`/dns/hosts
+
+cp -f /etc/hosts /etc/hosts.bkp
+cp -f /home/aaa/conf/`hostname --fqdn`/dns/hosts /etc/hosts
+
+# Install the dnsmasq package if needed
+aptitude install dnsmasq
+
+# Copy its configuration
+rm -rf /etc/dnsmasq.conf.bkp /etc/dnsmasq.d.bkp
+mv -f /etc/dnsmasq.conf /etc/dnsmasq.conf.bkp
+mv -f /etc/dnsmasq.d /etc/dnsmasq.d.bkp
+cp -f /home/aaa/conf/`hostname --fqdn`/dns/dnsmasq.conf /etc/
+cp -Rf /home/aaa/conf/`hostname --fqdn`/dns/dnsmasq.d /etc/
+
+# Restart the dnsmasq daemon
+/etc/init.d/dnsmasq restart
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/freeDiameter-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,18 @@
+#!/bin/bash -x
+
+# Install dependencies for freeDiameter
+aptitude install flex bison libsctp1 libsctp-dev libgcrypt-dev libgcrypt11-dbg libgnutls26 libgnutls26-dbg libgnutls-dev mercurial cmake gdb
+
+# Install the link to the configuration
+/home/aaa/installvm.sh conflink
+
+#Test CMake flags file
+if ! [ -f /root/conf/freeDiameter/CMakeFlags ]; then echo Missing flags file; exit 1; fi
+
+# Build freeDiameter
+rm -rf /root/freeDiameter
+mkdir /root/freeDiameter
+pushd /root/freeDiameter
+cmake `cat /root/conf/freeDiameter/CMakeFlags` /home/aaa/src/freeDiameter
+popd
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/freeDiameter-run.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,14 @@
+#!/bin/bash -x
+
+DATE=`date +%Y%m%d-%H%M%S`;
+HOST=`hostname --fqdn`;
+
+ulimit -c 1000000
+rm -f core*
+
+pushd freeDiameter
+make
+popd
+
+echo fd-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-fd.log
+/root/freeDiameter/freeDiameter/freeDiameterd -dd $* 2>&1 | tee -i /home/aaa/logs/fd-$HOST-$DATE.log
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/freeDiameter-trig.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,8 @@
+#!/bin/bash -x
+
+PID=`ps --no-heading -C freeDiameterd -o '%p'`;
+if [ "$1" = "loop" ];
+then while (true); do sleep 10; kill -USR1 $PID; done;
+else kill -USR1 $PID;
+fi
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/hostapd-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,21 @@
+#!/bin/bash -x
+
+# Install dependencies
+apt-get build-dep hostapd || exit 1
+aptitude install linux-backports-modules-karmic-generic-pae || exit 1
+
+# Install the link to the configuration
+/home/aaa/installvm.sh conflink
+
+# Test build directive file
+if ! [ -f /root/conf/hostapd/build.config ]; then echo Missing build config file; exit 1; fi
+
+# We need the radio emulation driver as well, check it was correctly installed.
+modprobe mac80211_hwsim || exit 1
+
+# Build hostapd
+rm -rf /root/hostapd
+cp -Rs /home/aaa/src/hostap /root/hostapd
+ln -s /root/conf/hostapd/build.config /root/hostapd/hostapd/.config
+cd /root/hostapd/hostapd && make || exit 1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/hostapd-run.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,14 @@
+#!/bin/bash -x
+
+DATE=`date +%Y%m%d-%H%M%S`;
+HOST=`hostname --fqdn`;
+
+ulimit -c 1000000
+rm -f core*
+
+# We need the radio emulation driver as well.
+modprobe mac80211_hwsim || exit 1
+
+# echo hap-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-hap.log
+# /root/hostapd/hostapd/hostapd -dd /root/conf/hostapd/hostapd.conf 2>&1 | tee -i /home/aaa/logs/hap-$HOST-$DATE.log
+/root/hostapd/hostapd/hostapd -dd /root/conf/hostapd/hostapd.conf 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/network-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,16 @@
+#!/bin/bash -x
+
+# Check configuration file is there
+if [ ! -e "/home/aaa/conf/`hostname --fqdn`/network/interfaces" ]; 
+then echo "Missing interfaces file in configuration"; exit 1;
+fi
+
+# Display the changes
+echo "The following changes are applied to your network configuration"
+diff -Nur /etc/network/interfaces /home/aaa/conf/`hostname --fqdn`/network/interfaces
+
+cp -f /etc/network/interfaces /etc/network/interfaces.bkp
+cp -f /home/aaa/conf/`hostname --fqdn`/network/interfaces /etc/network/interfaces
+
+# Restart the network
+/etc/init.d/networking restart
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/ntp-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,15 @@
+#!/bin/bash -x
+
+# Install dependencies for freeDiameter
+aptitude install ntp
+
+# Stop the server
+/etc/init.d/ntp stop
+
+# Copy the configuration file
+if [ -e "/home/aaa/conf/`hostname --fqdn`/ntp.conf" ]; 
+then cp -f /home/aaa/conf/`hostname --fqdn`/ntp.conf /etc/;
+fi
+
+# Restart the server
+/etc/init.d/ntp start
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/opendiam-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,21 @@
+#!/bin/bash -x
+
+# Installation of the binary is complex, it requires old distrib (ex: Debian etch)
+aptitude install debhelper autotools-dev libssl-dev libxerces27-dev libace-dev libboost-dev libacexml-dev
+rm -rf /root/opendiameter
+# The following archive comes from http://www.csg.uzh.ch/%7Ecrysm/opendiameter/opendiameter-1.0.7-i.tgz
+# Then it was modified as follow:
+# dch -l local 'Added support for EAP TLS'
+# add --with-eap-tls in the rules files (config.status directive)
+cp -Rs /home/aaa/src/opendiameter-1.0.7-i-tls /root/opendiameter
+pushd /root/opendiameter
+debuild -us -uc
+dpkg -i ../*.deb
+popd
+
+# Install the link to the configuration
+/home/aaa/installvm.sh conflink
+rm -rf /etc/opendiameter
+ln -sf /root/conf/opendiameter /etc/opendiameter
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/opendiam-run.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,20 @@
+#!/bin/bash -x
+
+DATE=`date +%Y%m%d-%H%M%S`;
+HOST=`hostname --fqdn`;
+
+ulimit -c 1000000
+rm -f core*
+
+# OpenDiameter without TLS
+#echo od-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-od.log
+# /usr/bin/aaad /etc/opendiameter/aaad/config/aaad.xml 2>&1 | tee -i /home/aaa/logs/od-$HOST-$DATE.log
+
+# OpenDiameter with TLS
+pushd /root/opendiameter
+make || exit 1
+popd
+pushd /root/conf/opendiameter-tls
+echo ods-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-ods.log
+/root/opendiameter/libdiametereap/server_test_tls 2>&1 | tee -i /home/aaa/logs/ods-$HOST-$DATE.log
+popd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/quagga-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+#!/bin/bash -x
+
+# Check configuration file is there
+if [ ! -d "/home/aaa/conf/`hostname --fqdn`/quagga" ]; 
+then echo "Missing configuration files"; exit 1;
+fi
+
+# Install the package if needed
+aptitude install quagga
+
+# Copy its configuration
+rm -rf /etc/quagga.bkp
+mv -f /etc/quagga /etc/quagga.bkp
+cp -Rf /home/aaa/conf/`hostname --fqdn`/quagga /etc/
+
+# Restart the daemon
+/etc/init.d/quagga restart
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/radvd-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+#!/bin/bash -x
+
+# Check configuration file is there
+if [ ! -e "/home/aaa/conf/`hostname --fqdn`/radvd.conf" ]; 
+then echo "Missing configuration files"; exit 1;
+fi
+
+# Install the package if needed
+aptitude install radvd
+
+# Copy its configuration
+rm -f /etc/radvd.conf.bkp
+mv -f /etc/radvd.conf /etc/radvd.conf.bkp
+cp -f /home/aaa/conf/`hostname --fqdn`/radvd.conf /etc/
+
+# Restart the daemon
+/etc/init.d/radvd restart
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/squid-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,19 @@
+#!/bin/bash -x
+
+# Check configuration file is there
+if [ ! -d "/home/aaa/conf/`hostname --fqdn`/squid" ]; 
+then echo "Missing configuration files"; exit 1;
+fi
+
+# Install the package if needed
+aptitude install squid
+
+# Copy its configuration
+rm -rf /etc/squid.bkp
+mv -f /etc/squid /etc/squid.bkp
+cp -Rf /home/aaa/conf/`hostname --fqdn`/squid /etc/
+
+# Restart the daemon
+/etc/init.d/squid restart
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/sysctl-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,15 @@
+#!/bin/bash -x
+
+# Check configuration file is there
+if [ ! -d "/home/aaa/conf/`hostname --fqdn`/sysctl.d" ]; 
+then echo "Missing configuration files"; exit 1;
+fi
+
+# Copy configuration
+cp -f /home/aaa/conf/`hostname --fqdn`/sysctl.d/99-testbedaaa.conf /etc/sysctl.d/99-testbedaaa.conf
+
+# Refresh the configuration
+invoke-rc.d procps start
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/vboxtools-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,7 @@
+#!/bin/bash -x
+
+# Install the packages
+# aptitude install dkms virtualbox-ose-guest-source virtualbox-ose-guest-utils virtualbox-ose-guest-dkms
+aptitude install dkms virtualbox-ose-guest-source virtualbox-ose-guest-dkms
+
+# Done :)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/waaad-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,16 @@
+#!/bin/bash -x
+
+# Install dependencies for waaad
+aptitude install flex bison libsctp1 libsctp-dev libgnutls26 libgnutls-dev mercurial cmake
+
+# Build waaad
+rm -rf /root/waaad
+mkdir /root/waaad
+pushd /root/waaad
+ln -sf /home/aaa/conf/`hostname --fqdn`/waaad/CMakeCache.txt
+cmake -DCMAKE_BUILD_TYPE:STRING=Debug -DDEFAULT_CONF_FILE:STRING=/home/aaa/conf/`hostname --fqdn`/waaad/waaad.conf /home/aaa/src/waaad
+mv -f CMakeCache.txt /home/aaa/conf/`hostname --fqdn`/waaad/CMakeCache.txt
+ln -sf /home/aaa/conf/`hostname --fqdn`/waaad/CMakeCache.txt
+make
+popd
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/waaad-kill.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,6 @@
+#!/bin/bash -x
+
+PID=`ps --no-heading -C waaad -o '%p'`
+kill -TERM $PID
+sleep 1
+kill -KILL $PID
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/waaad-run.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+DATE=`date +%Y%m%d-%H%M%S`
+HOST=`hostname --fqdn`
+
+ulimit -c 1000000
+rm -f core.*
+
+echo waaad-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-waaad.log
+/root/waaad/waaad/waaad -ddc /home/aaa/conf/$HOST/waaad/waaad.conf 2>&1 | tee -i /home/aaa/logs/waaad-$HOST-$DATE.log
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/waaad-trig.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,6 @@
+#!/bin/bash -x
+
+PID=`ps --no-heading -C waaad -o '%p'`
+kill -TERM $PID
+sleep 1
+kill -KILL $PID
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/wpasupplicant-install.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,21 @@
+#!/bin/bash -x
+
+# Install dependencies
+apt-get build-dep wpasupplicant || exit 1
+aptitude install linux-backports-modules-karmic-generic-pae || exit 1
+
+# Install the link to the configuration
+/home/aaa/installvm.sh conflink
+
+# Test build directive file
+if ! [ -f /root/conf/wpasupplicant/build.config ]; then echo Missing build config file; exit 1; fi
+
+# We need the radio emulation driver as well, check it was correctly installed.
+modprobe mac80211_hwsim || exit 1
+
+# Build wpa_supplicant
+rm -rf /root/wpa_supplicant
+cp -Rs /home/aaa/src/hostap /root/wpa_supplicant
+ln -s /root/conf/wpasupplicant/build.config /root/wpa_supplicant/wpa_supplicant/.config
+cd /root/wpa_supplicant/wpa_supplicant && make || exit 1
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/wpasupplicant-run.sh	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,14 @@
+#!/bin/bash -x
+
+DATE=`date +%Y%m%d-%H%M%S`;
+HOST=`hostname --fqdn`;
+
+ulimit -c 1000000
+rm -f core*
+
+# We need the radio emulation driver as well.
+modprobe mac80211_hwsim || exit 1
+
+# echo wpa-$HOST-$DATE.log > /home/aaa/logs/LATEST-$HOST-wpa.log
+# /root/wpa_supplicant/wpa_supplicant/wpa_supplicant -i wlan1 -c/root/conf/wpasupplicant/wpa_supplicant.conf 2>&1 | tee -i /home/aaa/logs/wpa-$HOST-$DATE.log
+/root/wpa_supplicant/wpa_supplicant/wpa_supplicant -i wlan1 -c/root/conf/wpasupplicant/wpa_supplicant.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/opendiameter-1.0.7-i-tls.patch	Thu Jun 17 11:00:32 2010 +0900
@@ -0,0 +1,566 @@
+diff -Nur opendiameter-1.0.7-i/applications/pana/Makefile.am opendiameter-1.0.7-i-tls/applications/pana/Makefile.am
+--- opendiameter-1.0.7-i/applications/pana/Makefile.am	2007-03-01 08:26:40.000000000 +0900
++++ opendiameter-1.0.7-i-tls/applications/pana/Makefile.am	2010-04-26 14:42:42.000000000 +0900
+@@ -14,11 +14,11 @@
+ AM_LDFLAGS = @L_LDFLAGS@
+ 
+ # Distribution
+-if compile_EAPTLS
+-noinst_PROGRAMS = pacd client_pana_eaptls
+-else
++# if compile_EAPTLS
++# noinst_PROGRAMS = pacd client_pana_eaptls
++# else
+ noinst_PROGRAMS = pacd
+-endif
++# endif
+ 
+ pacd_SOURCES = pacd.cxx pacd_config.cxx pacd_config.h
+ pacd_LDADD = @L_LIBS@ \
+@@ -29,8 +29,9 @@
+              $(top_builddir)/libodutl/libodutl.la
+ 
+ if compile_EAPTLS
+-client_pana_eaptls_SOURCES = client_pana_eap-tls.cxx
++# client_pana_eaptls_SOURCES = client_pana_eap-tls.cxx
+ client_pana_eaptls_LDADD = @L_LIBS@ \
++		-lxerces-c	\
+              $(top_builddir)/libpana/libpana.la \
+              $(top_builddir)/libeap/libeap.la \
+              $(top_builddir)/libeap/libeaparchie.la \
+diff -Nur opendiameter-1.0.7-i/applications/pana/Makefile.in opendiameter-1.0.7-i-tls/applications/pana/Makefile.in
+--- opendiameter-1.0.7-i/applications/pana/Makefile.in	2007-03-01 08:31:02.000000000 +0900
++++ opendiameter-1.0.7-i-tls/applications/pana/Makefile.in	2010-04-26 14:42:42.000000000 +0900
+@@ -34,9 +34,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@compile_EAPTLS_FALSE@noinst_PROGRAMS = pacd$(EXEEXT)
+-@compile_EAPTLS_TRUE@noinst_PROGRAMS = pacd$(EXEEXT) \
+-@compile_EAPTLS_TRUE@	client_pana_eaptls$(EXEEXT)
++noinst_PROGRAMS = pacd$(EXEEXT)
+ subdir = applications/pana
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -46,17 +44,6 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+-am__client_pana_eaptls_SOURCES_DIST = client_pana_eap-tls.cxx
+-@compile_EAPTLS_TRUE@am_client_pana_eaptls_OBJECTS =  \
+-@compile_EAPTLS_TRUE@	client_pana_eap-tls.$(OBJEXT)
+-client_pana_eaptls_OBJECTS = $(am_client_pana_eaptls_OBJECTS)
+-@compile_EAPTLS_TRUE@client_pana_eaptls_DEPENDENCIES =  \
+-@compile_EAPTLS_TRUE@	$(top_builddir)/libpana/libpana.la \
+-@compile_EAPTLS_TRUE@	$(top_builddir)/libeap/libeap.la \
+-@compile_EAPTLS_TRUE@	$(top_builddir)/libeap/libeaparchie.la \
+-@compile_EAPTLS_TRUE@	$(top_builddir)/libeap/libeaptls.la \
+-@compile_EAPTLS_TRUE@	$(top_builddir)/libdiamparser/libdiamparser.la \
+-@compile_EAPTLS_TRUE@	$(top_builddir)/libodutl/libodutl.la
+ am_pacd_OBJECTS = pacd.$(OBJEXT) pacd_config.$(OBJEXT)
+ pacd_OBJECTS = $(am_pacd_OBJECTS)
+ pacd_DEPENDENCIES = $(top_builddir)/libpana/libpana.la \
+@@ -83,8 +70,8 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(client_pana_eaptls_SOURCES) $(pacd_SOURCES)
+-DIST_SOURCES = $(am__client_pana_eaptls_SOURCES_DIST) $(pacd_SOURCES)
++SOURCES = $(pacd_SOURCES)
++DIST_SOURCES = $(pacd_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -214,6 +201,7 @@
+               -D@HOST_OS@
+ 
+ AM_LDFLAGS = @L_LDFLAGS@
++# endif
+ pacd_SOURCES = pacd.cxx pacd_config.cxx pacd_config.h
+ pacd_LDADD = @L_LIBS@ \
+              $(top_builddir)/libpana/libpana.la \
+@@ -222,8 +210,10 @@
+              $(top_builddir)/libdiamparser/libdiamparser.la \
+              $(top_builddir)/libodutl/libodutl.la
+ 
+-@compile_EAPTLS_TRUE@client_pana_eaptls_SOURCES = client_pana_eap-tls.cxx
++
++# client_pana_eaptls_SOURCES = client_pana_eap-tls.cxx
+ @compile_EAPTLS_TRUE@client_pana_eaptls_LDADD = @L_LIBS@ \
++@compile_EAPTLS_TRUE@		-lxerces-c	\
+ @compile_EAPTLS_TRUE@             $(top_builddir)/libpana/libpana.la \
+ @compile_EAPTLS_TRUE@             $(top_builddir)/libeap/libeap.la \
+ @compile_EAPTLS_TRUE@             $(top_builddir)/libeap/libeaparchie.la \
+@@ -271,9 +261,6 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
+-client_pana_eaptls$(EXEEXT): $(client_pana_eaptls_OBJECTS) $(client_pana_eaptls_DEPENDENCIES) 
+-	@rm -f client_pana_eaptls$(EXEEXT)
+-	$(CXXLINK) $(client_pana_eaptls_LDFLAGS) $(client_pana_eaptls_OBJECTS) $(client_pana_eaptls_LDADD) $(LIBS)
+ pacd$(EXEEXT): $(pacd_OBJECTS) $(pacd_DEPENDENCIES) 
+ 	@rm -f pacd$(EXEEXT)
+ 	$(CXXLINK) $(pacd_LDFLAGS) $(pacd_OBJECTS) $(pacd_LDADD) $(LIBS)
+@@ -284,7 +271,6 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_pana_eap-tls.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pacd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pacd_config.Po@am__quote@
+ 
+diff -Nur opendiameter-1.0.7-i/libdiametereap/Makefile.am opendiameter-1.0.7-i-tls/libdiametereap/Makefile.am
+--- opendiameter-1.0.7-i/libdiametereap/Makefile.am	2007-02-14 00:53:56.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libdiametereap/Makefile.am	2010-04-26 14:42:42.000000000 +0900
+@@ -49,6 +49,7 @@
+ 
+ if compile_EAPTLS
+ LDADD = @L_LIBS@ \
++	-lxerces-c	\
+         $(top_builddir)/libdiametereap/libdiametereap.la \
+ 	$(top_builddir)/libdiameter/libdiameter.la \
+ 	$(top_builddir)/libdiamparser/libdiamparser.la \
+diff -Nur opendiameter-1.0.7-i/libdiametereap/Makefile.in opendiameter-1.0.7-i-tls/libdiametereap/Makefile.in
+--- opendiameter-1.0.7-i/libdiametereap/Makefile.in	2007-03-01 08:31:03.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libdiametereap/Makefile.in	2010-04-26 14:42:42.000000000 +0900
+@@ -316,6 +316,7 @@
+ @compile_EAPTLS_FALSE@	$(top_builddir)/libodutl/libodutl.la
+ 
+ @compile_EAPTLS_TRUE@LDADD = @L_LIBS@ \
++@compile_EAPTLS_TRUE@	-lxerces-c	\
+ @compile_EAPTLS_TRUE@        $(top_builddir)/libdiametereap/libdiametereap.la \
+ @compile_EAPTLS_TRUE@	$(top_builddir)/libdiameter/libdiameter.la \
+ @compile_EAPTLS_TRUE@	$(top_builddir)/libdiamparser/libdiamparser.la \
+diff -Nur opendiameter-1.0.7-i/libdiametereap/test/server_test_tls.cxx opendiameter-1.0.7-i-tls/libdiametereap/test/server_test_tls.cxx
+--- opendiameter-1.0.7-i/libdiametereap/test/server_test_tls.cxx	2007-03-02 01:46:38.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libdiametereap/test/server_test_tls.cxx	2010-04-26 16:56:34.000000000 +0900
+@@ -180,13 +180,13 @@
+ protected:
+   std::string& InputConfigFile()
+   {
+-    std::cout << "Received an Tls-Request "<< std::endl;
+-      
++       
+ //    static std::string configFile;
+ //    std::cout << "Input config filename (within 10sec.): " << std::endl;
+ //    std::cin >> configFile;
+ //    std::cout << "Config file name = " << configFile << std::endl;
+ static std::string configFile("./config/server.eap-tls.xml");
++   std::cout << "Requested EAP conf file, giving config/server.eap-tls.xml "<< std::endl;
+     return configFile;
+ }
+ 
+@@ -250,7 +250,8 @@
+ 
+   void Start() throw(AAA_Error)
+   { 
+-    DiameterEapServerSession::Start(); 
++   std::cout << "Diameter EAP server session Start." << std::endl;
++     DiameterEapServerSession::Start(); 
+   }
+ 
+   /// This virtual function is called when an EAP server session is
+@@ -276,10 +277,7 @@
+ 	(DiameterScholarAttribute<diameter_octetstring_t> &eapMasterSessionKey)
+     {
+ 	std::cout << "Setting master session key" << std::endl;
+-	if (userNameValidate)
+-	{
+-	    eapMasterSessionKey.Set (((MyEapAuthTlsStateMachine &) (eap->MethodStateMachine ())).MSK ());
+-	}
++        eapMasterSessionKey.Set (((MyEapAuthTlsStateMachine &) (eap->MethodStateMachine ())).MSK ());
+ 	return true;
+     }
+ // End New
+@@ -295,7 +293,8 @@
+       return false;
+ #endif
+ // New
+-    userNameValidate = (userName == "ohba");
++   std::cout << "Validate Username (always OK in test) : " << userName << std::endl;
++    userNameValidate = true;
+     return userNameValidate;
+ // End New
+   }
+@@ -392,12 +391,30 @@
+ typedef AAAServerSessionClassFactory<MyDiameterEapServerSession> 
+ MyServerFactory;
+ 
++/***************** Accoutning ********************/
++
++class MyAAAAccountingServerSession : public AAAAccountingServerSession
++{
++ public:
++  MyAAAAccountingServerSession(AAAApplicationCore& appCore, 
++			     diameter_unsigned32_t appId) 
++    : AAAAccountingServerSession(appCore, appId)
++  {
++   std::cout << "Accounting server session class instantiated."<< std::endl;
++  }
++
++};
++
++typedef AAAServerSessionClassFactory<MyAAAAccountingServerSession> 
++        MyAcctServerFactory;
++
++
++/*******************************************************************/
+ class MyInitializer
+ {
+  public:
+   MyInitializer(AAA_Task &t, AAAApplicationCore &appCore) 
+-    : task(t), applicationCore(appCore), 
+-      myAuthFactory(MyServerFactory(appCore, 2000))
++    : task(t), applicationCore(appCore)
+   {
+     Start();
+   }
+@@ -412,7 +429,16 @@
+   void Start()
+   {
+     InitEap();
+-    applicationCore.RegisterServerSessionFactory(&myAuthFactory);
++    
++   m_AuthFactory = std::auto_ptr<MyServerFactory>
++         (new MyServerFactory(applicationCore, EapApplicationId));
++
++   applicationCore.RegisterServerSessionFactory(m_AuthFactory.get());
++
++   m_AcctFactory = std::auto_ptr<MyAcctServerFactory>
++         (new MyAcctServerFactory(applicationCore, (diameter_unsigned32_t)3));
++
++   applicationCore.RegisterServerSessionFactory(m_AcctFactory.get());
+   }
+ 
+   void Stop() {}
+@@ -427,7 +453,7 @@
+   methodRegistrar.registerMethod
+     (std::string("TLS"), EapType(TLS_METHOD_TYPE), 
+      Authenticator, myAuthTlsCreator);
+-  }
++ }
+ 
+   AAA_Task &task;
+   AAAApplicationCore &applicationCore;
+@@ -439,7 +465,8 @@
+   EapMethodStateMachineCreator<MyEapAuthIdentityStateMachine> 
+   myAuthIdentityCreator;
+ 
+-  MyServerFactory myAuthFactory;
++      std::auto_ptr<MyServerFactory> m_AuthFactory;
++      std::auto_ptr<MyAcctServerFactory> m_AcctFactory;
+ };
+ 
+ int
+@@ -462,7 +489,8 @@
+ 	exit(1);
+       }
+   MyInitializer initializer(task, applicationCore);
+-
++    AAA_LOG((LM_DEBUG, "Test Application initialized\n"));
++ 
+   while (1) 
+       ACE_OS::sleep(1);
+   return 0;
+diff -Nur opendiameter-1.0.7-i/libeap/eap-tls/eap_tls_mng.cxx opendiameter-1.0.7-i-tls/libeap/eap-tls/eap_tls_mng.cxx
+--- opendiameter-1.0.7-i/libeap/eap-tls/eap_tls_mng.cxx	2007-03-02 02:16:49.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/eap-tls/eap_tls_mng.cxx	2010-04-26 14:42:42.000000000 +0900
+@@ -209,8 +209,8 @@
+   std::string random_file = conf.get_random_file();
+ 	if (!(RAND_load_file(random_file.c_str(), 1024*1024))) {
+ 		ERR_print_errors_fp(stderr);
+-		EAP_LOG(LM_ERROR, "rlm_eap_tls: Error loading randomness");
+-		return NULL;
++		EAP_LOG(LM_ERROR, "rlm_eap_tls: Error loading randomness, ignored\n");
++		// return NULL;
+ 	}
+ 
+    SSL_CTX_set_session_id_context(ctx,(const unsigned char*)&session_id_context,sizeof session_id_context);
+diff -Nur opendiameter-1.0.7-i/libeap/eap-tls/eap_tls_xml_parser.cxx opendiameter-1.0.7-i-tls/libeap/eap-tls/eap_tls_xml_parser.cxx
+--- opendiameter-1.0.7-i/libeap/eap-tls/eap_tls_xml_parser.cxx	2007-03-02 01:46:38.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/eap-tls/eap_tls_xml_parser.cxx	2010-04-26 14:42:42.000000000 +0900
+@@ -30,8 +30,12 @@
+ /*                                                                        */
+ /* END_COPYRIGHT                                                          */
+ 
++/* For compilation */
++#include "../../libdiamparser/include/diameter_parser.h"
++
+ #include "xml.h"
+ #include "xml_errorreporter.h"
++
+ #include "eap_tls_xml_parser.hxx"
+ #include <xercesc/util/PlatformUtils.hpp>
+ #include <xercesc/util/XMLString.hpp>
+@@ -92,10 +96,10 @@
+       XercesDOMParser parser;
+       myDOMTreeErrorReporter errReporter;
+ 
+-      parser.setValidationScheme(XercesDOMParser::Val_Always);
++      parser.setValidationScheme(XercesDOMParser::Val_Auto);
+       parser.setDoNamespaces(true);
+       parser.setDoSchema(true);
+-      parser.setErrorHandler(&errReporter);
++      //parser.setErrorHandler(&errReporter);
+ 
+       try {
+          parser.parse(filename.data());
+diff -Nur opendiameter-1.0.7-i/libeap/include/eap_tls_data_defs.hxx opendiameter-1.0.7-i-tls/libeap/include/eap_tls_data_defs.hxx
+--- opendiameter-1.0.7-i/libeap/include/eap_tls_data_defs.hxx	2007-03-02 01:47:11.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/include/eap_tls_data_defs.hxx	2010-04-26 14:42:42.000000000 +0900
+@@ -41,6 +41,10 @@
+ //#include "rbtree.h"
+ #include "ace/Singleton.h"
+ 
++/* For compilation */
++#include "../../libdiamparser/include/diameter_parser.h"
++
++
+ //
+ // Definition of default values
+ //
+diff -Nur opendiameter-1.0.7-i/libeap/include/eap_tls_fsm.hxx opendiameter-1.0.7-i-tls/libeap/include/eap_tls_fsm.hxx
+--- opendiameter-1.0.7-i/libeap/include/eap_tls_fsm.hxx	2007-03-02 02:16:38.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/include/eap_tls_fsm.hxx	2010-04-26 14:42:42.000000000 +0900
+@@ -200,6 +200,7 @@
+ 	if (parser.open(fname, rootData) != 0)
+ 	{
+ 		// TODO: Error message
++	        EAP_LOG(LM_DEBUG, "Error in input file\n");
+ 		return;
+ 	}
+ 
+diff -Nur opendiameter-1.0.7-i/libeap/include/xml_errorreporter.h opendiameter-1.0.7-i-tls/libeap/include/xml_errorreporter.h
+--- opendiameter-1.0.7-i/libeap/include/xml_errorreporter.h	1970-01-01 09:00:00.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/include/xml_errorreporter.h	2010-04-26 14:42:42.000000000 +0900
+@@ -0,0 +1,150 @@
++/* BEGIN_COPYRIGHT                                                        */
++/*                                                                        */
++/* Open Diameter: Open-source software for the Diameter and               */
++/*                Diameter related protocols                              */
++/*                                                                        */
++/* Copyright (C) 2002-2004 Open Diameter Project                          */
++/*                                                                        */
++/* This library is free software; you can redistribute it and/or modify   */
++/* it under the terms of the GNU Lesser General Public License as         */
++/* published by the Free Software Foundation; either version 2.1 of the   */
++/* License, or (at your option) any later version.                        */
++/*                                                                        */
++/* This library is distributed in the hope that it will be useful,        */
++/* but WITHOUT ANY WARRANTY; without even the implied warranty of         */
++/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      */
++/* Lesser General Public License for more details.                        */
++/*                                                                        */
++/* You should have received a copy of the GNU Lesser General Public       */
++/* License along with this library; if not, write to the Free Software    */
++/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307    */
++/* USA.                                                                   */
++/*                                                                        */
++/* In addition, when you copy and redistribute some or the entire part of */
++/* the source code of this software with or without modification, you     */
++/* MUST include this copyright notice in each copy.                       */
++/*                                                                        */
++/* If you make any changes that are appeared to be useful, please send    */
++/* sources that include the changed part to                               */
++/* diameter-developers@lists.sourceforge.net so that we can reflect your  */
++/* changes to one unified version of this software.                       */
++/*                                                                        */
++/* END_COPYRIGHT                                                          */
++
++/*
++ * The Apache Software License, Version 1.1
++ *
++ * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
++ * reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The end-user documentation included with the redistribution,
++ *    if any, must include the following acknowledgment:
++ *       "This product includes software developed by the
++ *        Apache Software Foundation (http://www.apache.org/)."
++ *    Alternately, this acknowledgment may appear in the software itself,
++ *    if and wherever such third-party acknowledgments normally appear.
++ *
++ * 4. The names "Xerces" and "Apache Software Foundation" must
++ *    not be used to endorse or promote products derived from this
++ *    software without prior written permission. For written
++ *    permission, please contact apache\@apache.org.
++ *
++ * 5. Products derived from this software may not be called "Apache",
++ *    nor may "Apache" appear in their name, without prior written
++ *    permission of the Apache Software Foundation.
++ *
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
++ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ * ====================================================================
++ *
++ * This software consists of voluntary contributions made by many
++ * individuals on behalf of the Apache Software Foundation, and was
++ * originally based on software copyright (c) 1999, International
++ * Business Machines, Inc., http://www.ibm.com .  For more information
++ * on the Apache Software Foundation, please see
++ * <http://www.apache.org/>.
++ */
++
++
++#include "../libdiamparser/include/diameter_parser_api.h"
++#include <xercesc/util/XercesDefs.hpp>
++#include <xercesc/sax/ErrorHandler.hpp>
++
++class AAA_PARSER_EXPORT myDOMTreeErrorReporter  : public ErrorHandler
++{
++public:
++    // -----------------------------------------------------------------------
++    //  Constructors and Destructor
++    // -----------------------------------------------------------------------
++/*
++    myDOMTreeErrorReporter (int i) :
++       fSawErrors(false)
++    {
++
++    }
++*/
++    myDOMTreeErrorReporter ()
++    {
++	fSawErrors = false;
++    }
++
++
++
++
++//    myDOMTreeErrorReporter ();
++
++    ~myDOMTreeErrorReporter ()
++    {
++    }
++
++    // -----------------------------------------------------------------------
++    //  Implementation of the error handler interface
++    // -----------------------------------------------------------------------
++    void warning(const SAXParseException& toCatch){};
++    void error(const SAXParseException& toCatch){};
++    void fatalError(const SAXParseException& toCatch){};
++    void resetErrors(){};
++
++    // -----------------------------------------------------------------------
++    //  Getter methods
++    // -----------------------------------------------------------------------
++    bool getSawErrors() const;
++
++    // -----------------------------------------------------------------------
++    //  Private data members
++    //
++    //  fSawErrors
++    //      This is set if we get any errors, and is queryable via a getter
++    //      method. Its used by the main code to suppress output if there are
++    //      errors.
++    // -----------------------------------------------------------------------
++    bool    fSawErrors;
++};
++
++inline bool myDOMTreeErrorReporter ::getSawErrors() const
++{
++    return fSawErrors;
++}
++
+diff -Nur opendiameter-1.0.7-i/libeap/include/xml.h opendiameter-1.0.7-i-tls/libeap/include/xml.h
+--- opendiameter-1.0.7-i/libeap/include/xml.h	1970-01-01 09:00:00.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/include/xml.h	2010-04-26 14:42:42.000000000 +0900
+@@ -0,0 +1,54 @@
++/* BEGIN_COPYRIGHT                                                        */
++/*                                                                        */
++/* Open Diameter: Open-source software for the Diameter and               */
++/*                Diameter related protocols                              */
++/*                                                                        */
++/* Copyright (C) 2002-2004 Open Diameter Project                          */
++/*                                                                        */
++/* This library is free software; you can redistribute it and/or modify   */
++/* it under the terms of the GNU Lesser General Public License as         */
++/* published by the Free Software Foundation; either version 2.1 of the   */
++/* License, or (at your option) any later version.                        */
++/*                                                                        */
++/* This library is distributed in the hope that it will be useful,        */
++/* but WITHOUT ANY WARRANTY; without even the implied warranty of         */
++/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      */
++/* Lesser General Public License for more details.                        */
++/*                                                                        */
++/* You should have received a copy of the GNU Lesser General Public       */
++/* License along with this library; if not, write to the Free Software    */
++/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307    */
++/* USA.                                                                   */
++/*                                                                        */
++/* In addition, when you copy and redistribute some or the entire part of */
++/* the source code of this software with or without modification, you     */
++/* MUST include this copyright notice in each copy.                       */
++/*                                                                        */
++/* If you make any changes that are appeared to be useful, please send    */
++/* sources that include the changed part to                               */
++/* diameter-developers@lists.sourceforge.net so that we can reflect your  */
++/* changes to one unified version of this software.                       */
++/*                                                                        */
++/* END_COPYRIGHT                                                          */
++#ifndef __UTL_XML_H__
++#define __UTL_XML_H__
++
++#include <string>
++#include <xercesc/dom/DOM.hpp>
++#include "../libdiamparser/include/diameter_parser_api.h"
++
++#if defined(XERCES_HAS_CPP_NAMESPACE)
++using namespace xercesc;
++#endif
++
++class AAA_PARSER_EXPORT UtilXML
++{
++public:
++	static std::string getProp(const DOMNode *n, const char* name, char* const dflt);
++	static std::string getProp(const DOMNode *n, const char* name);
++	static bool matchNode(const DOMNode *n, const char* name);
++	static DOMNode* getNextElementNode(DOMNode *n);
++	static std::string transcodeFromXMLCh(const XMLCh*);
++};
++
++#endif // __UTL_XML_H__
+diff -Nur opendiameter-1.0.7-i/libeap/Makefile.am opendiameter-1.0.7-i-tls/libeap/Makefile.am
+--- opendiameter-1.0.7-i/libeap/Makefile.am	2007-02-14 00:53:56.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/Makefile.am	2010-04-26 14:42:42.000000000 +0900
+@@ -116,6 +116,7 @@
+ libeaptls_la_LDFLAGS = -version-info 1:0:0 
+ libeaptls_la_AR = $(AR) -qcs
+ LDADD = @L_LIBS@ \
++	-lxerces-c	\
+         $(top_builddir)/libeap/libeap.la \
+         $(top_builddir)/libeap/libeaparchie.la \
+         $(top_builddir)/libeap/libeaptls.la \
+diff -Nur opendiameter-1.0.7-i/libeap/Makefile.in opendiameter-1.0.7-i-tls/libeap/Makefile.in
+--- opendiameter-1.0.7-i/libeap/Makefile.in	2007-03-01 08:31:03.000000000 +0900
++++ opendiameter-1.0.7-i-tls/libeap/Makefile.in	2010-04-26 14:42:42.000000000 +0900
+@@ -420,6 +420,7 @@
+ @compile_EAPTLS_FALSE@        $(top_builddir)/libeap/libeaparchie.la
+ 
+ @compile_EAPTLS_TRUE@LDADD = @L_LIBS@ \
++@compile_EAPTLS_TRUE@	-lxerces-c	\
+ @compile_EAPTLS_TRUE@        $(top_builddir)/libeap/libeap.la \
+ @compile_EAPTLS_TRUE@        $(top_builddir)/libeap/libeaparchie.la \
+ @compile_EAPTLS_TRUE@        $(top_builddir)/libeap/libeaptls.la \
Binary file src/opendiameter-1.0.7-i.tar.gz has changed
"Welcome to our mercurial repository"