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

implemented part reason message

Browse Source
This commit is contained in:
Michiel Broek 2005-04-24 12:14:39 +00:00
parent f224e68f37
commit 7cbc2e9e72
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mbtask/taskchat.c
View File

@ -396,6 +396,9 @@ int part(pid_t pid, char *reason)
chn_list *tmp; chn_list *tmp;
#endif #endif
if (strlen(reason) > 54)
reason[54] = '\0';
Syslog('-', "Part pid %d from channel, reason %s", pid, reason); Syslog('-', "Part pid %d from channel, reason %s", pid, reason);
#ifdef USE_EXPERIMENT #ifdef USE_EXPERIMENT
@ -413,8 +416,12 @@ int part(pid_t pid, char *reason)
chat_msg(chat_users[i].channel, chat_users[i].nick, reason); chat_msg(chat_users[i].channel, chat_users[i].nick, reason);
sprintf(buf, "%s has left channel #%s, %d users left", chat_users[i].nick, tmp->name, tmp->users); sprintf(buf, "%s has left channel #%s, %d users left", chat_users[i].nick, tmp->name, tmp->users);
chat_msg(chat_users[i].channel, NULL, buf); chat_msg(chat_users[i].channel, NULL, buf);
if (strcmp(tmp->name, (char *)"sysop")) if (strcmp(tmp->name, (char *)"sysop")) {
send_all("PART %s@%s %s\r\n", chat_users[i].nick, CFG.myfqdn, tmp->name); if (reason && strlen(reason))
send_all("PART %s@%s %s %s\r\n", chat_users[i].nick, CFG.myfqdn, tmp->name, reason);
else
send_all("PART %s@%s %s\r\n", chat_users[i].nick, CFG.myfqdn, tmp->name);
}
/* /*
* Clean channel * Clean channel

31
mbtask/taskibc.c
View File

@ -1186,7 +1186,7 @@ void command_part(char *hostname, char *parameters)
ncs_list *tnsl; ncs_list *tnsl;
chn_list *tmp; chn_list *tmp;
usr_list *tmpu; usr_list *tmpu;
char *nick, *server, *channel; char *nick, *server, *channel, *message;
for (tnsl = ncsl; tnsl; tnsl = tnsl->next) { for (tnsl = ncsl; tnsl; tnsl = tnsl->next) {
if (strcmp(tnsl->server, hostname) == 0) { if (strcmp(tnsl->server, hostname) == 0) {
@ -1196,7 +1196,8 @@ void command_part(char *hostname, char *parameters)
nick = strtok(parameters, "@\0"); nick = strtok(parameters, "@\0");
server = strtok(NULL, " \0"); server = strtok(NULL, " \0");
channel = strtok(NULL, "\0"); channel = strtok(NULL, " \0");
message = strtok(NULL, "\0");
if (channel == NULL) { if (channel == NULL) {
send_msg(tnsl, "461 PART: Not enough parameters\r\n"); send_msg(tnsl, "461 PART: Not enough parameters\r\n");
@ -1220,12 +1221,18 @@ void command_part(char *hostname, char *parameters)
pthread_mutex_lock(&b_mutex); pthread_mutex_lock(&b_mutex);
tmpu->channel[0] = '\0'; tmpu->channel[0] = '\0';
pthread_mutex_unlock(&b_mutex); pthread_mutex_unlock(&b_mutex);
Syslog('+', "IBC: user %s left channel %s", nick, channel); if (message)
Syslog('+', "IBC: user %s left channel %s: %s", nick, channel, message);
else
Syslog('+', "IBC: user %s left channel %s", nick, channel);
usrchg = TRUE; usrchg = TRUE;
} }
} }
broadcast(hostname, "PART %s@%s %s\r\n", nick, server, channel); if (message)
broadcast(hostname, "PART %s@%s %s %s\r\n", nick, server, channel, message);
else
broadcast(hostname, "PART %s@%s %s\r\n", nick, server, channel);
} }
@ -1271,7 +1278,7 @@ void receiver(struct servent *se)
int rc, len, inlist; int rc, len, inlist;
socklen_t sl; socklen_t sl;
ncs_list *tnsl; ncs_list *tnsl;
char *hostname, *prefix, *command, *parameters; char *hostname, *command, *parameters;
pfd.fd = ls; pfd.fd = ls;
pfd.events = POLLIN; pfd.events = POLLIN;
@ -1322,18 +1329,8 @@ void receiver(struct servent *se)
/* /*
* Parse message * Parse message
*/ */
if (crbuf[0] == ':') { command = strtok(crbuf, " \0");
prefix = strtok(crbuf, " "); parameters = strtok(NULL, "\0");
command = strtok(NULL, " \0");
parameters = strtok(NULL, "\0");
} else {
prefix = NULL;
command = strtok(crbuf, " \0");
parameters = strtok(NULL, "\0");
}
// Syslog('r', "prefix \"%s\"", printable(prefix, 0));
// Syslog('r', "command \"%s\"", printable(command, 0));
// Syslog('r', "parameters \"%s\"", printable(parameters, 0));
if (! strcmp(command, (char *)"PASS")) { if (! strcmp(command, (char *)"PASS")) {
if (parameters == NULL) { if (parameters == NULL) {