Menu
▾
▴
solidircd-cvs — CVS
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(16) |
Aug
(7) |
Sep
(4) |
Oct
(94) |
Nov
(11) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(128) |
Jun
(22) |
Jul
(46) |
Aug
|
Sep
(15) |
Oct
|
Nov
|
Dec
(32) |
| 2006 |
Jan
(11) |
Feb
(2) |
Mar
(74) |
Apr
(3) |
May
|
Jun
(11) |
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(23) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gabriel B. <sh...@us...> - 2005-09-04 06:31:19
|
Update of /cvsroot/solidircd/solidircd-stable/zlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32409/zlib Modified Files: zconf.h Log Message: updates... |
|
From: Gabriel B. <sh...@us...> - 2005-09-04 05:25:09
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25136/src Added Files: klines.c m_gline.c Log Message: new files. --- NEW FILE: m_gline.c --- /************************************************************************ * Solid Internet Relay Chat Daemon, src/m_gline.c * Copyright (C) 2004 Juan Baez * * 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 1, 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. */ /* $Id: m_gline.c,v 1.1 2005/09/04 05:25:00 sheik Exp $ */ #include "struct.h" #include "common.h" #include "sys.h" #include "numeric.h" #include "userban.h" #include "h.h" #if defined( HAVE_STRING_H ) #include <string.h> #else #include <strings.h> #endif extern char *smalldate(time_t); /* defined in s_misc.c */ extern int isnumber(char *); extern char *cluster(char *hostname); int m_gline(aClient *cptr, aClient *sptr, int parc, char *parv[]) { struct userBan *ban, *oban; char buffer[1024]; char *user, *host; char *reason; char *current_date; aClient *acptr; char tempuser[USERLEN + 2]; char temphost[HOSTLEN + 1]; int temporary_gline_time = 0; /* -Dianora */ time_t temporary_gline_time_seconds = 0; int time_specified = 0; char *argv; int i; char fbuf[512]; if (!IsAnOper(sptr) && !IsServer(sptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); return 0; } if (parc < 2) { sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "GLINE"); return 0; } argv = parv[1]; if ((temporary_gline_time = isnumber(argv)) >= 0) { if (parc < 3) { sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "GLINE"); return 0; } if (temporary_gline_time > 1080000) temporary_gline_time = 1080000; temporary_gline_time_seconds = (time_t) temporary_gline_time; argv = parv[2]; parc--; time_specified = 1; } else { temporary_gline_time = 0; } if(strchr(argv, ' ')) { sendto_one(sptr, ":%s NOTICE %s :Poorly formatted hostname " "(contains spaces). Be sure you are using the form: " "/quote GLINE [time] <user@host/nick> :<reason>", me.name, parv[0]); return 0; } if ((host = strchr(argv, '@')) || *argv == '*') { if (host) { user = argv; *(host++) = '\0'; } else { user = "*"; host = argv; } if (!*host) host = "*"; strncpyzt(tempuser, user, USERLEN + 2); strncpyzt(temphost, host, HOSTLEN); user = tempuser; host = temphost; } else { if (!(acptr = find_chasing(sptr, argv, NULL))) return 0; if (!acptr->user) return 0; if (IsServer(acptr)) { sendto_one(sptr, ":%s NOTICE %s :Can't GLINE a server, use @'s " "where appropriate", me.name, parv[0]); return 0; } tempuser[0] = '*'; if (*acptr->user->username == '~') strcpy(tempuser + 1, (char *) acptr->user->username + 1); else strcpy(tempuser + 1, acptr->user->username); user = tempuser; host = cluster(acptr->user->host); } if (time_specified) argv = parv[3]; else argv = parv[2]; /* FIXME: Shouldnt we use our hown DEFAULT_GLINE_TIME? - Tux`*/ #ifdef DEFAULT_KLINE_TIME if (time_specified <= 0) { temporary_gline_time = 30; temporary_gline_time_seconds = (time_t) temporary_gline_time *(time_t) 60; } #endif if (parc > 2) { if (*argv) reason = argv; else reason = "No reason"; } else reason = "No reason"; if (!match(user, "akjhfkahfasfjd") && !match(host, "ldksjfl.kss...kdjfd.jfklsjf")) { sendto_one(sptr, ":%s NOTICE %s :Can't G-Line *@*", me.name, parv[0]); return 0; } if (temporary_gline_time == 0 && strchr(reason, ':')) { sendto_one(sptr, ":%s NOTICE %s :Invalid character ':' in comment", me.name, parv[0]); return 0; } if (temporary_gline_time == 0 && strchr(reason, '#')) { sendto_one(sptr,":%s NOTICE %s :Invalid character '#' in comment", me.name, parv[0]); return 0; } ban = make_hostbased_ban(user, host); if(!ban) { sendto_one(sptr, ":%s NOTICE %s :Malformed ban %s@%s", me.name, parv[0], user, host); return 0; } if ((oban = find_userban_exact(ban, 0))) { if (oban->flags & UBAN_GLINE) { if (MyClient(sptr)) { sendto_one(sptr, ":%s NOTICE %s :[%s@%s] already %s for %s", me.name, parv[0], user, host, NETWORK_GLINNED_NAME, oban->reason ? oban->reason : "<No Reason>"); } else { /* The G-Line does not exist, and sptr is not our client. * However, we should still send it... - Tux` */ host = get_userban_host(ban, fbuf, 512); sendto_serv_butone(sptr, ":%s GLINE %d %s@%s :%s", parv[0], temporary_gline_time_seconds, user, host, reason); } userban_free(ban); return 0; } } current_date = smalldate((time_t) 0); ban->flags |= temporary_gline_time ? (UBAN_GLINE|UBAN_TEMPORARY) : (UBAN_GLINE); if (IsServer(sptr)) ircsprintf(buffer, "%s", reason); ircsprintf(buffer, "%s (%s)", reason, current_date); ban->reason = (char *) MyMalloc(strlen(buffer) + 1); strcpy(ban->reason, buffer); ban->timeset = timeofday; ban->duration = temporary_gline_time_seconds; if(user_match_ban(sptr, ban)) { sendto_one(sptr, ":%s NOTICE %s :You attempted to add a gline [%s@%s] " "which would affect yourself. Aborted.", me.name, parv[0], user, host); userban_free(ban); return 0; } add_hostbased_userban(ban); /* Check local users against it */ for (i = 0; i <= highest_fd; i++) { if (!(acptr = local[i]) || IsMe(acptr) || IsLog(acptr)) continue; if (IsPerson(acptr) && user_match_ban(acptr, ban)) { sendto_ops(NETWORK_GLINE_NAME" active for %s", get_client_name(acptr, FALSE)); sendto_serv_butone(sptr, ":%s GLOBOPS :%s active for %s", NETWORK_GLINE_NAME, me.name, get_client_name(acptr, FALSE)); ircsprintf(fbuf, NETWORK_GLINNED_NAME": %s", reason); exit_client(acptr, acptr, &me, fbuf); i--; } } host = get_userban_host(ban, fbuf, 512); if(temporary_gline_time) { sendto_realops("%s added a temporary %d sec(s) "NETWORK_GLINE_NAME" for [%s@%s] [%s]", parv[0], temporary_gline_time, user, host, reason); sendto_serv_butone(sptr, ":%s GLINE %d %s@%s :%s", parv[0], temporary_gline_time_seconds, user, host, reason); return 0; } sendto_realops("%s added a permanent gline for [%s@%s] [%s]", parv[0], user, host, reason); sendto_serv_butone(sptr, ":%s GLINE %d %s@%s :%s", parv[0], temporary_gline_time_seconds, user, host, reason); return 0; } int m_ungline(aClient *cptr, aClient *sptr, int parc, char *parv[]) { struct userBan *ban; char *user, *host; if (!IsAnOper(sptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); return 0; } if(parc<2) { sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],"UNGLINE"); return 0; } if ((host = strchr(parv[1], '@')) || *parv[1] == '*') { if (host) { user = parv[1]; *(host++) = '\0'; } else { user = "*"; host = parv[1]; } } else { sendto_one(sptr, ":%s NOTICE %s :Invalid parameters",me.name, parv[0]); return 0; } if ((user[0] == '*') && (user[1] == '\0') && (host[0] == '*') && (host[1] == '\0')) { sendto_one(sptr, ":%s NOTICE %s :Cannot ungline everyone",me.name, parv[0]); return 0; } ban = make_hostbased_ban(user, host); if(ban) { struct userBan *oban; ban->flags |= (UBAN_GLINE|UBAN_TEMPORARY); if((oban = find_userban_exact(ban, UBAN_GLINE))) { char tmp[512]; host = get_userban_host(oban, tmp, 512); remove_userban(oban); userban_free(oban); userban_free(ban); if (MyClient(sptr)) sendto_one(sptr, ":%s NOTICE %s :G-line for [%s@%s] is removed", me.name, parv[0], user, host); sendto_ops("%s has removed the G-line for: [%s@%s] (%d matches)", parv[0], user, host, 1); sendto_serv_butone(cptr, ":%s UNGLINE %s@%s", sptr->name, user, host); return 0; } userban_free(ban); } if (MyClient(sptr)) sendto_one(sptr, ":%s NOTICE %s :No g-line for %s@%s was found", me.name, parv[0], user, host); return 0; } --- NEW FILE: klines.c --- /* * klines.c - Kline interface and storage * Copyright (C) 2005 Trevor Talbot and * the DALnet coding team * * 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 1, 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. */ /* $Id: klines.c,v 1.1 2005/09/04 05:25:00 sheik Exp $ */ /* * This is a simple K-Line journal implementation. When a K-Line with a * duration greater than KLINE_MIN_STORE_TIME is added, it is written to the * journal file (.klines): * + expireTS usermask hostmask reason * * When a K-Line is manually removed, it also results in a journal entry: * - usermask hostmask * * This allows K-Lines to be saved across restarts and rehashes. * * To keep the journal from getting larger than it needs to be, it is * periodically compacted: all active K-Lines are dumped into a new file, which * then replaces the active journal. This is done on startup as well as every * KLINE_STORE_COMPACT_THRESH journal entries. */ #include "struct.h" #include "common.h" #include "sys.h" #include "h.h" #include <fcntl.h> #include "userban.h" #include "numeric.h" static int journal = -1; static char journalfilename[512]; static int journalcount; void klinestore_add(struct userBan *); void klinestore_remove(struct userBan *); /* ircd.c */ extern int forked; /* s_misc.c */ extern char *smalldate(time_t); /* * m_kline * Add a local user@host ban. * * parv[0] = sender * parv[1] = duration (optional) * parv[2] = nick or user@host mask * parv[3] = reason (optional) */ int m_kline(aClient *cptr, aClient *sptr, int parc, char *parv[]) { char rbuf[512]; char *target; char *user; char *host; char *reason = "<no reason>"; int tkminutes = DEFAULT_KLINE_TIME; int tkseconds; long lval; struct userBan *ban; struct userBan *existing; if (!OPCanKline(sptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); return 0; } if (parc < 2) { sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "KLINE"); return 0; } lval = strtol(parv[1], &target, 10); if (*target != 0) { target = parv[1]; if (parc > 2) reason = parv[2]; } else { /* valid expiration time */ tkminutes = lval; if (parc < 3) { sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "KLINE"); return 0; } target = parv[2]; if (parc > 3) reason = parv[3]; } /* negative times, or times greater than a year, are permanent */ if (tkminutes < 0 || tkminutes > (365 * 24 * 60)) tkminutes = 0; tkseconds = tkminutes * 60; if ((host = strchr(target, '@'))) { *host++ = 0; user = target; } else { user = "*"; host = target; } if (!match(user, "akjhfkahfasfjd") && !match(host, "ldksjfl.kss...kdjfd.jfklsjf")) { sendto_one(sptr, ":%s NOTICE %s :KLINE: %s@%s mask is too wide", me.name, parv[0], user, host); return 0; } /* * XXX: nick target support to be re-added */ if (!(ban = make_hostbased_ban(user, host))) { sendto_one(sptr, ":%s NOTICE %s :KLINE: invalid ban mask %s@%s", me.name, parv[0], user, host); return 0; } ban->flags |= UBAN_LOCAL; /* only looks for duplicate klines, not akills */ if ((existing = find_userban_exact(ban, UBAN_LOCAL))) { sendto_one(sptr, ":%s NOTICE %s :KLINE: %s@%s is already %s: %s", me.name, parv[0], user, host, LOCAL_BANNED_NAME, existing->reason ? existing->reason : "<no reason>"); userban_free(ban); return 0; } if (user_match_ban(sptr, ban)) { sendto_one(sptr, ":%s NOTICE %s :KLINE: %s@%s matches you, rejected", me.name, parv[0], user, host); userban_free(ban); return 0; } ircsnprintf(rbuf, sizeof(rbuf), "%s (%s)", reason, smalldate(0)); ban->reason = MyMalloc(strlen(rbuf) + 1); strcpy(ban->reason, rbuf); if (tkseconds) { ban->flags |= UBAN_TEMPORARY; ban->timeset = NOW; ban->duration = tkseconds; } add_hostbased_userban(ban); if (!tkminutes || tkminutes >= KLINE_MIN_STORE_TIME) klinestore_add(ban); userban_sweep(ban); host = get_userban_host(ban, rbuf, sizeof(rbuf)); if (tkminutes) sendto_realops("%s added temporary %d min. "LOCAL_BAN_NAME" for" " [%s@%s] [%s]", parv[0], tkminutes, user, host, reason); else sendto_realops("%s added "LOCAL_BAN_NAME" for [%s@%s] [%s]", parv[0], user, host, reason); return 0; } /* * m_unkline * Remove a local user@host ban. * * parv[0] = sender * parv[1] = user@host mask */ int m_unkline(aClient *cptr, aClient *sptr, int parc, char *parv[]) { char hbuf[512]; char *user; char *host; struct userBan *ban; struct userBan *existing; if (!OPCanUnKline(sptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); return 0; } if (parc < 2) { sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "UNKLINE"); return 0; } if ((host = strchr(parv[1], '@'))) { *host++ = 0; user = parv[1]; } else { user = "*"; host = parv[1]; } if (!(ban = make_hostbased_ban(user, host))) { sendto_one(sptr, ":%s NOTICE %s :UNKLINE: No such ban %s@%s", me.name, parv[0], user, host); return 0; } ban->flags |= UBAN_LOCAL; existing = find_userban_exact(ban, UBAN_LOCAL); host = get_userban_host(ban, hbuf, sizeof(hbuf)); userban_free(ban); if (!existing) { sendto_one(sptr, ":%s NOTICE %s :UNKINE: No such ban %s@%s", me.name, parv[0], user, host); return 0; } if (existing->flags & UBAN_CONF) { sendto_one(sptr, ":%s NOTICE %s :UNKLINE: %s@%s is specified in the" " configuration file and cannot be removed online", me.name, parv[0], user, host); return 0; } remove_userban(existing); klinestore_remove(existing); userban_free(existing); sendto_ops("%s has removed the K-Line for: [%s@%s]", parv[0], user, host); return 0; } static void ks_error(char *msg) { if (!forked) puts(msg); else sendto_ops("%s", msg); } /* * Writes a K-Line to the appropriate file. */ void ks_write(int f, char type, struct userBan *ub) { char outbuf[1024]; char cidr[4] = ""; time_t expiretime = 0; char *user = "*"; char *reason = ""; char *host = ub->h; int len; /* userban.c */ unsigned int netmask_to_cidr(unsigned int); if (ub->flags & UBAN_TEMPORARY) expiretime = ub->timeset + ub->duration; if (ub->u) user = ub->u; if (ub->reason) reason = ub->reason; if (ub->flags & (UBAN_CIDR4|UBAN_CIDR4BIG)) { host = inetntoa((char *)&ub->cidr4ip); ircsprintf(cidr, "/%d", netmask_to_cidr(ntohl(ub->cidr4mask))); } if (type == '+') len = ircsprintf(outbuf, "%c %d %s %s%s %s\n", type, (int)expiretime, user, host, cidr, reason); else len = ircsprintf(outbuf, "%c %s %s%s\n", type, user, host, cidr); write(f, outbuf, len); } /* * Parses a K-Line entry from a storage journal line. * Returns 0 on invalid input, 1 otherwise. */ static int ks_read(char *s) { char type; time_t duration = 0; char *user; char *host; char *reason = ""; struct userBan *ban; struct userBan *existing; type = *s++; /* bad type */ if (type != '+' && type != '-') return 0; /* malformed */ if (*s++ != ' ') return 0; if (type == '+') { duration = strtol(s, &s, 0); if (duration) { /* already expired */ if (NOW >= duration) return 1; duration -= NOW; } /* malformed */ if (*s++ != ' ') return 0; } /* usermask */ user = s; while (*s && *s != ' ') s++; /* malformed */ if (*s != ' ') return 0; /* mark end of user mask */ *s++ = 0; /* hostmask */ host = s; while (*s && *s != ' ') s++; if (type == '+') { /* malformed */ if (*s != ' ') return 0; /* mark end of host mask */ *s++ = 0; /* reason is the only thing left */ reason = s; } ban = make_hostbased_ban(user, host); if (!ban) return 0; ban->flags |= UBAN_LOCAL; if (type == '+') { if (duration) { ban->flags |= UBAN_TEMPORARY; ban->timeset = NOW; ban->duration = duration; } if (*reason) DupString(ban->reason, reason); add_hostbased_userban(ban); } else { existing = find_userban_exact(ban, UBAN_LOCAL|UBAN_CONF); userban_free(ban); /* add may have been skipped due to being expired, so not an error */ if (!existing) return 1; remove_userban(existing); userban_free(existing); } return 1; } /* * Compact K-Line store: dump active klines to a new file and remove the * current journal. * Returns 1 on success, 0 on failure. */ int klinestore_compact(void) { char buf1[512]; int newfile; /* userban.c */ extern void ks_dumpklines(int); if (forked) sendto_ops_lev(DEBUG_LEV, "Compacting K-Line store..."); journalcount = 0; /* open a compaction file to dump all active klines to */ ircsnprintf(buf1, sizeof(buf1), "%s/.klines_c", dpath); newfile = open(buf1, O_WRONLY|O_CREAT|O_TRUNC, 0700); if (newfile < 0) { ircsnprintf(buf1, sizeof(buf1), "ERROR: Unable to create K-Line" " compaction file .klines_c: %s", strerror(errno)); ks_error(buf1); return 0; } /* do the dump */ ks_dumpklines(newfile); close(newfile); /* close active storage file, rename compaction file, and reopen */ if (journal >= 0) { close(journal); journal = -1; } if (rename(buf1, journalfilename) < 0) { ircsnprintf(buf1, sizeof(buf1), "ERROR: Unable to rename K-Line" " compaction file .klines_c to .klines: %s", strerror(errno)); ks_error(buf1); return 0; } journal = open(journalfilename, O_WRONLY|O_APPEND, 0700); if (journal < 0) { ircsnprintf(buf1, sizeof(buf1), "ERROR: Unable to reopen K-Line" " storage file .klines: %s", strerror(errno)); ks_error(buf1); return 0; } return 1; } /* * Add a K-Line to the active store. */ void klinestore_add(struct userBan *ban) { if (journal >= 0) ks_write(journal, '+', ban); if (++journalcount > KLINE_STORE_COMPACT_THRESH) klinestore_compact(); } /* * Remove a K-Line from the active store. */ void klinestore_remove(struct userBan *ban) { if (journal >= 0) ks_write(journal, '-', ban); if (++journalcount > KLINE_STORE_COMPACT_THRESH) klinestore_compact(); } /* * Initialize K-Line storage. Pass 1 when klines don't need to be reloaded. * Returns 0 on failure, 1 otherwise. */ int klinestore_init(int noreload) { char buf1[1024]; FILE *jf; ircsnprintf(journalfilename, sizeof(journalfilename), "%s/.klines", dpath); if (journal >= 0) { if (noreload) return 1; close(journal); journal = -1; } /* "a+" to create if it doesn't exist */ jf = fopen(journalfilename, "a+"); if (!jf) { ircsnprintf(buf1, sizeof(buf1), "ERROR: Unable to open K-Line storage" " file .klines: %s", strerror(errno)); ks_error(buf1); return 0; } rewind(jf); /* replay journal */ while (fgets(buf1, sizeof(buf1), jf)) { char *s = strchr(buf1, '\n'); /* no newline, consider it malformed and stop here */ if (!s) break; *s = 0; if (!ks_read(buf1)) break; } fclose(jf); /* this will reopen the journal for appending */ return klinestore_compact(); } |
|
From: Gabriel B. <sh...@us...> - 2005-09-04 05:24:26
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/src Modified Files: Makefile.in ircd.c s_conf.c s_serv.c s_user.c userban.c Log Message: updates need to finish m_gline.c Index: Makefile.in =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 9 Jul 2005 03:09:11 -0000 1.3 --- Makefile.in 4 Sep 2005 05:24:13 -0000 1.4 *************** *** 20,27 **** SOURCES = blalloc.c bsd.c channel.c clientlist.c clones.c confparse.c \ ! fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c ircsprintf.c list.c \ ! m_shun.c m_nick.c m_rwho.c m_server.c m_services.c m_stats.c m_who.c match.c \ ! memcount.c modules.c packet.c parse.c pcre.c probability.c res.c \ ! s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c s_misc.c s_numeric.c \ s_serv.c s_user.c sbuf.c scache.c send.c ssl.c struct.c support.c \ toys.c throttle.c userban.c whowas.c zlink.c \ --- 20,27 ---- SOURCES = blalloc.c bsd.c channel.c clientlist.c clones.c confparse.c \ ! fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c ircsprintf.c \ ! klines.c list.c m_gline.c m_shun.c m_nick.c m_rwho.c m_server.c m_services.c \ ! m_stats.c m_who.c match.c memcount.c modules.c packet.c parse.c pcre.c\ ! probability.c res.c s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c s_misc.c s_numeric.c \ s_serv.c s_user.c sbuf.c scache.c send.c ssl.c struct.c support.c \ toys.c throttle.c userban.c whowas.c zlink.c \ *************** *** 136,139 **** --- 136,144 ---- ../include/fds.h ../include/memcount.h ../include/blalloc.h ircsprintf.o: ircsprintf.c ../include/ircsprintf.h ../include/setup.h + klines.o: klines.c ../include/struct.h ../include/config.h \ + ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \ + ../include/sbuf.h ../include/common.h ../include/h.h ../include/send.h \ + ../include/fdlist.h ../include/ircsprintf.h ../include/find.h \ + ../include/userban.h ../include/numeric.h list.o: list.c ../include/struct.h ../include/config.h ../include/setup.h \ ../include/defs.h ../include/sys.h ../include/hash.h ../include/sbuf.h \ *************** *** 143,146 **** --- 148,156 ---- ../include/zlink.h ../include/memcount.h ../include/throttle.h \ ../include/queue.h + m_gline.o: m_gline.c ../include/struct.h ../include/dbuf.h ../include/config.h \ + ../include/setup.h ../include/defs.h ../include/hash.h \ + ../include/h.h ../include/send.h ../include/common.h \ + ../include/ircsprintf.h ../include/msg.h ../include/sys.h \ + ../include/userban.h ../include/common.h m_shun.o: m_shun.c ../include/struct.h ../include/config.h \ ../include/setup.h ../include/defs.h ../include/hash.h \ Index: s_conf.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** s_conf.c 9 Jul 2005 20:18:50 -0000 1.8 --- s_conf.c 4 Sep 2005 05:24:13 -0000 1.9 *************** *** 85,88 **** --- 85,89 ---- #endif extern void confparse_error(char *, int); + extern int klinestore_init(int); /* initclass() *************** *** 1538,1542 **** return lnum; /* this isnt a parser problem - dont pull out */ ! ban->flags |= UBAN_LOCAL; DupString(ban->reason, ub_r); ban->timeset = NOW; --- 1539,1543 ---- return lnum; /* this isnt a parser problem - dont pull out */ ! ban->flags |= (UBAN_LOCAL|UBAN_CONF); DupString(ban->reason, ub_r); ban->timeset = NOW; *************** *** 2324,2328 **** sendto_ops("Got signal SIGHUP, reloading ircd conf. file"); remove_userbans_match_flags(UBAN_NETWORK, 0); ! remove_userbans_match_flags(UBAN_LOCAL|UBAN_TEMPORARY, 0); remove_simbans_match_flags(SBAN_NICK|SBAN_LOCAL|SBAN_TEMPORARY, 0); remove_simbans_match_flags(SBAN_CHAN|SBAN_LOCAL|SBAN_TEMPORARY, 0); --- 2325,2330 ---- sendto_ops("Got signal SIGHUP, reloading ircd conf. file"); remove_userbans_match_flags(UBAN_NETWORK, 0); ! /* remove all but kill {} blocks from conf */ ! remove_userbans_match_flags(UBAN_LOCAL, UBAN_CONF); remove_simbans_match_flags(SBAN_NICK|SBAN_LOCAL|SBAN_TEMPORARY, 0); remove_simbans_match_flags(SBAN_CHAN|SBAN_LOCAL|SBAN_TEMPORARY, 0); *************** *** 2350,2355 **** flush_cache(); /* Flush DNS cache */ ! /* remove perm klines */ ! remove_userbans_match_flags(UBAN_LOCAL, UBAN_TEMPORARY); remove_simbans_match_flags(SBAN_NICK|SBAN_LOCAL, SBAN_TEMPORARY); remove_simbans_match_flags(SBAN_CHAN|SBAN_LOCAL, SBAN_TEMPORARY); --- 2352,2357 ---- flush_cache(); /* Flush DNS cache */ ! /* remove kill {} blocks */ ! remove_userbans_match_flags(UBAN_LOCAL|UBAN_CONF, 0); remove_simbans_match_flags(SBAN_NICK|SBAN_LOCAL, SBAN_TEMPORARY); remove_simbans_match_flags(SBAN_CHAN|SBAN_LOCAL, SBAN_TEMPORARY); *************** *** 2377,2380 **** --- 2379,2386 ---- merge_confs(); build_rplcache(); + nextconnect = 1; /* reset autoconnects */ + + /* replay journal if necessary */ + klinestore_init( (sig == SIGHUP) ? 0 : 1 ); rehashed = 1; Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** s_user.c 9 Jul 2005 23:30:03 -0000 1.12 --- s_user.c 4 Sep 2005 05:24:13 -0000 1.13 *************** *** 527,530 **** --- 527,543 ---- #endif + + + /* used by m_user, m_put, m_post */ + static int + reject_proxy(aClient *cptr, char *cmd, char *args) + { + sendto_realops_lev(REJ_LEV, "proxy attempt from %s: %s %s", + inetntoa((char *)&cptr->ip), cmd, args ? args : ""); + return exit_client(cptr, cptr, &me, "relay connection"); + } + + + /* * * register_user *************** *** 2293,2297 **** - /* * m_user --- 2306,2309 ---- *************** *** 2305,2312 **** m_user(aClient *cptr, aClient *sptr, int parc, char *parv[]) { - #define UFLAGS (UMODE_i|UMODE_v|UMODE_R) char *username, *host, *server, *realname; struct simBan *ban; if (parc > 2 && (username = (char *) strchr(parv[1], '@'))) --- 2317,2327 ---- m_user(aClient *cptr, aClient *sptr, int parc, char *parv[]) { char *username, *host, *server, *realname; struct simBan *ban; + + /* FTP proxy */ + if (!IsRegistered(cptr) && parc == 2 && cptr->receiveM == 1) + return reject_proxy(cptr, "USER", parv[1]); if (parc > 2 && (username = (char *) strchr(parv[1], '@'))) *************** *** 2354,2358 **** user->server = find_or_add(server); strncpyzt(user->host, host, sizeof(user->host)); - strncpyzt(user->realhost, host, sizeof(user->host)); } else --- 2369,2372 ---- *************** *** 2364,2368 **** return 0; } ! #ifndef NO_DEFAULT_INVISIBLE sptr->umode |= UMODE_i; --- 2378,2382 ---- return 0; } ! sptr->umode |= (USER_UMODES & atoi(host)); #ifndef NO_DEFAULT_INVISIBLE sptr->umode |= UMODE_i; *************** *** 2379,2383 **** SetUmodez(sptr); #endif - #ifdef NO_USER_SERVERKILLS sptr->umode &= ~UMODE_k; --- 2393,2396 ---- *************** *** 2386,2393 **** sptr->umode &= ~UMODE_s; #endif - - sptr->umode |= (UFLAGS & atoi(host)); strncpyzt(user->host, host, sizeof(user->host)); - strncpyzt(user->realhost, host, sizeof(user->host)); user->server = me.name; } --- 2399,2403 ---- *************** *** 2415,2419 **** return 0; } ! /* * m_quit --- 2425,2429 ---- return 0; } ! /* * m_quit *************** *** 4285,4288 **** --- 4295,4318 ---- #endif + int + m_put(aClient *cptr, aClient *sptr, int parc, char *parv[]) + { + /* HTTP PUT proxy */ + if (!IsRegistered(cptr) && cptr->receiveM == 1) + return reject_proxy(cptr, "PUT", parv[1]); + + return 0; + } + + int + m_post(aClient *cptr, aClient *sptr, int parc, char *parv[]) + { + /* HTTP POST proxy */ + if (!IsRegistered(cptr) && cptr->receiveM == 1) + return reject_proxy(cptr, "POST", parv[1]); + + return 0; + } + u_long *************** *** 4367,4370 **** --- 4397,4403 ---- } + + + mc->total.c = mc->aways.c + mc->silences.c + mc->servers.c; mc->total.m = mc->aways.m + mc->silences.m + mc->servers.m; Index: s_serv.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_serv.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** s_serv.c 5 Jul 2005 21:53:42 -0000 1.4 --- s_serv.c 4 Sep 2005 05:24:13 -0000 1.5 *************** *** 162,170 **** } - - - - - /* * m_squit --- 162,165 ---- *************** *** 419,422 **** --- 414,418 ---- * parv[1] = servername */ + int m_info(aClient *cptr, aClient *sptr, int parc, char *parv[]) *************** *** 524,527 **** --- 520,524 ---- * parv[1] = servername */ + int m_dalinfo(aClient *cptr, aClient *sptr, int parc, char *parv[]) *************** *** 577,580 **** --- 574,578 ---- * parv[1] = servername */ + int m_solidinfo(aClient *cptr, aClient *sptr, int parc, char *parv[]) *************** *** 623,629 **** } - - - /* * * m_links --- 621,624 ---- *************** *** 841,850 **** * * 199970918 JRL hacked to ignore parv[1] completely and require parc > 3 * * Now if parv[1] is anything other than *, it forces a recount. * -Quension [May 2005] - * to cause a force */ - int m_lusers(aClient *cptr, aClient *sptr, int parc, char *parv[]) --- 836,844 ---- * * 199970918 JRL hacked to ignore parv[1] completely and require parc > 3 + * to cause a force * * Now if parv[1] is anything other than *, it forces a recount. * -Quension [May 2005] */ int m_lusers(aClient *cptr, aClient *sptr, int parc, char *parv[]) *************** *** 876,881 **** int send_lusers(aClient *cptr, aClient *sptr, int parc, char *parv[]) { ! ! /* forced recount */ if (IsAnOper(sptr) && (parc > 1) && (*parv[1] != '*')) { --- 870,874 ---- int send_lusers(aClient *cptr, aClient *sptr, int parc, char *parv[]) { ! /* forced recount */ if (IsAnOper(sptr) && (parc > 1) && (*parv[1] != '*')) { *************** *** 936,947 **** } } - - - /* sanity check */ - - if (m_server != Count.myserver) - { ! sendto_realops_lev(DEBUG_LEV, "Local server count off by %d", Count.myserver - m_server); Count.myserver = m_server; --- 929,937 ---- } } ! /* sanity check */ ! if (m_server != Count.myserver) ! { ! sendto_realops_lev(DEBUG_LEV, "Local server count off by %d", Count.myserver - m_server); Count.myserver = m_server; *************** *** 987,996 **** sendto_realops_lev(DEBUG_LEV, "Unknown connection count off by %d", Count.unknown - u_count); ! Count.unknown = u_count; ! ! } } /* Recount loop */ - /* save stats */ if ((timeofday - last_stat_save) > 3600) --- 977,984 ---- sendto_realops_lev(DEBUG_LEV, "Unknown connection count off by %d", Count.unknown - u_count); ! Count.unknown = u_count; ! } } /* Recount loop */ /* save stats */ if ((timeofday - last_stat_save) > 3600) *************** *** 1018,1022 **** #endif sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0], ! Count.total - Count.invisi, Count.invisi, Count.server); #ifndef SHOW_INVISIBLE_LUSERS else --- 1006,1010 ---- #endif sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0], ! Count.total - Count.invisi, Count.invisi, Count.server); #ifndef SHOW_INVISIBLE_LUSERS else *************** *** 1027,1031 **** #endif ! if (Count.oper) sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], Count.oper); --- 1015,1019 ---- #endif ! if (Count.oper) sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], Count.oper); *************** *** 1040,1048 **** sendto_one(sptr, rpl_str(RPL_LUSERME), #ifdef HIDEULINEDSERVS ! me.name, parv[0], Count.local, ! IsOper(sptr) ? Count.myserver : Count.myserver - Count.myulined); #else me.name, parv[0], Count.local, Count.myserver); #endif sendto_one(sptr, rpl_str(RPL_LOCALUSERS), me.name, parv[0], Count.local, Count.max_loc); --- 1028,1037 ---- sendto_one(sptr, rpl_str(RPL_LUSERME), #ifdef HIDEULINEDSERVS ! me.name, parv[0], Count.local, ! IsOper(sptr) ? Count.myserver : Count.myserver - Count.myulined); #else me.name, parv[0], Count.local, Count.myserver); #endif + sendto_one(sptr, rpl_str(RPL_LOCALUSERS), me.name, parv[0], Count.local, Count.max_loc); *************** *** 1141,1145 **** me.name, IsAnOper(cptr) ? "Local" : "Remote", parv[1], parv[2] ? parv[2] : "", ! sptr->name); #if defined(USE_SYSLOG) && defined(SYSLOG_CONNECT) --- 1130,1134 ---- me.name, IsAnOper(cptr) ? "Local" : "Remote", parv[1], parv[2] ? parv[2] : "", ! sptr->name); #if defined(USE_SYSLOG) && defined(SYSLOG_CONNECT) *************** *** 2012,2015 **** --- 2001,2005 ---- } + #if 0 int m_kline(aClient *cptr, aClient *sptr, int parc, char *parv[]) { *************** *** 2298,2303 **** if ((k->kline = strdup(buffer)) == NULL) { ! free(k->comment); ! free(k); sendto_one(sptr, ":%s NOTICE %s :Problem allocating memory", me.name, parv[0]); --- 2288,2293 ---- if ((k->kline = strdup(buffer)) == NULL) { ! free(k->comment); ! free(k); sendto_one(sptr, ":%s NOTICE %s :Problem allocating memory", me.name, parv[0]); *************** *** 2356,2359 **** --- 2346,2350 ---- #endif /* LOCKFILE */ } + #endif /* *************** *** 2402,2406 **** } ! #ifdef UNKLINE /* * * m_unkline --- 2393,2397 ---- } ! #if 0 /* * * m_unkline *************** *** 2475,2478 **** --- 2466,2470 ---- remove_userban(oban); + klinestore_remove(oban); userban_free(oban); userban_free(ban); *************** *** 2580,2593 **** return 0; } - #ifdef HAVE_SSL - else if(mycmp(parv[1], "SSL") == 0) - { - sendto_ops("%s is reloading SSL support", parv[0]); - sendto_one(sptr, rpl_str(RPL_REHASHING), me.name, parv[0], - "SSL support"); - - rehash_ssl(); - } - #endif } else --- 2572,2575 ---- *************** *** 3636,3646 **** if ((acptr = find_person(lp->value.wptr->nick, NULL))) sendto_one(sptr, rpl_str(RPL_NOWON), me.name, parv[0], ! acptr->name, acptr->user->username, MyConnect(acptr) ? acptr->sockhost : acptr->user->realhost, acptr->user->host, acptr->tsinfo); - - if (IsUmodev(acptr)) - sendto_one(cptr, "SVHOST %s %s", - acptr->name, acptr->user->host); - /* * But actually, only show them offline if its a capital --- 3618,3623 ---- if ((acptr = find_person(lp->value.wptr->nick, NULL))) sendto_one(sptr, rpl_str(RPL_NOWON), me.name, parv[0], ! acptr->name, acptr->user->username, acptr->user->host, acptr->tsinfo); /* * But actually, only show them offline if its a capital *************** *** 4133,4137 **** } - u_long memcount_s_serv(MCs_serv *mc) --- 4110,4113 ---- *************** *** 4164,4176 **** mc->total.c += mc->help.c; mc->total.m += mc->help.m; ! /* This is just a future reminder for me -Sheik 07/04/2005 ! for (m =rulesfile; m; m = m->next) ! { ! mc->rules.c++; ! mc->rules.m += sizeof(*m); ! } ! mc->total.c += mc->rules.c; ! mc->total.m += mc->rules.m; ! */ return mc->total.m; } --- 4140,4145 ---- mc->total.c += mc->help.c; mc->total.m += mc->help.m; ! return mc->total.m; } + Index: userban.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/userban.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** userban.c 5 Jul 2005 21:53:42 -0000 1.4 --- userban.c 4 Sep 2005 05:24:13 -0000 1.5 *************** *** 540,543 **** --- 540,549 ---- kset[0] = 'K'; } + + else if (ban->flags & UBAN_GLINE) + { + kset[0] = 'g'; + } + else if (ban->flags & UBAN_SHUN) { *************** *** 562,565 **** --- 568,585 ---- (ban->reason) ? ban->reason : "No reason"); } + else if (ban->flags & UBAN_SHUN) + { + sendto_one(cptr, ":%s SHUN %d %s@%s :%s", me.name, + (ban->flags & UBAN_TEMPORARY) ? ((ban->duration + ban->timeset) - NOW) : 0, + (ban->flags & UBAN_WILDUSER) ? "*" : ban->u, host, + (ban->reason) ? ban->reason : "No reason"); + } + else if (ban->flags & UBAN_GLINE) + { + sendto_one(cptr, ":%s GLINE %d %s@%s :%s", me.name, + (ban->flags & UBAN_TEMPORARY) ? ((ban->duration + ban->timeset) - NOW) : 0, + (ban->flags & UBAN_WILDUSER) ? "*" : ban->u, host, + (ban->reason) ? ban->reason : "No reason"); + } bl = LIST_NEXT(bl, lp); *************** *** 1589,1592 **** --- 1609,1711 ---- } + + /* + * Dump all local connections that match a userban. + */ + void userban_sweep(struct userBan *ban) + { + char rbuf[512]; + aClient *acptr; + char *reason; + char *btext; + int clientonly = 1; + int i; + + if (ban->flags & UBAN_NETWORK) + btext = NETWORK_BANNED_NAME; + else + btext = LOCAL_BANNED_NAME; + + if (!(reason = ban->reason)) + reason = "<no reason>"; + + /* if it's purely IP based, dump unregistered and server connections too */ + if (ban->flags & UBAN_WILDUSER) + if (ban->flags & (UBAN_IP|UBAN_CIDR4|UBAN_CIDR4BIG)) + clientonly = 0; + + ircsnprintf(rbuf, sizeof(rbuf), "%s: %s", btext, reason); + + for (i = 0; i <= highest_fd; i++) + { + if (!(acptr = local[i]) || acptr->status < STAT_UNKNOWN) + continue; + + if (clientonly && !IsPerson(acptr)) + continue; + + if (user_match_ban(acptr, ban)) + { + sendto_ops("%s active for %s", btext, + get_client_name(acptr, FALSE)); + exit_client(acptr, acptr, &me, rbuf); + i--; + } + } + } + + + /* + * ks_dumpklines() helper + */ + static void + ks_dumplist(int f, uBanEnt *be) + { + struct userBan *ub; + + /* klines.c */ + extern void ks_write(int, char, struct userBan *); + + for (; be; be = LIST_NEXT(be, lp)) + { + ub = be->ban; + + /* must be local and not from conf */ + if ((ub->flags & (UBAN_LOCAL|UBAN_CONF)) != UBAN_LOCAL) + continue; + + /* must be over the storage threshold duration */ + if ((ub->flags & UBAN_TEMPORARY) + && ub->duration < (KLINE_MIN_STORE_TIME * 60)) + continue; + + ks_write(f, '+', ub); + } + } + + /* + * Called from klines.c during a storage GC. + */ + void + ks_dumpklines(int f) + { + int i, j; + + for (i = 0; i < 256; i++) + for (j = 0; j < 256; j++) + ks_dumplist(f, LIST_FIRST(&CIDR4_bans[i][j])); + + ks_dumplist(f, LIST_FIRST(&CIDR4BIG_bans)); + ks_dumplist(f, LIST_FIRST(&host_bans.wild_list)); + ks_dumplist(f, LIST_FIRST(&ip_bans.wild_list)); + + for (i = 0; i < HASH_SIZE; i++) + { + ks_dumplist(f, LIST_FIRST(&host_bans.hash_list[i])); + ks_dumplist(f, LIST_FIRST(&ip_bans.hash_list[i])); + } + } + + static void mc_userlist(MemCount *mc, uBanEnt *be) Index: ircd.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/ircd.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ircd.c 9 Jul 2005 03:09:11 -0000 1.5 --- ircd.c 4 Sep 2005 05:24:13 -0000 1.6 *************** *** 125,128 **** --- 125,129 ---- extern void read_help(char *); /* defined in s_serv.c */ extern void init_globals(); + extern int klinestore_init(int); /* defined in klines.c */ char **myargv; *************** *** 918,921 **** --- 919,926 ---- /* the pid file must be written *AFTER* the fork */ write_pidfile(); + + + /* this should be sooner, but the fork/detach stuff is so brain-dead... */ + klinestore_init(0); |
|
From: Gabriel B. <sh...@us...> - 2005-09-04 05:24:26
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/include Modified Files: config.h msg.h struct.h userban.h Log Message: updates need to finish m_gline.c Index: msg.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/msg.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** msg.h 27 Jun 2005 03:02:50 -0000 1.1.1.1 --- msg.h 4 Sep 2005 05:24:13 -0000 1.2 *************** *** 85,91 **** #define MSG_GNOTICE "GNOTICE" /* GNOTICE */ #define MSG_KLINE "KLINE" /* KLINE */ - #ifdef UNKLINE #define MSG_UNKLINE "UNKLINE" /* UNKLINE */ - #endif #define MSG_SET "SET" /* SET */ #define MSG_SAMODE "SAMODE" /* SAMODE */ --- 85,89 ---- *************** *** 140,146 **** --- 138,148 ---- #define MSG_SVSCLONE "SVSCLONE" /* SVSCLONE */ #define MSG_CHANKILL "CHANKILL" /* CHANKILL */ + #define MSG_PUT "PUT" /* PUT */ + #define MSG_POST "POST" /* POST */ #define MSG_MAP "MAP" /* MAP */ #define MSG_SHUN "SHUN" /* SHUN */ #define MSG_UNSHUN "UNSHUN" /* UNSHUN */ + #define MSG_GLINE "GLINE" /* gline */ + #define MSG_UNGLINE "UNGLINE" /* ungline */ #ifdef TOYS #define MSG_ELMER "ELMER" /* ELMER */ *************** *** 254,259 **** --- 256,266 ---- extern int m_svsclone(aClient *, aClient *, int, char **); extern int m_chankill(aClient *, aClient *, int, char **); + extern int m_put(aClient *, aClient *, int, char **); + extern int m_post(aClient *, aClient *, int, char **); extern int m_shun(aClient *, aClient *, int, char **); extern int m_unshun(aClient *, aClient *, int, char **); + extern int m_gline(aClient *, aClient *, int, char **); + extern int m_ungline(aClient *, aClient *, int, char **); + #ifdef TOYS extern int m_elmer(aClient *, aClient *, int, char **); *************** *** 354,360 **** {MSG_CLOSE, m_close, MAXPARA, 0, 0}, {MSG_KLINE, m_kline, MAXPARA, 0, 0}, - #ifdef UNKLINE {MSG_UNKLINE, m_unkline, MAXPARA, 0, 0}, - #endif {MSG_HASH, m_hash, MAXPARA, 0, 0}, {MSG_DNS, m_dns, MAXPARA, 0, 0}, --- 361,365 ---- *************** *** 408,411 **** --- 413,418 ---- {MSG_SHUN, m_shun, MAXPARA, 0, 0}, {MSG_UNSHUN, m_unshun, MAXPARA, 0, 0}, + {MSG_GLINE, m_gline, MAXPARA, 0, 0}, + {MSG_UNGLINE, m_ungline, MAXPARA, 0, 0}, #ifdef TOYS {MSG_ELMER, m_elmer, MAXPARA, 0, 0}, *************** *** 416,419 **** --- 423,428 ---- {MSG_SVSCLONE, m_svsclone, MAXPARA, 0, 0}, {MSG_CHANKILL, m_chankill, MAXPARA, 0, 0}, + {MSG_PUT, m_put, 2, MF_UNREG, 0}, + {MSG_POST, m_post, 2, MF_UNREG, 0}, {MSG_LUSERSLOCK, m_luserslock, MAXPARA, 0, 0}, {MSG_LINKSCONTROL, m_linkscontrol, MAXPARA, 0, 0}, Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** config.h 10 Jul 2005 21:13:33 -0000 1.10 --- config.h 4 Sep 2005 05:24:13 -0000 1.11 *************** *** 87,91 **** /* Hostmasking address */ ! #define DEFAULT_STAFF_ADDRESS "staff.vidgamechat.net" /* Default help channel */ --- 87,91 ---- /* Hostmasking address */ ! #define DEFAULT_STAFF_ADDRESS "staff.solid-ircd.com" /* Default help channel */ *************** *** 102,107 **** /* used for services aliases */ ! #define DEFAULT_SERVICES_NAME "services.vidgamechat.net" ! #define DEFAULT_STATS_NAME "stats.vidgamechat.net" /* sent to users when they have been klined from the server */ --- 102,107 ---- /* used for services aliases */ ! #define DEFAULT_SERVICES_NAME "services.solid-ircd.com" ! #define DEFAULT_STATS_NAME "stats.solid-ircd.com" /* sent to users when they have been klined from the server */ *************** *** 298,306 **** * * Define this to the default time for a kline (in minutes) for klines with ! * unspecified times. undefine this for all klines with unspecified times ! * to be perm. (if defined, a kline with zero time will be perm). -- lucas */ #define DEFAULT_KLINE_TIME 30 /* * Pretty self explanatory: These are shown in server notices and to the --- 298,325 ---- * * Define this to the default time for a kline (in minutes) for klines with ! * unspecified times. A time of 0 will create a permanent kline. */ #define DEFAULT_KLINE_TIME 30 + + /* + * KLINE_MIN_STORE_TIME + * + * The minimum duration (in minutes) a kline must be before it will be stored + * in the on-disk journal. + */ + + #define KLINE_MIN_STORE_TIME 180 + + /* + * KLINE_STORE_COMPACT_THRESH + * + * The maximum number of entries to write to the active kline storage journal + * before compacting it. This threshold prevents the journal from growing + * indefinitely while klines are added and removed on a running server. + */ + + #define KLINE_STORE_COMPACT_THRESH 1000 + /* * Pretty self explanatory: These are shown in server notices and to the *************** *** 313,331 **** #define SHUN_NAME "shun" #define SHUNNED_NAME "shunned" - /* - * LOCKFILE - Exclusive use of ircd.conf and kline.conf during writes - * - * This creates a lockfile prior to writes to ircd.conf or kline.conf, and - * can be used in conjunction with viconf (included in the tools - * directory). This prevents loss of data when klines are added while - * someone is manually editting the file. File writes will be retried - * at the next KLINE, ZLINE, REHASH, or after CHECK_PENDING_KLINES - * minutes have elapsed. - * - * If you do not wish to use this feature, leave LOCKFILE #undef - */ - #define LOCKFILE "/tmp/ircd.conf.lock" - #define CHECK_PENDING_KLINES 10 /* in minutes */ /* --- 332,339 ---- #define SHUN_NAME "shun" #define SHUNNED_NAME "shunned" + #define NETWORK_GLINE_NAME "g-line" + #define NETWORK_GLINNED_NAME "g-lined" + /* *************** *** 482,491 **** #endif ! /* ! * UNKLINE - /quote unkline - remove klines on the fly if you choose to ! * support this, an oper can do a /quote UNKLINE of an exact matching ! * KLINE to remove the kline ! */ ! #define UNKLINE /* --- 490,494 ---- #endif ! /* Index: userban.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/userban.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** userban.h 5 Jul 2005 02:40:01 -0000 1.2 --- userban.h 4 Sep 2005 05:24:13 -0000 1.3 *************** *** 21,46 **** /* $Id$ */ ! #define UBAN_LOCAL 0x0001 /* formerly known as a K: or Z: line */ ! #define UBAN_NETWORK 0x0002 /* formerly known as an autokill or an SZline */ ! #define UBAN_GECOS 0x0004 /* formerly known as an SGLINE */ ! #define UBAN_NICK 0x0008 /* formerly known as an SQLINE */ ! #define UBAN_HOST 0x0010 /* this ban matches against the user's resolved host */ ! #define UBAN_IP 0x0020 /* this ban matches against the user's IP address */ - #define UBAN_WILD 0x0040 /* this ban has wildcards */ ! #define UBAN_CIDR4 0x0080 /* this ban is an IPv4 CIDR ban */ ! #define UBAN_CIDR4BIG 0x0100 /* this ban is an IPv4 CIDR ban for something greater than a /16 */ ! #define UBAN_WILDUSER 0x0200 /* Username is just '*' */ ! #define UBAN_WILDHOST 0x0400 /* Hostname is just '*.*' or '*' -- this ban is a user@* ban */ ! #define UBAN_TEMPORARY 0x0800 /* userban is temporary */ ! #define UBAN_SHUN 0x1000 /* shun */ ! #define SBAN_LOCAL 0x001 #define SBAN_NETWORK 0x002 #define SBAN_NICK 0x004 /* sban on the nick field */ --- 21,46 ---- /* $Id$ */ ! #define UBAN_LOCAL 0x001 /* formerly known as a K: or Z: line */ ! #define UBAN_NETWORK 0x002 /* formerly known as an autokill or an SZline */ ! #define UBAN_CONF 0x004 /* this ban came from ircd.conf */ ! #define UBAN_GLINE 0x0008 /* Like a K: line but global. */ ! #define UBAN_HOST 0x010 /* this ban matches against the user's resolved host */ ! #define UBAN_IP 0x020 /* this ban matches against the user's IP address */ ! #define UBAN_SHUN 0x1000 /* shun */ ! #define UBAN_WILD 0x040 /* this ban has wildcards */ ! #define UBAN_CIDR4 0x080 /* this ban is an IPv4 CIDR ban */ ! #define UBAN_CIDR4BIG 0x100 /* this ban is an IPv4 CIDR ban for something greater than a /16 */ ! #define UBAN_WILDUSER 0x200 /* Username is just '*' */ ! #define UBAN_WILDHOST 0x400 /* Hostname is just '*.*' or '*' -- this ban is a user@* ban */ ! #define UBAN_TEMPORARY 0x800 /* userban is temporary */ ! #define SBAN_LOCAL 0x001 #define SBAN_NETWORK 0x002 #define SBAN_NICK 0x004 /* sban on the nick field */ *************** *** 61,65 **** time_t timeset; /* time this ban was set */ time_t duration; /* length of this ban, in seconds, or 0xFFFFFFFF for permanent */ - void *internal_ent; /* internal -- pointer to banlist entry tag */ --- 61,64 ---- *************** *** 97,101 **** char *get_userban_host(struct userBan *, char *, int); ! /* Simban Calls */ --- 96,100 ---- char *get_userban_host(struct userBan *, char *, int); ! void userban_sweep(struct userBan *); /* Simban Calls */ Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** struct.h 9 Jul 2005 23:30:02 -0000 1.5 --- struct.h 4 Sep 2005 05:24:13 -0000 1.6 *************** *** 246,249 **** --- 246,250 ---- #define FLAGS_MAP 0x10000000 #define FLAGS_SHUNNED 0x20000000 /* User is shunned */ + #define FLAGS_GLINED 0x80000000 /* User is shunned */ #ifdef HAVE_SSL #define FLAGS_SSL 0x40000000 /* SSL */ |
|
From: Gabriel B. <sh...@us...> - 2005-09-04 05:24:26
|
Update of /cvsroot/solidircd/solidircd-stable/zlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/zlib Modified Files: zconf.h Log Message: updates need to finish m_gline.c |
|
From: Gabriel B. <sh...@us...> - 2005-09-04 05:24:26
|
Update of /cvsroot/solidircd/solidircd-stable/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/doc Modified Files: template.conf Log Message: updates need to finish m_gline.c Index: template.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/doc/template.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** template.conf 9 Jul 2005 15:11:12 -0000 1.5 --- template.conf 4 Sep 2005 05:24:13 -0000 1.6 *************** *** 629,632 **** --- 629,634 ---- /* our services */ + + /* * connect { * name services.name; # Services' IRC name |
|
From: Gabriel B. <sh...@us...> - 2005-09-04 05:24:26
|
Update of /cvsroot/solidircd/solidircd-stable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987 Modified Files: CHANGES Log Message: updates need to finish m_gline.c Index: CHANGES =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/CHANGES,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGES 9 Jul 2005 20:18:49 -0000 1.6 --- CHANGES 4 Sep 2005 05:24:12 -0000 1.7 *************** *** 31,34 **** --- 31,60 ---- Changes from Sheik ------------------------- + 03/09/2005 - Fixed misc conf parsing issues (from GeniusDex) + 03/09/2005 - Fixed unknown connection reporting in LUSERS + 03/09/2005 - Fixed LIST C> not working at all + 03/09/2005 - Fixed memory leaks in SVSHOLD and LIST options + 03/09/2005 - Fixed busy loops with the epoll socket engine + 03/09/2005 - Fixed LIST wildcard mask detection + 03/09/2005 - Changed oper access flag * to include everything + 03/09/2005 - Changed failed link messages to provide more info to +A opers + 03/09/2005 - Changed cmode +c to block all control codes (except CTCP and ISO-2022) + 03/09/2005 - Added oper access flags for umodes ydb + 03/09/2005 - Reworked memory accounting: + stats z shows short summary + stats Z shows detailed reports + MEMTRACE define in config.h to debug memory leaks, adds to Z report + + 03/09/2005 - Changed general connection reporting format to reduce ambiguity + (affects stats L, trace, etc): + servers: name[host] + clients: nick!user@host + unknown: name([F]ident@host) + where name is a nick or "<unnamed>" + where F is: + ? identd lookup in progress + + valid identd response + - no identd response (ident is "unknown") + 4/7/2005 - removed rquit the code needs to be reviewed and will be delayed for 3.4.8 4/7/2005 - rework memory accounting,add MEMTRACE for debugging, minor memroy leak fix. |
|
From: Gabriel B. <sh...@us...> - 2005-07-10 21:13:42
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27282/src Modified Files: channel.c Log Message: la. Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** channel.c 9 Jul 2005 19:55:15 -0000 1.8 --- channel.c 10 Jul 2005 21:13:33 -0000 1.9 *************** *** 3984,3988 **** DupString(lp->value.cp, name+1); } ! else if (strchr(name, '*') || strchr(name, '*')) { doall = 1; --- 3984,3988 ---- DupString(lp->value.cp, name+1); } ! else if (strchr(name, '*') || strchr(name, '?')) { doall = 1; |
|
From: Gabriel B. <sh...@us...> - 2005-07-10 21:13:42
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27282/include Modified Files: config.h Log Message: la. Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config.h 9 Jul 2005 23:30:02 -0000 1.9 --- config.h 10 Jul 2005 21:13:33 -0000 1.10 *************** *** 936,941 **** * Don't use it. - lucas */ ! #define DEBUGMODE /* define DEBUGMODE to enable */ ! #define DUMP_DEBUG --- 936,941 ---- * Don't use it. - lucas */ ! #undef DEBUGMODE /* define DEBUGMODE to enable */ ! #undef DUMP_DEBUG |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 23:30:14
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19737/include Modified Files: config.h struct.h Log Message: update. Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config.h 9 Jul 2005 15:11:12 -0000 1.8 --- config.h 9 Jul 2005 23:30:02 -0000 1.9 *************** *** 225,229 **** * Enable this at your own risk currently elmer is not working but silly works. - Sheik 1/7/2005 */ ! #undef TOYS /* File names --- 225,229 ---- * Enable this at your own risk currently elmer is not working but silly works. - Sheik 1/7/2005 */ ! #define TOYS /* File names *************** *** 936,941 **** * Don't use it. - lucas */ ! #undef DEBUGMODE /* define DEBUGMODE to enable */ ! #undef DUMP_DEBUG --- 936,941 ---- * Don't use it. - lucas */ ! #define DEBUGMODE /* define DEBUGMODE to enable */ ! #define DUMP_DEBUG Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** struct.h 9 Jul 2005 20:18:49 -0000 1.4 --- struct.h 9 Jul 2005 23:30:02 -0000 1.5 *************** *** 115,133 **** - char mydummy[64]; - char mydummy2[64]; - #define WHOSTENTP(x) ((x)[0]|(x)[1]|(x)[2]|(x)[3]|(x)[4]|(x)[5]|(x)[6]|(x)[7]|(x)[8]|(x)[9]|(x)[10]|(x)[11]|(x)[12]|(x)[13]|(x)[14]|(x)[15]) - - #define INADDRANY_STR "0::0" - /* from manpage: - In order to allow applications - to easily declare buffers of the proper size to store IPv4 - and IPv6 addresses in string form, the following two con- - stants are defined in <netinet/in.h>: - - #define INET_ADDRSTRLEN 16 - #define INET6_ADDRSTRLEN 46 - */ #define HOSTIPLEN 46 /* Length of ipv6 address */ --- 115,119 ---- *************** *** 263,267 **** #define FLAGS_SSL 0x40000000 /* SSL */ #endif - #define FLAGS_IPV6 0x80000000 /* user is an ipv6 user */ /* Capabilities of the ircd or clients */ --- 249,252 ---- *************** *** 344,349 **** - - /* for sendto_ops_lev */ --- 329,332 ---- *************** *** 490,495 **** #endif - #define IsIPV6(x) ((x)->flags & FLAGS_IPV6) - #define SetIPV6(x) ((x)->flags |= FLAGS_IPV6) #define IsURSL(x) ((x)->flags & FLAGS_URSL) --- 473,476 ---- |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 23:30:11
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19737/src Modified Files: m_server.c s_misc.c s_user.c Log Message: update. Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** s_user.c 9 Jul 2005 20:47:51 -0000 1.11 --- s_user.c 9 Jul 2005 23:30:03 -0000 1.12 *************** *** 1956,1960 **** } ! #ifdef PLUS_R_TO_NONREG_WARN /* Warn +R users that their target cannot reply - Unim4trix0 */ if (IsNoNonReg(sptr) && !IsRegNick(acptr) && !IsOper(acptr)) --- 1956,1962 ---- } ! #ifdef PLUS_R_TO_NONREG_WARN ! ! /* Warn +R users that their target cannot reply - Unim4trix0 */ if (IsNoNonReg(sptr) && !IsRegNick(acptr) && !IsOper(acptr)) *************** *** 1977,1980 **** --- 1979,1983 ---- case CTCP_NONE: break; + #ifdef DCCALLOW case CTCP_DCCSEND: *************** *** 2201,2205 **** { if (len + strlen(chptr->chname) > (size_t) BUFSIZE - 4 - mlen) - //if (!(IsULine (acptr)) && (IsAnOper(acptr) && !IsUmodeW(acptr)) // this is wrong need a better way to do this. -Sheik { sendto_one(sptr, ":%s %d %s %s :%s", me.name, --- 2204,2207 ---- *************** *** 2367,2371 **** #endif ! if (confopts & FLAGS_AUTOUMODE_v) SetUmodev(sptr); --- 2369,2373 ---- #endif ! if (confopts & FLAGS_AUTOUMODE_v) SetUmodev(sptr); *************** *** 2413,2422 **** return 0; } ! ! /* * m_quit * parv[0] = sender prefix * parv[1] = comment */ int m_quit(aClient *cptr, aClient *sptr, int parc, char *parv[]) --- 2415,2426 ---- return 0; } ! ! /* * m_quit * parv[0] = sender prefix * parv[1] = comment */ + + int m_quit(aClient *cptr, aClient *sptr, int parc, char *parv[]) *************** *** 2428,2439 **** if (!IsServer(cptr)) { ! if (!(confopts & FLAGS_RQUIT) && IsRegNick(sptr)) ! { ! strcpy(comment, "Quit: "); ! strncpy(comment + 6, reason, TOPICLEN - 6); ! } ! else ! strcpy(comment, "Client Quit"); ! comment[TOPICLEN] = 0; return exit_client(cptr, sptr, sptr, comment); --- 2432,2445 ---- if (!IsServer(cptr)) { ! ! ! /* Check to see if rquit is on & if user is register. -Sheik 21/05/2005 */ ! if (!(confopts & FLAGS_RQUIT) || IsRegNick(sptr)) ! { ! strcpy(comment, "Quit: "); ! strncpy(comment + 6, reason, TOPICLEN - 6); ! } ! else ! strcpy(comment, "Client Quit"); comment[TOPICLEN] = 0; return exit_client(cptr, sptr, sptr, comment); *************** *** 2443,2446 **** --- 2449,2453 ---- } + /* * m_kill Index: m_server.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/m_server.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** m_server.c 5 Jul 2005 03:17:53 -0000 1.3 --- m_server.c 9 Jul 2005 23:30:03 -0000 1.4 *************** *** 285,289 **** sendnick_TS(cptr, acptr); } - sync_lists(cptr); } --- 285,288 ---- *************** *** 334,339 **** { ircstp->is_ref++; ! ! sendto_one(cptr, "ERROR :Lost Connect block"); sendto_ops_lev(ADMIN_LEV, "Lost Connect block for server %s", get_client_name(cptr, TRUE)); --- 333,337 ---- { ircstp->is_ref++; ! sendto_one(cptr, "ERROR :Lost Connect block"); sendto_ops_lev(ADMIN_LEV, "Lost Connect block for server %s", get_client_name(cptr, TRUE)); *************** *** 345,349 **** { ircstp->is_ref++; ! sendto_one(cptr, "ERROR :Wrong link password", inpath); sendto_ops("Link %s dropped, wrong password", inpath); return exit_client(cptr, cptr, cptr, "Bad Password"); --- 343,347 ---- { ircstp->is_ref++; ! sendto_one(cptr, "ERROR :Wrong link password", inpath); sendto_ops("Link %s dropped, wrong password", inpath); return exit_client(cptr, cptr, cptr, "Bad Password"); *************** *** 351,355 **** memset(cptr->passwd, '\0', sizeof(cptr->passwd)); ! if (find_client(host, NULL)) { sendto_gnotice("from %s: Link %s dropped, server already exists", --- 349,353 ---- memset(cptr->passwd, '\0', sizeof(cptr->passwd)); ! if (find_client(host, NULL)) { sendto_gnotice("from %s: Link %s dropped, server already exists", *************** *** 360,364 **** } - if(!(confopts & FLAGS_HUB)) { --- 358,361 ---- *************** *** 425,432 **** { sendto_gnotice("from %s: Warning: %s linked, non-TS server", ! me.name, get_client_name(cptr, HIDEME)); sendto_serv_butone(cptr, ":%s GNOTICE :Warning: %s linked, non-TS server", ! me.name, get_client_name(cptr, HIDEME)); } --- 422,429 ---- { sendto_gnotice("from %s: Warning: %s linked, non-TS server", ! me.name, get_client_name(cptr, HIDEME)); sendto_serv_butone(cptr, ":%s GNOTICE :Warning: %s linked, non-TS server", ! me.name, get_client_name(cptr, HIDEME)); } *************** *** 458,463 **** throttle_remove(inetntoa((char *)&cptr->ip)); - - #ifdef HAVE_ENCRYPTION_ON if(!CanDoDKEY(cptr) || !WantDKEY(cptr)) --- 455,458 ---- *************** *** 595,603 **** } ! /* new connection */ if (IsUnknown(cptr) || IsHandshake(cptr)) { ! ! strncpyzt(cptr->name, host, sizeof(cptr->name)); strncpyzt(cptr->info, info[0] ? info : me.name, REALLEN); cptr->hopcount = hop; --- 590,597 ---- } ! /* new connection */ if (IsUnknown(cptr) || IsHandshake(cptr)) { ! strncpyzt(cptr->name, host, sizeof(cptr->name)); strncpyzt(cptr->info, info[0] ? info : me.name, REALLEN); cptr->hopcount = hop; *************** *** 614,625 **** ircstp->is_ref++; sendto_ops_lev(ADMIN_LEV, "Link %s dropped, no Connect block", ! get_client_name(cptr, TRUE)); ! ! ! return exit_client(cptr, cptr, cptr, "No Connect block"); } } ! ! /* already linked server */ if (!IsServer(cptr)) return 0; --- 608,617 ---- ircstp->is_ref++; sendto_ops_lev(ADMIN_LEV, "Link %s dropped, no Connect block", ! get_client_name(cptr, TRUE)); ! return exit_client(cptr, cptr, cptr, "No Connect block"); } } ! ! /* already linked server */ if (!IsServer(cptr)) return 0; *************** *** 712,719 **** { aconn = cptr->serv->aconn; ! sendto_gnotice("from %s: Non-Hub link %s introduced %s", ! me.name, get_client_name(cptr, HIDEME), host); sendto_serv_butone(cptr,":%s GNOTICE :Non-Hub link %s introduced " ! "%s", me.name, get_client_name(cptr, HIDEME), host); sendto_one(cptr, "ERROR :You're not a hub (introducing %s)", --- 704,711 ---- { aconn = cptr->serv->aconn; ! sendto_gnotice("from %s: Non-Hub link %s introduced %s", ! me.name, get_client_name(cptr, HIDEME), host); sendto_serv_butone(cptr,":%s GNOTICE :Non-Hub link %s introduced " ! "%s", me.name, get_client_name(cptr, HIDEME), host); sendto_one(cptr, "ERROR :You're not a hub (introducing %s)", *************** *** 775,779 **** } ! return 0; } --- 767,771 ---- } ! return 0; } Index: s_misc.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** s_misc.c 5 Jul 2005 21:53:42 -0000 1.6 --- s_misc.c 9 Jul 2005 23:30:03 -0000 1.7 *************** *** 616,620 **** { next = lp->next; ! MyFree(lp->value.cp); free_link(lp); } --- 616,620 ---- { next = lp->next; ! MyFree(lp->value.cp); free_link(lp); } *************** *** 622,626 **** { next = lp->next; ! MyFree(lp->value.cp); free_link(lp); } --- 622,626 ---- { next = lp->next; ! MyFree(lp->value.cp); free_link(lp); } |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 23:30:11
|
Update of /cvsroot/solidircd/solidircd-stable/zlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19737/zlib Modified Files: Makefile zconf.h Log Message: update. Index: zconf.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/zlib/zconf.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zconf.h 9 Jul 2005 20:18:50 -0000 1.2 --- zconf.h 9 Jul 2005 23:30:03 -0000 1.3 *************** *** 276,280 **** #endif ! #if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include <sys/types.h> /* for off_t */ # include <unistd.h> /* for SEEK_* and off_t */ --- 276,280 ---- #endif ! #if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include <sys/types.h> /* for off_t */ # include <unistd.h> /* for SEEK_* and off_t */ Index: Makefile =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/zlib/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 9 Jul 2005 20:18:50 -0000 1.2 --- Makefile 9 Jul 2005 23:30:03 -0000 1.3 *************** *** 17,23 **** # make install prefix=$HOME ! CC=gcc ! CFLAGS=-O3 -DUSE_MMAP #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG --- 17,23 ---- # make install prefix=$HOME ! CC=cc ! CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG *************** *** 25,31 **** # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=-L. libz.a ! LDSHARED=gcc ! CPP=gcc -E LIBS=libz.a --- 25,31 ---- # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=libz.a ! LDSHARED=$(CC) ! CPP=$(CC) -E LIBS=libz.a *************** *** 40,48 **** EXE= ! prefix =/usr/local ! exec_prefix =${prefix} ! libdir =${exec_prefix}/lib ! includedir =${prefix}/include ! mandir =${prefix}/share/man man3dir = ${mandir}/man3 --- 40,48 ---- EXE= ! prefix = /usr/local ! exec_prefix = ${prefix} ! libdir = ${exec_prefix}/lib ! includedir = ${prefix}/include ! mandir = ${prefix}/share/man man3dir = ${mandir}/man3 |
|
From: Juan B. <tu...@us...> - 2005-07-09 20:48:03
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1135/src Modified Files: s_user.c Log Message: Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** s_user.c 9 Jul 2005 20:18:50 -0000 1.10 --- s_user.c 9 Jul 2005 20:47:51 -0000 1.11 *************** *** 2428,2432 **** if (!IsServer(cptr)) { ! if (!(confopts & FLAGS_RQUIT) || IsRegNick(sptr)) { strcpy(comment, "Quit: "); --- 2428,2432 ---- if (!IsServer(cptr)) { ! if (!(confopts & FLAGS_RQUIT) && IsRegNick(sptr)) { strcpy(comment, "Quit: "); |
|
From: Juan B. <tu...@us...> - 2005-07-09 20:19:02
|
Update of /cvsroot/solidircd/solidircd-stable/zlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17403/zlib Modified Files: Makefile zconf.h Log Message: Index: zconf.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/zlib/zconf.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** zconf.h 27 Jun 2005 03:02:45 -0000 1.1.1.1 --- zconf.h 9 Jul 2005 20:18:50 -0000 1.2 *************** *** 276,280 **** #endif ! #if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include <sys/types.h> /* for off_t */ # include <unistd.h> /* for SEEK_* and off_t */ --- 276,280 ---- #endif ! #if 1 /* HAVE_UNISTD_H -- this line is updated by ./configure */ # include <sys/types.h> /* for off_t */ # include <unistd.h> /* for SEEK_* and off_t */ Index: Makefile =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/zlib/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 27 Jun 2005 03:02:47 -0000 1.1.1.1 --- Makefile 9 Jul 2005 20:18:50 -0000 1.2 *************** *** 17,23 **** # make install prefix=$HOME ! CC=cc ! CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG --- 17,23 ---- # make install prefix=$HOME ! CC=gcc ! CFLAGS=-O3 -DUSE_MMAP #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG *************** *** 25,31 **** # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=libz.a ! LDSHARED=$(CC) ! CPP=$(CC) -E LIBS=libz.a --- 25,31 ---- # -Wstrict-prototypes -Wmissing-prototypes ! LDFLAGS=-L. libz.a ! LDSHARED=gcc ! CPP=gcc -E LIBS=libz.a *************** *** 40,48 **** EXE= ! prefix = /usr/local ! exec_prefix = ${prefix} ! libdir = ${exec_prefix}/lib ! includedir = ${prefix}/include ! mandir = ${prefix}/share/man man3dir = ${mandir}/man3 --- 40,48 ---- EXE= ! prefix =/usr/local ! exec_prefix =${prefix} ! libdir =${exec_prefix}/lib ! includedir =${prefix}/include ! mandir =${prefix}/share/man man3dir = ${mandir}/man3 |
|
From: Juan B. <tu...@us...> - 2005-07-09 20:19:02
|
Update of /cvsroot/solidircd/solidircd-stable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17403 Modified Files: CHANGES Log Message: Index: CHANGES =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/CHANGES,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CHANGES 9 Jul 2005 01:50:41 -0000 1.5 --- CHANGES 9 Jul 2005 20:18:49 -0000 1.6 *************** *** 15,18 **** --- 15,21 ---- Changes from Tux --------------- + 09/07/2005 - Fixed 'free_func' FreeBSD compilation error. + 09/07/2005 - Fixed rquit. + 09/07/2005 - Fixed elmer. 02/07/2005 - Added conops notice on client exit. *************** *** 329,331 **** - Outdated modules.ini and all inifile uses - now a modules {} conf block - Updated m_module to allow non-admin viewing of hooks and loaded modules ! - Added module hooks for user and channel targetted privmsgs \ No newline at end of file --- 332,334 ---- - Outdated modules.ini and all inifile uses - now a modules {} conf block - Updated m_module to allow non-admin viewing of hooks and loaded modules ! - Added module hooks for user and channel targetted privmsgs |
|
From: Juan B. <tu...@us...> - 2005-07-09 20:19:02
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17403/src Modified Files: s_conf.c s_debug.c s_user.c zlink.c Log Message: Index: s_conf.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** s_conf.c 9 Jul 2005 03:09:12 -0000 1.7 --- s_conf.c 9 Jul 2005 20:18:50 -0000 1.8 *************** *** 1015,1027 **** tswarndelta = atoi(tmp->value); } - /* rquit needs to be reviewed by tux is currently bogus. else if(tmp->type && (tmp->type->flag & OPTF_RQUIT)) ! { ! tmp->type = NULL; ! new_confopts |= FLAGS_RQUIT; ! } ! ! */ ! else if(tmp->type && (tmp->type->flag & OPTF_HOSTPREFIX)) { --- 1015,1023 ---- tswarndelta = atoi(tmp->value); } else if(tmp->type && (tmp->type->flag & OPTF_RQUIT)) ! { ! tmp->type = NULL; ! new_confopts |= FLAGS_RQUIT; ! } else if(tmp->type && (tmp->type->flag & OPTF_HOSTPREFIX)) { Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** s_user.c 9 Jul 2005 01:22:50 -0000 1.9 --- s_user.c 9 Jul 2005 20:18:50 -0000 1.10 *************** *** 2428,2433 **** if (!IsServer(cptr)) { ! strcpy(comment, "Quit: "); ! strncpy(comment + 6, reason, TOPICLEN - 6); comment[TOPICLEN] = 0; return exit_client(cptr, sptr, sptr, comment); --- 2428,2439 ---- if (!IsServer(cptr)) { ! if (!(confopts & FLAGS_RQUIT) || IsRegNick(sptr)) ! { ! strcpy(comment, "Quit: "); ! strncpy(comment + 6, reason, TOPICLEN - 6); ! } ! else ! strcpy(comment, "Client Quit"); ! comment[TOPICLEN] = 0; return exit_client(cptr, sptr, sptr, comment); Index: s_debug.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_debug.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** s_debug.c 28 Jun 2005 02:24:00 -0000 1.2 --- s_debug.c 9 Jul 2005 20:18:50 -0000 1.3 *************** *** 236,241 **** if (!(confopts & FLAGS_SHOWLINKS)) *s++ = 'L'; ! // if ((confopts & FLAGS_RQUIT)) ! // *s++ = 'Q'; #ifdef HIDE_SERVERMODE_ORIGINS *s++ = 'M'; --- 236,241 ---- if (!(confopts & FLAGS_SHOWLINKS)) *s++ = 'L'; ! if ((confopts & FLAGS_RQUIT)) ! *s++ = 'Q'; #ifdef HIDE_SERVERMODE_ORIGINS *s++ = 'M'; Index: zlink.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/zlink.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zlink.c 5 Jul 2005 03:17:54 -0000 1.3 --- zlink.c 9 Jul 2005 20:18:50 -0000 1.4 *************** *** 29,34 **** #include <stdlib.h> #include <string.h> - #include "zlib.h" #include "memcount.h" #define COMPRESSION_LEVEL 3 /* 0 to 9, 0 = none */ --- 29,34 ---- #include <stdlib.h> #include <string.h> #include "memcount.h" + #include "zlib.h" #define COMPRESSION_LEVEL 3 /* 0 to 9, 0 = none */ |
|
From: Juan B. <tu...@us...> - 2005-07-09 20:19:00
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17403/include Modified Files: confparse.h struct.h Log Message: Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** struct.h 28 Jun 2005 03:08:12 -0000 1.3 --- struct.h 9 Jul 2005 20:18:49 -0000 1.4 *************** *** 776,780 **** #define FLAGS_SHOWLINKS 0x0040 #define FLAGS_SPLITOPOK 0x0080 ! //#define FLAGS_RQUIT 0x0100 #define FLAGS_AUTOUMODE_R 0x0200 #define FLAGS_AUTOUMODE_v 0x0400 --- 776,780 ---- #define FLAGS_SHOWLINKS 0x0040 #define FLAGS_SPLITOPOK 0x0080 ! #define FLAGS_RQUIT 0x0100 #define FLAGS_AUTOUMODE_R 0x0200 #define FLAGS_AUTOUMODE_v 0x0400 Index: confparse.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/confparse.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** confparse.h 28 Jun 2005 02:24:00 -0000 1.2 --- confparse.h 9 Jul 2005 20:18:49 -0000 1.3 *************** *** 185,190 **** #define OPTT_AUP "AUP" #define OPTF_AUP 0x500000 ! //#define OPTT_RQUIT "rquit" ! //#define OPTF_RQUIT 0x00800000 --- 185,190 ---- #define OPTT_AUP "AUP" #define OPTF_AUP 0x500000 ! #define OPTT_RQUIT "rquit" ! #define OPTF_RQUIT 0x00800000 *************** *** 269,273 **** {OPTT_WEBSITE, OPTF_WEBSITE, VARTYPE_NAME}, {OPTT_AUP, OPTF_AUP, VARTYPE_NAME}, ! //{OPTT_RQUIT, OPTF_RQUIT, VARTYPE_NONE}, {(char *) 0, 0, 0} }; --- 269,273 ---- {OPTT_WEBSITE, OPTF_WEBSITE, VARTYPE_NAME}, {OPTT_AUP, OPTF_AUP, VARTYPE_NAME}, ! {OPTT_RQUIT, OPTF_RQUIT, VARTYPE_NONE}, {(char *) 0, 0, 0} }; |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 19:55:24
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5146/src Modified Files: channel.c version.c.SH Log Message: update. Index: version.c.SH =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/version.c.SH,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** version.c.SH 27 Jun 2005 03:02:32 -0000 1.1.1.1 --- version.c.SH 9 Jul 2005 19:55:15 -0000 1.2 *************** *** 93,97 **** "| Translators & Documents Team ", "| dc <dc...@so...> ", ! "| pi <pi...@so...> ", "| mj <mj...@so...> ", "|----------------------------------------------------------------------------------------", --- 93,97 ---- "| Translators & Documents Team ", "| dc <dc...@so...> ", ! "| izlude <iz...@so...> ", "| mj <mj...@so...> ", "|----------------------------------------------------------------------------------------", Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** channel.c 9 Jul 2005 03:09:11 -0000 1.7 --- channel.c 9 Jul 2005 19:55:15 -0000 1.8 *************** *** 1491,1496 **** #ifdef HAVE_SSL #define SM_ERR_SSL 0x0010 /* SSL Only*/ - #define SM_ERR_RSL 0x0020 /* RSL(Resolvoled Clients) Only*/ #endif #define SM_MAXMODES MAXMODEPARAMSUSER --- 1491,1496 ---- #ifdef HAVE_SSL #define SM_ERR_SSL 0x0010 /* SSL Only*/ #endif + #define SM_ERR_RSL 0x0020 /* RSL(Resolvoled Clients) Only*/ #define SM_MAXMODES MAXMODEPARAMSUSER |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 19:55:23
|
Update of /cvsroot/solidircd/solidircd-stable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5146 Modified Files: TODO Log Message: update. Index: TODO =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TODO 9 Jul 2005 15:11:12 -0000 1.3 --- TODO 9 Jul 2005 19:55:14 -0000 1.4 *************** *** 50,77 **** - - [ ] Review sslguide.txt - Being worked on by: - Progress: - Language: - - - - [ ] Review operguide.txt - Being worked on by: - Progress: - Language: - - [ ] Review reference.txt - Being worked on by: - Progress: - Language: - - - [ ] Review template.txt - Being worked on by: - Progress: - Language: - Quality Assurance Team: -------------------- --- 50,53 ---- *************** *** 83,88 **** ! [ ] Test Solid3.4.7(stable) Being done by: Sheik ! Progress: Status: In progress. \ No newline at end of file --- 59,64 ---- ! [/] Test Solid3.4.7(stable) Being done by: Sheik ! Progress: Smooth! Status: In progress. \ No newline at end of file |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 15:11:21
|
Update of /cvsroot/solidircd/solidircd-stable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329 Modified Files: INSTALL README TODO Log Message: Documentation update. Index: README =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 9 Jul 2005 01:50:41 -0000 1.3 --- README 9 Jul 2005 15:11:12 -0000 1.4 *************** *** 36,43 **** ----------------- ! Recommendations ----------------- ! This is a our first stable release it is different than solid3.4.6 so please review template.conf and include/config.h carefully alot ! of things have changed. --- 36,47 ---- ----------------- ! Suggestions ----------------- ! This is a our first stable release is different than solid3.4.6 so please review template.conf and include/config.h ! carefully alot of things have changed. + *** IMPORTANT *** + Please send any SECURITY RELATED bugs to gab...@so... - any + non-critical bugs can be submitted to our bug tracker at http://www.solid-ircd.com + for code discussion. \ No newline at end of file Index: TODO =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/TODO,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TODO 5 Jul 2005 02:39:59 -0000 1.2 --- TODO 9 Jul 2005 15:11:12 -0000 1.3 *************** *** 1,4 **** Solid-IRCD 3.4.7 Development Version To do List. ! Last Reviewed by Gabriel Baez(Sheik) on 26/06/2005 ---------------------- --- 1,4 ---- Solid-IRCD 3.4.7 Development Version To do List. ! Last Reviewed by Gabriel Baez(Sheik) on 08/06/2005 ---------------------- *************** *** 7,12 **** [X] = Done ---------------------- ! Notes: If you're working on something, update your progress,description, and add your nick. -Sheik ! Developers --- 7,11 ---- [X] = Done ---------------------- ! Notes: Developers *************** *** 21,35 **** - [X] Channel mode that will prevent unresolved clients from joining. - Being worked on by: Sheik - Progress: 100% - Description: This is done needs to be tested more when we start resolving properly. - - [X] Channel mode that will block all channel notices. - Description: - Being worked on by: Sheik - Progress: 100% - Description: This needs to be tested. - --- 20,23 ---- *************** *** 40,55 **** ! [X] Implement user mode Deaf ! Being worked on by: Sheik ! Progress: 100% ! Description: This mode will prevent user with said mode from receiving channel messages. ! This mode can be applied by the user or an oper. It can decrese bandwidth usage ! ! ! [] Clean up last modified files, fix and error in userban.c ! Being worked on by:Sheik ! Progress: ! Description: ! --- 28,35 ---- ! [/] Sync with bahamut 1.8.4 ! Being worked by: Sheik ! Progress: 95% ! Description: Index: INSTALL =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/INSTALL,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** INSTALL 27 Jun 2005 03:01:55 -0000 1.1.1.1 --- INSTALL 9 Jul 2005 15:11:12 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- Makefiles to match your system: ./configure + To build with Client SSL support disabled use ./configure --disable-openssl Type ./configure --help to see different options. Most people will not |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 15:11:20
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329/include Modified Files: config.h Log Message: Documentation update. Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/config.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.h 9 Jul 2005 01:50:41 -0000 1.7 --- config.h 9 Jul 2005 15:11:12 -0000 1.8 *************** *** 926,930 **** /* Debugging configs */ ! #define DNS_DEBUG /* --- 926,930 ---- /* Debugging configs */ ! #undef DNS_DEBUG /* |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 15:11:20
|
Update of /cvsroot/solidircd/solidircd-stable/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329/doc Modified Files: reference.conf template.conf Log Message: Documentation update. Index: template.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/doc/template.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** template.conf 9 Jul 2005 03:09:10 -0000 1.4 --- template.conf 9 Jul 2005 15:11:12 -0000 1.5 *************** *** 99,103 **** auto_umode_R; # Only registered users can query other users. auto_umode_v; # Will automaticly set the hostmaskin mode for users. ! bot_class bot; # ircbot class --- 99,103 ---- auto_umode_R; # Only registered users can query other users. auto_umode_v; # Will automaticly set the hostmaskin mode for users. ! bot_class bot; # Search bots class exception. *************** *** 206,215 **** /* uncomment this if ssl is enable. ! * ssl { ! * certificate "ssl/vgc.pem"; # Server Certificate ! * keyfile "ssl/vgckey.pem"; # Keys for the server ! * allow_umodez; # Allow SSL users to change UMODE_z ! * }; ! * */ --- 206,215 ---- /* uncomment this if ssl is enable. ! ssl { ! certificate "ssl/vgc.pem"; # Server Certificate ! keyfile "ssl/vgckey.pem"; # Keys for the server ! allow_umodez; # Allow SSL users to change UMODE_z ! }; ! */ *************** *** 351,355 **** ! /* connection class for bots */ class { name bot; # Class name --- 351,355 ---- ! /* connection exception class for search bots such as searchirc & netsplit.de */ class { name bot; # Class name Index: reference.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/doc/reference.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** reference.conf 9 Jul 2005 01:22:49 -0000 1.2 --- reference.conf 9 Jul 2005 15:11:12 -0000 1.3 *************** *** 99,102 **** --- 99,103 ---- auto_umode_R; # Only registered users can query other users. auto_umode_v; # Will automaticly set the hostmaskin mode for users. + bot_class bot; # Search bots class exception. *************** *** 190,193 **** --- 191,219 ---- + /* Client Side SSL + * Issues to note... + * Information you exchange with an IRC server over a secure connection can not be viewed or changed by others. + * However, be aware that traffic between public servers on a network is exchanged over plain, open unencrypted lines. + * This means that if you want to be sure that your communication is secure, you and the person with whom you want to + * communicate securely should both connect to the same SSL-capable server, and communicate via a query window. + * If talking on a channel, be aware that everyone on the channel must be on a secure connection. + * If one person on the channel is not on a secure connection, your communications on that channel will not be secure. + * + * To create your SSL certificate run the /makecert.sh file in ircd/ssl/. + */ + + + + /* uncomment this if ssl is enable. + ssl { + certificate "ssl/vgc.pem"; # Server Certificate + keyfile "ssl/vgckey.pem"; # Keys for the server + allow_umodez; # Allow SSL users to change UMODE_z + }; + + */ + + + /* Port [REQUIRED] * The Port blocks define where the server will accept connections. At *************** *** 325,331 **** ! /* connection class for bots */ class { ! name bot_class; # Class name maxusers 100; # Maximum connections pingfreq 90; # Check idle connections every N seconds --- 351,357 ---- ! /* connection exception class for search bots such as searchirc & netsplit.de */ class { ! name bot; # Class name maxusers 100; # Maximum connections pingfreq 90; # Check idle connections every N seconds *************** *** 336,340 **** allow { host *@atte.netsplit.de; # Allows this host to get our channel list ! class bot_class; # This is the class used for bots. }; --- 362,366 ---- allow { host *@atte.netsplit.de; # Allows this host to get our channel list ! class bot; # This is the class used for bots. }; *************** *** 342,346 **** allow { host *@data.searchirc.org; # Allows this host to get our channel list ! class bot_class; # This is the class used for bots. }; --- 368,372 ---- allow { host *@data.searchirc.org; # Allows this host to get our channel list ! class bot; # This is the class used for bots. }; *************** *** 797,820 **** - /* Client Side SSL - * Issues to note... - * Information you exchange with an IRC server over a secure connection can not be viewed or changed by others. - * However, be aware that traffic between public servers on a network is exchanged over plain, open unencrypted lines. - * This means that if you want to be sure that your communication is secure, you and the person with whom you want to - * communicate securely should both connect to the same SSL-capable server, and communicate via a query window. - * If talking on a channel, be aware that everyone on the channel must be on a secure connection. - * If one person on the channel is not on a secure connection, your communications on that channel will not be secure. - * - * To create your SSL certificate run the /makecert.sh file in ircd/ssl/. - */ - - - - /* uncomment this if ssl is enable. - * ssl { - * certificate "ssl/vgc.pem"; # Server Certificate - * keyfile "ssl/vgckey.pem"; # Keys for the server - * allow_umodez; # Allow SSL users to change UMODE_z - * }; - * - */ \ No newline at end of file --- 823,824 ---- |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 14:58:14
|
Update of /cvsroot/solidircd/solidircd-dev/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1891/include Modified Files: config.h Log Message: config update. Index: config.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/config.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.h 30 May 2005 23:21:46 -0000 1.11 --- config.h 9 Jul 2005 14:58:02 -0000 1.12 *************** *** 224,228 **** * */ ! #define TOYS /* File names --- 224,228 ---- * */ ! #undef TOYS /* File names *************** *** 627,631 **** * disable it! :) */ ! #define DCCALLOW --- 627,631 ---- * disable it! :) */ ! #undef DCCALLOW |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 03:09:28
|
Update of /cvsroot/solidircd/solidircd-stable/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26449/doc Modified Files: template.conf Log Message: update. Index: template.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/doc/template.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** template.conf 9 Jul 2005 01:50:41 -0000 1.3 --- template.conf 9 Jul 2005 03:09:10 -0000 1.4 *************** *** 191,194 **** --- 191,219 ---- + /* Client Side SSL + * Issues to note... + * Information you exchange with an IRC server over a secure connection can not be viewed or changed by others. + * However, be aware that traffic between public servers on a network is exchanged over plain, open unencrypted lines. + * This means that if you want to be sure that your communication is secure, you and the person with whom you want to + * communicate securely should both connect to the same SSL-capable server, and communicate via a query window. + * If talking on a channel, be aware that everyone on the channel must be on a secure connection. + * If one person on the channel is not on a secure connection, your communications on that channel will not be secure. + * + * To create your SSL certificate run the /makecert.sh file in ircd/ssl/. + */ + + + + /* uncomment this if ssl is enable. + * ssl { + * certificate "ssl/vgc.pem"; # Server Certificate + * keyfile "ssl/vgckey.pem"; # Keys for the server + * allow_umodez; # Allow SSL users to change UMODE_z + * }; + * + */ + + + /* Port [REQUIRED] * The Port blocks define where the server will accept connections. At *************** *** 798,821 **** - /* Client Side SSL - * Issues to note... - * Information you exchange with an IRC server over a secure connection can not be viewed or changed by others. - * However, be aware that traffic between public servers on a network is exchanged over plain, open unencrypted lines. - * This means that if you want to be sure that your communication is secure, you and the person with whom you want to - * communicate securely should both connect to the same SSL-capable server, and communicate via a query window. - * If talking on a channel, be aware that everyone on the channel must be on a secure connection. - * If one person on the channel is not on a secure connection, your communications on that channel will not be secure. - * - * To create your SSL certificate run the /makecert.sh file in ircd/ssl/. - */ - - - - /* uncomment this if ssl is enable. - * ssl { - * certificate "ssl/vgc.pem"; # Server Certificate - * keyfile "ssl/vgckey.pem"; # Keys for the server - * allow_umodez; # Allow SSL users to change UMODE_z - * }; - * - */ \ No newline at end of file --- 823,824 ---- |
|
From: Gabriel B. <sh...@us...> - 2005-07-09 03:09:27
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26449/src Modified Files: Makefile.in channel.c ircd.c memcount.c modules.c s_conf.c Log Message: update. Index: ircd.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/ircd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ircd.c 5 Jul 2005 21:53:41 -0000 1.4 --- ircd.c 9 Jul 2005 03:09:11 -0000 1.5 *************** *** 1311,1315 **** } - u_long memcount_ircd(MCircd *mc) --- 1311,1314 ---- *************** *** 1336,1349 **** mc->s_confbuf.m += sizeof(Staff_Address); mc->s_confbuf.c++; - mc->s_confbuf.m += sizeof(HiddenServName); - mc->s_confbuf.c++; - mc->s_confbuf.m += sizeof(HiddenServDesc); - mc->s_confbuf.c++; - mc->s_confbuf.m += sizeof(HELPCHAN); - mc->s_confbuf.c++; - mc->s_confbuf.m += sizeof(WEBSITE); - mc->s_confbuf.c++; - mc->s_confbuf.m += sizeof(AUP); - mc->s_confbuf.c++; mc->s_confbuf.m += sizeof(configfile); mc->s_confbuf.c++; --- 1335,1338 ---- Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** channel.c 9 Jul 2005 01:22:50 -0000 1.6 --- channel.c 9 Jul 2005 03:09:11 -0000 1.7 *************** *** 5140,5147 **** Link *lp2; chanMember *cm; - #ifdef FLUD struct fludbot *fb; #endif mc->file = __FILE__; --- 5140,5147 ---- Link *lp2; chanMember *cm; #ifdef FLUD struct fludbot *fb; #endif + mc->file = __FILE__; *************** *** 5177,5180 **** --- 5177,5181 ---- for (cm = chptr->members; cm; cm = cm->next) mc->e_chanmembers++; + #ifdef FLUD for (fb = chptr->fluders; fb; fb = fb->next) *************** *** 5225,5227 **** return mc->total.m; ! } --- 5226,5229 ---- return mc->total.m; ! ! } Index: Makefile.in =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 5 Jul 2005 02:40:01 -0000 1.2 --- Makefile.in 9 Jul 2005 03:09:11 -0000 1.3 *************** *** 14,17 **** --- 14,19 ---- RES_SRC = + + #This is only for very old systems that NEED this #RES_SRC = res_mkquery.c res_init.c res_comp.c *************** *** 355,359 **** ../include/ircsprintf.h ../include/find.h ../include/memcount.h \ ../include/blalloc.h ../include/throttle.h ../include/queue.h - dh.o: dh.c ../include/memcount.h ../include/struct.h ../include/config.h \ ../include/setup.h ../include/defs.h ../include/sys.h ../include/hash.h \ --- 357,360 ---- Index: s_conf.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** s_conf.c 9 Jul 2005 01:22:50 -0000 1.6 --- s_conf.c 9 Jul 2005 03:09:12 -0000 1.7 *************** *** 2449,2453 **** } - u_long memcount_s_conf(MCs_conf *mc) --- 2449,2452 ---- *************** *** 2581,2583 **** return mc->total.m; ! } --- 2580,2582 ---- return mc->total.m; ! } |
6 messages has been excluded from this view by a project administrator.
