mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Some small fixes
This commit is contained in:
parent
8be6b0986d
commit
e75930e72e
|
@ -50,6 +50,7 @@
|
||||||
// misc
|
// misc
|
||||||
#include "../../testing/misc_tools.c"
|
#include "../../testing/misc_tools.c"
|
||||||
|
|
||||||
|
|
||||||
#define DAEMON_NAME "tox_bootstrap_daemon"
|
#define DAEMON_NAME "tox_bootstrap_daemon"
|
||||||
|
|
||||||
#define SLEEP_TIME_MILLISECONDS 30
|
#define SLEEP_TIME_MILLISECONDS 30
|
||||||
|
@ -60,7 +61,7 @@
|
||||||
#define DEFAULT_PORT 33445
|
#define DEFAULT_PORT 33445
|
||||||
#define DEFAULT_ENABLE_IPV6 0 // 1 - true, 0 - false
|
#define DEFAULT_ENABLE_IPV6 0 // 1 - true, 0 - false
|
||||||
#define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false
|
#define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false
|
||||||
#define DEFAULT_ENABLE_TCP_RELAY 1
|
#define DEFAULT_ENABLE_TCP_RELAY 1 // 1 - true, 0 - false
|
||||||
|
|
||||||
#define MIN_ALLOWED_PORT 1
|
#define MIN_ALLOWED_PORT 1
|
||||||
#define MAX_ALLOWED_PORT 65535
|
#define MAX_ALLOWED_PORT 65535
|
||||||
|
@ -356,7 +357,7 @@ int bootstrap_from_config(char *cfg_file_path, DHT *dht, int enable_ipv6)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process settings
|
// Process settings
|
||||||
if (strlen(bs_public_key) != 64) {
|
if (strlen(bs_public_key) != crypto_box_PUBLICKEYBYTES*2) {
|
||||||
syslog(LOG_WARNING, "Bootstrap node #%d: Invalid '%s': %s. Skipping the node.\n", i, NAME_PUBLIC_KEY,
|
syslog(LOG_WARNING, "Bootstrap node #%d: Invalid '%s': %s. Skipping the node.\n", i, NAME_PUBLIC_KEY,
|
||||||
bs_public_key);
|
bs_public_key);
|
||||||
goto next;
|
goto next;
|
||||||
|
@ -380,9 +381,9 @@ int bootstrap_from_config(char *cfg_file_path, DHT *dht, int enable_ipv6)
|
||||||
syslog(LOG_DEBUG, "Successfully added bootstrap node #%d: %s:%d %s\n", i, bs_address, bs_port, bs_public_key);
|
syslog(LOG_DEBUG, "Successfully added bootstrap node #%d: %s:%d %s\n", i, bs_address, bs_port, bs_public_key);
|
||||||
|
|
||||||
next:
|
next:
|
||||||
// config_setting_lookup_string() allocates string inside and doesn't allow us to free it
|
// config_setting_lookup_string() allocates string inside and doesn't allow us to free it direcly
|
||||||
// so in order to reuse `bs_public_key` and `bs_address` we have to remove the element
|
// though it's freed when the element is removed, so we free it right away in order to keep memory
|
||||||
// which will cause libconfig to free allocated strings
|
// consumption minimal
|
||||||
config_setting_remove_elem(node_list, 0);
|
config_setting_remove_elem(node_list, 0);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
@ -396,17 +397,13 @@ next:
|
||||||
|
|
||||||
void print_public_key(uint8_t *public_key)
|
void print_public_key(uint8_t *public_key)
|
||||||
{
|
{
|
||||||
char buffer[64 + 1];
|
char buffer[2*crypto_box_PUBLICKEYBYTES + 1];
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < 32; i++) {
|
for (i = 0; i < crypto_box_PUBLICKEYBYTES; i++) {
|
||||||
if (public_key[i] < 16) {
|
index += sprintf(buffer + index, "%02hhX", public_key[i]);
|
||||||
index += sprintf(buffer + index, "0");
|
|
||||||
}
|
|
||||||
|
|
||||||
index += sprintf(buffer + index, "%hhX", public_key[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
syslog(LOG_INFO, "Public Key: %s\n", buffer);
|
syslog(LOG_INFO, "Public Key: %s\n", buffer);
|
||||||
|
@ -468,10 +465,6 @@ int main(int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enable_lan_discovery) {
|
|
||||||
LANdiscovery_init(dht);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (manage_keys(dht, keys_file_path)) {
|
if (manage_keys(dht, keys_file_path)) {
|
||||||
syslog(LOG_DEBUG, "Keys are managed successfully\n");
|
syslog(LOG_DEBUG, "Keys are managed successfully\n");
|
||||||
} else {
|
} else {
|
||||||
|
@ -559,6 +552,10 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
int waiting_for_dht_connection = 1;
|
int waiting_for_dht_connection = 1;
|
||||||
|
|
||||||
|
if (enable_lan_discovery) {
|
||||||
|
LANdiscovery_init(dht);
|
||||||
|
}
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
do_DHT(dht);
|
do_DHT(dht);
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
|
|
||||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||||
DESC="Tox DHT bootstrap server daemon"
|
DESC="Tox DHT bootstrap daemon"
|
||||||
NAME=tox_bootstrap_daemon
|
NAME=tox_bootstrap_daemon
|
||||||
# You may want to change USER if you are using it anywhere else
|
# You may want to change USER if you are using it anywhere else
|
||||||
USER=tom
|
USER=tom
|
||||||
CFG=/home/$USER/.$NAME/conf
|
CFG=/home/$USER/.$NAME/conf
|
||||||
DAEMON=/home/$USER/$NAME
|
DAEMON=/home/$USER/.$NAME/$NAME
|
||||||
DAEMON_ARGS="$CFG"
|
DAEMON_ARGS="$CFG"
|
||||||
PIDFILE=/home/$USER/.$NAME/pid
|
PIDFILE=/home/$USER/.$NAME/pid
|
||||||
SCRIPTNAME=/etc/init.d/$NAME
|
SCRIPTNAME=/etc/init.d/$NAME
|
||||||
|
|
Loading…
Reference in New Issue
Block a user