bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move initialization of mqtt

Browse Source
This commit is contained in:
Andrew Pamment 2018-06-19 09:14:18 +10:00
parent 5853f46f5b
commit 50f4b9a5a8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bbs.c
View File

@ -882,24 +882,6 @@ void runbbs_real(int socket, char *ip, int ssh) {
int tries; int tries;
int fno; int fno;
// initialize mqtt
if (conf.broadcast_enable && conf.broadcast_address != NULL && conf.broadcast_port != 0) {
mosquitto_lib_init();
mosq = mosquitto_new(NULL, 1, NULL);
if (conf.broadcast_user != NULL && conf.broadcast_pass != NULL) {
mosquitto_username_pw_set(mosq, conf.broadcast_user, conf.broadcast_pass);
}
if(mosquitto_connect(mosq, conf.broadcast_address, conf.broadcast_port, 60)){
dolog("Unable to connect to MQTT server.");
conf.broadcast_enable = 0;
} else {
if (mosquitto_loop_start(mosq) != MOSQ_ERR_SUCCESS) {
dolog("Unable to start MQTT loop.");
conf.broadcast_enable = 0;
}
}
}
atexit(exit_bbs); atexit(exit_bbs);
usertimeout = 10; usertimeout = 10;
@ -977,7 +959,25 @@ void runbbs_real(int socket, char *ip, int ssh) {
} }
exit(1); exit(1);
} }
// initialize mqtt
if (conf.broadcast_enable && conf.broadcast_address != NULL && conf.broadcast_port != 0) {
mosquitto_lib_init();
mosq = mosquitto_new(NULL, 1, NULL);
if (conf.broadcast_user != NULL && conf.broadcast_pass != NULL) {
mosquitto_username_pw_set(mosq, conf.broadcast_user, conf.broadcast_pass);
}
if(mosquitto_connect(mosq, conf.broadcast_address, conf.broadcast_port, 60)){
dolog("Unable to connect to MQTT server.");
conf.broadcast_enable = 0;
} else {
if (mosquitto_loop_start(mosq) != MOSQ_ERR_SUCCESS) {
dolog("Unable to start MQTT loop.");
conf.broadcast_enable = 0;
}
}
}
broadcast("USER: unknown; NODE:%d; STATUS: Logging in.", mynode); broadcast("USER: unknown; NODE:%d; STATUS: Logging in.", mynode);
dolog("Incoming %s connection on node %d", (ssh ? "SSH" : "Telnet"), mynode); dolog("Incoming %s connection on node %d", (ssh ? "SSH" : "Telnet"), mynode);