From e5ad9bb990a4c4e59c981410261022ce44b73d84 Mon Sep 17 00:00:00 2001 From: joonicks Date: Mon, 5 Mar 2018 23:09:40 +0100 Subject: [PATCH 1/2] 2018 cleanup update --- .gitignore | 1 + VERSIONS | 5 ++++ src/auth.c | 8 ++++++- src/channel.c | 5 ++-- src/core.c | 6 ++--- src/ctcp.c | 8 +++---- src/debug.c | 36 +++++++++++++++++++---------- src/function.c | 4 ++-- src/h.h | 8 ++++--- src/irc.c | 2 +- src/main.c | 2 +- src/net.c | 6 ++--- src/notify.c | 4 ++-- src/perl.c | 5 ++-- src/prot.c | 2 +- src/settings.h | 63 +++++++++++++++++++++++++++----------------------- src/structs.h | 20 +++++++++++++--- src/tcl.c | 11 ++++----- src/user.c | 2 +- src/vars.c | 6 ++--- 20 files changed, 122 insertions(+), 82 deletions(-) diff --git a/.gitignore b/.gitignore index 2ee5549..5b2b409 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ mech.pid root.zone* trick.conf +conf diff --git a/VERSIONS b/VERSIONS index b28a6ad..5176c01 100644 --- a/VERSIONS +++ b/VERSIONS @@ -1,3 +1,8 @@ +3.0.99p4 -- February, 2018. + + * Fixed: Strlen/Strlen2 code cleanup. + * Fixed: Various compiler warnings. + 3.0.99p3 -- July 24th, 2009. * Added: Python scripting support (supplied by S.Marquis) diff --git a/src/auth.c b/src/auth.c index f814bdf..00cd8a8 100644 --- a/src/auth.c +++ b/src/auth.c @@ -68,7 +68,7 @@ char *cipher(char *arg) if (!arg || !*arg) return(NULL); - + B1a = B2a = B3a = B4a = 0; B1b = B2b = B3b = B4b = 0; ptr = arg; @@ -447,3 +447,9 @@ listcheck: } to_user(from,"You are now officially immortal"); } + +#ifdef MD5CRYPT +void do_md5(COMMAND_ARGS) +{ +} +#endif /* MD5CRYPT */ diff --git a/src/channel.c b/src/channel.c index bf8a901..f7b8b90 100644 --- a/src/channel.c +++ b/src/channel.c @@ -295,8 +295,7 @@ Ban *make_ban(Ban **banlist, char *from, char *banmask, time_t when) return(NULL); } - sz = sizeof(Ban) + Strlen2(from,banmask); - //sz = sizeof(Ban) + strlen(from) + strlen(banmask); + sz = sizeof(Ban) + Strlen2(from,banmask); // banmask is never NULL set_mallocdoer(make_ban); new = (Ban*)Calloc(sz); @@ -478,7 +477,7 @@ void channel_massmode(Chan *chan, char *pattern, int filtmode, char mode, char t if (i) { - if ((Strlen2(deopstring,burst)) >= MSGLEN-2) + if ((Strlen2(deopstring,burst)) >= MSGLEN-2) // burst is never NULL { write(current->sock,burst,strlen(burst)); #ifdef DEBUG diff --git a/src/core.c b/src/core.c index e85288b..9476b0d 100644 --- a/src/core.c +++ b/src/core.c @@ -168,13 +168,13 @@ int write_session(void) varval = varval->proc_var; if (IsChar(j)) { - if ((int)VarName[j].setto != varval->char_var) + if (VarName[j].v.num != varval->char_var) to_file(sf,"set %s %c\n",VarName[j].name,varval->char_var); } else if (IsNum(j)) { - if ((int)VarName[j].setto != varval->int_var) + if (VarName[j].v.num != varval->int_var) to_file(sf,"set %s %i\n",VarName[j].name,varval->int_var); } else @@ -200,7 +200,7 @@ int write_session(void) varval = &chan->setting[j]; if (IsNum(j)) { - if ((int)VarName[j].setto != varval->int_var) + if (VarName[j].v.num != varval->int_var) to_file(sf,"set %s %i\n",VarName[j].name,varval->int_var); } else diff --git a/src/ctcp.c b/src/ctcp.c index e7a2918..55586fc 100644 --- a/src/ctcp.c +++ b/src/ctcp.c @@ -156,7 +156,7 @@ int dcc_sendfile(char *target, char *filename) struct sockaddr_in sai; Client *client; int s,f,sz; - char tempfile[Strlen2(filename,DCC_PUBLICFILES)+2]; + char tempfile[strlen(filename)+strlen(DCC_PUBLICFILES)+2]; // strlen(DCC_PUBLICFILES) evaluates at compile time to a constant. Strcpy(tempfile,DCC_PUBLICFILES); Strcat(tempfile,filename); @@ -177,7 +177,7 @@ int dcc_sendfile(char *target, char *filename) } set_mallocdoer(dcc_sendfile); - client = (Client*)Calloc(sizeof(Client) + Strlen2(filename,target)); + client = (Client*)Calloc(sizeof(Client) + Strlen2(filename,target)); // target is never NULL client->fileno = f; client->sock = s; @@ -608,7 +608,7 @@ void ctcp_dcc(char *from, char *to, char *rest) if (1) { - char tempname[Strlen2(filename,DCC_PUBLICINCOMING)+1]; + char tempname[strlen(filename)+strlen(DCC_PUBLICINCOMING)+1]; // strlen(DCC_PUBLICINCOMING) evaluates to a constant during compile. Strcpy(Strcpy(tempname,DCC_PUBLICINCOMING),filename); @@ -620,7 +620,7 @@ void ctcp_dcc(char *from, char *to, char *rest) return; } set_mallocdoer(ctcp_dcc); - client = (Client*)Calloc(sizeof(Client) + Strlen2(filename,from)); + client = (Client*)Calloc(sizeof(Client) + Strlen2(filename,from)); // from is never NULL client->fileno = f; client->fileend = filesz; client->sock = s; diff --git a/src/debug.c b/src/debug.c index 0067513..bdf6a24 100644 --- a/src/debug.c +++ b/src/debug.c @@ -154,7 +154,7 @@ LS struct #ifdef PYTHON { python_hook, "python_hook" }, { python_unhook, "python_unhook" }, -#endif /* PYTHON */ +#endif /* PYTHON */ #ifdef RAWDNS { rawdns, "rawdns" }, { parse_query, "parse_query" }, @@ -196,12 +196,12 @@ LS const DEFstruct SCRIPTdefs[] = { HOOK_BOTNET, "HOOK_BOTNET" }, { HOOK_DCC_COMPLETE, "HOOK_DCC_COMPLETE" }, #ifdef TCL -{ (int)tcl_timer_jump, "tcl_timer_jump" }, -{ (int)tcl_parse_jump, "tcl_parse_jump" }, +{ .v.func=tcl_timer_jump, "tcl_timer_jump" }, +{ .v.func=tcl_parse_jump, "tcl_parse_jump" }, #endif /* TCL */ #ifdef PYTHON -{ (int)python_timer_jump, "python_timer_jump" }, -{ (int)python_parse_jump, "python_parse_jump" }, +{ .v.func=python_timer_jump, "python_timer_jump" }, +{ .v.func=python_parse_jump, "python_parse_jump" }, #endif /* PYTHON */ { 0, }}; #endif /* SCRIPTING */ @@ -301,9 +301,9 @@ void strflags(char *dst, const DEFstruct *flagsstruct, int flags) int i; *dst = 0; - for(i=0;(flagsstruct[i].id);i++) + for(i=0;(flagsstruct[i].v.id);i++) { - if (flagsstruct[i].id & flags) + if (flagsstruct[i].v.id & flags) { if (*dst) Strcat(dst,"|"); @@ -318,7 +318,19 @@ const char *strdef(const DEFstruct *dtab, int num) for(i=0;(dtab[i].idstr);i++) { - if (dtab[i].id == num) + if (dtab[i].v.id == num) + return(dtab[i].idstr); + } + return("UNKNOWN"); +} + +const char *funcdef(const DEFstruct *dtab, void *func) +{ + int i; + + for(i=0;(dtab[i].idstr);i++) + { + if (dtab[i].v.func == func) return(dtab[i].idstr); } return("UNKNOWN"); @@ -468,7 +480,7 @@ void debug_settings(UniVar *setting, int type) } tpad = STREND(tabs); - n = 24 - (Strlen2(pad,VarName[i].name) + 2); + n = 24 - (Strlen2(pad,VarName[i].name) + 2); // VarName[i].name is never NULL while(n >= 8) { n = n - 8; @@ -1161,7 +1173,7 @@ void debug_rawdns(void) #endif /* RAWDNS */ -#if defined(TCL) || defined(PYTHON) +#if defined(TCL) || defined(PYTHON) #if 0 typedef struct @@ -1174,7 +1186,7 @@ typedef struct ulong minute2; //:30; ulong hour; //:24; ulong weekday; //:7; - + } HookTimer; #endif /* 0 */ @@ -1213,7 +1225,7 @@ void debug_scripthook(void) for(h=hooklist;h;h=h->next) { memtouch(h); - debug(" ; func\t\t"mx_pfmt" %s\n",(mx_ptr)h->func,strdef(SCRIPTdefs,(int)h->func)); + debug(" ; func\t\t"mx_pfmt" %s\n",(mx_ptr)h->func,funcdef(SCRIPTdefs,h->func)); debug(" ; guid\t\t%i\n",h->guid); debug(" ; flags\t\t%s (%i)\n",strdef(SCRIPTdefs,h->flags),h->flags); if (h->flags == HOOK_TIMER) diff --git a/src/function.c b/src/function.c index f8fa76d..e8e1a50 100644 --- a/src/function.c +++ b/src/function.c @@ -176,7 +176,7 @@ void Free(char **mem) #endif /* DEBUG */ -int Strlen(const char *first, ...) +const int Strlen(const char *first, ...) { const char *s,*o; int n; @@ -200,7 +200,7 @@ int Strlen(const char *first, ...) } __attr(CORE_SEG,__regparm(2)) -int Strlen2(const char *one, const char *two) +const int Strlen2(const char *one, const char *two) { const char *s1,*s2; diff --git a/src/h.h b/src/h.h index e2d30e4..48b9b93 100644 --- a/src/h.h +++ b/src/h.h @@ -23,7 +23,7 @@ #define ischannel(x) (*x == '#') -#define nullstr(x) (x) ? x : NULLSTR +#define nullstr(x) ((x)) ? (x) : NULLSTR #define nullbuf(x) (x && *x) ? x : NULLSTR #define chkhigh(x) if (x > hisock) { hisock = x; } @@ -107,6 +107,7 @@ #endif /* DEBUG */ +LS Chan *find_channel(char *, int) __attr(CORE_SEG, __regparm (2) ); LS Chan *find_channel_ac(char *) __attr(CORE_SEG, __regparm (1) ); LS Chan *find_channel_ny(char *) __attr(CORE_SEG, __regparm (1) ); LS ChanUser *find_chanuser(Chan *, const char *) __attr(CORE_SEG, __regparm (2) ); @@ -208,8 +209,8 @@ LS ulong stringhash(char *) __page(CORE_SEG); */ LS void *Calloc(int) __attr(CORE_SEG, __regparm (1) ); LS void Free(char **) __attr(CORE_SEG, __regparm (1) ); -LS int Strlen(const char *, ...) __page(CORE_SEG); -LS int Strlen2(const char *, const char *) __attr(CORE_SEG, __regparm (2) ); +LS const int Strlen(const char *, ...) __page(CORE_SEG); +LS const int Strlen2(const char *, const char *) __attr(CORE_SEG, __regparm (2) ); LS int matches(const char *, const char *) __att2(CORE_SEG, const, __regparm (2) ); LS int num_matches(const char *, const char *) __att2(CORE_SEG, const, __regparm (2) ); LS int a2i(char *) __attr(CORE_SEG, __regparm (1) ); @@ -527,6 +528,7 @@ LS void select_bounce(void) __page(CORE_SEG); LS void do_chanban(COMMAND_ARGS) __page(CMD1_SEG); LS void process_chanbans(void) __page(CORE_SEG); +LS void chanban_action(char *, char *, Shit *) __page(CORE_SEG); #endif /* CHANBAN */ diff --git a/src/irc.c b/src/irc.c index 99226d9..4a6efdb 100644 --- a/src/irc.c +++ b/src/irc.c @@ -37,7 +37,7 @@ void make_ireq(int t, char *from, char *nick) char *pt; set_mallocdoer(make_ireq); - ir = (IReq*)Calloc(sizeof(IReq) + Strlen2(from,nick)); + ir = (IReq*)Calloc(sizeof(IReq) + Strlen(from,nick,NULL)); // can not use Strlen2() if 2nd arg might be NULL, Strlen() handles NULLs. ir->t = t; ir->when = now; diff --git a/src/main.c b/src/main.c index 0ac8355..675acf7 100644 --- a/src/main.c +++ b/src/main.c @@ -770,7 +770,7 @@ restart_die: LS char *bad_exe = "init: Error: Improper executable name\n"; #ifdef __GNUC__ -int main(int argc, char **argv, char **envp) __attribute__ ((__noreturn__, __sect(INIT_SEG))); +int main(int argc, char **argv, char **envp) __attribute__ ((__sect(INIT_SEG))); #endif int main(int argc, char **argv, char **envp) { diff --git a/src/net.c b/src/net.c index 6030f8c..e03fe14 100644 --- a/src/net.c +++ b/src/net.c @@ -338,7 +338,7 @@ void basicAuth(BotNet *bn, char *rest) case BNAUTH_MD5: if (linkpass && *linkpass) { - char *enc,temppass[24 + Strlen2(pass,linkpass)]; + char *enc,temppass[24 + Strlen2(pass,linkpass)]; // linkpass is never NULL /* "mypass theirpass REMOTEsid LOCALsid" */ sprintf(temppass,"%s %s %i %i",linkpass,pass,bn->rsid,bn->lsid); @@ -546,7 +546,7 @@ void basicBanner(BotNet *bn, char *rest) if (cfg->pass && *cfg->pass) { char *enc,salt[8]; - char temppass[24 + Strlen2(cfg->pass,linkpass)]; + char temppass[24 + Strlen2(cfg->pass,linkpass)]; // linkpass(procvar) is not NULL /* "theirpass mypass LOCALsid REMOTEsid" */ sprintf(temppass,"%s %s %i %i",cfg->pass,linkpass,bn->lsid,bn->rsid); @@ -1498,7 +1498,7 @@ usage: goto usage; set_mallocdoer(do_link); - cfg = (NetCfg*)Calloc(sizeof(NetCfg) + Strlen2(pass,host)); + cfg = (NetCfg*)Calloc(sizeof(NetCfg) + Strlen(pass,host,NULL)); // host might be NULL, Strlen() handles NULLs, Strlen2() does not. cfg->guid = iguid; cfg->port = iport; diff --git a/src/notify.c b/src/notify.c index ae4b3ac..f2b7751 100644 --- a/src/notify.c +++ b/src/notify.c @@ -244,7 +244,7 @@ void catch_whois(char *nick, char *userhost, char *realname) * put in a new log entry */ set_mallocdoer(catch_whois); - nlog = (nfLog*)Calloc(sizeof(nfLog) + Strlen2(userhost,realname)); + nlog = (nfLog*)Calloc(sizeof(nfLog) + Strlen2(userhost,realname)); // realname is never NULL nlog->signon = now; nlog->next = nf->log; nf->log = nlog; @@ -306,7 +306,7 @@ int notifylog_callback(char *rest) pp = &(*pp)->next; } set_mallocdoer(notifylog_callback); - nlog = (nfLog*)Calloc(sizeof(nfLog) + Strlen2(userhost,rest)); + nlog = (nfLog*)Calloc(sizeof(nfLog) + Strlen2(userhost,rest)); // rest is never NULL nlog->signon = on; nlog->signoff = off; nlog->next = *pp; diff --git a/src/perl.c b/src/perl.c index 9b1d59c..2130107 100644 --- a/src/perl.c +++ b/src/perl.c @@ -61,7 +61,6 @@ int perl_parse_jump(char *from, char *rest, Hook *hook) SPAGAIN; /* Rehash stack, it's probably been clobbered */ return(POPi); /* Pop an int */ - } /* @@ -83,7 +82,7 @@ XS(XS_perl_parse_hook) /* * translate *name and *sub from perl variables to C strings - * SvPV(ST(0)) returns a string(char) pointer to the first arg. + * SvPV(ST(0)) returns a string(char) pointer to the first arg. * but I don't know if it's safe to point directly in to perl * space like that. */ @@ -100,7 +99,7 @@ XS(XS_perl_parse_hook) * make a Hook struct and link it into the parse hook list */ set_mallocdoer(perl_parse_hook); - hook = (Hook*)Calloc(sizeof(Hook) + Strlen2(name,sub)); + hook = (Hook*)Calloc(sizeof(Hook) + Strlen2(name,sub)); // sub is never NULL hook->func = perl_parse_jump; hook->next = hooklist; hooklist = hook; diff --git a/src/prot.c b/src/prot.c index 80f5652..9134e87 100644 --- a/src/prot.c +++ b/src/prot.c @@ -51,7 +51,7 @@ void send_kick(Chan *chan, const char *nick, const char *format, ...) pp = &(*pp)->next; set_mallocdoer(send_kick); - *pp = new = (qKick*)Calloc(sizeof(qKick) + Strlen2(nick,gsockdata)); + *pp = new = (qKick*)Calloc(sizeof(qKick) + Strlen2(nick,gsockdata)); // gsockdata is never NULL /* Calloc sets to zero new->next = NULL; */ new->reason = Strcpy(new->nick,nick) + 1; diff --git a/src/settings.h b/src/settings.h index 0e7d80d..9ad9f5a 100644 --- a/src/settings.h +++ b/src/settings.h @@ -25,8 +25,13 @@ #define DEFAULTCMDCHAR '-' #define ZERO 0 -#define INTCAST(x) (void*)((int)x) -#define CHARCAST (void*)((int)DEFAULTCMDCHAR) +#define INTCAST(x) .v.num=x +#define CMDCHAR .v.chr=DEFAULTCMDCHAR +#define VNULL .v.str=NULL +#define TOGPROC(x) .v.numptr=&x +#define CHRPROC(x) .v.str=&x +#define INTPROC(x) .v.numptr=&x +#define STRPROC(x) .v.strptr=&x LS const Setting VarName[SIZE_VARS] = { @@ -44,10 +49,10 @@ LS const Setting VarName[SIZE_VARS] = { INT_VAR, 40, 0, ZERO, "CKL", 20 }, { TOG_VAR, 40, 0, ZERO, "CTL", 1 }, #ifdef DYNAMODE -{ STR_VAR, 40, 0, NULL, "DYNLIMIT", 1 }, /* settings for dynamode: `delay:window:minwin' */ +{ STR_VAR, 40, 0, VNULL, "DYNLIMIT", 1 }, /* settings for dynamode: `delay:window:minwin' */ #endif /* DYNAMODE */ { TOG_VAR, 40, 0, ZERO, "ENFM", 1 }, -{ STR_VAR, 40, 0, NULL, "ENFMODES" }, /* modes to enforce, +ENFM to enable */ +{ STR_VAR, 40, 0, VNULL, "ENFMODES" }, /* modes to enforce, +ENFM to enable */ { INT_VAR, 40, 0, INTCAST(6), "FL", 20 }, /* number of lines that counts as a text flood */ { INT_VAR, 40, 0, ZERO, "FPL", 2 }, { INT_VAR, 40, 0, INTCAST(0), "IKT", 40320 }, /* idle-kick: minutes of idle-time (max 4 weeks) */ @@ -65,7 +70,7 @@ LS const Setting VarName[SIZE_VARS] = { TOG_VAR, 40, 0, INTCAST(1), "SHIT", 1 }, /* shitlist enable */ { TOG_VAR, 40, 0, ZERO, "SO", 1 }, /* safe-op enable */ #ifdef STATS -{ STR_VAR, 80, 0, NULL, "STATS" }, /* statistics log file */ +{ STR_VAR, 80, 0, VNULL, "STATS" }, /* statistics log file */ #endif /* STATS */ { TOG_VAR, 40, 0, ZERO, "TOP", 1 }, /* @@ -73,33 +78,33 @@ LS const Setting VarName[SIZE_VARS] = */ /* TYPE UACCES MIN DEFAULT NAME MAX */ { INT_GLOBAL, 40, 0, ZERO, "AAWAY", 1440 }, /* set auto-away after ___ minutes */ -{ STR_GLOBAL, 90, 0, NULL, "ALTNICK" }, /* alternative nick */ +{ STR_GLOBAL, 90, 0, VNULL, "ALTNICK" }, /* alternative nick */ #ifdef BOTNET -{ TOG_PROC, 90, 0, (&autolink), "AUTOLINK", 1 }, /* establish links automagically */ +{ TOG_PROC, 90, 0, TOGPROC(autolink), "AUTOLINK", 1 }, /* establish links automagically */ #endif /* BOTNET */ #ifdef BOUNCE -{ INT_PROC, 100, 0, (&bounce_port), "BNCPORT", 65535, (&new_port_bounce) }, /* irc proxy port to listen on */ +{ INT_PROC, 100, 0, INTPROC(bounce_port), "BNCPORT", 65535, (&new_port_bounce) }, /* irc proxy port to listen on */ #endif /* BOUNCE */ { TOG_GLOBAL, 90, 0, INTCAST(1), "CC", 1 }, /* require command char */ -{ CHR_GLOBAL, 90, 1, CHARCAST, "CMDCHAR", 255 }, /* command char */ +{ CHR_GLOBAL, 90, 1, CMDCHAR, "CMDCHAR", 255 }, /* command char */ #ifdef CTCP { TOG_GLOBAL, 90, 0, INTCAST(1), "CTCP", 1 }, /* ctcp replies enable */ #endif /* CTCP */ -{ INT_PROC, 100, 10, (&ctimeout), "CTIMEOUT", 3600 }, /* how long to wait between connect attempts */ +{ INT_PROC, 100, 10, INTPROC(ctimeout), "CTIMEOUT", 3600 }, /* how long to wait between connect attempts */ #ifdef DCC_FILE { INT_GLOBAL, 80, 0, ZERO, "DCCANON", 100 }, /* anonymous (non user) DCC slots */ -{ STR_GLOBAL, 80, 0, NULL, "DCCFILES" }, /* string with space separated masks for auto-accepted filenames */ +{ STR_GLOBAL, 80, 0, VNULL, "DCCFILES" }, /* string with space separated masks for auto-accepted filenames */ { INT_GLOBAL, 80, 0, INTCAST(4), "DCCUSER", 100 }, /* user DCC slots */ #endif /* DCC_FILE */ { TOG_GLOBAL, 80, 0, ZERO, "ENFPASS", 1 }, /* disallow users with no passwords */ -{ STR_GLOBAL, 90, 0, NULL, "IDENT" }, /* register with this in the `user' field */ -{ STR_GLOBAL, 90, 0, NULL, "IRCNAME" }, /* register with this in the `real name' field */ +{ STR_GLOBAL, 90, 0, VNULL, "IDENT" }, /* register with this in the `user' field */ +{ STR_GLOBAL, 90, 0, VNULL, "IRCNAME" }, /* register with this in the `real name' field */ #ifdef NOTIFY { INT_GLOBAL, 80, 10, INTCAST(30), "ISONDELAY", 600 }, /* seconds between each ISON */ #endif /* NOTIFY */ #ifdef BOTNET -{ STR_PROC, 90, 0, (&linkpass), "LINKPASS" }, /* local process linkpass */ -{ INT_PROC, 100, 0, (&linkport), "LINKPORT", 65535 }, /* listen on for botnet connections */ +{ STR_PROC, 90, 0, STRPROC(linkpass), "LINKPASS" }, /* local process linkpass */ +{ INT_PROC, 100, 0, INTPROC(linkport), "LINKPORT", 65535 }, /* listen on for botnet connections */ #endif /* BOTNET */ { INT_GLOBAL, 80, 1, INTCAST(3), "MODES", 20 }, /* max number of channel modes to send */ #ifdef BOTNET @@ -107,36 +112,36 @@ LS const Setting VarName[SIZE_VARS] = #endif /* BOTNET */ { TOG_GLOBAL, 80, 0, ZERO, "NOIDLE", 1 }, /* dont idle */ #ifdef NOTIFY -{ STR_GLOBAL, 80, 0, NULL, "NOTIFYFILE" }, /* read notify settings from */ +{ STR_GLOBAL, 80, 0, VNULL, "NOTIFYFILE" }, /* read notify settings from */ #endif /* NOTIFY */ { TOG_GLOBAL, 90, 0, ZERO, "ONOTICE", 1 }, /* ircd has /notice @#channel */ #ifdef TRIVIA -{ CHR_PROC, 80, 0, (&triv_qchar), "QCHAR" }, /* use as mask char when displaying answer */ -{ INT_PROC, 80, 1, (&triv_qdelay), "QDELAY", 3600 }, /* seconds between each question */ -{ STR_PROC, 80, 0, (&triv_qfile), "QFILE" }, /* load questions from */ +{ CHR_PROC, 80, 0, CHRPROC(triv_qchar), "QCHAR" }, /* use as mask char when displaying answer */ +{ INT_PROC, 80, 1, INTPROC(triv_qdelay), "QDELAY", 3600 }, /* seconds between each question */ +{ STR_PROC, 80, 0, STRPROC(triv_qfile), "QFILE" }, /* load questions from */ #endif /* TRIVIA */ #ifdef CTCP { TOG_GLOBAL, 80, 0, ZERO, "RF", 1 }, /* random ctcp finger reply */ { TOG_GLOBAL, 80, 0, ZERO, "RV", 1 }, /* random ctcp version reply */ #endif /* CTCP */ #ifdef SEEN -{ STR_PROC, 90, 0, (&seenfile), "SEENFILE" }, /* load/save seen database from */ +{ STR_PROC, 90, 0, STRPROC(seenfile), "SEENFILE" }, /* load/save seen database from */ #endif /* SEEN */ -{ STR_GLOBAL, 80, 0, NULL, "SERVERGROUP" }, /* connect bot to a certain group of servers */ +{ STR_GLOBAL, 80, 0, VNULL, "SERVERGROUP" }, /* connect bot to a certain group of servers */ { TOG_GLOBAL, 90, 0, ZERO, "SPY", 1 }, /* send info about executed commands to status channel */ -{ STR_GLOBAL, 90, 0, NULL, "UMODES" }, /* send these modes on connect */ +{ STR_GLOBAL, 90, 0, VNULL, "UMODES" }, /* send these modes on connect */ #ifdef UPTIME -{ STR_PROC, 100, 0, (&uptimehost), "UPHOST" }, /* send uptime packets to */ -{ STR_PROC, 100, 0, (&uptimenick), "UPNICK" }, /* send as identifier instead of bots nick */ -{ INT_PROC, 100, 0, (&uptimeport), "UPPORT", 65535 }, /* send packets to port */ +{ STR_PROC, 100, 0, STRPROC(uptimehost), "UPHOST" }, /* send uptime packets to */ +{ STR_PROC, 100, 0, STRPROC(uptimenick), "UPNICK" }, /* send as identifier instead of bots nick */ +{ INT_PROC, 100, 0, INTPROC(uptimeport), "UPPORT", 65535 }, /* send packets to port */ #endif /* UPTIME */ -{ STR_GLOBAL, 90, 0, NULL, "USERFILE" }, /* what file to load/save userlist from/to */ -{ STR_GLOBAL, 90, 0, NULL, "VIRTUAL", 0, (&var_resolve_host) }, /* visual host */ +{ STR_GLOBAL, 90, 0, VNULL, "USERFILE" }, /* what file to load/save userlist from/to */ +{ STR_GLOBAL, 90, 0, VNULL, "VIRTUAL", 0, (&var_resolve_host) }, /* visual host */ #ifdef WEB -{ INT_PROC, 100, 0, (&webport), "WEBPORT", 65535 }, /* httpd should listen on... */ +{ INT_PROC, 100, 0, INTPROC(webport), "WEBPORT", 65535 }, /* httpd should listen on... */ #endif /* WEB */ #ifdef WINGATE -{ STR_GLOBAL, 90, 0, NULL, "WINGATE", 0, (&var_resolve_host) }, /* wingate hostname */ +{ STR_GLOBAL, 90, 0, VNULL, "WINGATE", 0, (&var_resolve_host) }, /* wingate hostname */ { INT_GLOBAL, 90, 0, ZERO, "WINGPORT", 65535 }, /* wingate port */ #endif /* WINGATE */ { 0, }}; diff --git a/src/structs.h b/src/structs.h index 2d140d2..80203ef 100644 --- a/src/structs.h +++ b/src/structs.h @@ -82,7 +82,12 @@ typedef struct typedef struct DEFstruct { - int id; + union + { + int id; + void *func; + + } v; char *idstr; } DEFstruct; @@ -168,7 +173,16 @@ typedef struct Setting uchar type; uchar uaccess; /* user access to touch/view this setting */ short min; - void *setto; /* type-casted to whatever */ + union + { + int num; + int *numptr; + char chr; + char *str; + char **strptr; + + } v; + //void *setto; /* type-casted to whatever */ char *name; int max; void (*func)(const struct Setting *); @@ -565,7 +579,7 @@ typedef struct Mech #ifdef IDWRAP char *identfile; -#endif /* IDWRAP */ +#endif /* IDWRAP */ /* big buffers at the end */ UniVar setting[SIZE_VARS]; /* global vars + channel defaults */ diff --git a/src/tcl.c b/src/tcl.c index 6b23816..965df85 100644 --- a/src/tcl.c +++ b/src/tcl.c @@ -173,8 +173,7 @@ int tcl_parse_jump(char *from, char *rest, Hook *hook) Tcl_GetIntFromObj(energymech_tcl,tcl_result,&i); } #ifdef DEBUG - if (energymech_tcl->result && *energymech_tcl->result) - debug("(tcl_parse_jump) result = %s\n",nullstr(energymech_tcl->result)); + debug("(tcl_parse_jump) result = %i\n",i); #endif /* DEBUG */ return(i); } @@ -199,8 +198,7 @@ void tcl_dcc_complete(Client *client, int cps) Tcl_ObjSetVar2(energymech_tcl,vname,NULL,obj,TCL_GLOBAL_ONLY); Tcl_VarEval(energymech_tcl,hook->self," $_filetarget $_filename $_cps",NULL); #ifdef DEBUG - if (energymech_tcl->result && *energymech_tcl->result) - debug("(tcl_dcc_complete) result = %s\n",nullstr(energymech_tcl->result)); + debug("(tcl_dcc_complete) filetarget %s, filename %s\n",client->whom,client->filename); #endif /* DEBUG */ } } @@ -335,7 +333,7 @@ int tcl_debug(void *foo, Tcl_Interp *I, int objc, Tcl_Obj *CONST objv[]) return(TCL_ERROR); debug("(tcl_debug) %s\n",text); - + return(TCL_OK); } @@ -476,8 +474,7 @@ int tcl_dns_jump(char *host, char *resolved, Hook *hook) Tcl_GetIntFromObj(energymech_tcl,tcl_result,&i); } #ifdef DEBUG - if (energymech_tcl->result && *energymech_tcl->result) - debug("(tcl_dns_jump) result = %s\n",nullstr(energymech_tcl->result)); + debug("(tcl_dns_jump) result = %i\n",i); #endif /* DEBUG */ return(i); } diff --git a/src/user.c b/src/user.c index 5c87485..f504065 100644 --- a/src/user.c +++ b/src/user.c @@ -716,7 +716,7 @@ User *add_user(char *handle, char *pass, int axs) #endif /* DEBUG */ set_mallocdoer(add_user); - user = (User*)Calloc(sizeof(User) + Strlen2(handle,pass)); + user = (User*)Calloc(sizeof(User) + Strlen(handle,pass,NULL)); // Strlen() tolerates pass being NULL, Strlen2() does not. user->x.x.access = axs; user->next = current->userlist; current->userlist = user; diff --git a/src/vars.c b/src/vars.c index 2152241..1d1f481 100644 --- a/src/vars.c +++ b/src/vars.c @@ -79,7 +79,7 @@ void copy_vars(UniVar *dst, UniVar *src) { dst[i].int_var = src[i].int_var; } - } + } } void set_binarydefault(UniVar *dst) @@ -87,7 +87,7 @@ void set_binarydefault(UniVar *dst) int i; for(i=0;VarName[i].name;i++) - dst[i].str_var = VarName[i].setto; + dst[i].str_var = VarName[i].v.str; } void delete_vars(UniVar *vars, int which) @@ -388,7 +388,7 @@ second_pass: varval = (IsProc(i)) ? current->setting[i].proc_var : &univar[i]; - sz = Strlen2(tmp,VarName[i].name); + sz = Strlen2(tmp,VarName[i].name); // VarName[i].name is never NULL if (IsStr(i)) { From f9d37e65a4a215255f61d63a89c99bad1abde7be Mon Sep 17 00:00:00 2001 From: joonicks Date: Fri, 9 Mar 2018 01:29:18 +0100 Subject: [PATCH 2/2] 2018 progress --- .gitignore | 5 + COPYING | 339 --------------------------------------------------- VERSIONS | 7 +- src/auth.c | 6 - src/core.c | 160 +++++++++++++----------- src/gencmd.c | 6 +- src/global.h | 4 +- src/h.h | 2 +- src/help.c | 20 ++- src/main.c | 32 +++-- src/net.c | 2 +- src/text.h | 14 ++- src/user.c | 45 ++++--- 13 files changed, 186 insertions(+), 456 deletions(-) delete mode 100644 COPYING diff --git a/.gitignore b/.gitignore index 5b2b409..cc9f56b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ root.zone* trick.conf conf +debug* +*.log +*.stats +*.session +energymech.userfile diff --git a/COPYING b/COPYING deleted file mode 100644 index a43ea21..0000000 --- a/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/VERSIONS b/VERSIONS index 5176c01..c9ad9e9 100644 --- a/VERSIONS +++ b/VERSIONS @@ -1,5 +1,10 @@ -3.0.99p4 -- February, 2018. +3.0.99p4 -- WORK IN PROGRESS (~February, 2018) + * Fixed: Potential memory corruption bug in do_user(). + * Fixed: Aliases saves to session file. + * Added: CORE & INFO (statistics) can now be output redirected. + * Added: SPY to files saved in sessions. + * Fixed: HELP command should now be working properly again. * Fixed: Strlen/Strlen2 code cleanup. * Fixed: Various compiler warnings. diff --git a/src/auth.c b/src/auth.c index 00cd8a8..05c81af 100644 --- a/src/auth.c +++ b/src/auth.c @@ -447,9 +447,3 @@ listcheck: } to_user(from,"You are now officially immortal"); } - -#ifdef MD5CRYPT -void do_md5(COMMAND_ARGS) -{ -} -#endif /* MD5CRYPT */ diff --git a/src/core.c b/src/core.c index 9476b0d..9e71ad5 100644 --- a/src/core.c +++ b/src/core.c @@ -138,7 +138,11 @@ int write_session(void) #ifdef RAWDNS Strp *p; #endif /* RAWDNS */ +#ifdef ALIAS + Alias *alias; +#endif /* ALIAS */ Server *sp; + Spy *spy; Chan *chan; Mech *bot; UniVar *varval; @@ -155,6 +159,83 @@ int write_session(void) to_file(sf,"dnsserver %s\n",inet_ntoa(ia_ns[j])); #endif /* RAWDNS */ + to_file(sf,"set ctimeout %i\n",ctimeout); + for(sp=serverlist;sp;sp=sp->next) + { + to_file(sf,"server %s %i %s\n",sp->name,(sp->port) ? sp->port : 6667, + (sp->pass[0]) ? sp->pass : ""); + } + +#ifdef BOTNET + if (linkpass) + to_file(sf,"set linkpass %s\n",linkpass); + if (linkport) + to_file(sf,"set linkport %i\n",linkport); + if (autolink) + to_file(sf,"set autolink 1\n"); + for(cfg=netcfglist;cfg;cfg=cfg->next) + { + to_file(sf,"link %i %s",cfg->guid,(cfg->pass) ? cfg->pass : MATCH_ALL); + if (cfg->host) + to_file(sf," %s %i",cfg->host,cfg->port); + to_file(sf,"\n"); + } +#endif /* BOTNET */ + +#ifdef BOUNCE + if (bounce_port) + to_file(sf,"set bncport %i\n",bounce_port); +#endif /* BOUNCE */ + +#ifdef WEB + if (webport) + to_file(sf,"set webport %i\n",webport); +#endif /* WEB */ + +#ifdef UPTIME + if (uptimehost && Strcasecmp(uptimehost,defaultuptimehost)) + to_file(sf,"set uphost %s\n",uptimehost); + if (uptimeport) + to_file(sf,"set upport %i\n",uptimeport); + if (uptimenick) + to_file(sf,"set upnick %s\n",uptimenick); +#endif /* UPTIME */ + +#ifdef TRIVIA + if (triv_qfile) + to_file(sf,"set qfile %s\n",triv_qfile); + to_file(sf,"set qdelay %i\n",triv_qdelay); + to_file(sf,"set qchar %c\n",triv_qchar); +#endif /* TRIVIA */ + +#ifdef SEEN + if (seenfile) + to_file(sf,"set seenfile %s\n",seenfile); +#endif /* SEEN */ + +#ifdef DYNCMD + /* + * because of "chaccess XXX disable" its best to save chaccess last + */ + for(j=0;mcmd[j].name;j++) + { + if (acmd[j] != mcmd[j].defaultaccess) + { + if (acmd[j] == 250) + to_file(sf,"chaccess %s disable\n",mcmd[j].name); + else + to_file(sf,"chaccess %s %i\n",mcmd[j].name,(int)acmd[j]); + } + } +#endif /* DYNCMD */ + +#ifdef ALIAS + for(alias=aliaslist;alias;alias=alias->next) + { + to_file(sf,"alias %s %s\n",alias->alias,alias->format); + } +#endif /* ALIAS */ + for(bot=botlist;bot;bot=bot->next) { to_file(sf,"nick %i %s\n",bot->guid,bot->wantnick); @@ -214,77 +295,20 @@ int write_session(void) } } } - } - - to_file(sf,"set ctimeout %i\n",ctimeout); - for(sp=serverlist;sp;sp=sp->next) - { - to_file(sf,"server %s %i %s\n",sp->name,(sp->port) ? sp->port : 6667, - (sp->pass[0]) ? sp->pass : ""); - } - -#ifdef TRIVIA - if (triv_qfile) - to_file(sf,"set qfile %s\n",triv_qfile); - to_file(sf,"set qdelay %i\n",triv_qdelay); - to_file(sf,"set qchar %c\n",triv_qchar); -#endif /* TRIVIA */ - -#ifdef UPTIME - if (uptimehost && Strcasecmp(uptimehost,defaultuptimehost)) - to_file(sf,"set uphost %s\n",uptimehost); - if (uptimeport) - to_file(sf,"set upport %i\n",uptimeport); - if (uptimenick) - to_file(sf,"set upnick %s\n",uptimenick); -#endif /* UPTIME */ - -#ifdef SEEN - if (seenfile) - to_file(sf,"set seenfile %s\n",seenfile); -#endif /* SEEN */ - -#ifdef BOTNET - if (linkpass) - to_file(sf,"set linkpass %s\n",linkpass); - if (linkport) - to_file(sf,"set linkport %i\n",linkport); - if (autolink) - to_file(sf,"set autolink 1\n"); - for(cfg=netcfglist;cfg;cfg=cfg->next) - { - to_file(sf,"link %i %s",cfg->guid,(cfg->pass) ? cfg->pass : MATCH_ALL); - if (cfg->host) - to_file(sf," %s %i",cfg->host,cfg->port); - to_file(sf,"\n"); - } -#endif /* BOTNET */ - -#ifdef BOUNCE - if (bounce_port) - to_file(sf,"set bncport %i\n",bounce_port); -#endif /* BOUNCE */ - -#ifdef WEB - if (webport) - to_file(sf,"set webport %i\n",webport); -#endif /* WEB */ - -#ifdef DYNCMD - /* - * because of "chaccess XXX disable" its best to save chaccess last - */ - for(j=0;mcmd[j].name;j++) - { - if (acmd[j] != mcmd[j].defaultaccess) + // SPY files + for(spy=bot->spylist;spy;spy=spy->next) { - if (acmd[j] == 250) - to_file(sf,"chaccess %s disable\n",mcmd[j].name); - else - to_file(sf,"chaccess %s %i\n",mcmd[j].name,(int)acmd[j]); + if (spy->t_dest == SPY_FILE) + { + if (spy->src && spy->dest) + to_file(sf,"spy %s > %s\n",spy->src,spy->dest); +#ifdef DEBUG + else + debug("spy to session fail\n"); +#endif /* DEBUG */ + } } } -#endif /* DYNCMD */ close(sf); return(TRUE); diff --git a/src/gencmd.c b/src/gencmd.c index fa6068d..5110e44 100644 --- a/src/gencmd.c +++ b/src/gencmd.c @@ -132,7 +132,7 @@ struct { 0, "READ", "do_read", 40 | CCPW }, #endif /* NOTE */ #ifdef STATS - { 0, "INFO", "do_info", 40 | CCPW | CAXS | DCC }, + { 0, "INFO", "do_info", 40 | CCPW | REDIR | CAXS | DCC }, #endif /* STATS */ /* @@ -227,7 +227,7 @@ struct { 0, "DNSSERVER", "do_dnsserver", 100 | CCPW | GAXS }, { 0, "DNSROOT", "do_dnsroot", 100 | CCPW | GAXS | CARGS }, #endif /* RAWDNS */ - { 0, "CORE", "do_core", 100 | CCPW | DCC }, + { 0, "CORE", "do_core", 100 | CCPW | REDIR | DCC }, { 0, "DIE", "do_die", 100 | CCPW | GAXS }, { 0, "RESET", "do_reset", 100 | CCPW | GAXS | NOCMD }, { 0, "SHUTDOWN", "do_shutdown", 100 | CCPW | GAXS | NOPUB | NOCMD }, @@ -235,7 +235,7 @@ struct { 0, "DEBUG", "do_debug", 100 | CCPW | GAXS }, #endif /* DEBUG */ #ifdef PYTHON -#ifdef PLEASE_HACK_MY_SHELL +#ifdef PLEASE_HACK_MY_SHELL { 0, "PYTHON", "do_python", 100 | CCPW | GAXS | CARGS }, #endif /* PLEASE_HACK_MY_SHELL */ { 0, "PYTHONSCRIPT", "do_pythonscript", 100 | CCPW | GAXS | CARGS }, diff --git a/src/global.h b/src/global.h index 8ed9857..d723634 100644 --- a/src/global.h +++ b/src/global.h @@ -40,8 +40,8 @@ #define DEFAULTCMDCHAR '-' #define MECHUSERLOGIN "v3.energymech.net" -BEG const char VERSION[] MDEF("3.0.99p3"); -BEG const char SRCDATE[] MDEF("July 24th, 2009"); +BEG const char VERSION[] MDEF("3.0.99p4"); +BEG const char SRCDATE[] MDEF("March 5th, 2018"); #ifdef __CYGWIN__ BEG const char BOTCLASS[] MDEF("WinMech"); #else /* ! CYGWIN */ diff --git a/src/h.h b/src/h.h index 48b9b93..15114c1 100644 --- a/src/h.h +++ b/src/h.h @@ -257,7 +257,7 @@ LS void cfg_shit(char *) __page(CFG1_SEG); LS void cfg_user(char *) __page(CFG1_SEG); void mirror_user(User *) __page(CORE_SEG); void mirror_userlist(void) __page(CORE_SEG); -LS void addtouser(Strp **, const char *) __attr(CORE_SEG, __regparm (2) ); +LS void addtouser(Strp **, const char *, int) __attr(CORE_SEG, __regparm (3) ); LS int remfromuser(Strp **, const char *) __attr(CORE_SEG, __regparm (2) ); /* diff --git a/src/help.c b/src/help.c index 6de9791..8b291dd 100644 --- a/src/help.c +++ b/src/help.c @@ -168,12 +168,6 @@ help_loop: return; } - /* - * We dont want to show help for "../../../../../../etc/passwd" - */ - if (!is_safepath(rest)) - return; - pt = Strcpy(line,HELPDIR); for(i=0;(rest[i]);i++) { @@ -184,6 +178,20 @@ help_loop: pt++; } *pt = 0; + + /* + * We dont want to show help for "../../../../../../etc/passwd" + */ + if (!is_safepath(line)) +#ifdef DEBUG + { + debug("(do_help) unsafe help filename (%s), exiting\n",line); + return; + } +#else + return; +#endif /* DEBUG */ + #ifdef DEBUG debug("(do_help) help file check: %s\n",line); #endif /* DEBUG */ diff --git a/src/main.c b/src/main.c index 675acf7..33ab3a9 100644 --- a/src/main.c +++ b/src/main.c @@ -850,16 +850,27 @@ int main(int argc, char **argv, char **envp) versiononly = TRUE; break; case 'h': +/* +#define TEXT_PSWITCH1 " -p encrypt using the password hashing algorithm,\n" +#define TEXT_PSWITCH2 " output the result and then quit.\n" + +#define TEXT_DSWITCH " -d start mech in debug mode\n" +#define TEXT_OSWITCH " -o write debug output to \n" +#define TEXT_XSWITCH " -X write a debug file before exit\n" +*/ + to_file(1,TEXT_USAGE,executable); - to_file(1,TEXT_FSWITCH); - to_file(1,TEXT_CSWITCH); + to_file(1,TEXT_FSWITCH + TEXT_CSWITCH + TEXT_PSWITCH1 + TEXT_PSWITCH2 #ifdef DEBUG - to_file(1," -d start mech in debug mode\n"); - to_file(1," -o write debug output to \n"); - to_file(1," -X write a debug file before exit\n"); + TEXT_DSWITCH + TEXT_OSWITCH + TEXT_XSWITCH #endif /* DEBUG */ - to_file(1,TEXT_HSWITCH); - to_file(1,TEXT_VSWITCH); + TEXT_HSWITCH + TEXT_VSWITCH); _exit(0); case 'c': makecore = TRUE; @@ -887,6 +898,13 @@ int main(int argc, char **argv, char **envp) } do_fork = TRUE; break; + case 'p': + ++argv; + if (*argv) + to_file(1,"%s\n",makepass(*argv)); + else + to_file(1,"error: Missing argument for -p \n"); + _exit(0); case 'X': debug_on_exit = TRUE; break; diff --git a/src/net.c b/src/net.c index e03fe14..9318e7c 100644 --- a/src/net.c +++ b/src/net.c @@ -1016,7 +1016,7 @@ void ushareUser(BotNet *bn, char *rest) #ifdef DEBUG debug("(ushareUser) user %s ++ mask/chan %s\n",user->name,rest); #endif /* DEBUG */ - addtouser((c == '*') ? &user->mask : &user->chan,rest); + addtouser((c == '*') ? &user->mask : &user->chan,rest,TRUE); } } } diff --git a/src/text.h b/src/text.h index 14a2795..8188d8e 100644 --- a/src/text.h +++ b/src/text.h @@ -129,10 +129,16 @@ #define TEXT_SIGUSR1 "QUIT :Switching servers... (SIGUSR1)\n" #define TEXT_USAGE "Usage: %s [switches [args]]\n" -#define TEXT_FSWITCH " -f read configuration from \n" -#define TEXT_CSWITCH " -c make core file instead of coredebug/reset\n" -#define TEXT_HSWITCH " -h show this help\n" -#define TEXT_VSWITCH " -v show EnergyMech version\n" +#define TEXT_FSWITCH " -f read configuration from \n" +#define TEXT_CSWITCH " -c make core file instead of coredebug/reset\n" +#define TEXT_HSWITCH " -h show this help\n" +#define TEXT_VSWITCH " -v show EnergyMech version\n" +#define TEXT_PSWITCH1 " -p encrypt using the password hashing algorithm,\n" +#define TEXT_PSWITCH2 " output the result and then quit.\n" + +#define TEXT_DSWITCH " -d start mech in debug mode\n" +#define TEXT_OSWITCH " -o write debug output to \n" +#define TEXT_XSWITCH " -X write a debug file before exit\n" #define TEXT_HDR_VERS "EnergyMech %s, %s\n" #define TEXT_HDR_DATE "Compiled on " __DATE__ " " __TIME__ "\n" diff --git a/src/user.c b/src/user.c index f504065..92e019f 100644 --- a/src/user.c +++ b/src/user.c @@ -69,12 +69,12 @@ void cfg_pass(char *rest) void cfg_mask(char *rest) { - addtouser(&cfgUser->mask,rest); + addtouser(&cfgUser->mask,rest,TRUE); } void cfg_chan(char *rest) { - addtouser(&cfgUser->chan,rest); + addtouser(&cfgUser->chan,rest,TRUE); } LS struct @@ -447,8 +447,8 @@ void rehash_chanusers(void) } } -__attr(CORE_SEG, __regparm (2)) -void addtouser(Strp **pp, const char *string) +__attr(CORE_SEG, __regparm (3)) +void addtouser(Strp **pp, const char *string, int rehash) { Strp *um; @@ -463,7 +463,8 @@ void addtouser(Strp **pp, const char *string) set_mallocdoer(addtouser); *pp = um = (Strp*)Calloc(sizeof(Strp) + strlen(string)); Strcpy(um->p,string); - rehash_chanusers(); + if (rehash) + rehash_chanusers(); } __attr(CORE_SEG, __regparm (2)) @@ -1133,6 +1134,7 @@ void do_user(COMMAND_ARGS) Strp *ump; char *handle,*pt,*mask,*nick,*chan,*anum,*pass,*encpass; char mode; + char tmpmask[NUHLEN]; int change; int newaccess,uaccess; union usercombo combo; @@ -1209,27 +1211,31 @@ void do_user(COMMAND_ARGS) /* * convert and check nick/mask */ - if ((mask = nick2uh(from,nick)) == NULL) + if ((mask = nick2uh(from,nick)) == NULL) // nick2uh uses nuh_buf return; + Strcpy(tmpmask,mask); +#ifdef DEBUG + debug("(do_user) nick2uh(from \"%s\", nick \"%s\") = mask \"%s\"\n",from,nick,tmpmask); +#endif /* DEBUG */ #ifdef NEWBIE - if (!matches(mask,"!@")) + if (!matches(tmpmask,"!@")) { - to_user(from,"Problem adding %s (global mask)",mask); + to_user(from,"Problem adding %s (global mask)",tmpmask); return; } - if (matches("*@?*.?*",mask)) + if (matches("*@?*.?*",tmpmask)) { - to_user(from,"Problem adding %s (invalid mask)",mask); + to_user(from,"Problem adding %s (invalid mask)",tmpmask); return; } #endif /* NEWBIE */ - format_uh(mask,FUH_USERHOST); + format_uh(tmpmask,FUH_USERHOST); // format_uh uses local temporary buffer but copies result back into tmpmask /* * dont duplicate users */ - if (get_useraccess(mask,chan)) + if (get_useraccess(tmpmask,chan)) { - to_user(from,"%s (%s) on %s is already a user",nick,mask,chan); + to_user(from,"%s (%s) on %s is already a user",nick,tmpmask,chan); return; } /* @@ -1246,9 +1252,12 @@ void do_user(COMMAND_ARGS) * add_user() touches current->ul_save for us */ user = add_user(handle,encpass,newaccess); - addtouser(&user->mask,mask); - addtouser(&user->chan,chan); - to_user(from,"%s has been added as %s on %s",handle,mask,chan); + addtouser(&user->mask,tmpmask,FALSE); // does not run rehash_chanusers(), does not clobber nuh_buf + addtouser(&user->chan,chan,TRUE); // clobbers nuh_buf +#ifdef DEBUG + debug("(do_user) from %s, handle %s,\n\tmask %s (arg %s),\n\tuser->mask %s, chan %s\n",from,handle,mask,nick,user->mask,chan); +#endif /* DEBUG */ + to_user(from,"%s has been added as %s on %s",handle,tmpmask,chan); to_user(from,"Access level: %i%s%s",newaccess,(pass) ? " Password: " : "",(pass) ? pass : ""); #ifdef NEWUSER_SPAM if ((newaccess != BOTLEVEL) && find_nuh(nick)) @@ -1418,7 +1427,7 @@ usage: return; } #endif /* NEWBIE */ - addtouser(&user->chan,mask); + addtouser(&user->chan,mask,TRUE); change++; } else @@ -1452,7 +1461,7 @@ usage: return; } #endif /* NEWBIE */ - addtouser(&user->mask,mask); + addtouser(&user->mask,mask,TRUE); change++; }