# HG changeset patch
# User Sebastien Decugis <sdecugis@nict.go.jp>
# Date 1317189023 -7200
# Node ID 36caa2c02d1e25309bc9cc6a1f0bb3333ddf7e80
# Parent  463ffc722c1acf5cd259e5202c53b72b726e5f61
Enable running two freeDiameter instances on a single host

diff -r 463ffc722c1a -r 36caa2c02d1e doc/single_host/freeDiameter-1.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/single_host/freeDiameter-1.conf	Wed Sep 28 07:50:23 2011 +0200
@@ -0,0 +1,16 @@
+
+# -------- Test configuration ---------
+
+Identity = "peer1.localdomain";
+Realm = "localdomain";
+# Port = 3868;
+# SecPort = 3869;
+
+TLS_Cred = "peer1.cert.pem",
+	   "peer1.key.pem";
+TLS_CA = "cacert.pem";
+
+LoadExtension = "extensions/test_app.fdx" : "test_app1.conf";
+
+ConnectPeer = "peer2.localdomain" { ConnectTo = "127.0.0.1"; No_TLS; port = 30868; };
+
diff -r 463ffc722c1a -r 36caa2c02d1e doc/single_host/freeDiameter-2.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/single_host/freeDiameter-2.conf	Wed Sep 28 07:50:23 2011 +0200
@@ -0,0 +1,15 @@
+# -------- Test configuration ---------
+
+Identity = "peer2.localdomain";
+Realm = "localdomain";
+Port = 30868;
+SecPort = 30869;
+
+TLS_Cred = "peer2.cert.pem",
+	   "peer2.key.pem";
+TLS_CA = "cacert.pem";
+
+LoadExtension = "extensions/test_app.fdx" : "test_app2.conf";
+
+ConnectPeer = "peer1.localdomain" { ConnectTo = "127.0.0.1"; No_TLS; };
+
diff -r 463ffc722c1a -r 36caa2c02d1e doc/single_host/make_certs.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/single_host/make_certs.sh	Wed Sep 28 07:50:23 2011 +0200
@@ -0,0 +1,20 @@
+rm -rf demoCA
+mkdir demoCA
+echo 01 > demoCA/serial
+touch demoCA/index.txt
+
+
+
+# CA self certificate
+openssl req  -new -batch -x509 -days 3650 -nodes -newkey rsa:1024 -out cacert.pem -keyout cakey.pem -subj /CN=ca.localdomain/C=FR/ST=BdR/L=Aix/O=fD/OU=Tests
+
+#peer1
+openssl genrsa -out peer1.key.pem 1024
+openssl req -new -batch -out peer1.csr.pem -key peer1.key.pem -subj /CN=peer1.localdomain/C=FR/ST=BdR/L=Aix/O=fD/OU=Tests
+openssl ca -cert cacert.pem -keyfile cakey.pem -in peer1.csr.pem -out peer1.cert.pem -outdir . -batch
+
+#peer2
+openssl genrsa -out peer2.key.pem 1024
+openssl req -new -batch -out peer2.csr.pem -key peer2.key.pem -subj /CN=peer2.localdomain/C=FR/ST=BdR/L=Aix/O=fD/OU=Tests
+openssl ca -cert cacert.pem -keyfile cakey.pem -in peer2.csr.pem -out peer2.cert.pem -outdir . -batch
+
diff -r 463ffc722c1a -r 36caa2c02d1e doc/single_host/test_app1.conf
diff -r 463ffc722c1a -r 36caa2c02d1e doc/single_host/test_app2.conf
diff -r 463ffc722c1a -r 36caa2c02d1e libfdcore/fdd.y
--- a/libfdcore/fdd.y	Mon Sep 26 13:44:10 2011 +0200
+++ b/libfdcore/fdd.y	Wed Sep 28 07:50:23 2011 +0200
@@ -488,7 +488,7 @@
 				}
 				if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); YYERROR; }
 				
-				CHECK_FCT_DO( fd_ep_add_merge( &fddpi.pi_endpoints, ai->ai_addr, ai->ai_addrlen, EP_FL_CONF | disc ), YYERROR );
+				CHECK_FCT_DO( fd_ep_add_merge( &fddpi.pi_endpoints, ai->ai_addr, ai->ai_addrlen, EP_FL_CONF | (disc ?: EP_ACCEPTALL) ), YYERROR );
 				free($4);
 				freeaddrinfo(ai);
 			}