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: Juan B. <tu...@us...> - 2005-07-02 20:18:38
|
Update of /cvsroot/solidircd/solidircd-dev/zlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10997/zlib Modified Files: Makefile zconf.h Log Message: ConOps Index: zconf.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/zlib/zconf.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** zconf.h 13 May 2005 17:18:26 -0000 1.1.1.2 --- zconf.h 2 Jul 2005 20:18:29 -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-dev/zlib/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 11 May 2005 22:10:22 -0000 1.1.1.1 --- Makefile 2 Jul 2005 20:18:28 -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-02 20:18:37
|
Update of /cvsroot/solidircd/solidircd-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10997 Modified Files: CHANGES Log Message: ConOps Index: CHANGES =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/CHANGES,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CHANGES 12 Jun 2005 19:07:00 -0000 1.23 --- CHANGES 2 Jul 2005 20:18:26 -0000 1.24 *************** *** 12,17 **** ------------------ Changes from Tux ! --------------- ! ----------------- --- 12,17 ---- ------------------ Changes from Tux ! ----------------- ! 02/07/2005 - Added conops notice on client exit. ----------------- |
|
From: Gabriel B. <sh...@us...> - 2005-06-28 03:08:22
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16096/src Modified Files: channel.c s_user.c Log Message: ready to run some test now. Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** s_user.c 28 Jun 2005 02:51:35 -0000 1.3 --- s_user.c 28 Jun 2005 03:08:13 -0000 1.4 *************** *** 437,441 **** SetURSL(sptr); sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has an unresolved client.", ! me.name, sptr->name); } strncpy(sptr->user->maskhost, mask, HOSTLEN+1); --- 437,441 ---- SetURSL(sptr); sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has an unresolved client.", ! me.name, sptr->name); // need to add more info here explaining the user why this was done. } strncpy(sptr->user->maskhost, mask, HOSTLEN+1); *************** *** 1770,1777 **** } ! if ((ret = can_send(sptr, chptr, parv[2]))) ! // If channel mode +E is set it it shouldn't allow the user to send the notice. ! if(notice && (chptr->mode.mode & MODE_NONOTICE)) ! ret = 1; { if (ismine && !notice) --- 1770,1776 ---- } ! ! ! if ((ret = can_send(sptr, chptr, parv[2]))) { if (ismine && !notice) *************** *** 1781,1784 **** --- 1780,1785 ---- } + + if (chflags) { Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** channel.c 27 Jun 2005 03:02:08 -0000 1.1.1.1 --- channel.c 28 Jun 2005 03:08:12 -0000 1.2 *************** *** 1104,1109 **** *mbuf++ = 'L'; #endif ! if (chptr->mode.mode & MODE_NONOTICE) ! *mbuf++ = 'E'; if (chptr->mode.limit) { --- 1104,1108 ---- *mbuf++ = 'L'; #endif ! if (chptr->mode.limit) { *************** *** 1513,1517 **** MODE_LISTED, 'L', #endif ! MODE_NONOTICE, 'E', 0x0, 0x0 }; --- 1512,1516 ---- MODE_LISTED, 'L', #endif ! 0x0, 0x0 }; *************** *** 4586,4590 **** SJ_MODEADD('L', MODE_LISTED); #endif ! SJ_MODEADD('E', MODE_NONOTICE); case 'k': strncpyzt(mode.key, parv[4 + args], KEYLEN + 1); --- 4585,4589 ---- SJ_MODEADD('L', MODE_LISTED); #endif ! case 'k': strncpyzt(mode.key, parv[4 + args], KEYLEN + 1); *************** *** 4750,4754 **** SJ_MODEPLUS('L', MODE_LISTED); #endif ! SJ_MODEPLUS('E', MODE_NONOTICE); SJ_MODEMINUS('p', MODE_PRIVATE); --- 4749,4753 ---- SJ_MODEPLUS('L', MODE_LISTED); #endif ! SJ_MODEMINUS('p', MODE_PRIVATE); *************** *** 4771,4775 **** SJ_MODEMINUS('L', MODE_LISTED); #endif ! SJ_MODEMINUS('E', MODE_NONOTICE); } --- 4770,4774 ---- SJ_MODEMINUS('L', MODE_LISTED); #endif ! } |
|
From: Gabriel B. <sh...@us...> - 2005-06-28 03:08:22
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16096/include Modified Files: struct.h Log Message: ready to run some test now. Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** struct.h 28 Jun 2005 02:24:00 -0000 1.2 --- struct.h 28 Jun 2005 03:08:12 -0000 1.3 *************** *** 1378,1382 **** #define MODE_SSL 0x100000 #define MODE_RSL 0x200000 ! #define MODE_NONOTICE 0x400000 --- 1378,1382 ---- #define MODE_SSL 0x100000 #define MODE_RSL 0x200000 ! |
|
From: Gabriel B. <sh...@us...> - 2005-06-28 02:51:43
|
Update of /cvsroot/solidircd/solidircd-stable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6482 Modified Files: configure Log Message: meh. Index: configure =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/configure,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** configure 27 Jun 2005 03:02:01 -0000 1.1.1.1 --- configure 28 Jun 2005 02:51:34 -0000 1.2 *************** *** 8262,8264 **** echo "" and configuration theres alot of new things that can be set and unset, after your echo "" finish editing include/config.h then compile the ircd. - echo "" NOTE: TO disable a option in include/config. change the define to undef its visa versa to enable. --- 8262,8263 ---- |
|
From: Gabriel B. <sh...@us...> - 2005-06-28 02:51:43
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6482/src Modified Files: s_user.c Log Message: meh. Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** s_user.c 28 Jun 2005 02:24:00 -0000 1.2 --- s_user.c 28 Jun 2005 02:51:35 -0000 1.3 *************** *** 98,102 **** UMODE_C, 'C', /* oper only */ UMODE_H, 'H', /* oper only */ ! UMODE_W, 'W', /* oper only */ #ifdef HAVE_SSL UMODE_z, 'z', /* use mode */ --- 98,102 ---- UMODE_C, 'C', /* oper only */ UMODE_H, 'H', /* oper only */ ! //UMODE_W, 'W', /* oper only */ #ifdef HAVE_SSL UMODE_z, 'z', /* use mode */ *************** *** 2195,2201 **** --- 2195,2203 ---- chptr = lp->value.chptr; showchan=ShowChannel(sptr,chptr); + if (showchan || IsAdmin(sptr)) { 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, *************** *** 2205,2209 **** } ! if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsUmodeW (sptr) && IsAnOper(cptr))) // hide the channel from regular users if oper is +W if(!showchan) /* if we're not really supposed to show the chan * but do it anyways, mark it as such! */ --- 2207,2211 ---- } ! if(!showchan) /* if we're not really supposed to show the chan * but do it anyways, mark it as such! */ *************** *** 3426,3430 **** me.name, sptr->name); } ! if ((setflags & UMODE_W) && !IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) { --- 3428,3432 ---- me.name, sptr->name); } ! /* if ((setflags & UMODE_W) && !IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) { *************** *** 3436,3440 **** sptr->umode |= UMODE_W; } ! #ifdef HAVE_SSL --- 3438,3442 ---- sptr->umode |= UMODE_W; } ! */ #ifdef HAVE_SSL |
|
From: Gabriel B. <sh...@us...> - 2005-06-28 02:24:09
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23597/src Modified Files: s_conf.c s_debug.c s_user.c Log Message: bug fixes. yea yea yea. Index: s_conf.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** s_conf.c 27 Jun 2005 03:02:09 -0000 1.1.1.1 --- s_conf.c 28 Jun 2005 02:24:00 -0000 1.2 *************** *** 1014,1017 **** --- 1014,1018 ---- tswarndelta = atoi(tmp->value); } + /* rquit needs to be reviewed by tux is currently bogus. else if(tmp->type && (tmp->type->flag & OPTF_RQUIT)) { *************** *** 1020,1024 **** } ! else if(tmp->type && (tmp->type->flag & OPTF_HOSTPREFIX)) --- 1021,1025 ---- } ! */ 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.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** s_user.c 27 Jun 2005 03:02:25 -0000 1.1.1.1 --- s_user.c 28 Jun 2005 02:24:00 -0000 1.2 *************** *** 2190,2208 **** } ! mlen = strlen(me.name) + strlen(parv[0]) + 6 + strlen(name); for (len = 0, *buf = '\0', lp = user->channel; lp; lp = lp->next) { chptr = lp->value.chptr; showchan=ShowChannel(sptr,chptr); ! ! if (showchan || IsAdmin(sptr)) ! { - if (len + strlen(chptr->chname) > (size_t) BUFSIZE - 4 - mlen) { - - //if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsUmodeW (sptr) && IsAnOper(cptr))) - { sendto_one(sptr, ":%s %d %s %s :%s", me.name, RPL_WHOISCHANNELS, parv[0], name, buf); --- 2190,2202 ---- } ! mlen = strlen(me.name) + strlen(parv[0]) + 6 + strlen(name); for (len = 0, *buf = '\0', lp = user->channel; lp; lp = lp->next) { chptr = lp->value.chptr; showchan=ShowChannel(sptr,chptr); ! if (showchan || IsAdmin(sptr)) { if (len + strlen(chptr->chname) > (size_t) BUFSIZE - 4 - mlen) { sendto_one(sptr, ":%s %d %s %s :%s", me.name, RPL_WHOISCHANNELS, parv[0], name, buf); *************** *** 2210,2249 **** len = 0; } - } - /* When UMODE_W Is not set. - * The purpose of UMODE_W is to hide what channels the oper is on, so users wont stalk them. - * This hack was written by Gabriel Baez (sh...@so...) - */ - if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsUmodeW (sptr) && IsAnOper(cptr))) - { - if(!showchan) /* if we're not really supposed to show the chan - * but do it anyways, mark it as such! */ - *(buf + len++) = '*'; - if (is_chan_op(acptr, chptr)) - *(buf + len++) = '@'; - if (is_halfop(acptr, chptr)) - *(buf + len++) = '%'; - else if (has_voice(acptr, chptr)) - *(buf + len++) = '+'; - if (len) - *(buf + len) = '\0'; - strcpy(buf + len, chptr->chname); - len += strlen(chptr->chname); - strcat(buf + len, " "); - len++; - } ! /* When UMODE_W Is n set. ! */ ! ! else if (!(IsULine (sptr)) && (IsAnOper(sptr) && IsUmodeW (sptr) && IsAnOper(cptr))) ! { if(!showchan) /* if we're not really supposed to show the chan * but do it anyways, mark it as such! */ ! *(buf + len++) = '*'; if (is_chan_op(acptr, chptr)) *(buf + len++) = '@'; - if (is_halfop(acptr, chptr)) - *(buf + len++) = '%'; else if (has_voice(acptr, chptr)) *(buf + len++) = '+'; --- 2204,2214 ---- len = 0; } ! if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsUmodeW (sptr) && IsAnOper(cptr))) // hide the channel from regular users if oper is +W if(!showchan) /* if we're not really supposed to show the chan * but do it anyways, mark it as such! */ ! *(buf + len++) = '%'; if (is_chan_op(acptr, chptr)) *(buf + len++) = '@'; else if (has_voice(acptr, chptr)) *(buf + len++) = '+'; *************** *** 2254,2260 **** strcat(buf + len, " "); len++; } ! } ! } if (buf[0] != '\0') sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, --- 2219,2225 ---- strcat(buf + len, " "); len++; + } } ! if (buf[0] != '\0') sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, *************** *** 2450,2455 **** * parv[1] = comment */ - - int m_quit(aClient *cptr, aClient *sptr, int parc, char *parv[]) --- 2415,2418 ---- *************** *** 2461,2476 **** if (!IsServer(cptr)) { ! /* rquit currently not exiting client from nick list, it will get corrected once get_client_name in s_.misc.c ! * is updated with the ipv4 and ipv6 code. ! */ ! ! /* 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); --- 2424,2429 ---- if (!IsServer(cptr)) { ! strcpy(comment, "Quit: "); ! strncpy(comment + 6, reason, TOPICLEN - 6); comment[TOPICLEN] = 0; return exit_client(cptr, sptr, sptr, comment); *************** *** 3452,3468 **** if ((setflags & UMODE_H) && !IsUmodeH(sptr) && IsOper(sptr)) { ! set_hostmask(sptr); // do we really need this crappy notice? - Sheik ! sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are no longer a under cover.", ! me.name, sptr->name); ! } if (!(setflags & UMODE_H) && IsUmodeH(sptr) && IsOper(sptr)) { set_hostmask(sptr); ! sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are now and under cover oper.", ! me.name, sptr->name); ! ! } if ((setflags & UMODE_Y) && !IsDeaf(sptr)) --- 3405,3416 ---- if ((setflags & UMODE_H) && !IsUmodeH(sptr) && IsOper(sptr)) { ! set_hostmask(sptr); ! } if (!(setflags & UMODE_H) && IsUmodeH(sptr) && IsOper(sptr)) { set_hostmask(sptr); ! } if ((setflags & UMODE_Y) && !IsDeaf(sptr)) *************** *** 3481,3498 **** if ((setflags & UMODE_W) && !IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) { ! sptr->umode &= ~UMODE_W; // bad grammar need to correct it to something better later on -Sheik ! sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are no longer hiding the channels that you're in, on your WHOIS Info from regular users.", ! me.name, sptr->name); ! } - if (!(setflags & UMODE_W) && IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) { sptr->umode |= UMODE_W; - sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are now hiding the channels that you're in, on your WHOIS Info from regular users.", - me.name, sptr->name); } - #ifdef HAVE_SSL --- 3429,3440 ---- if ((setflags & UMODE_W) && !IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) { ! sptr->umode &= ~UMODE_W; ! } if (!(setflags & UMODE_W) && IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) { sptr->umode |= UMODE_W; } #ifdef HAVE_SSL Index: s_debug.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_debug.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** s_debug.c 27 Jun 2005 03:02:34 -0000 1.1.1.1 --- s_debug.c 28 Jun 2005 02:24:00 -0000 1.2 *************** *** 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'; |
|
From: Gabriel B. <sh...@us...> - 2005-06-28 02:24:08
|
Update of /cvsroot/solidircd/solidircd-stable/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23597/include Modified Files: confparse.h struct.h Log Message: bug fixes. yea yea yea. Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/include/struct.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** struct.h 27 Jun 2005 03:02:55 -0000 1.1.1.1 --- struct.h 28 Jun 2005 02:24:00 -0000 1.2 *************** *** 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.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** confparse.h 27 Jun 2005 03:02:53 -0000 1.1.1.1 --- confparse.h 28 Jun 2005 02:24:00 -0000 1.2 *************** *** 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-06-28 02:24:08
|
Update of /cvsroot/solidircd/solidircd-stable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23597 Modified Files: CHANGES Log Message: bug fixes. yea yea yea. Index: CHANGES =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/CHANGES,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CHANGES 27 Jun 2005 03:01:54 -0000 1.1.1.1 --- CHANGES 28 Jun 2005 02:23:59 -0000 1.2 *************** *** 34,38 **** This mode can be applied by the user or an oper. It can decrese bandwidth usage. 22/05/2005 - Added new oper mode +W this mode will hide what channels the oper is in, useful for does who don't like to be stalked. - 21/05/2005 - Readded rquit. 21/05/2005 - Applied a hostmask tweak from Crako thnx. 21/05/2005 - Fixed a minor bug, when user was kicked, it would show on their whois that they were still there. thanks to Crako for reporting this. --- 34,37 ---- |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 19:19:46
|
Update of /cvsroot/solidircd/solidircd-dev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21308/src Modified Files: s_serv.c Log Message: misc. Index: s_serv.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_serv.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** s_serv.c 5 Jun 2005 23:12:38 -0000 1.9 --- s_serv.c 12 Jun 2005 19:19:35 -0000 1.10 *************** *** 456,460 **** sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, " Welcome to %s", Network_Name,"IRC Network"); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); --- 456,460 ---- sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, "Welcome to %s", Network_Name,"IRC Network"); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); *************** *** 462,466 **** sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, " Acceptable Use Policy: \2\2 %s", AUP); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); --- 462,466 ---- sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, "Acceptable Use Policy: \2\2 %s", AUP); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); *************** *** 482,489 **** sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, " Build #%s, compiled on %s", generation, creation); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, " Server been up since %s", myctime (me.firsttime)); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); --- 482,489 ---- sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, "Build #%s, compiled on %s", generation, creation); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); ! ircsprintf (outstr, "Server been up since %s", myctime (me.firsttime)); sendto_one (sptr, rpl_str (RPL_INFO), me.name, parv[0], outstr); |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 19:19:44
|
Update of /cvsroot/solidircd/solidircd-dev/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21308/include Modified Files: patchlevel.h Log Message: misc. Index: patchlevel.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/patchlevel.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** patchlevel.h 13 May 2005 17:18:33 -0000 1.1.1.2 --- patchlevel.h 12 Jun 2005 19:19:35 -0000 1.2 *************** *** 34,38 **** #define PATCH 7 ! #define PATCHES "dev" void build_version(void); --- 34,38 ---- #define PATCH 7 ! #define PATCHES "cvs" void build_version(void); |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 19:07:13
|
Update of /cvsroot/solidircd/solidircd-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12320 Modified Files: CHANGES Log Message: misc updates refer to CHANGES for more information. Index: CHANGES =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/CHANGES,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** CHANGES 12 Jun 2005 18:26:25 -0000 1.22 --- CHANGES 12 Jun 2005 19:07:00 -0000 1.23 *************** *** 19,29 **** ------------------ ! 03/05/2005 - Fixed Non opers can set themselves usermode +H (hidden oper) [ #1194884 ] ! 03/05/2005 - Fixed /ircops shows opers who have set usermode +H (hide operstatus) [ #1194878 ] ! 03/05/2005 - Fixed halfops cannot voice or devoice a user. [ #1193540 ] ------------------------ Changes from Sheik ------------------------- 12/06/2005 - Added Channel mode +E this will block channel notices from users. Credit goes to Kobi_S for this patch. 30/05/2005 - Fixed some typos in s_user.c --- 19,30 ---- ------------------ ! 03/05/2005 - Fixed Non opers can set themselves usermode +H (hidden oper) [ #1194884 ] ! 03/05/2005 - Fixed /ircops shows opers who have set usermode +H (hide operstatus) [ #1194878 ] ! 03/05/2005 - Fixed halfops cannot voice or devoice a user. [ #1193540 ] ------------------------ Changes from Sheik ------------------------- + 12/06/2005 - Applied Doc_Z's patch for new configuration option,"this option prevents users from joining empty channels. This is ideal to lock down networks to one specific purpose or to vet new channels via some form of services system. Please note you will need to define the keyword in the options block, see reference.conf." 12/06/2005 - Added Channel mode +E this will block channel notices from users. Credit goes to Kobi_S for this patch. 30/05/2005 - Fixed some typos in s_user.c |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 19:07:13
|
Update of /cvsroot/solidircd/solidircd-dev/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12320/include Modified Files: confparse.h struct.h Log Message: misc updates refer to CHANGES for more information. Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/struct.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** struct.h 12 Jun 2005 18:26:25 -0000 1.25 --- struct.h 12 Jun 2005 19:07:00 -0000 1.26 *************** *** 783,786 **** --- 783,787 ---- #define FLAGS_LETSMODE_t 0x02000 #define FLAGS_LETSMODE_B 0x04000 + #define FLAGS_OPERCREATECHAN 0x08000 Index: confparse.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/confparse.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** confparse.h 29 May 2005 20:07:52 -0000 1.7 --- confparse.h 12 Jun 2005 19:07:00 -0000 1.8 *************** *** 129,132 **** --- 129,133 ---- /* these are the strings for options ONLY */ + /*the numbers on this configuration needs to be reviewed they seem to be messy. */ #define OPTT_NETNAME "NETWORK_NAME" *************** *** 188,193 **** #define OPTT_AUP "AUP" #define OPTF_AUP 0x500000 ! #define OPTT_RQUIT "rquit" #define OPTF_RQUIT 0x00800000 --- 189,197 ---- #define OPTT_AUP "AUP" #define OPTF_AUP 0x500000 ! #define OPTT_RQUIT "rquit" #define OPTF_RQUIT 0x00800000 + #define OPTT_OPERCREATECHAN "OPER_CREATE_CHAN" + #define OPTF_OPERCREATECHAN 0x400000 + *************** *** 276,281 **** {OPTT_HOSTPREFIX, OPTF_HOSTPREFIX, VARTYPE_NAME}, {OPTT_AUTOUMODEV, OPTF_AUTOUMODEV, VARTYPE_NONE}, ! {OPTT_AUTOUMODER, OPTF_AUTOUMODER, VARTYPE_NONE}, ! {OPTT_HIDDENSERVNAME, OPTF_HIDDENSERVNAME, VARTYPE_NAME}, {OPTT_HIDDENSERVDESC, OPTF_HIDDENSERVDESC, VARTYPE_STRING}, {OPTT_BOTCLASS, OPTF_BOTCLASS, VARTYPE_NAME}, --- 280,285 ---- {OPTT_HOSTPREFIX, OPTF_HOSTPREFIX, VARTYPE_NAME}, {OPTT_AUTOUMODEV, OPTF_AUTOUMODEV, VARTYPE_NONE}, ! {OPTT_AUTOUMODER, OPTF_AUTOUMODER, VARTYPE_NONE}, ! {OPTT_HIDDENSERVNAME, OPTF_HIDDENSERVNAME, VARTYPE_NAME}, {OPTT_HIDDENSERVDESC, OPTF_HIDDENSERVDESC, VARTYPE_STRING}, {OPTT_BOTCLASS, OPTF_BOTCLASS, VARTYPE_NAME}, *************** *** 283,286 **** --- 287,291 ---- {OPTT_WEBSITE, OPTF_WEBSITE, VARTYPE_NAME}, {OPTT_AUP, OPTF_AUP, VARTYPE_NAME}, + {OPTT_OPERCREATECHAN, OPTF_OPERCREATECHAN, VARTYPE_NONE}, {(char *) 0, 0, 0} }; |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 19:07:11
|
Update of /cvsroot/solidircd/solidircd-dev/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12320/doc Modified Files: reference.conf template.conf Log Message: misc updates refer to CHANGES for more information. Index: template.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/doc/template.conf,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** template.conf 30 May 2005 19:13:35 -0000 1.14 --- template.conf 12 Jun 2005 19:07:00 -0000 1.15 *************** *** 41,59 **** auto_umode_R; # Only registered users can query other users. auto_umode_v; # Will automaticly set the hostmaskin mode for users. ! rquit; # Will not allow unregistered users to have a quit message. }; - /* HostMasking options */ - HostMask { - prefix "hidden"; # Prefix, up to 10 characters - - key1 "thisiskey1"; - key2 "thisiskey2"; - key3 "thisiskey3"; - - type "NEW"; # Type of hostmasking. you want to use - }; /* where to listen for connections */ --- 41,50 ---- auto_umode_R; # Only registered users can query other users. auto_umode_v; # Will automaticly set the hostmaskin mode for users. ! rquit; # Will not allow unregistered users to have a quit message. ! oper_create_chan; # Require oper status to make a channel }; /* where to listen for connections */ *************** *** 380,382 **** /* This should be uncommented if TOYS is defined in include/config.h */ ! #include "elmer.conf" \ No newline at end of file --- 371,373 ---- /* This should be uncommented if TOYS is defined in include/config.h */ ! #include "elmer.conf" Index: reference.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/doc/reference.conf,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** reference.conf 30 May 2005 19:13:29 -0000 1.12 --- reference.conf 12 Jun 2005 19:07:00 -0000 1.13 *************** *** 98,101 **** --- 98,102 ---- auto_umode_v; # Will automaticly set the hostmaskin mode for users. rquit; # Will not allow unregistered users to have a quit message. + oper_create_chan; # Require oper status to make a channel *************** *** 196,199 **** --- 197,210 ---- * in multiple Options blocks. If a token is specified twice, the second * value overrides the first. + * + * rquit explination coming soon. + * + * The oper_create_chan token causes the server to return invite only + * channel if a user tries to JOIN an empty channel. This is useful on + * networks that wish to vet new channels or lock their network to a need. + * All client servers on the network must have this flag for it to be + * useful. + * + * */ *************** *** 868,870 **** /* This should be uncommented if TOYS is defined in include/config.h */ ! #include "elmer.conf" \ No newline at end of file --- 879,881 ---- /* This should be uncommented if TOYS is defined in include/config.h */ ! #include "elmer.conf" |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 19:07:11
|
Update of /cvsroot/solidircd/solidircd-dev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12320/src Modified Files: channel.c s_conf.c s_debug.c Log Message: misc updates refer to CHANGES for more information. Index: s_conf.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_conf.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** s_conf.c 30 May 2005 23:21:52 -0000 1.9 --- s_conf.c 12 Jun 2005 19:07:01 -0000 1.10 *************** *** 1095,1098 **** --- 1095,1103 ---- strncpyzt(AUP, tmp->value, sizeof(AUP)); } + else if(tmp->type && (tmp->type->flag & OPTF_OPERCREATECHAN)) + { + tmp->type = NULL; + new_confopts |= FLAGS_OPERCREATECHAN; + } } return lnum; Index: s_debug.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_debug.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** s_debug.c 21 May 2005 21:13:18 -0000 1.2 --- s_debug.c 12 Jun 2005 19:07:01 -0000 1.3 *************** *** 198,201 **** --- 198,203 ---- if ((confopts & FLAGS_WGMON) == FLAGS_WGMON) *s++ = 'w'; + if (confopts & FLAGS_OPERCREATECHAN) + *s++ = 'c'; s += ircsprintf(s, " TS%iow", TS_CURRENT); Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/channel.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** channel.c 12 Jun 2005 18:26:25 -0000 1.19 --- channel.c 12 Jun 2005 19:07:01 -0000 1.20 *************** *** 2932,2935 **** --- 2932,2945 ---- if (MyConnect(sptr)) { + + /* Does this server require new channels to be created by an oper? */ + if(confopts & FLAGS_OPERCREATECHAN) { + /* If the client is a user and the channel doesn't exist then give back invite only. */ + if(!IsOper(sptr) && !ChannelExists(name)) { + sendto_one(sptr, ":%s 473 %s %s :Cannot create channel, prohibited by administration.", me.name, parv[0], name); + continue; + } + } + /* have we quarantined this channel? */ if(!IsOper(sptr) && (ban = check_mask_simbanned(name, SBAN_CHAN))) |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 18:31:58
|
Update of /cvsroot/solidircd/solidircd-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27523 Modified Files: Makefile.in TODO Log Message: minor changes. Index: Makefile.in =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 16 May 2005 07:25:50 -0000 1.2 --- Makefile.in 12 Jun 2005 18:31:44 -0000 1.3 *************** *** 50,54 **** @echo "* For help with solid-ircd, please refer to http://solid-ircd.com *" @echo "* If you wan to come to our dev channel which you're more than welcome to. *" ! @echo "* its irc.vidgamechat.net #Solid *" @echo "******************************************************************************" --- 50,54 ---- @echo "* For help with solid-ircd, please refer to http://solid-ircd.com *" @echo "* If you wan to come to our dev channel which you're more than welcome to. *" ! @echo "* is irc.solid-ircd.com #Solid *" @echo "******************************************************************************" Index: TODO =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/TODO,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** TODO 12 Jun 2005 18:14:06 -0000 1.19 --- TODO 12 Jun 2005 18:31:44 -0000 1.20 *************** *** 27,35 **** Description: This is done needs to be tested more when we start resolving properly. ! [] Channel mode that will block all channel notices. ! Description: ! Being worked on by: ! Progress: Description: --- 27,35 ---- 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. |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 18:26:34
|
Update of /cvsroot/solidircd/solidircd-dev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24508/src Modified Files: channel.c s_user.c Log Message: more updates refer to changes and to do list. Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_user.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** s_user.c 5 Jun 2005 23:12:38 -0000 1.32 --- s_user.c 12 Jun 2005 18:26:26 -0000 1.33 *************** *** 1827,1830 **** --- 1827,1835 ---- if ((ret = can_send(sptr, chptr, parv[2]))) + + // If channel mode +E is set it it shouldn't allow the user to send the notice. + if(notice && (chptr->mode.mode & MODE_NONOTICE)) + ret = 1; + { if (ismine && !notice) Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/channel.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** channel.c 5 Jun 2005 23:12:37 -0000 1.18 --- channel.c 12 Jun 2005 18:26:25 -0000 1.19 *************** *** 1104,1107 **** --- 1104,1109 ---- *mbuf++ = 'L'; #endif + if (chptr->mode.mode & MODE_NONOTICE) + *mbuf++ = 'E'; if (chptr->mode.limit) { *************** *** 1511,1514 **** --- 1513,1517 ---- MODE_LISTED, 'L', #endif + MODE_NONOTICE, 'E', 0x0, 0x0 }; *************** *** 4582,4585 **** --- 4585,4589 ---- SJ_MODEADD('L', MODE_LISTED); #endif + SJ_MODEADD('E', MODE_NONOTICE); case 'k': strncpyzt(mode.key, parv[4 + args], KEYLEN + 1); *************** *** 4740,4748 **** SJ_MODEPLUS('S', MODE_SSL); #endif ! SJ_MODEPLUS('D', MODE_RSL); ! SJ_MODEPLUS('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEPLUS('L', MODE_LISTED); #endif SJ_MODEMINUS('p', MODE_PRIVATE); --- 4744,4753 ---- SJ_MODEPLUS('S', MODE_SSL); #endif ! SJ_MODEPLUS('D', MODE_RSL); ! SJ_MODEPLUS('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEPLUS('L', MODE_LISTED); #endif + SJ_MODEPLUS('E', MODE_NONOTICE); SJ_MODEMINUS('p', MODE_PRIVATE); *************** *** 4765,4768 **** --- 4770,4774 ---- SJ_MODEMINUS('L', MODE_LISTED); #endif + SJ_MODEMINUS('E', MODE_NONOTICE); } |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 18:26:34
|
Update of /cvsroot/solidircd/solidircd-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24508 Modified Files: CHANGES Log Message: more updates refer to changes and to do list. Index: CHANGES =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/CHANGES,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** CHANGES 30 May 2005 05:00:14 -0000 1.21 --- CHANGES 12 Jun 2005 18:26:25 -0000 1.22 *************** *** 26,29 **** --- 26,30 ---- Changes from Sheik ------------------------- + 12/06/2005 - Added Channel mode +E this will block channel notices from users. Credit goes to Kobi_S for this patch. 30/05/2005 - Fixed some typos in s_user.c 30/05/2005 - Added Deaf Mode, This mode will prevent user with said mode from receiving channel messages. *************** *** 328,330 **** - 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 --- 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 |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 18:26:34
|
Update of /cvsroot/solidircd/solidircd-dev/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24508/include Modified Files: struct.h Log Message: more updates refer to changes and to do list. Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/struct.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** struct.h 5 Jun 2005 20:44:27 -0000 1.24 --- struct.h 12 Jun 2005 18:26:25 -0000 1.25 *************** *** 1381,1384 **** --- 1381,1385 ---- #define MODE_SSL 0x100000 #define MODE_RSL 0x200000 + #define MODE_NONOTICE 0x400000 /* mode flags which take another parameter (With PARAmeterS) */ |
|
From: Gabriel B. <sh...@us...> - 2005-06-12 18:14:17
|
Update of /cvsroot/solidircd/solidircd-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19070 Modified Files: TODO Log Message: Todo list update. Index: TODO =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TODO 30 May 2005 04:59:25 -0000 1.18 --- TODO 12 Jun 2005 18:14:06 -0000 1.19 *************** *** 1,5 **** Solid-IRCD 3.4.7 Development Version To do List. ! Last Reviewed by Gabriel Baez(Sheik) on 26/05/2005 ---------------------- --- 1,5 ---- Solid-IRCD 3.4.7 Development Version To do List. ! Last Reviewed by Gabriel Baez(Sheik) on 12/06/2005 ---------------------- *************** *** 22,34 **** ! [/] Channel mode that will prevent unresolved clients from joining. Being worked on by: Sheik ! Progress: 85% Description: ! [/] mlock configuration Description: ! Being worked on by: Sheik ! Progress: 75% Description: --- 22,41 ---- ! [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. ! ! [] Channel mode that will block all channel notices. ! Description: ! Being worked on by: ! Progress: Description: ! ! [] Channel mode that will block all ctcp. Description: ! Being worked on by: ! Progress: Description: *************** *** 67,71 **** [ ] Implement server to server SSL ! Being worked on by: Progress: Description: --- 74,78 ---- [ ] Implement server to server SSL ! Being worked on by: Tux` Progress: Description: *************** *** 91,96 **** [ ] m_kill tweak ! Being worked on by: Sheik ! Progress: 5% Description: If oper is set +H we need to change so that when that oper does a kill it will show the server name instead and not his nick, to protect the oper's identity. -Sheik --- 98,103 ---- [ ] m_kill tweak ! Being worked on by: ! Progress: Description: If oper is set +H we need to change so that when that oper does a kill it will show the server name instead and not his nick, to protect the oper's identity. -Sheik |
|
From: Gabriel B. <sh...@us...> - 2005-06-05 23:12:49
|
Update of /cvsroot/solidircd/solidircd-dev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1941/src Modified Files: channel.c ircd.c s_err.c s_serv.c s_user.c toys.c version.c.SH Log Message: misc updates and code clean up. Index: toys.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/toys.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** toys.c 21 May 2005 23:00:43 -0000 1.2 --- toys.c 5 Jun 2005 23:12:38 -0000 1.3 *************** *** 1,5 **** /* * Solid Internet Relay Chat daemon, src/toys.c ! * Copyright (C) 2004 Juan L. Baez * * This program is free software; you can redistribute it and/or modify --- 1,5 ---- /* * Solid Internet Relay Chat daemon, src/toys.c ! * Copyright (C) 1999-2005 Toshi Morita & Juan L. Baez. * * This program is free software; you can redistribute it and/or modify *************** *** 296,378 **** return 0; } - - - - /* - * m_freeze (stop a user from sending data to the server) - * old freeze needs to be updated a little bit is just here for future use. - */ - /* - int m_freeze(aClient *cptr, aClient *sptr, int parc, char *parv[]) - { - aClient *target; - - if (check_registered(sptr)) - return 0; - - if (parc < 2) - { - sendto_one (sptr, err_str(ERR_NEEDMOREPARAMS), - me.name, parv[0], "FREEZE"); - return 0; - } - - target = find_client (parv[1], NULL); - - if (target == NULL) - { - sendto_one (sptr, err_str (ERR_NOSUCHNICK), - me.name, sptr->name, parv[1]); - return 0; - } - - if (IsServer(cptr)) { - sendto_serv_butone(cptr, ":%s FREEZE :%s", parv[0], parv[1]); - target->user->special= 3; - return 0; - } - - if (!IsOper(sptr)) - { - sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); - return 0; - } - - if (IsServer (target)) - { - - - if (!IsAdmin (sptr)) - { - sendto_one (sptr, err_str (ERR_NOSUCHNICK), - me.name, sptr->name, parv[1]); - return 0; - } - } - - if (IsOper (target)) - { - sendto_ops("%s (%s@%s) tried to FREEZE ircop [%s]", sptr->name, - sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(&me, ":%s GNOTICE :%s (%s@%s) tried to FREEZE ircop [%s]", - me.name, sptr->name, sptr->user->username, sptr->user->host, parv[1]); - return 0; - } - - target->user->special= 3; - #if 0 - sendto_one(target, ":%s NOTICE %s :*** %s waves a magic wand " - "and freezes you",me.name, parv[1], parv[0]); - #endif - sendto_ops("%s (%s@%s) added SILENT FREEZE on [%s]", sptr->name, - sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(&me, ":%s GLOBOPS :%s (%s@%s) added SILENT FREEZE on [%s]", - me.name, sptr->name, sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(cptr, ":%s FREEZE %s", IsServer(cptr) ? parv[0] : me.name, parv[1]); - - return 0; - } - */ --- 296,297 ---- Index: version.c.SH =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/version.c.SH,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** version.c.SH 21 May 2005 14:59:47 -0000 1.4 --- version.c.SH 5 Jun 2005 23:12:38 -0000 1.5 *************** *** 58,64 **** ! "-------------------------------------------------------------------------------------------", ! "| $package (Internet Relay Chat)", ! "| Based on the original code written by Jarkko Oikarinen ", "| Copyright 1988, 1989, 1990, 1991 University of Oulu, Computing Center ", "| ", --- 58,64 ---- ! "+-----------------------------------------------------------------------------------------", ! "| $package (Internet Relay Chat) ", ! "| Based on the original code written by Jarkko Oikarinen ", "| Copyright 1988, 1989, 1990, 1991 University of Oulu, Computing Center ", "| ", *************** *** 66,70 **** "| 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. ", "|-----------------------------------------------------------------------------------------", "| Regular expression support is provided by the PCRE library package, ", --- 66,70 ---- "| 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. ", "|-----------------------------------------------------------------------------------------", "| Regular expression support is provided by the PCRE library package, ", *************** *** 72,121 **** "| by the University of Cambridge, England. ", "|-----------------------------------------------------------------------------------------", ! "| ", ! "| ", ! "| Solid IRCd is an Internet Relay Chat Daemond based on bahamut IRCd developed ", ! "| by the bahamut team. Our main goal is to provide users with a stable server, and ", ! "| at the same time, a more secure server, while having all the features of bahamut ", ! "| and more. solid-ircd can be obtained at http://www.solid-ircd.com ", ! "|----------------------------------------------------------------------------------------", ! "| Solid IRCd is brough to you by the following people: ", ! "| ", ! "| Senior Lead Coders: ", ! "| tm2 <tm...@so...> ", ! "| Tux <tu...@so...> ", ! "| The_Sphere <sol...@dm...> ", ! "|----------------------------------------------------------------------------------------", ! "| ", ! "| Project Manager ", ! "| Sheik <sh...@so...> ", ! "|----------------------------------------------------------------------------------------", ! "| ", ! "| Translators & Documents Team ", ! "| dc <dc...@so...> ", ! "| pi <pi...@so...> ", ! "| mj <mj...@so...> ", ! "|----------------------------------------------------------------------------------------", ! "| ", ! "| Quality Assurance Team ", ! "| Waqario ", ! "| Trystan ", ! "| Fl00k ", ! "| BarkerJr ", ! "|----------------------------------------------------------------------------------------", ! "| ", ! "| Contributors ", ! "| NeoGandalf ", ! "| Mark (Ma...@fr...) ", ! "| bamaboy ", ! "| Crako ", ! "|----------------------------------------------------------------------------------------", ! "| ", ! "| DALnet Credits - Type /dalinfo ", ! "| ", ! "| If you find any bugs please email ir...@so... ", ! "| or use our bug report system at our site. ", ! "| ", ! "| solid-ircd homepage: http://wwww.solid-ircd.com ", ! "-----------------------------------------------------------------------------------------", 0 }; --- 72,121 ---- "| by the University of Cambridge, England. ", "|-----------------------------------------------------------------------------------------", ! "| ", ! "| ", ! "| Solid IRCd is an Internet Relay Chat Daemond based on bahamut IRCd developed ", ! "| by the bahamut team. Our main goal is to provide users with a stable server, and ", ! "| at the same time, a more secure server, while having all the features of bahamut ", ! "| and more. solid-ircd can be obtained at http://www.solid-ircd.com ", ! "|-----------------------------------------------------------------------------------------", ! "| Solid IRCd is brought to you by the following people: ", ! "| ", ! "| Senior Lead Developers: ", ! "| tm2 <tm...@so...> ", ! "| Tux <tu...@so...> ", ! "| The_Sphere <sol...@dm...> ", ! "|-----------------------------------------------------------------------------------------", ! "| ", ! "| Project Manager ", ! "| Sheik <sh...@so...> ", ! "|-----------------------------------------------------------------------------------------", ! "| ", ! "| Translators & Documents Team ", ! "| dc <dc...@so...> ", ! "| pi <pi...@so...> ", ! "| mj <mj...@so...> ", ! "|-----------------------------------------------------------------------------------------", ! "| ", ! "| Quality Assurance Team ", ! "| Waqario ", ! "| Trystan ", ! "| Fl00k ", ! "| ", ! "|-----------------------------------------------------------------------------------------", ! "| ", ! "| Contributors ", ! "| NeoGandalf ", ! "| Mark (Ma...@fr...) ", ! "| bamaboy ", ! "| Crako ", ! "|-----------------------------------------------------------------------------------------", ! "| ", ! "| DALnet Credits - Type /dalinfo ", ! "| ", ! "| If you find any bugs please email ir...@so... ", ! "| or use our bug report system at our site. ", ! "| ", ! "| solid-ircd homepage: http://wwww.solid-ircd.com ", ! "------------------------------------------------------------------------------------------", 0 }; Index: s_err.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_err.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** s_err.c 29 May 2005 22:24:39 -0000 1.6 --- s_err.c 5 Jun 2005 23:12:38 -0000 1.7 *************** *** 27,31 **** "version %s", /* 003 RPL_CREATED */ ":%s 003 %s :This server was created %s", ! /* 004 RPL_MYINFO */ ":%s 004 %s %s %s aAbcCdefFghHiIjkKmnoOrRsvwxXy " "bceiIjklLmMnoOprRstv", /* 005 RPL_ISUPPORT */ ":%s 005 %s %s :are available on this server", --- 27,31 ---- "version %s", /* 003 RPL_CREATED */ ":%s 003 %s :This server was created %s", ! /* 004 RPL_MYINFO */ ":%s 004 %s %s %s aAbcCdefFghHiIjkKmnoOrRsvwxXy " "bceiIjklLmMnoOprRstv", /* 005 RPL_ISUPPORT */ ":%s 005 %s %s :are available on this server", *************** *** 221,227 **** /* 195 */ NULL, #ifdef HAVE_SSL ! /* 196 RPL_MAP */ "%s 015 %s :%s%-*s (Users:%5d) (%2d%%) (Users IPv6:%5d) ( %2d%%) (Users SSL:%5d) (%2d%%) ", #else ! /* 196 RPL_MAP */ ":%s 015 %s :%s%-*s (Users:%5d) (%2d%%) (Users IPv6:%5d) ( %2d%%) ", #endif /* 197 RPL_MAPEND */ ":%s 197 %s :End of /MAP", --- 221,227 ---- /* 195 */ NULL, #ifdef HAVE_SSL ! /* 196 RPL_MAP */ "%s 015 %s :%s%-*s (Normal Clients:%5d) (%2d%%) (IPv6 Clients:%5d) ( %2d%%) (SSL Clients:%5d) (%2d%%) ", #else ! /* 196 RPL_MAP */ ":%s 015 %s :%s%-*s (Clients:%5d) (%2d%%) (IPv6 Clients:%5d) ( %2d%%) ", #endif /* 197 RPL_MAPEND */ ":%s 197 %s :End of /MAP", *************** *** 359,363 **** /* 323 RPL_LISTEND */ ":%s 323 %s :End of /LIST", /* 324 RPL_CHANNELMODEIS */ ":%s 324 %s %s %s %s", ! /* 325 RPL_WHOISSMODES*/ ":%s 325 %s %s is using smodes [%s]", /* 326 */ NULL, /* 327 */ NULL, --- 359,363 ---- /* 323 RPL_LISTEND */ ":%s 323 %s :End of /LIST", /* 324 RPL_CHANNELMODEIS */ ":%s 324 %s %s %s %s", ! /* 325 */ NULL, /* 326 */ NULL, /* 327 */ NULL, *************** *** 469,473 **** /* 419 */ NULL, /* 420 */ NULL, ! /* 421 ERR_UNKNOWNCOMMAND */ ":%s 421 %s %s :Unknown command", /* 422 ERR_NOMOTD */ ":%s 422 %s :MOTD File is missing", /* 423 ERR_NOADMININFO */ ":%s 423 %s %s :No administrative info " --- 469,473 ---- /* 419 */ NULL, /* 420 */ NULL, ! /* 421 ERR_UNKNOWNCOMMAND */ ":%s 421 %s %s :Unknown command", /* 422 ERR_NOMOTD */ ":%s 422 %s :MOTD File is missing", /* 423 ERR_NOADMININFO */ ":%s 423 %s %s :No administrative info " *************** *** 1078,1082 **** /* 997 */ NULL, /* 998 */ NULL, ! /* 999 */ ":%s 999 %s Numeric error! yikes!", /* 1000 */ NULL }; --- 1078,1082 ---- /* 997 */ NULL, /* 998 */ NULL, ! /* 999 */ ":%s 999 %s Numeric error! yikes! !woopie!", /* 1000 */ NULL }; Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/channel.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** channel.c 30 May 2005 23:21:52 -0000 1.17 --- channel.c 5 Jun 2005 23:12:37 -0000 1.18 *************** *** 1096,1103 **** if (chptr->mode.mode & MODE_RSL) *mbuf++ = 'D'; ! ! ! if (chptr->mode.mode & MODE_NONICK) ! *mbuf++ = 'N'; if (chptr->mode.mode & MODE_MODREG) *mbuf++ = 'M'; --- 1096,1101 ---- if (chptr->mode.mode & MODE_RSL) *mbuf++ = 'D'; ! if (chptr->mode.mode & MODE_NONICK) ! *mbuf++ = 'N'; if (chptr->mode.mode & MODE_MODREG) *mbuf++ = 'M'; *************** *** 1322,1326 **** if (l->flags & MODE_CHANOP) *t++ = '@'; ! if (l->flags & MODE_HALFOP) *t++ = '%'; if (l->flags & MODE_VOICE) --- 1320,1324 ---- if (l->flags & MODE_CHANOP) *t++ = '@'; ! if (l->flags & MODE_HALFOP) *t++ = '%'; if (l->flags & MODE_VOICE) *************** *** 1414,1418 **** if (IsULine(sptr) && !MyClient(sptr)) ! chanop=4; /* extra speshul access */ else if (IsOper(sptr) && !is_chan_op(sptr, chptr) && !is_halfop(sptr,chptr) && !IsULine(sptr)) chanop=3; --- 1412,1416 ---- if (IsULine(sptr) && !MyClient(sptr)) ! chanop=4; /* extra speshul access */ else if (IsOper(sptr) && !is_chan_op(sptr, chptr) && !is_halfop(sptr,chptr) && !IsULine(sptr)) chanop=3; *************** *** 1459,1476 **** break; default: ! /* Les give this oper mode another try using the old code.. 17/05/2005 -Sheik */ ! if (chanop == 3 && MyClient(sptr)) ! sendto_ops("OperMode on Channel (%s), by %s. Modes: %s%s%s", ! chptr->chname, parv[0], modebuf, (*parabuf!=0 ? " " : ""), parabuf); - sendto_channel_butserv_me(chptr, sptr, - ":%s MODE %s %s %s", parv[0], - chptr->chname, modebuf, - parabuf); sendto_serv_butone(cptr, ":%s MODE %s %ld %s %s", parv[0], ! chptr->chname, chptr->channelts, modebuf, ! parabuf); } return 0; --- 1457,1473 ---- break; default: ! /* Les give this oper mode another try using the old code.. 17/05/2005 -Sheik ! * This old format seems to be 95% corect -Sheik June 05 2005 ! */ ! if (chanop == 3 && MyClient(sptr)) ! sendto_ops("OperMode on Channel (%s), by %s. Modes: %s%s%s", ! chptr->chname, parv[0], modebuf, (*parabuf!=0 ? " " : ""), parabuf); + sendto_channel_butserv_me(chptr, sptr, ":%s MODE %s %s %s", parv[0], + chptr->chname, modebuf, parabuf); sendto_serv_butone(cptr, ":%s MODE %s %ld %s %s", parv[0], ! chptr->chname, chptr->channelts, modebuf, parabuf); } return 0; *************** *** 1485,1493 **** int level, int parc, char *parv[], char *mbuf, char *pbuf) { ! #define SM_ERR_NOPRIVS 0x0001 /* is not an op */ ! #define SM_ERR_MOREPARMS 0x0002 /* needs more parameters */ #define SM_ERR_RESTRICTED 0x0004 /* not allowed to op others or be op'd */ #define SM_ERR_NOTOPER 0x0008 /* not an irc op */ ! #ifdef HAVE_SSL #define SM_ERR_SSL 0x0010 /* SSL Only*/ #define SM_ERR_RSL 0x0020 /* RSL(Resolvoled Clients) Only*/ --- 1482,1491 ---- int level, int parc, char *parv[], char *mbuf, char *pbuf) { ! ! #define SM_ERR_NOPRIVS 0x0001 /* is not an op */ ! #define SM_ERR_MOREPARMS 0x0002 /* needs more parameters */ #define SM_ERR_RESTRICTED 0x0004 /* not allowed to op others or be op'd */ #define SM_ERR_NOTOPER 0x0008 /* not an irc op */ ! #ifdef HAVE_SSL #define SM_ERR_SSL 0x0010 /* SSL Only*/ #define SM_ERR_RSL 0x0020 /* RSL(Resolvoled Clients) Only*/ *************** *** 1501,1509 **** static int flags[] = { ! MODE_PRIVATE, 'p', MODE_SECRET, 's', ! MODE_MODERATED, 'm', MODE_NOPRIVMSGS, 'n', MODE_TOPICLIMIT, 't', MODE_REGONLY, 'R', MODE_INVITEONLY, 'i', MODE_NOCTRL, 'c', MODE_OPERONLY, 'O', ! MODE_MODREG, 'M', MODE_NONICK, 'N', MODE_RSL, 'D', #ifdef HAVE_SSL MODE_SSL, 'S', --- 1499,1507 ---- static int flags[] = { ! MODE_PRIVATE, 'p', MODE_SECRET, 's', ! MODE_MODERATED, 'm', MODE_NOPRIVMSGS, 'n', MODE_TOPICLIMIT, 't', MODE_REGONLY, 'R', MODE_INVITEONLY, 'i', MODE_NOCTRL, 'c', MODE_OPERONLY, 'O', ! MODE_MODREG, 'M', MODE_NONICK, 'N', MODE_RSL, 'D', #ifdef HAVE_SSL MODE_SSL, 'S', *************** *** 1608,1612 **** #endif ! //This channel mode is to block unresolved isp clients from joining the channel. Its not complete yet. case 'D': --- 1606,1613 ---- #endif ! /* Added by Gabriel Baez On May 23 2005. ! * +D will prevent users who have been marke as unresolved clients, from joining the channel. ! * This is one of my favorite modes. -Sheik June 05 2005. ! */ case 'D': *************** *** 1616,1625 **** break; } ! else if (MyClient(sptr) && IsURSL(sptr) && !IsOper(sptr)) { errors |= SM_ERR_RSL; break; } ! else { if (change=='+') --- 1617,1626 ---- break; } ! else if (MyClient(sptr) && IsURSL(sptr) && !IsOper(sptr)) /* If you're not a oper, then stay out! -Sheik */ { errors |= SM_ERR_RSL; break; } ! else { if (change=='+') *************** *** 1632,1636 **** break; - case 'O': if (!IsULine(sptr) && (level<2 || !IsOper(sptr))) --- 1633,1636 ---- *************** *** 2405,2409 **** #ifdef HAVE_SSL if(errors & SM_ERR_SSL) ! sendto_one(sptr,":%s NOTICE %s :*** Notice -- +S is " "restricted to SSL Connections only.", me.name, sptr->name); --- 2405,2409 ---- #ifdef HAVE_SSL if(errors & SM_ERR_SSL) ! sendto_one(sptr,":%s NOTICE %s :*** Notice -- This channel has (+S) set, which means that is" "restricted to SSL Connections only.", me.name, sptr->name); *************** *** 2412,2416 **** if(errors & SM_ERR_RSL) sendto_one(sptr,":%s NOTICE %s :*** Notice -- Permission denied" ! "-Only IRCops & Resolved users can set +D", me.name, sptr->name); } --- 2412,2417 ---- if(errors & SM_ERR_RSL) sendto_one(sptr,":%s NOTICE %s :*** Notice -- Permission denied" ! "This channel has (+D) set, and you have been marked has an unresolved client" ! "there for you may not join this channel.", me.name, sptr->name); } *************** *** 2485,2491 **** error = ERR_RSL; - - - #ifdef INVITE_LISTS if (error && is_invited(sptr, chptr)) --- 2486,2489 ---- *************** *** 3378,3383 **** if (is_only_halfop(sptr, chptr) && (is_chan_op(who,chptr) || is_halfop(who,chptr))) { ! sendto_one(sptr, ":%s NOTICE %s :Could not kick %s, halfops can't kick chanops or halfops", ! me.name, parv[0], who->name); } else --- 3376,3387 ---- if (is_only_halfop(sptr, chptr) && (is_chan_op(who,chptr) || is_halfop(who,chptr))) { ! sendto_one (who, ! ":%s NOTICE %s :*** Notice -- %s attempted to kick you. You are a channel operator, and can't be" ! " kicked by a half operator", ! me.name, who->name, sptr->name); // this will help out paranoid channel operators -Sheik. ! ! sendto_one(sptr, ":%s NOTICE %s :*** Notice -- You can't kick %s, as a halfop you can't kick" ! " channel operators and half operators.", ! me.name, parv[0], who->name); } else *************** *** 3811,3815 **** static char *usage[] = { ! " Usage: /raw LIST options (on mirc) or /quote LIST options (ircII)", "", "If you don't include any options, the default is to send you the", --- 3815,3819 ---- static char *usage[] = { ! "Usage: /raw LIST options (on mirc) or /quote LIST options (ircII)", "", "If you don't include any options, the default is to send you the", *************** *** 4573,4581 **** SJ_MODEADD('S', MODE_SSL); #endif ! ! SJ_MODEADD('D', MODE_RSL); ! ! ! SJ_MODEADD('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEADD('L', MODE_LISTED); --- 4577,4582 ---- SJ_MODEADD('S', MODE_SSL); #endif ! SJ_MODEADD('D', MODE_RSL); ! SJ_MODEADD('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEADD('L', MODE_LISTED); *************** *** 4739,4746 **** SJ_MODEPLUS('S', MODE_SSL); #endif - SJ_MODEPLUS('D', MODE_RSL); ! ! SJ_MODEPLUS('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEPLUS('L', MODE_LISTED); --- 4740,4745 ---- SJ_MODEPLUS('S', MODE_SSL); #endif SJ_MODEPLUS('D', MODE_RSL); ! SJ_MODEPLUS('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEPLUS('L', MODE_LISTED); *************** *** 4761,4768 **** SJ_MODEMINUS('S', MODE_SSL); #endif - SJ_MODEMINUS('D', MODE_RSL); ! ! SJ_MODEMINUS('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEMINUS('L', MODE_LISTED); --- 4760,4765 ---- SJ_MODEMINUS('S', MODE_SSL); #endif SJ_MODEMINUS('D', MODE_RSL); ! SJ_MODEMINUS('N', MODE_NONICK); #ifdef USE_CHANMODE_L SJ_MODEMINUS('L', MODE_LISTED); Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_user.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** s_user.c 5 Jun 2005 20:44:28 -0000 1.31 --- s_user.c 5 Jun 2005 23:12:38 -0000 1.32 *************** *** 1343,1347 **** "gif", "png", ! "jpg" NULL }; --- 1343,1347 ---- "gif", "png", ! "jpg", NULL }; *************** *** 2217,2221 **** if (IsUmodey(acptr)) ! sendto_one(acptr, ":%s NOTICE %s :*** Notice -- /WHOIS command used on you by: %s (%s@%s)", me.name, acptr->name, sptr->name, sptr->user->username, sptr->user->realhost); --- 2217,2221 ---- if (IsUmodey(acptr)) ! sendto_one(acptr, ":%s NOTICE %s :*** Notice -- /WHOIS command used on you by: %s (%s@%s)", me.name, acptr->name, sptr->name, sptr->user->username, sptr->user->realhost); *************** *** 2316,2321 **** } - - if (buf[0] != '\0') sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, --- 2316,2319 ---- *************** *** 2367,2380 **** sendto_one(sptr, rpl_str(RPL_ISSSL), me.name, parv[0], name); #endif ! //if (!(IsOper(acptr)) && (IsSmodeB(acptr))) ! // if (IsSmodeB(acptr)) ! // sendto_one(sptr, rpl_str(RPL_ISRSL), me.name, parv[0], name); ! ! if (!(IsOper(acptr)) && (IsURSL(acptr))) ! // if (IsURSL(acptr)) ! sendto_one(sptr, rpl_str(RPL_ISNOTRSL), me.name, parv[0], name); ! ! /* don't give away that this oper is on this server if they're hidden! */ if (acptr->user && MyConnect(acptr) && ((sptr == acptr) || --- 2365,2371 ---- sendto_one(sptr, rpl_str(RPL_ISSSL), me.name, parv[0], name); #endif ! if (!(IsOper(acptr)) && (IsURSL(acptr))) ! sendto_one(sptr, rpl_str(RPL_ISNOTRSL), me.name, parv[0], name); /* don't give away that this oper is on this server if they're hidden! */ if (acptr->user && MyConnect(acptr) && ((sptr == acptr) || *************** *** 2382,2386 **** sendto_one(sptr, rpl_str(RPL_WHOISIDLE), me.name, parv[0], name, timeofday - user->last, acptr->firsttime); - continue; } --- 2373,2376 ---- *************** *** 2389,2394 **** } - - /* * m_user --- 2379,2382 ---- *************** *** 2399,2402 **** --- 2387,2391 ---- * parv[4] = users real name info */ + int m_user(aClient *cptr, aClient *sptr, int parc, char *parv[]) *************** *** 2441,2446 **** user = make_user(sptr); oflags = sptr->umode; ! ! /* * changed the goto into if-else... -Taner --- 2430,2434 ---- user = make_user(sptr); oflags = sptr->umode; ! /* * changed the goto into if-else... -Taner *************** *** 2469,2474 **** if (confopts & FLAGS_AUTOUMODE_v) SetUmodev(sptr); ! ! if (confopts & FLAGS_AUTOUMODE_R) SetNoNonReg(sptr); --- 2457,2461 ---- if (confopts & FLAGS_AUTOUMODE_v) SetUmodev(sptr); ! if (confopts & FLAGS_AUTOUMODE_R) SetNoNonReg(sptr); *************** *** 2487,2491 **** sptr->umode |= (UFLAGS & atoi(host)); - strncpyzt(user->host, host, sizeof(user->host)); strncpyzt(user->realhost, host, sizeof(user->host)); --- 2474,2477 ---- *************** *** 2493,2497 **** } strncpyzt(sptr->info, realname, sizeof(sptr->info)); - sptr->user->servicestamp = serviceid; if (!MyConnect(sptr)) { --- 2479,2482 ---- *************** *** 2504,2509 **** throttle_check(mydummy, -1, sptr->tsinfo); #endif ! } else ! { /* ipv6 */ ip++; --- 2489,2495 ---- throttle_check(mydummy, -1, sptr->tsinfo); #endif ! } ! else ! { /* ipv6 */ ip++; Index: ircd.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/ircd.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** ircd.c 13 May 2005 17:17:56 -0000 1.1.1.2 --- ircd.c 5 Jun 2005 23:12:38 -0000 1.2 *************** *** 677,680 **** --- 677,683 ---- printf("Security related issues should be sent to ir...@so...\n"); printf("All other issues should be sent to bugtracker\n\n"); + #ifdef HAVE_SSL + fprintf (stderr, "Built with %s\n", OPENSSL_VERSION_TEXT); + #endif setup_corefile(); Index: s_serv.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_serv.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** s_serv.c 29 May 2005 21:05:42 -0000 1.8 --- s_serv.c 5 Jun 2005 23:12:38 -0000 1.9 *************** *** 3857,3863 **** } ! /* svident and setident are based on the code by Mouse * Added on 04/22/05 -Sheik ! * m_svident * parv[0] = sender * parv[1] = nickname --- 3857,3863 ---- } ! /* svident and setident are based on the code by Mouse * Added on 04/22/05 -Sheik ! * m_svident * parv[0] = sender * parv[1] = nickname *************** *** 3875,3880 **** return 0; if (MyClient(sptr)) ! { ! if (!IsAnOper(sptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); --- 3875,3880 ---- return 0; if (MyClient(sptr)) ! { ! if (!IsAnOper(sptr)) /* If its not an oper then access denied.*/ { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); *************** *** 3882,3888 **** } else ! if (MyClient(sptr)) { ! if (IsAnOper(sptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); --- 3882,3888 ---- } else ! if (MyClient(sptr)) { ! if (IsAnOper(sptr)) /* If its a oper then, do nothing, only Ulined servers can use this. */ { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); *************** *** 3963,3968 **** } - - if ((acptr = find_person(parv[1], NULL))) { --- 3963,3966 ---- *************** *** 3993,3996 **** --- 3991,3995 ---- ** */ + #ifdef IRCOP_LIST *************** *** 4002,4012 **** int locals = 0; int globals = 0; - if (!MyClient(sptr)) return 0; ! ! strcpy (buf, "+-------------------------+ Online IRC Operators +----------------------------+"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); ! strcpy (buf, "\2Nick Status Server\2"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); strcpy (buf, "+--------------------------------------------------------------------------------+"); --- 4001,4009 ---- int locals = 0; int globals = 0; if (!MyClient(sptr)) return 0; ! strcpy (buf, "+-------------------------+ Online IRC Operators +-------------------------------+"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); ! strcpy (buf, "\2Nick Status Server\2"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); strcpy (buf, "+--------------------------------------------------------------------------------+"); *************** *** 4015,4019 **** for (acptr = client; acptr; acptr = acptr->next) { - // if (!(IsULine (acptr)) && !(IsUmodeH (acptr))) && IsAnOper(acptr)) if (!(IsULine (acptr)) && (IsAnOper(acptr) && !IsUmodeH (acptr))) { --- 4012,4015 ---- *************** *** 4021,4025 **** continue; ! ircsprintf (buf, "\2%-30s\2 %s %-8s %s", acptr->name ? acptr->name : "<Unknown>", IsOper (acptr) ? "Global" : "Local", --- 4017,4021 ---- continue; ! ircsprintf (buf, "\2%-30s\2 %s %-8s %s", acptr->name ? acptr->name : "<Unknown>", IsOper (acptr) ? "Global" : "Local", *************** *** 4041,4045 **** globals > 1 ? "ls" : "l", locals, locals > 1 ? "ls" : "l"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); ! strcpy (buf, "+----------------------------------------------------------------------------------+"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); sendto_one (sptr, rpl_str (RPL_ENDOFIRCOPS), me.name, parv[0]); --- 4037,4041 ---- globals > 1 ? "ls" : "l", locals, locals > 1 ? "ls" : "l"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); ! strcpy (buf, "+--------------------------------------------------------------------------------+"); sendto_one (sptr, rpl_str (RPL_IRCOPS), me.name, parv[0], buf); sendto_one (sptr, rpl_str (RPL_ENDOFIRCOPS), me.name, parv[0]); *************** *** 4069,4073 **** char *tmp =NULL; *p = '\0'; ! if (prompt_length > 60) sendto_one(cptr, ":%s 017 %s :%s%-*s --> *more*", me.name, cptr->name, prompt, server->name); --- 4065,4069 ---- char *tmp =NULL; *p = '\0'; ! if (prompt_length > 60) sendto_one(cptr, ":%s 017 %s :%s%-*s --> *more*", me.name, cptr->name, prompt, server->name); *************** *** 4192,4204 **** if (IsServer(acptr) && (strlen(acptr->name) + acptr->hopcount * 2) > longest) longest = strlen(acptr->name) + acptr->hopcount * 2; - - if (longest > 60) - longest = 60; longest += 2; sendto_one(cptr, ":%s 016 %s :Connected servers:", me.name, cptr->name); ! sendto_one(cptr, ":%s 016 %s :====================================", me.name, cptr->name); dump_map(sptr, &me, parv[1], 0, longest); ! sendto_one(cptr, ":%s 016 %s :====================================", me.name, cptr->name); sendto_one(sptr, rpl_str(RPL_MAPEND), me.name, parv[0]); --- 4188,4199 ---- if (IsServer(acptr) && (strlen(acptr->name) + acptr->hopcount * 2) > longest) longest = strlen(acptr->name) + acptr->hopcount * 2; + if (longest > 60) + longest = 60; longest += 2; sendto_one(cptr, ":%s 016 %s :Connected servers:", me.name, cptr->name); ! sendto_one(cptr, ":%s 016 %s :========================================================", me.name, cptr->name); dump_map(sptr, &me, parv[1], 0, longest); ! sendto_one(cptr, ":%s 016 %s :========================================================", me.name, cptr->name); sendto_one(sptr, rpl_str(RPL_MAPEND), me.name, parv[0]); |
|
From: Gabriel B. <sh...@us...> - 2005-06-05 23:12:46
|
Update of /cvsroot/solidircd/solidircd-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1941 Modified Files: CHANGES.conf Log Message: misc updates and code clean up. Index: CHANGES.conf =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/CHANGES.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGES.conf 21 May 2005 21:13:17 -0000 1.2 --- CHANGES.conf 5 Jun 2005 23:12:37 -0000 1.3 *************** *** 7,11 **** ADDED THE FOLLOWING LINES ! local_clones 1:15; # Default maximum local IP:site clones HELPCHAN "#help"; # Official Network Help Channel will be shown in /help and /info --- 7,11 ---- ADDED THE FOLLOWING LINES ! global_clones 1:15; local_clones 1:15; # Default maximum local IP:site clones HELPCHAN "#help"; # Official Network Help Channel will be shown in /help and /info *************** *** 46,48 **** locop_host "LocOp.VidGameChat.Net"; # Local Operator's hostmask ! we now use this instead: staff_address staff.vidgamechat.net; # Opermask hostname \ No newline at end of file --- 46,48 ---- locop_host "LocOp.VidGameChat.Net"; # Local Operator's hostmask ! we now use this instead: staff_address staff.vidgamechat.net; # Opermask hostname |
|
From: Gabriel B. <sh...@us...> - 2005-06-05 20:44:41
|
Update of /cvsroot/solidircd/solidircd-dev/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15421/include Modified Files: h.h struct.h Log Message: code clean up and comment updates. Index: h.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/h.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** h.h 30 May 2005 23:21:47 -0000 1.7 --- h.h 5 Jun 2005 20:44:27 -0000 1.8 *************** *** 370,379 **** E time_t timeofday; ! E int in6_is_addr_loopback(uint32_t *f); E void add_local_domain(char *hname, int size); E void report_error(char *text, aClient * cptr); E void report_listener_error(char *text, aListener *lptr); E void open_listeners(); ! E int add_listener(aPort *aport); E void close_listener(aListener *lptr); E void close_listeners(); --- 370,379 ---- E time_t timeofday; ! E int in6_is_addr_loopback(uint32_t *f); E void add_local_domain(char *hname, int size); E void report_error(char *text, aClient * cptr); E void report_listener_error(char *text, aListener *lptr); E void open_listeners(); ! E int add_listener(aPort *aport); E void close_listener(aListener *lptr); E void close_listeners(); *************** *** 385,389 **** E void close_connection(aClient *cptr); E void reset_sock_opts(int fd, int type); ! E int get_sockerr(aClient * cptr); E char *irc_get_sockerr(aClient *cptr); E void set_non_blocking(int fd, aClient * cptr); --- 385,389 ---- E void close_connection(aClient *cptr); E void reset_sock_opts(int fd, int type); ! E int get_sockerr(aClient * cptr); E char *irc_get_sockerr(aClient *cptr); E void set_non_blocking(int fd, aClient * cptr); Index: struct.h =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/include/struct.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** struct.h 4 Jun 2005 15:37:34 -0000 1.23 --- struct.h 5 Jun 2005 20:44:27 -0000 1.24 *************** *** 238,247 **** #define FLAGS_HAVERECVQ 0x000040 /* Client has full commands in their recvq */ #define FLAGS_DOINGDNS 0x000080 /* client is waiting for a DNS response */ ! #define FLAGS_AUTH 0x000100 /* client is waiting on rfc931 response */ #define FLAGS_WRAUTH 0x000200 /* set if we havent writen to ident server */ ! #define FLAGS_LOCAL 0x000400 /* set for local clients */ ! #define FLAGS_GOTID 0x000800 /* successful ident lookup achieved */ ! #define FLAGS_DOID 0x001000 /* I-lines say must use ident return */ ! #define FLAGS_NONL 0x002000 /* No \n in buffer */ #define FLAGS_NORMALEX 0x004000 /* Client exited normally */ #define FLAGS_SENDQEX 0x008000 /* Sendq exceeded */ --- 238,247 ---- #define FLAGS_HAVERECVQ 0x000040 /* Client has full commands in their recvq */ #define FLAGS_DOINGDNS 0x000080 /* client is waiting for a DNS response */ ! #define FLAGS_AUTH 0x000100 /* client is waiting on rfc931 response */ #define FLAGS_WRAUTH 0x000200 /* set if we havent writen to ident server */ ! #define FLAGS_LOCAL 0x000400 /* set for local clients */ ! #define FLAGS_GOTID 0x000800 /* successful ident lookup achieved */ ! #define FLAGS_DOID 0x001000 /* I-lines say must use ident return */ ! #define FLAGS_NONL 0x002000 /* No \n in buffer */ #define FLAGS_NORMALEX 0x004000 /* Client exited normally */ #define FLAGS_SENDQEX 0x008000 /* Sendq exceeded */ *************** *** 393,397 **** #define USER_UMODES (UMODE_i|UMODE_v|UMODE_R|UMODE_Y) ! /* modes only opers can have */ /* modes only opers can have */ --- 393,397 ---- #define USER_UMODES (UMODE_i|UMODE_v|UMODE_R|UMODE_Y) ! /* modes only opers can have */ *************** *** 400,408 **** #define OPER_UMODES (UMODE_a|UMODE_b|UMODE_c|UMODE_d|UMODE_e|UMODE_f|UMODE_g|\ UMODE_h|UMODE_j|UMODE_m|UMODE_n|UMODE_y|UMODE_A|UMODE_F|\ ! UMODE_K|UMODE_H|UMODE_C|UMODE_W) #else ! #define OPER_UMODES (UMODE_a|UMODE_b|UMODE_c|UMODE_d|UMODE_f|UMODE_g|\ UMODE_h|UMODE_j|UMODE_m|UMODE_n|UMODE_y|UMODE_A|UMODE_F|\ ! UMODE_K|UMODE_H|UMODE_C|UMODE_W) #endif --- 400,408 ---- #define OPER_UMODES (UMODE_a|UMODE_b|UMODE_c|UMODE_d|UMODE_e|UMODE_f|UMODE_g|\ UMODE_h|UMODE_j|UMODE_m|UMODE_n|UMODE_y|UMODE_A|UMODE_F|\ ! UMODE_K|UMODE_H|UMODE_C|UMODE_W|UMODE_s|UMODE_w) #else ! #define OPER_UMODES (UMODE_a|UMODE_b|UMODE_c|UMODE_d|UMODE_f|UMODE_g|\ UMODE_h|UMODE_j|UMODE_m|UMODE_n|UMODE_y|UMODE_A|UMODE_F|\ ! UMODE_K|UMODE_H|UMODE_C|UMODE_W|UMODE_s|UMODE_w) #endif *************** *** 471,476 **** #define SetUmodeW(x) ((x)->umode |= UMODE_W) - - #define SetNoNonReg(x) ((x)->umode |= UMODE_R) #define SetSAdmin(x) ((x)->umode |= UMODE_a) --- 471,474 ---- *************** *** 525,529 **** #define RC4EncLink(x) (((x)->flags & (FLAGS_RC4IN|FLAGS_RC4OUT)) ==\ (FLAGS_RC4IN|FLAGS_RC4OUT)) - #define ZipIn(x) ((x)->flags & FLAGS_ZIPPED_IN) #define SetZipIn(x) ((x)->flags |= FLAGS_ZIPPED_IN) --- 523,526 ---- *************** *** 770,786 **** /* global configuration flags */ ! #define FLAGS_HUB 0x0001 ! #define FLAGS_SERVHUB 0x0002 ! #define FLAGS_SMOTD 0x0004 ! #define FLAGS_CRYPTPASS 0x0008 ! #define FLAGS_WGMONURL 0x0010 ! #define FLAGS_WGMONHOST 0x0020 ! #define FLAGS_WGMON (FLAGS_WGMONURL|FLAGS_WGMONHOST) ! #define FLAGS_SHOWLINKS 0x0040 ! #define FLAGS_SPLITOPOK 0x0080 ! #define FLAGS_RQUIT 0x0100 ! #define FLAGS_AUTOUMODE_R 0x0200 ! #define FLAGS_AUTOUMODE_v 0x0400 ! #define FLAGS_LETUMODE_z 0x0800 #define FLAGS_LETUMODE_v 0x01000 #define FLAGS_LETSMODE_t 0x02000 --- 767,783 ---- /* global configuration flags */ ! #define FLAGS_HUB 0x0001 ! #define FLAGS_SERVHUB 0x0002 ! #define FLAGS_SMOTD 0x0004 ! #define FLAGS_CRYPTPASS 0x0008 ! #define FLAGS_WGMONURL 0x0010 ! #define FLAGS_WGMONHOST 0x0020 ! #define FLAGS_WGMON (FLAGS_WGMONURL|FLAGS_WGMONHOST) ! #define FLAGS_SHOWLINKS 0x0040 ! #define FLAGS_SPLITOPOK 0x0080 ! #define FLAGS_RQUIT 0x0100 ! #define FLAGS_AUTOUMODE_R 0x0200 ! #define FLAGS_AUTOUMODE_v 0x0400 ! #define FLAGS_LETUMODE_z 0x0800 #define FLAGS_LETUMODE_v 0x01000 #define FLAGS_LETSMODE_t 0x02000 *************** *** 790,803 **** /* flags for connects */ ! #define CONN_ZIP 0x001 /* zippable */ ! #define CONN_DKEY 0x010 /* cryptable */ ! #define CONN_HUB 0x100 /* hubbable! */ /* U:lined flags in Server struct */ ! #define ULF_SFDIRECT 0x00000001 /* send shortform commands */ ! #define ULF_REQTARGET 0x00000002 /* require @server target on PRIVMSGs */ ! #define ULF_NOBTOPIC 0x00000010 /* don't send TOPICs on burst */ ! #define ULF_NOAWAY 0x00000020 /* don't send AWAYs at all */ --- 787,800 ---- /* flags for connects */ ! #define CONN_ZIP 0x001 /* zippable */ ! #define CONN_DKEY 0x010 /* cryptable */ ! #define CONN_HUB 0x100 /* hubbable! */ /* U:lined flags in Server struct */ ! #define ULF_SFDIRECT 0x00000001 /* send shortform commands */ ! #define ULF_REQTARGET 0x00000002 /* require @server target on PRIVMSGs */ ! #define ULF_NOBTOPIC 0x00000010 /* don't send TOPICs on burst */ ! #define ULF_NOAWAY 0x00000020 /* don't send AWAYs at all */ *************** *** 806,822 **** /* this is currently BOTH C:lines and N:lines */ char *host; ! char *apasswd; /* nline password - to accept connection */ ! char *cpasswd; /* cline password - to connect out with */ char *name; ! char *source; /* when connecting, use this IP address */ ! struct in6_addr ipnum; /* ip address host field */ ! struct in_addr ip4num; /* ipv4 address if applicable */ int port; int flags; int legal; ! aClient *acpt; /* whos using this! */ ! time_t hold; /* used for autoconnections */ ! char *class_name; /* the accual name of our class */ ! aClass *class; /* pointer to the class */ char *family; aConnect *next; --- 803,819 ---- /* this is currently BOTH C:lines and N:lines */ char *host; ! char *apasswd; /* nline password - to accept connection */ ! char *cpasswd; /* cline password - to connect out with */ char *name; ! char *source; /* when connecting, use this IP address */ ! struct in6_addr ipnum; /* ip address host field */ ! struct in_addr ip4num; /* ipv4 address if applicable */ int port; int flags; int legal; ! aClient *acpt; /* whos using this! */ ! time_t hold; /* used for autoconnections */ ! char *class_name; /* the accual name of our class */ ! aClass *class; /* pointer to the class */ char *family; aConnect *next; *************** *** 858,863 **** int flags; int legal; ! int opers; /* number of opers currently using this */ ! char *class_name; aClass *class; aOper *next; --- 855,860 ---- int flags; int legal; ! int opers; /* number of opers currently using this */ ! char *class_name; aClass *class; aOper *next; *************** *** 877,881 **** int port; char *ptype; ! aListener *lstn; int legal; char *family; --- 874,878 ---- int port; char *ptype; ! aListener *lstn; int legal; char *family; *************** *** 903,907 **** char vhost_string[40]; /* bind to */ struct in6_addr allow_ip; /* allow from */ ! struct in6_addr vhost_ip; /* bind to */ time_t lasttime; /* last time I accepted */ long sendK; /* counters, see below */ --- 900,904 ---- char vhost_string[40]; /* bind to */ struct in6_addr allow_ip; /* allow from */ ! struct in6_addr vhost_ip; /* bind to */ time_t lasttime; /* last time I accepted */ long sendK; /* counters, see below */ *************** *** 914,918 **** int clients; /* number of clients currently on this */ aPort *aport; /* link to the P: line I came from */ ! long flags; #ifdef HAVE_SSL SSL *ssl; --- 911,915 ---- int clients; /* number of clients currently on this */ aPort *aport; /* link to the P: line I came from */ ! long flags; #ifdef HAVE_SSL SSL *ssl; *************** *** 932,939 **** char username[USERLEN + 1]; char host[HOSTLEN + 1]; ! char realhost[HOSTLEN + 1]; char maskhost[HOSTLEN + 1]; char *server; /* pointer to scached server name */ ! int special; /* elmer/silly routines */ unsigned int servicetype; /* set by SVSMODE +T */ unsigned int servicestamp; /* set by SVSMODE +d */ --- 929,936 ---- char username[USERLEN + 1]; char host[HOSTLEN + 1]; ! char realhost[HOSTLEN + 1]; char maskhost[HOSTLEN + 1]; char *server; /* pointer to scached server name */ ! int special; /* elmer/silly routines */ unsigned int servicetype; /* set by SVSMODE +T */ unsigned int servicestamp; /* set by SVSMODE +d */ *************** *** 977,981 **** void *zip_in; long uflags; /* U:lined flags */ - long sflags; /* U:lined flags */ }; --- 974,977 ---- *************** *** 1007,1011 **** struct in6_addr ip; /* keep real ip# too */ ! struct in_addr ip4; char hostip[HOSTIPLEN + 1]; /* Keep real ip as string * too - Dianora */ --- 1003,1007 ---- struct in6_addr ip; /* keep real ip# too */ ! struct in_addr ip4; char hostip[HOSTIPLEN + 1]; /* Keep real ip as string * too - Dianora */ *************** *** 1127,1132 **** #ifdef MSG_TARGET_LIMIT struct { ! struct Client *cli; ! time_t sent; } targets[MSG_TARGET_MAX]; /* structure for target rate limiting */ time_t last_target_complain; --- 1123,1128 ---- #ifdef MSG_TARGET_LIMIT struct { ! struct Client *cli; ! time_t sent; } targets[MSG_TARGET_MAX]; /* structure for target rate limiting */ time_t last_target_complain; *************** *** 1349,1356 **** #define CHFL_CHANOP 0x0001 /* Channel operator */ ! #define CHFL_HALFOP 0x0002 /* Half Channel operator */ #define CHFL_VOICE 0x0004 /* the power to speak */ ! #define CHFL_DEOPPED 0x0008 /* deopped by us, modes need to be bounced */ ! #define CHFL_BANNED 0x0010 /* is banned */ /* ban mask types */ --- 1345,1352 ---- #define CHFL_CHANOP 0x0001 /* Channel operator */ ! #define CHFL_HALFOP 0x0002 /* Half Channel operator */ #define CHFL_VOICE 0x0004 /* the power to speak */ ! #define CHFL_DEOPPED 0x0008 /* deopped by us, modes need to be bounced */ ! #define CHFL_BANNED 0x0010 /* is banned */ /* ban mask types */ |
|
From: Gabriel B. <sh...@us...> - 2005-06-05 20:44:41
|
Update of /cvsroot/solidircd/solidircd-dev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15421/src Modified Files: s_user.c Log Message: code clean up and comment updates. Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_user.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** s_user.c 30 May 2005 23:21:52 -0000 1.30 --- s_user.c 5 Jun 2005 20:44:28 -0000 1.31 *************** *** 97,104 **** UMODE_j, 'j', /* oper only */ UMODE_K, 'K', /* oper only */ ! UMODE_v, 'v', /* use mode */ ! UMODE_Y, 'Y', /* use mode */ UMODE_C, 'C', /* oper only */ ! UMODE_H, 'H', /* oper only */ UMODE_W, 'W', /* oper only */ #ifdef HAVE_SSL --- 97,104 ---- UMODE_j, 'j', /* oper only */ UMODE_K, 'K', /* oper only */ ! UMODE_v, 'v', /* use mode */ ! UMODE_Y, 'Y', /* use mode */ UMODE_C, 'C', /* oper only */ ! UMODE_H, 'H', /* oper only */ UMODE_W, 'W', /* oper only */ #ifdef HAVE_SSL *************** *** 1121,1125 **** ! /* Now we can tell if the user connecting is a ssl connection or not.*/ #ifdef HAVE_SSL --- 1121,1127 ---- ! /* Now we can tell if a local connecting client is a ssl connection or not. ! * ! */ #ifdef HAVE_SSL *************** *** 1132,1136 **** sptr->class->name); #endif - sendto_serv_butone(NULL, ":%s CONOPS :Client connecting: %s (%s@%s) [%s] {%s}", me.name, nick, user->username, sptr->sockhost ? --- 1134,1137 ---- *************** *** 1138,1142 **** sptr->hostip, sptr->class->name); - send_lusers(sptr, sptr, 1, parv); --- 1139,1142 ---- *************** *** 1339,1342 **** --- 1339,1347 ---- "htm", "zip", + "rar", + "ini", + "gif", + "png", + "jpg" NULL }; *************** *** 2554,2558 **** if (!IsServer(cptr)) { ! /* Check to see if rquit is on & if user is register. -Sheik 21/05/2005 */ if (!(confopts & FLAGS_RQUIT) || IsRegNick(sptr)) { --- 2559,2567 ---- if (!IsServer(cptr)) { ! /* rquit currently not exiting client from nick list, it will get corrected once get_client_name in s_.misc.c ! * is updated with the ipv4 and ipv6 code. ! */ ! ! /* Check to see if rquit is on & if user is register. -Sheik 21/05/2005 */ if (!(confopts & FLAGS_RQUIT) || IsRegNick(sptr)) { *************** *** 2750,2753 **** --- 2759,2765 ---- * as this user don't exist there any more either */ + /* Kills needs some update, if the oper is UMODE_H we don't need to display his nickname, but the + * server's name instead. -Sheik June 05 2005 + */ #ifndef HIDE_KILL_ORIGINS if (MyConnect(acptr)) |
|
From: Gabriel B. <sh...@us...> - 2005-05-30 23:22:09
|
Update of /cvsroot/solidircd/solidircd-dev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9526/src Modified Files: channel.c m_server.c m_who.c s_conf.c s_user.c whowas.c Log Message: alot of code clean up, removed smode, it was useless. Index: m_who.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/m_who.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** m_who.c 29 May 2005 19:55:08 -0000 1.3 --- m_who.c 30 May 2005 23:21:52 -0000 1.4 *************** *** 539,543 **** return 0; /* don't let people find hidden opers via /who +s server */ ! if(IsUmodeI(ac) && !showall) return 0; } --- 539,543 ---- return 0; /* don't let people find hidden opers via /who +s server */ ! if(IsUmodeH(ac) && !showall) return 0; } *************** *** 628,633 **** /* allow lusers only 200 replies from /who */ #define MAXWHOREPLIES 200 ! #define WHO_HOPCOUNT(s, a) ( ( (IsULine((a)) || IsUmodeI((a))) && !IsAnOper((s)) ) ? 0 : a->hopcount) ! #define WHO_SERVER(s ,a) ((IsUmodeI((a)) && !IsAnOper((s))) ? HiddenServName : a->user->server) #define WHO_HOST(a) ((wsopts.ip_show) ? (a)->hostip : (a)->user->host) #define WHO_REALHOST(a) ((wsopts.ip_show) ? (a)->hostip : (a)->user->realhost) --- 628,633 ---- /* allow lusers only 200 replies from /who */ #define MAXWHOREPLIES 200 ! #define WHO_HOPCOUNT(s, a) ( ( (IsULine((a)) || IsUmodeH((a))) && !IsAnOper((s)) ) ? 0 : a->hopcount) ! #define WHO_SERVER(s ,a) ((IsUmodeH((a)) && !IsAnOper((s))) ? HiddenServName : a->user->server) #define WHO_HOST(a) ((wsopts.ip_show) ? (a)->hostip : (a)->user->host) #define WHO_REALHOST(a) ((wsopts.ip_show) ? (a)->hostip : (a)->user->realhost) Index: s_conf.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_conf.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** s_conf.c 29 May 2005 22:24:38 -0000 1.8 --- s_conf.c 30 May 2005 23:21:52 -0000 1.9 *************** *** 1733,1736 **** --- 1733,1737 ---- } + /* use less might use it later */ int confadd_mlock(cVar *vars[], int lnum) Index: whowas.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/whowas.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** whowas.c 13 May 2005 17:17:46 -0000 1.1.1.2 --- whowas.c 30 May 2005 23:21:52 -0000 1.2 *************** *** 154,158 **** IsAnOper(sptr) ? temp->realhost : temp->hostname, temp->realname); ! if((temp->umode & UMODE_I) && !IsAnOper(sptr)) sendto_one(sptr, rpl_str(RPL_WHOISSERVER), me.name, parv[0], temp->name, --- 154,158 ---- IsAnOper(sptr) ? temp->realhost : temp->hostname, temp->realname); ! if((temp->umode & UMODE_H) && !IsAnOper(sptr)) sendto_one(sptr, rpl_str(RPL_WHOISSERVER), me.name, parv[0], temp->name, Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/s_user.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** s_user.c 30 May 2005 19:40:59 -0000 1.29 --- s_user.c 30 May 2005 23:21:52 -0000 1.30 *************** *** 57,61 **** extern void send_topic_burst(aClient *); static char *get_mode_str (aClient *); - static char *get_smode_str (aClient *); extern void outofmemory(void); /* defined in list.c */ #ifdef MAXBUFFERS --- 57,60 ---- *************** *** 98,106 **** UMODE_j, 'j', /* oper only */ UMODE_K, 'K', /* oper only */ - UMODE_I, 'I', /* oper only */ UMODE_v, 'v', /* use mode */ UMODE_C, 'C', /* oper only */ UMODE_H, 'H', /* oper only */ ! #ifdef HAVE_SSL UMODE_z, 'z', /* use mode */ --- 97,105 ---- UMODE_j, 'j', /* oper only */ UMODE_K, 'K', /* oper only */ UMODE_v, 'v', /* use mode */ + UMODE_Y, 'Y', /* use mode */ UMODE_C, 'C', /* oper only */ UMODE_H, 'H', /* oper only */ ! UMODE_W, 'W', /* oper only */ #ifdef HAVE_SSL UMODE_z, 'z', /* use mode */ *************** *** 110,127 **** - int solid_modes[] = - { - SMODE_E, 'E', /* Whois Notify */ - SMODE_W, 'W', /* Hide channel from whois */ - SMODE_t, 't', /* None Resolved Client */ - //SMODE_B, 'B', /* Resolved Client */ - SMODE_Y, 'Y', /* Deaf Mode */ - - 0, 0 - }; - - - - --- 109,112 ---- *************** *** 321,325 **** #ifdef NO_USER_OPERTARGETED_COMMANDS ! if (MyClient(sptr) && !IsAnOper(sptr) && IsUmodeI(acptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); --- 306,310 ---- #ifdef NO_USER_OPERTARGETED_COMMANDS ! if (MyClient(sptr) && !IsAnOper(sptr) && IsUmodeH(acptr)) { sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); *************** *** 449,453 **** else ircsprintf (mask, "%s-%d.%s",HostPrefix, csum, dot+1); ! // SetSmodeB(sptr); //sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has a resolved client.", // me.name, sptr->name); --- 434,438 ---- else ircsprintf (mask, "%s-%d.%s",HostPrefix, csum, dot+1); ! //SetRSL(sptr); //sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has a resolved client.", // me.name, sptr->name); *************** *** 463,467 **** ircsprintf(mask, "%s-%d.c%d.usr.%s", HostPrefix, sum, csum, HostDomain); ! SetSmodet(sptr); sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has an unresolved client.", me.name, sptr->name); --- 448,452 ---- ircsprintf(mask, "%s-%d.c%d.usr.%s", HostPrefix, sum, csum, HostDomain); ! SetURSL(sptr); sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has an unresolved client.", me.name, sptr->name); *************** *** 587,591 **** char *parv[3]; static char ubuf[34]; - static char sbuf[34]; char *p; char a[64]; --- 572,575 ---- *************** *** 1275,1287 **** - send_smode(NULL, sptr, 0, SEND_SMODES, sbuf); - - if (!*sbuf) - { - sbuf[0] = '+'; - sbuf[1] = '\0'; - } - - hash_check_watch(sptr, RPL_LOGON); --- 1259,1262 ---- *************** *** 1325,1329 **** if (ubuf[1]) send_umode(cptr, sptr, 0, ALL_UMODES, ubuf); - if (sbuf[1]) send_smode(cptr, sptr, 0, SEND_SMODES, sbuf); if (IsUmodev(sptr)) set_hostmask(sptr); --- 1300,1303 ---- *************** *** 2151,2177 **** - /* - * get_smode_str - * - * Returns an ASCII string of modes - */ - - char *get_smode_str(aClient *acptr) - { - char *m; - int flag, len, *s; - - m = buf2; - *m++ = '+'; - for (s = solid_modes, len = 0; (flag = *s) && (len < (BUFSIZE - 4)); s += 2) - if (acptr->smode & flag) { - *m++ = (char)s[1]; - len++; - } - *m = 0; - return buf2; - } - - /* --- 2125,2128 ---- *************** *** 2215,2219 **** } ! if(IsUmodeI(acptr)) { /* allow /whois nick nick, but nothing else */ --- 2166,2170 ---- } ! if(IsUmodeH(acptr)) { /* allow /whois nick nick, but nothing else */ *************** *** 2260,2264 **** ! if (IsSmodeE(acptr)) sendto_one(acptr, ":%s NOTICE %s :*** Notice -- /WHOIS command used on you by: %s (%s@%s)", me.name, acptr->name, sptr->name, sptr->user->username, sptr->user->realhost); --- 2211,2215 ---- ! if (IsUmodey(acptr)) sendto_one(acptr, ":%s NOTICE %s :*** Notice -- /WHOIS command used on you by: %s (%s@%s)", me.name, acptr->name, sptr->name, sptr->user->username, sptr->user->realhost); *************** *** 2288,2296 **** sendto_one(sptr, rpl_str(RPL_WHOISMODES), ! me.name, parv[0], name, get_mode_str(acptr), ! get_smode_str(acptr)); ! ! sendto_one(sptr, rpl_str(RPL_WHOISSMODES), ! me.name, parv[0], name, get_smode_str(acptr)); } --- 2239,2244 ---- sendto_one(sptr, rpl_str(RPL_WHOISMODES), ! me.name, parv[0], name, get_mode_str(acptr)); ! } *************** *** 2308,2312 **** { ! //if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsSmodeW (sptr) && IsAnOper(cptr))) { sendto_one(sptr, ":%s %d %s %s :%s", me.name, --- 2256,2260 ---- { ! //if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsUmodeW (sptr) && IsAnOper(cptr))) { sendto_one(sptr, ":%s %d %s %s :%s", me.name, *************** *** 2320,2324 **** * This hack was written by Gabriel Baez (sh...@so...) */ ! if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsSmodeW (sptr) && IsAnOper(cptr))) { if(!showchan) /* if we're not really supposed to show the chan --- 2268,2272 ---- * This hack was written by Gabriel Baez (sh...@so...) */ ! if (!(IsULine (sptr)) && (IsAnOper(sptr) && !IsUmodeW (sptr) && IsAnOper(cptr))) { if(!showchan) /* if we're not really supposed to show the chan *************** *** 2339,2346 **** } ! /* When SMODE_W Is n set. */ ! else if (!(IsULine (sptr)) && (IsAnOper(sptr) && IsSmodeW (sptr) && IsAnOper(cptr))) { if(!showchan) /* if we're not really supposed to show the chan --- 2287,2294 ---- } ! /* When UMODE_W Is n set. */ ! else if (!(IsULine (sptr)) && (IsAnOper(sptr) && IsUmodeW (sptr) && IsAnOper(cptr))) { if(!showchan) /* if we're not really supposed to show the chan *************** *** 2368,2372 **** sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, parv[0], name, buf); ! if(!(IsUmodeI(acptr) && !IsAnOper(sptr)) || (acptr == sptr)) { sendto_one(sptr, rpl_str(RPL_WHOISSERVER), me.name, parv[0], name, --- 2316,2320 ---- sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, parv[0], name, buf); ! if(!(IsUmodeH(acptr) && !IsAnOper(sptr)) || (acptr == sptr)) { sendto_one(sptr, rpl_str(RPL_WHOISSERVER), me.name, parv[0], name, *************** *** 2419,2424 **** ! if (!(IsOper(acptr)) && (IsSmodet(acptr))) ! // if (IsSmodet(acptr)) sendto_one(sptr, rpl_str(RPL_ISNOTRSL), me.name, parv[0], name); --- 2367,2372 ---- ! if (!(IsOper(acptr)) && (IsURSL(acptr))) ! // if (IsURSL(acptr)) sendto_one(sptr, rpl_str(RPL_ISNOTRSL), me.name, parv[0], name); *************** *** 2426,2430 **** /* don't give away that this oper is on this server if they're hidden! */ if (acptr->user && MyConnect(acptr) && ((sptr == acptr) || ! !IsUmodeI(acptr) || (parc > 2) || IsAnOper(sptr))) sendto_one(sptr, rpl_str(RPL_WHOISIDLE), me.name, parv[0], name, timeofday - user->last, acptr->firsttime); --- 2374,2378 ---- /* don't give away that this oper is on this server if they're hidden! */ if (acptr->user && MyConnect(acptr) && ((sptr == acptr) || ! !IsUmodeH(acptr) || (parc > 2) || IsAnOper(sptr))) sendto_one(sptr, rpl_str(RPL_WHOISIDLE), me.name, parv[0], name, timeofday - user->last, acptr->firsttime); *************** *** 2450,2454 **** { #define UFLAGS (UMODE_i|UMODE_v|UMODE_R) ! #define SFLAGS (SMODE_Y) char *username, *host, *server, *realname; struct simBan *ban; --- 2398,2402 ---- { #define UFLAGS (UMODE_i|UMODE_v|UMODE_R) ! char *username, *host, *server, *realname; struct simBan *ban; *************** *** 2534,2538 **** sptr->umode |= (UFLAGS & atoi(host)); ! sptr->smode |= (SFLAGS & atoi(host)); strncpyzt(user->host, host, sizeof(user->host)); strncpyzt(user->realhost, host, sizeof(user->host)); --- 2482,2486 ---- sptr->umode |= (UFLAGS & atoi(host)); ! strncpyzt(user->host, host, sizeof(user->host)); strncpyzt(user->realhost, host, sizeof(user->host)); *************** *** 3041,3044 **** --- 2989,2993 ---- } + /* added Sat Jul 25 07:30:42 EST 1992 */ /* *************** *** 3072,3150 **** - - - - /* - * send the SMODE string for user (user) to connection cptr - */ - void - send_smode (aClient * cptr, - aClient * sptr, int old, int sendmask, char *smode_buf) - { - int *s, flag; - char *m; - int what = MODE_NULL; - - m = smode_buf; - *m = '\0'; - for (s = solid_modes; (flag = *s); s += 2) - { - if (MyClient (sptr) && !(flag & sendmask)) - continue; - if ((flag & old) && !(sptr->smode & flag)) - { - if (what == MODE_DEL) - *m++ = *(s + 1); - else - { - what = MODE_DEL; - *m++ = '-'; - *m++ = *(s + 1); - } - } - else if (!(flag & old) && (sptr->smode & flag)) - { - if (what == MODE_ADD) - *m++ = *(s + 1); - else - { - what = MODE_ADD; - *m++ = '+'; - *m++ = *(s + 1); - } - } - } - *m = '\0'; - if (*smode_buf && cptr) - sendto_one (cptr, ":%s SMODE %s :%s", sptr->name, - sptr->name, smode_buf); - } - - void - send_smode_out(aClient *cptr, aClient *sptr, int old) - { - aClient *acptr; - DLink *lp; - - send_smode(NULL, sptr, old, SEND_SMODES, buf); - - if(*buf) - { - for(lp = server_list; lp; lp = lp->next) - { - acptr = lp->value.cptr; - if((acptr != cptr) && (acptr != sptr)) - sendto_one(acptr, ":%s SMODE %s :%s", sptr->name, - sptr->name, buf); - } - } - - if (cptr && MyClient(cptr)) - send_smode(cptr, sptr, old, SEND_SMODES, buf); - } - - - - /* * m_oper --- 3021,3024 ---- *************** *** 3249,3253 **** { int old = (sptr->umode & ALL_UMODES); ! int old2 = (sptr->smode & SEND_SMODES); --- 3123,3127 ---- { int old = (sptr->umode & ALL_UMODES); ! *************** *** 3298,3302 **** set_hostmask(sptr); send_umode_out(cptr, sptr, old); - send_smode_out(cptr, sptr, old2); send_rplisupportoper(sptr); sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, parv[0]); --- 3172,3175 ---- *************** *** 3500,3681 **** } - /* - * m_smode() added 15/10/91 By Darren Reed. - * parv[0] - sender - * parv[1] - username to change mode for - * parv[2] - modes to change - */ - - /* SMODES are currently working properly u can set them individualy now, perfect. - * The only thing left with SMODES is not allowing users to set +E +W since this are oper modes. - * - */ - - - int - m_smode(aClient *cptr, aClient *sptr, int parc, char *parv[]) - { - int flag, *s, setflags, what = MODE_ADD, badflag = NO; - char **p, *m; - aClient *acptr; - - long sflags; - sflags = sptr->smode; - - if (parc < 2) - { - sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "SMODE"); - return 0; - } - - if(IsServer(sptr)) - return 0; - - if (!(acptr = find_person(parv[1], NULL))) - { - if (MyConnect(sptr)) - sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], - parv[1]); - return 0; - } - - - if ((sptr != acptr) || (acptr->from != sptr->from)) - { - sendto_one(sptr, err_str(ERR_USERSDONTMATCH), me.name, parv[0]); - return 0; - } - - - if (parc < 3) - { - m = buf; - *m++ = '+'; - for (s = solid_modes; (flag = *s) && (m - buf < BUFSIZE - 4); s += 2) - { - if (sptr->smode & (flag & SEND_SMODES)) - *m++ = (char) (*(s + 1)); - } - *m = '\0'; - sendto_one(sptr, rpl_str(RPL_SMODEIS), me.name, parv[0], buf); - return 0; - } - - /* find flags already set for user */ - setflags = 0; - for (s = solid_modes; (flag = *s); s += 2) - if (sptr->smode & flag) - setflags |= flag; - /* parse mode change string(s) */ - for (p = &parv[2]; p && *p; p++) - for (m = *p; *m; m++) - switch (*m) - { - case '+': - what = MODE_ADD; - break; - case '-': - what = MODE_DEL; - break; - /* we may not get these, but they shouldnt be in default */ - case ' ': - case '\r': - case '\n': - case '\t': - break; - case 't': - break; /* users can't set themselves +t -t */ - default: - for (s = solid_modes; (flag = *s); s += 2) - if (*m == (char) (*(s + 1))) - { - if (what == MODE_ADD) - sptr->smode |= flag; - else - sptr->smode &= ~flag; - break; - } - if (flag == 0 && MyConnect(sptr)) - badflag = YES; - break; - } - - if (badflag) - sendto_one(sptr, err_str(ERR_UMODEUNKNOWNFLAG), me.name, parv[0]); - - - if (MyConnect(sptr)) - { - - if ((setflags & SMODE_Y) && !IsDeaf(sptr)) - { - sptr->smode &= ~SMODE_Y; - sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are no longer marked as deaf and will recieve channel messages and notices as normal..", - me.name, sptr->name); - } - if (!(setflags & SMODE_Y) && IsDeaf(sptr)) - { - sptr->smode |= SMODE_Y; - sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You have marked yourself as deaf and will no longer recieve channel messages or notices from any channel.", - me.name, sptr->name); - } - if (!(confopts & FLAGS_LETSMODE_t)) - { - if ((setflags & SMODE_t) && CanSmodet(sptr) && !IsServer(cptr)) - sptr->smode |= SMODE_t; - - if (!(setflags & SMODE_t) && !CanSmodet(sptr) && !IsServer(cptr)) - sptr->smode &= ~SMODE_t; - } - if (IsSmodet(sptr) && !CanSmodet(sptr)) ClearSmodet(sptr); - - - /* Stop normal Clients from setting +E +W easily. -Sheik 29/05/2005 */ - if (!(setflags & (SMODE_E | SMODE_W)) && !IsOper(sptr) && !IsServer(cptr)) - { - sptr->smode &= ~SMODE_E; - sptr->smode &= ~SMODE_W; - - } - - if (!(setflags & SMODE_E) && IsSmodeE(sptr) && IsOper(sptr) && !IsServer(cptr)) - sptr->smode |= SMODE_E; - - if ((setflags & SMODE_E) && !IsSmodeE(sptr) && IsOper(sptr) && !IsServer(cptr)) - sptr->smode &= ~SMODE_E; - - if ((setflags & SMODE_W) && !IsSmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) - sptr->smode &= ~SMODE_W; - - - if (!(setflags & SMODE_W) && IsSmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) - sptr->smode |= SMODE_W; - - } - - - - - - - - /* - if (!(confopts & FLAGS_LETSMODE_B)) - { - if ((setflags & SMODE_B) && CanSmodeB(sptr) && !IsServer(cptr)) - sptr->smode |= SMODE_B; - - if (!(setflags & SMODE_B) && !CanSmodeB(sptr) && !IsServer(cptr)) - sptr->smode &= ~SMODE_B; - } - if (IsSmodeB(sptr) && !CanSmodeB(sptr)) ClearSmodeB(sptr); - */ - - - - send_smode_out (cptr, sptr, setflags); - return 0; - } /* --- 3373,3377 ---- *************** *** 3691,3695 **** char **p, *m; aClient *acptr; ! int old = (sptr->smode & SEND_SMODES); if (parc < 2) --- 3387,3391 ---- char **p, *m; aClient *acptr; ! if (parc < 2) *************** *** 3860,3863 **** --- 3556,3579 ---- set_hostmask(sptr); + if ((setflags & UMODE_Y) && !IsDeaf(sptr)) + { + sptr->umode &= ~UMODE_Y; + sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You are no longer marked as deaf and will recieve channel messages and notices as normal..", + me.name, sptr->name); + } + if (!(setflags & UMODE_Y) && IsDeaf(sptr)) + { + sptr->umode |= UMODE_Y; + sendto_one (sptr, ":%s NOTICE %s :*** Notice -- You have marked yourself as deaf and will no longer recieve channel messages or notices from any channel.", + me.name, sptr->name); + } + + if ((setflags & UMODE_W) && !IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) + sptr->umode &= ~UMODE_W; + + + if (!(setflags & UMODE_W) && IsUmodeW(sptr) && IsOper(sptr) && !IsServer(cptr)) + sptr->umode |= UMODE_W; + #ifdef HAVE_SSL *************** *** 3902,3925 **** if (IsUmodeb(sptr) && !OPCanUModeb(sptr)) ClearUmodeb(sptr); if (NoMsgThrottle(sptr) && !OPCanUModeF(sptr)) ClearNoMsgThrottle(sptr); - #ifdef ALLOW_HIDDEN_OPERS - # ifdef FORCE_EVERYONE_HIDDEN - sptr->umode |= UMODE_I; - # else - # if (RIDICULOUS_PARANOIA_LEVEL>=1) - if (IsUmodeI(sptr) && !(sptr->user->real_oper_host || IsAnOper(sptr))) - ClearUmodeI(sptr); - # endif - - # ifdef FORCE_OPERS_HIDDEN - if (IsAnOper(sptr) - # if (RIDICULOUS_PARANOIA_LEVEL>=1) - || (sptr->user->real_oper_host != NULL) - # endif - ) sptr->umode |= UMODE_I; - # endif /* FORCE_OPERS_HIDDEN */ - # endif /* FORCE_EVERYONE_HIDDEN */ - #else /* ALLOW_HIDDEN_OPERS */ - if (IsUmodeI(sptr)) ClearUmodeI(sptr); - #endif if (sptr->user->allow->flags & CONF_FLAGS_FORCEFLOOD) SetNoMsgThrottle(sptr); --- 3618,3621 ---- *************** *** 3927,3931 **** send_umode_out(cptr, sptr, setflags); ! send_smode_out (cptr, sptr, old); return 0; --- 3623,3627 ---- send_umode_out(cptr, sptr, setflags); ! return 0; Index: m_server.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/m_server.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** m_server.c 30 May 2005 19:40:59 -0000 1.8 --- m_server.c 30 May 2005 23:21:52 -0000 1.9 *************** *** 46,50 **** { static char ubuf[34]; - static char sbuf[34]; char ip[64]; --- 46,49 ---- *************** *** 58,67 **** } - send_smode(NULL, acptr, 0, SEND_SMODES, sbuf); - if (!*sbuf) /* trivial optimization - Dianora */ - { - sbuf[0] = '+'; - sbuf[1] = '\0'; - } --- 57,60 ---- *************** *** 92,102 **** acptr->name, acptr->user->host); } ! ! ! ! } } static int do_server_estab(aClient *cptr) --- 85,94 ---- acptr->name, acptr->user->host); } ! } } + + static int do_server_estab(aClient *cptr) Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-dev/src/channel.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** channel.c 29 May 2005 06:06:52 -0000 1.16 --- channel.c 30 May 2005 23:21:52 -0000 1.17 *************** *** 1611,1620 **** case 'D': ! if (!IsULine(sptr) && (check_level(level,2,chptr,sptr) && IsSmodet(sptr) && !IsOper(sptr))) { errors |= SM_ERR_RSL; break; } ! else if (MyClient(sptr) && IsSmodet(sptr) && !IsOper(sptr)) { errors |= SM_ERR_RSL; --- 1611,1620 ---- case 'D': ! if (!IsULine(sptr) && (check_level(level,2,chptr,sptr) && IsURSL(sptr) && !IsOper(sptr))) { errors |= SM_ERR_RSL; break; } ! else if (MyClient(sptr) && IsURSL(sptr) && !IsOper(sptr)) { errors |= SM_ERR_RSL; *************** *** 2482,2486 **** #endif ! if (chptr->mode.mode & MODE_RSL && IsSmodet(sptr)) error = ERR_RSL; --- 2482,2486 ---- #endif ! if (chptr->mode.mode & MODE_RSL && IsURSL(sptr)) error = ERR_RSL; |
6 messages has been excluded from this view by a project administrator.
