1.1 --- a/BPQ/dtn-bpq-dtlsr.conf Wed Jun 29 15:33:52 2011 +0100
1.2 +++ b/BPQ/dtn-bpq-dtlsr.conf Wed Jun 29 19:07:38 2011 +0100
1.3 @@ -4,10 +4,9 @@
1.4
1.5 set localhost [lindex [split [info hostname] .] 0]
1.6
1.7 -console set prompt "$localhost bpq-dtn% "
1.8 -
1.9 ################################################################################
1.10 -# basil.dsg.cs.tcd.ie
1.11 +# basil
1.12 +# console set prompt "$localhost dtn-bpq-basil% "
1.13 # console set addr 127.0.0.1
1.14 # console set port 7050
1.15 #
1.16 @@ -21,8 +20,23 @@
1.17 #
1.18 # interface add tcp0 tcp local_port=7556
1.19
1.20 +# Rotate the log every 24 hours (86400000 seconds)
1.21 +# the initial call to rotate (after the proc) is required to
1.22 +# start the proc running every hour.
1.23 +#
1.24 +# proc rotate {} {
1.25 +# set date [ clock format [ clock seconds ] -format "%Y-%m-%d-%H%M%S" ]
1.26 +# set new "dtnd-bpq-basil.$date.log"
1.27 +# file rename "/var/log/dtn/dtnd-bpq-basil.log" /home/dtnuser/data/dtn/log/bpq/$new
1.28 +#
1.29 +# log rotate
1.30 +#
1.31 +# after 86400000 rotate
1.32 +# }
1.33 +# rotate
1.34 ################################################################################
1.35 # sybil
1.36 +# console set prompt "$localhost dtn-bpq-sybil% "
1.37 # console set addr 127.0.0.1
1.38 # console set port 8050
1.39 #
1.40 @@ -34,10 +48,26 @@
1.41 # storage set dbname DTN-BPQ
1.42 # storage set dbdir /home/dtnuser/data/dtn/storage/bpq/sybil
1.43 #
1.44 -# interface add tcp0 tcp local_port=7556
1.45 +# interface add tcp0 tcp local_port=8556
1.46
1.47 +# Rotate the log every 24 hours (86400000 seconds)
1.48 +# the initial call to rotate (after the proc) is required to
1.49 +# start the proc running every hour.
1.50 +#
1.51 +# proc rotate {} {
1.52 +# set date [ clock format [ clock seconds ] -format "%Y-%m-%d-%H%M%S" ]
1.53 +# set new "dtnd-bpq-sybil.$date.log"
1.54 +# file rename "/var/log/dtn/dtnd-bpq-sybil.log" /home/dtnuser/data/dtn/log/bpq/$new
1.55 +#
1.56 +# log rotate
1.57 +#
1.58 +# after 86400000 rotate
1.59 +# }
1.60 +# rotate
1.61 ################################################################################
1.62 # default
1.63 +console set prompt "$localhost dtn-bpq% "
1.64 +
1.65 console set addr 127.0.0.1
1.66 console set port 7050
1.67
1.68 @@ -50,6 +80,22 @@
1.69 storage set dbdir /data/dtn/storage/bpq
1.70
1.71 interface add tcp0 tcp local_port=7556
1.72 +
1.73 +
1.74 +# Rotate the log every 24 hours (86400000 seconds)
1.75 +# the initial call to rotate (after the proc) is required to
1.76 +# start the proc running every hour.
1.77 +proc rotate {} {
1.78 + set date [ clock format [ clock seconds ] -format "%Y-%m-%d-%H%M%S" ]
1.79 + set new "dtnd-bpq.$date.log"
1.80 + file rename "/var/log/dtn/dtnd-bpq.log" /data/dtn/log/bpq/$new
1.81 +
1.82 + log rotate
1.83 +
1.84 + after 86400000 rotate
1.85 +}
1.86 +rotate
1.87 +
1.88 ################################################################################
1.89
1.90 param set link_min_retry_interval 1
1.91 @@ -69,47 +115,40 @@
1.92 route set dtlsr_lsa_lifetime 240
1.93 route set dtlsr_lsa_interval 120
1.94
1.95 -# Rotate the log every 24 hours (86400000 seconds)
1.96 -# the initial call to rotate (after the proc) is required to
1.97 -# start the proc running every hour.
1.98 -proc rotate {} {
1.99 - set date [ clock format [ clock seconds ] -format "%Y-%m-%d-%H%M%S" ]
1.100 - set new "dtnd-bpq.$date.log"
1.101 - file rename "/var/log/dtn/dtnd-bpq.log" /data/dtn/log/bpq/$new
1.102 -
1.103 - log rotate
1.104 -
1.105 - after 86400000 rotate
1.106 -}
1.107 -rotate
1.108 -
1.109 -discovery add tcp0d1 ip port=11556 addr=255.255.255.255
1.110 -discovery add tcp0d2 ip port=11556 addr=10.125.17.13
1.111 -discovery add tcp0d3 ip port=11556 addr=10.125.14.17
1.112 -discovery add tcp0d4 ip port=11556 addr=10.125.14.18
1.113 -discovery add tcp0d5 ip port=11556 addr=10.125.14.19
1.114 -discovery add tcp0d6 ip port=11556 addr=10.125.18.12
1.115 -discovery add tcp0d7 ip port=9557 addr=134.226.36.138
1.116 -
1.117 +################################################################################
1.118
1.119 switch -exact $localhost {
1.120 - basil.dsg.cs.tcd.ie {
1.121 + basil {
1.122 route local_eid dtn://basil.dsg.cs.tcd.ie.bpq
1.123 -
1.124 }
1.125 sybil {
1.126 route local_eid dtn://sybil.dsg.cs.tcd.ie.bpq
1.127 - discovery announce tcp0 tcp0d1 tcp interval=10 cl_addr=192.168.1.102 cl_port=7556
1.128 +
1.129 + discovery add tcp0d0 ip port=11557 addr=127.0.0.1
1.130 + discovery add tcp0d1 ip port=11556 addr=192.168.1.152
1.131 + discovery add tcp0d2 ip port=11556 addr=192.168.1.153
1.132 +
1.133 + discovery announce tcp0 tcp0d0 tcp interval=10 cl_addr=127.0.0.1 cl_port=8556
1.134 + discovery announce tcp0 tcp0d1 tcp interval=10 cl_addr=192.168.1.102 cl_port=8556
1.135 + discovery announce tcp0 tcp0d2 tcp interval=10 cl_addr=192.168.1.102 cl_port=8556
1.136 }
1.137 n4cgateway-1 {
1.138 route local_eid dtn://n4cgateway-1.bpq
1.139 - discovery announce tcp0 tcp0d2 tcp interval=10 cl_addr=10.125.17.10 cl_port=7556
1.140 +
1.141 + discovery add tcp0d3 ip port=11556 addr=10.125.17.13
1.142 +
1.143 + discovery announce tcp0 tcp0d3 tcp interval=10 cl_addr=10.125.17.10 cl_port=7556
1.144 }
1.145 n4cgateway-2 {
1.146 route local_eid dtn://n4cgateway-2.bpq
1.147 - discovery announce tcp0 tcp0d3 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.148 +
1.149 + discovery add tcp0d4 ip port=11556 addr=10.125.14.17
1.150 + discovery add tcp0d5 ip port=11556 addr=10.125.14.18
1.151 + discovery add tcp0d6 ip port=11556 addr=10.125.14.19
1.152 +
1.153 discovery announce tcp0 tcp0d4 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.154 discovery announce tcp0 tcp0d5 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.155 + discovery announce tcp0 tcp0d6 tcp interval=10 cl_addr=10.125.14.11 cl_port=7556
1.156
1.157 route add dtn://n4crouter-1.bpq/* dtn://n4cmule-1.bpq
1.158 route add dtn://n4crouter-1.bpq/* dtn://n4cmule-2.bpq
1.159 @@ -117,15 +156,24 @@
1.160 }
1.161 n4crouter-2 {
1.162 route local_eid dtn://n4crouter-2.bpq
1.163 - discovery announce tcp0 tcp0d6 tcp interval=10 cl_addr=10.125.18.13 cl_port=7556
1.164 +
1.165 + discovery add tcp0d7 ip port=11556 addr=10.125.18.12
1.166 +
1.167 + discovery announce tcp0 tcp0d7 tcp interval=10 cl_addr=10.125.18.13 cl_port=7556
1.168 }
1.169 n4crouter-1 {
1.170 route local_eid dtn://n4crouter-1.bpq
1.171 - discovery announce tcp0 tcp0d1 tcp interval=10 cl_addr=10.125.14.12 cl_port=7556
1.172 +
1.173 + discovery add tcp0d8 ip port=11556 addr=255.255.255.255
1.174 +
1.175 + discovery announce tcp0 tcp0d8 tcp interval=10 cl_addr=10.125.14.12 cl_port=7556
1.176 }
1.177 n4crouter-5 {
1.178 route local_eid dtn://n4crouter-5.bpq
1.179 - discovery announce tcp7 tcp0d7 tcp interval=10 cl_addr=10.125.14.16 cl_port=7556
1.180 +
1.181 + discovery add tcp0d9 ip port=11557 addr=134.226.36.138
1.182 +
1.183 + discovery announce tcp0 tcp0d9 tcp interval=10 cl_addr=10.125.14.16 cl_port=7556
1.184 }
1.185 n4cmule-1 {
1.186 route local_eid dtn://n4cmule-1.bpq
1.187 @@ -136,5 +184,18 @@
1.188 n4cmule-3 {
1.189 route local_eid dtn://n4cmule-3.bpq
1.190 }
1.191 + rudolf {
1.192 + route local_eid dtn://rudolf.sics.bpq
1.193 +
1.194 + discovery add tcp0d10 ip port=11557 addr=134.226.36.138
1.195 +
1.196 + discovery announce tcp0 tcp0d10 tcp interval=10 cl_addr=$localhost cl_port=7556
1.197 + }
1.198 + kwak {
1.199 + route local_eid dtn://kwak.sics.bpq
1.200 + }
1.201 + dasher {
1.202 + route local_eid dtn://dasher.sics.bpq
1.203 + }
1.204 }
1.205