1.1 --- a/BPQ/dtn-bpq-dtlsr.conf Thu Jun 30 18:29:31 2011 +0100
1.2 +++ b/BPQ/dtn-bpq-dtlsr.conf Fri Jul 01 14:19:40 2011 +0100
1.3 @@ -117,86 +117,80 @@
1.4
1.5 ################################################################################
1.6
1.7 +#discovery add tcp0d1 ip port=11556 local_addr=192.168.1.102 addr=192.168.1.102
1.8 +#discovery add tcp0d0 ip port=11556 local_addr=192.168.1.102 addr=192.168.1.102
1.9 +#discovery add tcp0d1 ip port=11556 addr=192.168.1.152
1.10 +#discovery add tcp0d2 ip port=11556 addr=192.168.1.153
1.11 +
1.12 +discovery add tcp0d0 ip port=11556 local_addr=0.0.0.0 addr=10.125.17.13
1.13 +
1.14 +discovery add tcp0d1 ip port=11556 local_addr=0.0.0.0 addr=10.125.14.17
1.15 +discovery add tcp0d2 ip port=11556 local_addr=0.0.0.0 addr=10.125.14.18
1.16 +discovery add tcp0d3 ip port=11556 local_addr=0.0.0.0 addr=10.125.14.19
1.17 +
1.18 +discovery add tcp0d4 ip port=11556 local_addr=0.0.0.0 addr=10.125.18.12
1.19 +
1.20 +discovery add tcp0d5 ip port=11556 local_addr=0.0.0.0 addr=255.255.255.255
1.21 +
1.22 +discovery add tcp0d6 ip port=11557 local_addr=0.0.0.0 addr=134.226.36.138
1.23 +
1.24 +discovery add tcp0d7 ip port=11557 addr=134.226.36.138
1.25 +################################################################################
1.26 +
1.27 switch -exact $localhost {
1.28 - basil {
1.29 - route local_eid dtn://basil.dsg.cs.tcd.ie.bpq
1.30 - discovery add tcp0d1 ip port=11556 local_addr=192.168.1.102 addr=192.168.1.102
1.31 - }
1.32 - sybil {
1.33 - route local_eid dtn://sybil.dsg.cs.tcd.ie.bpq
1.34
1.35 - discovery add tcp0d0 ip port=11556 local_addr=192.168.1.102 addr=192.168.1.102
1.36 - discovery add tcp0d1 ip port=11556 addr=192.168.1.152
1.37 - discovery add tcp0d2 ip port=11556 addr=192.168.1.153
1.38 +n4cgateway-1 {
1.39 + route local_eid dtn://n4cgateway-1.bpq
1.40
1.41 - discovery announce tcp0 tcp0d0 tcp interval=10 cl_addr=192.168.1.102 cl_port=8556
1.42 - discovery announce tcp0 tcp0d1 tcp interval=10 cl_addr=192.168.1.102 cl_port=8556
1.43 - discovery announce tcp0 tcp0d2 tcp interval=10 cl_addr=192.168.1.102 cl_port=8556
1.44 - }
1.45 - n4cgateway-1 {
1.46 - route local_eid dtn://n4cgateway-1.bpq
1.47 + discovery announce tcp0 tcp0d0 tcp interval=10 cl_addr=10.125.17.10 cl_port=7556
1.48 +}
1.49 +n4cgateway-2 {
1.50 + route local_eid dtn://n4cgateway-2.bpq
1.51
1.52 - discovery add tcp0d3 ip port=11556 addr=10.125.17.13
1.53 + discovery announce tcp0 tcp0d1 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.54 + discovery announce tcp0 tcp0d2 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.55 + discovery announce tcp0 tcp0d3 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.56
1.57 - discovery announce tcp0 tcp0d3 tcp interval=10 cl_addr=10.125.17.10 cl_port=7556
1.58 - }
1.59 - n4cgateway-2 {
1.60 - route local_eid dtn://n4cgateway-2.bpq
1.61 + route add dtn://n4crouter-1.bpq/* dtn://n4cmule-1.bpq
1.62 + route add dtn://n4crouter-1.bpq/* dtn://n4cmule-2.bpq
1.63 + route add dtn://n4crouter-1.bpq/* dtn://n4cmule-3.bpq
1.64 +}
1.65 +n4crouter-2 {
1.66 + route local_eid dtn://n4crouter-2.bpq
1.67
1.68 - discovery add tcp0d4 ip port=11556 addr=10.125.14.17
1.69 - discovery add tcp0d5 ip port=11556 addr=10.125.14.18
1.70 - discovery add tcp0d6 ip port=11556 addr=10.125.14.19
1.71 + discovery announce tcp0 tcp0d4 tcp interval=10 cl_addr=10.125.18.13 cl_port=7556
1.72 +}
1.73 +n4crouter-1 {
1.74 + route local_eid dtn://n4crouter-1.bpq
1.75
1.76 - discovery announce tcp0 tcp0d4 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.77 - discovery announce tcp0 tcp0d5 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.78 - discovery announce tcp0 tcp0d6 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.79 + discovery announce tcp0 tcp0d5 tcp interval=10 cl_addr=10.125.14.12 cl_port=7556
1.80 +}
1.81 +n4crouter-5 {
1.82 + route local_eid dtn://n4crouter-5.bpq
1.83
1.84 - route add dtn://n4crouter-1.bpq/* dtn://n4cmule-1.bpq
1.85 - route add dtn://n4crouter-1.bpq/* dtn://n4cmule-2.bpq
1.86 - route add dtn://n4crouter-1.bpq/* dtn://n4cmule-3.bpq
1.87 - }
1.88 - n4crouter-2 {
1.89 - route local_eid dtn://n4crouter-2.bpq
1.90 + discovery announce tcp0 tcp0d6 tcp interval=10 cl_addr=10.125.14.16 cl_port=7556
1.91 +}
1.92 +n4cmule-1 {
1.93 + route local_eid dtn://n4cmule-1.bpq
1.94 +}
1.95 +n4cmule-2 {
1.96 + route local_eid dtn://n4cmule-2.bpq
1.97 +}
1.98 +n4cmule-3 {
1.99 + route local_eid dtn://n4cmule-3.bpq
1.100 +}
1.101 +rudolf {
1.102 + route local_eid dtn://rudolf.sics.bpq
1.103
1.104 - discovery add tcp0d7 ip port=11556 addr=10.125.18.12
1.105
1.106 - discovery announce tcp0 tcp0d7 tcp interval=10 cl_addr=10.125.18.13 cl_port=7556
1.107 - }
1.108 - n4crouter-1 {
1.109 - route local_eid dtn://n4crouter-1.bpq
1.110 -
1.111 - discovery add tcp0d8 ip port=11556 addr=255.255.255.255
1.112 -
1.113 - discovery announce tcp0 tcp0d8 tcp interval=10 cl_addr=10.125.14.12 cl_port=7556
1.114 - }
1.115 - n4crouter-5 {
1.116 - route local_eid dtn://n4crouter-5.bpq
1.117 -
1.118 - discovery add tcp0d9 ip port=11557 addr=134.226.36.138
1.119 -
1.120 - discovery announce tcp0 tcp0d9 tcp interval=10 cl_addr=10.125.14.16 cl_port=7556
1.121 - }
1.122 - n4cmule-1 {
1.123 - route local_eid dtn://n4cmule-1.bpq
1.124 - }
1.125 - n4cmule-2 {
1.126 - route local_eid dtn://n4cmule-2.bpq
1.127 - }
1.128 - n4cmule-3 {
1.129 - route local_eid dtn://n4cmule-3.bpq
1.130 - }
1.131 - rudolf {
1.132 - route local_eid dtn://rudolf.sics.bpq
1.133 -
1.134 - discovery add tcp0d10 ip port=11557 addr=134.226.36.138
1.135 -
1.136 - discovery announce tcp0 tcp0d10 tcp interval=10 cl_addr=$localhost cl_port=7556
1.137 - }
1.138 - kwak {
1.139 - route local_eid dtn://kwak.sics.bpq
1.140 - }
1.141 - dasher {
1.142 - route local_eid dtn://dasher.sics.bpq
1.143 - }
1.144 + discovery announce tcp0 tcp0d7 tcp interval=10 cl_addr=$localhost cl_port=7556
1.145 +}
1.146 +kwak {
1.147 + route local_eid dtn://kwak.sics.bpq
1.148 +}
1.149 +dasher {
1.150 + route local_eid dtn://dasher.sics.bpq
1.151 }
1.152
1.153 +}
1.154 +