1.1 --- a/BPQ/dtn-bpq	Tue Jun 28 13:19:58 2011 +0100
     1.2 +++ b/BPQ/dtn-bpq	Wed Jun 29 15:33:52 2011 +0100
     1.3 @@ -29,7 +29,7 @@
     1.4  DAEMONARGS="-d -l info -o /var/log/dtn/dtnd-bpq.log -c /etc/dtn-bpq-dtlsr.conf"
     1.5  
     1.6  CONTROL="/usr/bin/dtnd-control"
     1.7 -CONTROLARGS="-port 7010"
     1.8 +CONTROLARGS="-port 7050"
     1.9  
    1.10  PIDFILE=/var/run/$NAME.pid
    1.11  SSD=`which start-stop-daemon`
    1.12 @@ -81,18 +81,8 @@
    1.13      $SSD $SSDARGS --stop --pidfile $PIDFILE || true
    1.14      ;;
    1.15  
    1.16 -  restart)
    1.17 -    echo -n "Stopping DTN daemon..."
    1.18 -    $CONTROL $CONTROLARGS stop || true
    1.19 -    echo -n "Making sure DTN daemon stops..."
    1.20 -    $SSD $SSDARGS --stop --pidfile $PIDFILE || true
    1.21 -    echo -n "Restarting DTN daemon..."
    1.22 -    $SSD $SSDARGS --start -m --pidfile $PIDFILE -- $ARGS
    1.23 -    pgrep -f "$REG">$PIDFILE
    1.24 -    ;;
    1.25 -
    1.26    *)
    1.27 -    echo "Usage: $SCRIPTNAME {start|start_tidy|init_db|stop|restart|logrotate}"
    1.28 +    echo "Usage: $SCRIPTNAME {start|start_tidy|init_db|stop|logrotate}"
    1.29      exit 1
    1.30      ;;
    1.31  esac

     2.1 --- a/BPQ/dtn-bpq-dtlsr.conf	Tue Jun 28 13:19:58 2011 +0100
     2.2 +++ b/BPQ/dtn-bpq-dtlsr.conf	Wed Jun 29 15:33:52 2011 +0100
     2.3 @@ -89,6 +89,7 @@
     2.4  discovery add tcp0d4 ip port=11556 addr=10.125.14.18
     2.5  discovery add tcp0d5 ip port=11556 addr=10.125.14.19
     2.6  discovery add tcp0d6 ip port=11556 addr=10.125.18.12
     2.7 +discovery add tcp0d7 ip port=9557 addr=134.226.36.138
     2.8  
     2.9  
    2.10  switch -exact $localhost {
    2.11 @@ -122,6 +123,10 @@
    2.12          route local_eid                             dtn://n4crouter-1.bpq
    2.13          discovery announce tcp0 tcp0d1 tcp interval=10 cl_addr=10.125.14.12 cl_port=7556
    2.14      }
    2.15 +    n4crouter-5 {
    2.16 +        route local_eid                             dtn://n4crouter-5.bpq
    2.17 +        discovery announce tcp7 tcp0d7 tcp interval=10 cl_addr=10.125.14.16 cl_port=7556
    2.18 +    }
    2.19      n4cmule-1 {
    2.20          route local_eid                             dtn://n4cmule-1.bpq
    2.21      }

     3.1 --- a/BPQ/install_bpq	Tue Jun 28 13:19:58 2011 +0100
     3.2 +++ b/BPQ/install_bpq	Wed Jun 29 15:33:52 2011 +0100
     3.3 @@ -4,7 +4,7 @@
     3.4  # wrap up output for easy redirection
     3.5  #
     3.6  function log {
     3.7 -    echo "`date +"%F %T"` $NODE $1" >> install.log
     3.8 +    echo "`date +"%F %T"` $NODE $1" 
     3.9  }
    3.10  
    3.11  function check {
    3.12 @@ -87,16 +87,11 @@
    3.13  create_bpq_wrapper /usr/bin/dtnping                             /usr/bin/dtnping-bpq
    3.14  create_bpq_wrapper /usr/bin/dtntraceroute                       /usr/bin/dtntraceroute-bpq
    3.15  
    3.16 -echo "!#/bin/bash"                          >  /usr/bin/dtnd-control-bpq
    3.17 -echo "dtnd-control -port 7010  \"\$*\""     >> /usr/bin/dtnd-control-bpq
    3.18 +echo "#!/bin/bash"                          >  /usr/bin/dtnd-control-bpq
    3.19 +echo "dtnd-control -port 7050  \"\$*\""     >> /usr/bin/dtnd-control-bpq
    3.20  chmod 755 /usr/bin/dtnd-control-bpq
    3.21  chown root:root /usr/bin/dtnd-control-bpq
    3.22  
    3.23 -
    3.24 -chown root:root /usr/bin/dtnd-bpq
    3.25 -chown root:root /usr/bin/dtnquery
    3.26 -chown root:root /usr/bin/dtnrespond
    3.27 -
    3.28  log "Copy dtn-bpq.conf to /etc"
    3.29  cp -f ./dtn-bpq-dtlsr.conf /etc
    3.30  chmod 644 /etc/dtn-bpq-dtlsr.conf