Renamed to fix build process

other/bootstrap_serverdaemon/Makefile.inc

@@ -1,17 +1,17 @@
 if BUILD_DHT_BOOTSTRAP_DAEMON
 
-noinst_PROGRAMS +=      tox-dht-bootstrap-server-daemon
+noinst_PROGRAMS += tox_dht_bootstrap_server_daemon
 
-DHT_bootstrap_daemon_SOURCES = \
-                        ../other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon.c
+tox_dht_bootstrap_server_daemon_SOURCES = \
+                        ../other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c
 
-DHT_bootstrap_daemon_CFLAGS = \
+tox_dht_bootstrap_server_daemon_CFLAGS = \
                         -I$(top_srcdir)/other/bootstrap_serverdaemon \
                         $(LIBSODIUM_CFLAGS) \
                         $(NACL_CFLAGS) \
                         $(LIBCONFIG_CFLAGS)
 
-DHT_bootstrap_daemon_LDADD = \
+tox_dht_bootstrap_server_daemon_LDADD = \
                         $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \

other/bootstrap_serverdaemon/README.md

@@ -2,43 +2,43 @@
 
 The following commands are to be executed as root:
 
-1. In `tox-dht-bootstrap-server-daemon` file change:
+1. In `tox_dht_bootstrap_server_daemon` file change:
   - `CFG` to where your config file (`conf`) will be; read rights required
   - `DAEMON` to point to the executable
   - `PIDFILE` to point to a pid file daemon would have rights to create
 
-2. Go over everything in `conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-dht-bootstrap-server-daemon`
+2. Go over everything in `conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox_dht_bootstrap_server_daemon`
 
 3. Execute: 
 ```
-mv tox-dht-bootstrap-server-daemon /etc/init.d/tox-dht-bootstrap-server-daemon
+mv tox_dht_bootstrap_server_daemon /etc/init.d/tox_dht_bootstrap_server_daemon
 ```
 
 4. Give the right permissions to this file: 
 ```
-chmod 755 /etc/init.d/tox-dht-bootstrap-server-daemon
+chmod 755 /etc/init.d/tox_dht_bootstrap_server_daemon
 ```
 
 5. Execute: 
 ```
-update-rc.d tox-dht-bootstrap-server-daemon defaults
+update-rc.d tox_dht_bootstrap_server_daemon defaults
 ```
 
 6. Start the service: 
 ```
-service tox-dht-bootstrap-server-daemon start
+service tox_dht_bootstrap_server_daemon start
 ```
 
 7. Verify that the service is running: 
 ```
-service tox-dht-bootstrap-server-daemon status
+service tox_dht_bootstrap_server_daemon status
 ```
 
 --
 
 You can see daemon's log with
 ```
-grep "tox-dht-bootstrap-server-daemon" /var/log/syslog
+grep "tox_dht_bootstrap_server_daemon" /var/log/syslog
 ```
 
 **Note that system log is where you find your public key**
@@ -49,12 +49,12 @@ grep "tox-dht-bootstrap-server-daemon" /var/log/syslog
 
 1. Check the log for errors with 
 ```
-grep "tox-dht-bootstrap-server-daemon" /var/log/syslog
+grep "tox_dht_bootstrap_server_daemon" /var/log/syslog
 ```
 
-2. Check that paths in the beginning of `/etc/init.d/tox-dht-bootstrap-server-daemon` are valid
+2. Check that paths in the beginning of `/etc/init.d/tox_dht_bootstrap_server_daemon` are valid
 
-3. Make sure that `PIDFILE` from `/etc/init.d/tox-dht-bootstrap-server-daemon` matches with the `pid_file_path` from `conf`
+3. Make sure that `PIDFILE` from `/etc/init.d/tox_dht_bootstrap_server_daemon` matches with the `pid_file_path` from `conf`
 
 4. Make sure you have write premmision to keys and pid files
 

other/bootstrap_serverdaemon/conf

@@ -7,14 +7,14 @@ port = 33445
 // The daemon should have premission to read/write to it
 // Remember to replace the provided example with
 // your own path
-keys_file_path = "/home/tom/.tox-dht-bootstrap-server-daemon/keys"
+keys_file_path = "/home/tom/.tox_dht_bootstrap_server_daemon/keys"
 
 // The PID file written to by daemon,
 // make sure that the user who runs the server
 // does have permissions to write to it
 // Remember to replace the provided example with
 // your own path
-pid_file_path = "/home/tom/.tox-dht-bootstrap-server-daemon/pid"
+pid_file_path = "/home/tom/.tox_dht_bootstrap_server_daemon/pid"
 
 enable_ipv6 = false
 

other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon

@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          tox-dht-bootstrap-server-daemon
+# Provides:          tox_dht_bootstrap_server_daemon
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
@@ -12,7 +12,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="ProjectTox bootstrap server daemon"
-NAME=tox-dht-bootstrap-server-daemon
+NAME=tox_dht_bootstrap_server_daemon
 USER=tom
 CFG=/home/$USER/.$NAME/conf
 DAEMON=/home/$USER/$NAME

other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c

@@ -1,4 +1,4 @@
-/* tox-dht-bootstrap-server-daemon
+/* tox_dht_bootstrap_server_daemon
  *
  * A simple DHT boostrap server for tox - daemon edition.
  *
@@ -42,13 +42,13 @@
 
 #include "../../testing/misc_tools.c"
 
-#define DAEMON_NAME "tox-dht-bootstrap-server-daemon"
+#define DAEMON_NAME "tox_dht_bootstrap_server_daemon"
 
 #define SLEEP_TIME_MILLISECONDS 30
 #define sleep usleep(1000*SLEEP_TIME_MILLISECONDS)
 
-#define DEFAULT_PID_FILE_PATH        ".tox-dht-bootstrap-server-daemon.pid"
-#define DEFAULT_KEYS_FILE_PATH       ".tox-dht-bootstrap-server-daemon.keys"
+#define DEFAULT_PID_FILE_PATH        ".tox_dht_bootstrap_server_daemon.pid"
+#define DEFAULT_KEYS_FILE_PATH       ".tox_dht_bootstrap_server_daemon.keys"
 #define DEFAULT_PORT                 33445
 #define DEFAULT_ENABLE_IPV6          0 // 1 - true, 0 - false
 #define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false