bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed server id's

Browse Source
This commit is contained in:
Michiel Broek 2006-05-25 20:25:13 +00:00
parent 01aa19f354
commit 71b9a88247
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mbtask/taskchat.c
View File

@ -844,7 +844,7 @@ void chat_checksysop_r(char *data, char *buf)
pid = (pid_t)atoi(strtok(NULL, ";")); pid = (pid_t)atoi(strtok(NULL, ";"));
if (reg_ispaging(pid)) { if (reg_ispaging(pid)) {
Syslog('c', "Check sysopchat for pid %s, user has paged", pid); Syslog('c', "Check sysopchat for pid %d, user has paged", pid);
/* /*
* Now check if sysop is present in the sysop channel * Now check if sysop is present in the sysop channel

1
mbtask/taskcomm.c
View File

@ -289,7 +289,6 @@ char *exe_cmd(char *in)
if ((result = reg_page(token))) { if ((result = reg_page(token))) {
snprintf(obuf, SS_BUFSIZE, "100:1,%d;", result); snprintf(obuf, SS_BUFSIZE, "100:1,%d;", result);
} }
Syslog('+', "%s", obuf);
return obuf; return obuf;
} }

14
mbtask/taskibc.c
View File

@ -1016,13 +1016,13 @@ int command_pass(int slot, char *hostname, char *parameters)
int command_server(char *hostname, char *parameters) int command_server(char *hostname, char *parameters)
{ {
char *p, *name, *hops, *id, *prod, *vers, *fullname; char *p, *name, *hops, *prod, *vers, *fullname;
unsigned int token; unsigned int token;
int i, j, ihops, found = FALSE; int i, j, ihops, found = FALSE;
name = strtok(parameters, " \0"); name = strtok(parameters, " \0");
hops = strtok(NULL, " \0"); hops = strtok(NULL, " \0");
id = strtok(NULL, " \0"); token = atoi(strtok(NULL, " \0"));
prod = strtok(NULL, " \0"); prod = strtok(NULL, " \0");
vers = strtok(NULL, " \0"); vers = strtok(NULL, " \0");
fullname = strtok(NULL, "\0"); fullname = strtok(NULL, "\0");
@ -1040,17 +1040,16 @@ int command_server(char *hostname, char *parameters)
return 400; return 400;
} }
token = atoi(id);
if (found && ncs_list[i].token) { if (found && ncs_list[i].token) {
/* /*
* We are in calling state, so we expect the token from the * We are in calling state, so we expect the token from the
* remote is the same as the token we sent. * remote is the same as the token we sent.
* In that case, the session is authorized. * In that case, the session is authorized.
*/ */
Syslog('c', "IBC: we are in calling state");
if (ncs_list[i].token == token) { if (ncs_list[i].token == token) {
p = calloc(512, sizeof(char)); p = calloc(512, sizeof(char));
snprintf(p, 512, "SERVER %s %d %s %s %s %s\r\n", name, ihops, id, prod, vers, fullname); snprintf(p, 512, "SERVER %s %d %d %s %s %s\r\n", name, ihops, token, prod, vers, fullname);
broadcast(ncs_list[i].server, p); broadcast(ncs_list[i].server, p);
free(p); free(p);
system_shout("* New server: %s, %s", name, fullname); system_shout("* New server: %s, %s", name, fullname);
@ -1120,12 +1119,13 @@ int command_server(char *hostname, char *parameters)
* valid PASS command. * valid PASS command.
*/ */
if (found && ncs_list[i].gotpass) { if (found && ncs_list[i].gotpass) {
Syslog('c', "IBC: we are in waiting state");
p = calloc(512, sizeof(char)); p = calloc(512, sizeof(char));
snprintf(p, 512, "PASS %s 0100 %s\r\n", ncs_list[i].passwd, ncs_list[i].compress ? "Z":""); snprintf(p, 512, "PASS %s 0100 %s\r\n", ncs_list[i].passwd, ncs_list[i].compress ? "Z":"");
send_msg(i, p); send_msg(i, p);
snprintf(p, 512, "SERVER %s 0 %d mbsebbs %s %s\r\n", ncs_list[i].myname, token, VERSION, CFG.bbs_name); snprintf(p, 512, "SERVER %s 0 %d mbsebbs %s %s\r\n", ncs_list[i].myname, token, VERSION, CFG.bbs_name);
send_msg(i, p); send_msg(i, p);
snprintf(p, 512, "SERVER %s %d %s %s %s %s\r\n", name, ihops, id, prod, vers, fullname); snprintf(p, 512, "SERVER %s %d 0 %s %s %s\r\n", name, ihops, prod, vers, fullname);
broadcast(ncs_list[i].server, p); broadcast(ncs_list[i].server, p);
system_shout("* New server: %s, %s", name, fullname); system_shout("* New server: %s, %s", name, fullname);
ncs_list[i].gotserver = TRUE; ncs_list[i].gotserver = TRUE;
@ -1185,7 +1185,7 @@ int command_server(char *hostname, char *parameters)
*/ */
if (add_server(name, ihops, prod, vers, fullname, hostname)) { if (add_server(name, ihops, prod, vers, fullname, hostname)) {
p = calloc(512, sizeof(char)); p = calloc(512, sizeof(char));
snprintf(p, 512, "SERVER %s %d %s %s %s %s\r\n", name, ihops, id, prod, vers, fullname); snprintf(p, 512, "SERVER %s %d 0 %s %s %s\r\n", name, ihops, prod, vers, fullname);
broadcast(hostname, p); broadcast(hostname, p);
free(p); free(p);
srvchg = TRUE; srvchg = TRUE;