pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-04 01:23:13 +02:00
Code Activity

- Fixed some MOTD problems: remote MOTD gone after rehash (#0001007) and motd time, etc...

Browse Source
This commit is contained in:
Bram Matthys
2003-05-31 01:28:14 +00:00
parent 88af97045e
commit bb53b0be8c
7 changed files with 72 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+1
View File
@@ -2201,3 +2201,4 @@ seen. gmtime warning still there
- Fixed some ./Config problems on Solaris with IPv6, SSL, and some other misc. things
(#0001004) reported by lion.
- Changed the /whois "secret channel" flag from '~' to '?'
- Fixed some MOTD problems: remote MOTD gone after rehash (#0001007) and motd time, etc...
include/h.h
+3 -3
View File
@@ -135,9 +135,7 @@ int match_ipv4(struct IN_ADDR *addr, struct IN_ADDR *mask, int b);
#ifdef INET6
int match_ipv6(struct IN_ADDR *addr, struct IN_ADDR *mask, int b);
#endif
aMotd *read_motd(char *filename);
aMotd *read_rules(char *filename);
extern struct tm *motd_tm;
extern struct tm motd_tm;
extern Link *Servers;
void add_ListItem(ListStruct *, ListStruct **);
ListStruct *del_ListItem(ListStruct *, ListStruct **);
@@ -547,7 +545,9 @@ extern char *pretty_time_val(long);
extern int init_conf(char *filename, int rehash);
extern void validate_configuration(void);
extern void run_configuration(void);
extern void rehash_motdrules();
extern aMotd *read_file(char *filename, aMotd **list);
extern aMotd *read_file_ex(char *filename, aMotd **list, struct tm *);
CMD_FUNC(m_server_remote);
extern void send_proto(aClient *, ConfigItem_link *);
extern char *xbase64enc(long i);
include/struct.h
+1 -1
View File
@@ -1001,7 +1001,7 @@ struct _configitem_tld {
ConfigItem *prev, *next;
ConfigFlag_tld flag;
char *mask, *motd_file, *rules_file, *channel;
struct tm *motd_tm;
struct tm motd_tm;
aMotd *rules, *motd;
u_short options;
};
src/ircd.c
+2 -2
View File
@@ -1134,9 +1134,9 @@ int InitwIRCD(int argc, char *argv[])
conf_listen->listener = &me;
run_configuration();
botmotd = (aMotd *) read_file(BPATH, &botmotd);
rules = (aMotd *) read_rules(RPATH);
rules = (aMotd *) read_file(RPATH, NULL);
opermotd = (aMotd *) read_file(OPATH, &opermotd);
motd = (aMotd *) read_motd(MPATH);
motd = (aMotd *) read_file_ex(MPATH, NULL, &motd_tm);
svsmotd = (aMotd *) read_file(VPATH, &svsmotd);
strncpy(me.sockhost, conf_listen->ip, sizeof(me.sockhost) - 1);
if (me.name[0] == '\0')
src/s_conf.c
+2 -3
View File
@@ -3137,12 +3137,11 @@ int _conf_tld(ConfigFile *conf, ConfigEntry *ce)
cep = config_find_entry(ce->ce_entries, "mask");
ca->mask = strdup(cep->ce_vardata);
cep = config_find_entry(ce->ce_entries, "motd");
ca->motd = read_motd(cep->ce_vardata);
ca->motd_file = strdup(cep->ce_vardata);
ca->motd_tm = motd_tm;
ca->motd = read_file_ex(cep->ce_vardata, NULL, &ca->motd_tm);
cep = config_find_entry(ce->ce_entries, "rules");
ca->rules = read_rules(cep->ce_vardata);
ca->rules_file = strdup(cep->ce_vardata);
ca->rules = read_file(cep->ce_vardata, NULL);
cep = config_find_entry(ce->ce_entries, "options");
if (cep)
{
src/s_serv.c
+62 -174
View File
@@ -57,10 +57,9 @@ aMotd *rules;
aMotd *motd;
aMotd *svsmotd;
aMotd *botmotd;
struct tm *motd_tm;
struct tm motd_tm;
aMotd *read_file(char *filename, aMotd **list);
aMotd *read_motd(char *filename);
aMotd *read_rules(char *filename);
aMotd *read_file_ex(char *filename, aMotd **list, struct tm *);
extern aMotd *Find_file(char *, short);
/*
** m_functions execute protocol messages on this server:
@@ -3527,6 +3526,19 @@ CMD_FUNC(m_admin)
return 0;
}
/** Rehash motd and rule files (MPATH/RPATH and all tld entries). */
void rehash_motdrules()
{
ConfigItem_tld *tlds;
motd = (aMotd *) read_file_ex(MPATH, &motd, &motd_tm);
rules = (aMotd *) read_file(RPATH, &rules);
for (tlds = conf_tld; tlds; tlds = (ConfigItem_tld *) tlds->next)
{
tlds->motd = read_file_ex(tlds->motd_file, &tlds->motd, &tlds->motd_tm);
tlds->rules = read_file(tlds->rules_file, &tlds->rules);
}
}
/*
** m_rehash
@@ -3609,30 +3621,7 @@ CMD_FUNC(m_rehash)
sendto_serv_butone(&me, ":%s GLOBOPS :%s is remotely rehashing everything", me.name, sptr->name);
opermotd = (aMotd *) read_file(OPATH, &opermotd);
botmotd = (aMotd *) read_file(BPATH, &botmotd);
motd = (aMotd *) read_motd(MPATH);
rules = (aMotd *) read_rules(RPATH);
for (tlds = conf_tld; tlds;
tlds = (ConfigItem_tld *) tlds->next)
{
while (tlds->motd)
{
amotd = tlds->motd->next;
MyFree(tlds->motd->line);
MyFree(tlds->motd);
tlds->motd = amotd;
}
tlds->motd = read_motd(tlds->motd_file);
while (tlds->rules)
{
amotd = tlds->rules->next;
MyFree(tlds->rules->line);
MyFree(tlds->rules);
tlds->rules = amotd;
}
tlds->rules =
read_rules(tlds->rules_file);
}
rehash_motdrules();
return 0;
}
if (!strnicmp("-gar", parv[1], 4))
@@ -3665,40 +3654,13 @@ CMD_FUNC(m_rehash)
if (!strnicmp("-motd", parv[1], 5)
|| !strnicmp("-rules", parv[1], 6))
{
ConfigItem_tld *tlds;
aMotd *amotd;
sendto_ops
("%sRehashing all MOTDs and RULES on request of %s",
cptr != sptr ? "Remotely " : "",
sptr->name);
if (cptr != sptr)
sendto_serv_butone(&me, ":%s GLOBOPS :%s is remotely rehashing all MOTDs and RULES", me.name, sptr->name);
motd = (aMotd *) read_motd(MPATH);
rules = (aMotd *) read_rules(RPATH);
for (tlds = conf_tld; tlds;
tlds = (ConfigItem_tld *) tlds->next)
{
if (!tlds->flag.motdptr) {
while (tlds->motd)
{
amotd = tlds->motd->next;
MyFree(tlds->motd->line);
MyFree(tlds->motd);
tlds->motd = amotd;
}
}
tlds->motd = read_motd(tlds->motd_file);
if (!tlds->flag.rulesptr) {
while (tlds->rules)
{
amotd = tlds->rules->next;
MyFree(tlds->rules->line);
MyFree(tlds->rules);
tlds->rules = amotd;
}
}
tlds->rules = read_rules(tlds->rules_file);
}
rehash_motdrules();
return 0;
}
/* didn't match / fall trough... should we continue?? */
@@ -3712,6 +3674,10 @@ CMD_FUNC(m_rehash)
else
sendto_ops("%s is rehashing server config file", parv[0]);
/* Normal rehash, rehash main motd&rules too, just like the on in the tld block will :p */
motd = (aMotd *) read_file_ex(MPATH, &motd, &motd_tm);
rules = (aMotd *) read_file(RPATH, &rules);
if (cptr == sptr)
sendto_one(sptr, rpl_str(RPL_REHASHING), me.name, parv[0], configfile);
return rehash(cptr, sptr, (parc > 1) ? ((*parv[1] == 'q') ? 2 : 0) : 0);
@@ -4009,7 +3975,7 @@ CMD_FUNC(m_motd)
{
ConfigItem_tld *ptr;
aMotd *temp, *temp2;
struct tm *tm = motd_tm;
struct tm *tm = &motd_tm;
int svsnofile = 0;
char userhost[HOSTLEN + USERLEN + 6];
@@ -4031,7 +3997,7 @@ HUNTED_ISME)
if (ptr)
{
temp = ptr->motd;
tm = ptr->motd_tm;
tm = &ptr->motd_tm;
}
else
temp = motd;
@@ -4105,124 +4071,29 @@ CMD_FUNC(m_opermotd)
return 0;
}
/*
* A merge from ircu and bahamut, and some extra stuff added by codemastr
*/
aMotd *read_rules(char *filename)
{
int fd = open(filename, O_RDONLY);
aMotd *temp, *newmotd, *last, *old;
char line[82];
char *tmp;
int i;
if (fd == -1)
return NULL;
/* If it is the default RULES, clear it -- codemastr */
if (!stricmp(filename, RPATH))
{
while (rules)
{
old = rules->next;
MyFree(rules->line);
MyFree(rules);
rules = old;
}
}
(void)dgets(-1, NULL, 0); /* make sure buffer is at empty pos */
newmotd = last = NULL;
while ((i = dgets(fd, line, sizeof(line) - 1)) > 0)
{
line[i] = '\0';
if ((tmp = (char *)strchr(line, '\n')))
*tmp = '\0';
if ((tmp = (char *)strchr(line, '\r')))
*tmp = '\0';
temp = (aMotd *) MyMalloc(sizeof(aMotd));
if (!temp)
outofmemory();
AllocCpy(temp->line, line);
temp->next = NULL;
if (!newmotd)
newmotd = temp;
else
last->next = temp;
last = temp;
}
close(fd);
return newmotd;
}
/*
* A merge from ircu and bahamut, and some extra stuff added by codemastr
*/
aMotd *read_motd(char *filename)
{
int fd = open(filename, O_RDONLY);
aMotd *temp, *newmotd, *last, *old;
struct stat sb;
char line[82];
char *tmp;
int i;
if (fd == -1)
return NULL;
fstat(fd, &sb);
/* If it is the default MOTD, clear it -- codemastr */
if (!stricmp(filename, MPATH))
{
while (motd)
{
old = motd->next;
MyFree(motd->line);
MyFree(motd);
motd = old;
}
/* We also wanna set it's last changed value -- codemastr */
motd_tm = localtime(&sb.st_mtime);
}
(void)dgets(-1, NULL, 0); /* make sure buffer is at empty pos */
newmotd = last = NULL;
while ((i = dgets(fd, line, 81)) > 0)
{
line[i] = '\0';
if ((tmp = (char *)strchr(line, '\n')))
*tmp = '\0';
if ((tmp = (char *)strchr(line, '\r')))
*tmp = '\0';
temp = (aMotd *) MyMalloc(sizeof(aMotd));
if (!temp)
outofmemory();
AllocCpy(temp->line, line);
temp->next = NULL;
if (!newmotd)
newmotd = temp;
else
last->next = temp;
last = temp;
}
close(fd);
return newmotd;
}
/*
* A merge from ircu and bahamut, and some extra stuff added by codemastr
* we can now use 1 function for multiple files -- codemastr
* Merged read_motd/read_rules stuff into this -- Syzop
*/
/** Read motd-like file, used for rules/motd/botmotd/opermotd/etc.
* @param filename Filename of file to read.
* @param list Reference to motd pointer (used for freeing if needed, can be NULL)
* @returns Pointer to MOTD or NULL if reading failed.
*/
aMotd *read_file(char *filename, aMotd **list)
{
return read_file_ex(filename, list, NULL);
}
/** Read motd-like file, used for rules/motd/botmotd/opermotd/etc.
* @param filename Filename of file to read.
* @param list Reference to motd pointer (used for freeing if needed, NULL allowed)
* @param t Pointer to struct tm to store filedatetime info in (NULL allowed)
* @returns Pointer to MOTD or NULL if reading failed.
*/
aMotd *read_file_ex(char *filename, aMotd **list, struct tm *t)
{
int fd = open(filename, O_RDONLY);
@@ -4234,12 +4105,29 @@ aMotd *read_file(char *filename, aMotd **list)
if (fd == -1)
return NULL;
while (*list)
if (list)
{
old = (*list)->next;
MyFree((*list)->line);
MyFree(*list);
*list = old;
while (*list)
{
old = (*list)->next;
MyFree((*list)->line);
MyFree(*list);
*list = old;
}
}
if (t)
{
struct tm *ttmp;
struct stat sb;
if (!fstat(fd, &sb))
{
ttmp = localtime(&sb.st_mtime);
memcpy(t, ttmp, sizeof(struct tm));
} else {
/* Sure, fstat() shouldn't fail, but... */
memset(t, 0, sizeof(struct tm));
}
}
(void)dgets(-1, NULL, 0); /* make sure buffer is at empty pos */
src/win32/Win32GUI.c
+1 -25
View File
@@ -819,31 +819,7 @@ static HMENU hRehash, hAbout, hConfig, hTray, hLogs;
ConfigItem_tld *tlds;
aMotd *amotd;
MessageBox(NULL, "Rehashing all MOTD and Rules files", "Rehashing", MB_OK);
motd = (aMotd *) read_motd(MPATH);
rules = (aMotd *) read_rules(RPATH);
for (tlds = conf_tld; tlds;
tlds = (ConfigItem_tld *) tlds->next) {
if (!tlds->flag.motdptr) {
while (tlds->motd)
{
amotd = tlds->motd->next;
MyFree(tlds->motd->line);
MyFree(tlds->motd);
tlds->motd = amotd;
}
}
tlds->motd = read_motd(tlds->motd_file);
if (!tlds->flag.rulesptr) {
while (tlds->rules)
{
amotd = tlds->rules->next;
MyFree(tlds->rules->line);
MyFree(tlds->rules);
tlds->rules = amotd;
}
}
tlds->rules = read_rules(tlds->rules_file);
}
rehash_motdrules();
sendto_realops("Rehashing all MOTD and Rules files via the console");
break;
}