[X2serv-cvs] CVS: x2/source chan.c,1.68,1.69 commands.c,1.127,1.128 config.h,1.50,1.51 main.c,1.47,1
Brought to you by:
sirvulcan
Menu
▾
▴
[X2serv-cvs] CVS: x2/source chan.c,1.68,1.69 commands.c,1.127,1.128 config.h,1.50,1.51 main.c,1.47,1.48 misc.c,1.37,1.38 route.c,1.10,1.11 setup.h,1.5,1.6
|
From: Alex S. <ru...@us...> - 2001-01-24 00:54:00
|
Update of /cvsroot/x2serv/x2/source
In directory usw-pr-cvs1:/tmp/cvs-serv8094/source
Modified Files:
chan.c commands.c config.h main.c misc.c route.c setup.h
Log Message:
sourceforge was down, so this is a bunch of changes piled together, including:
Fix for routing.dat was leaving off the last server listed.
Added a NETWORK define in the config.h file (which im going to move so we
dont get tons of cvs updates when various ppl change it).
Index: chan.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/chan.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** chan.c 2001/01/23 14:20:24 1.68
--- chan.c 2001/01/24 00:54:17 1.69
***************
*** 1150,1153 ****
--- 1150,1154 ----
free(bptr);
}
+ cptr->banned = NULL;
cptr->NumOfNicks = 0;
if(cptr->Joined != NULL)
Index: commands.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/commands.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -r1.127 -r1.128
*** commands.c 2001/01/23 14:20:24 1.127
--- commands.c 2001/01/24 00:54:17 1.128
***************
*** 749,753 ****
int c_addmaster(C_PARAM)
{
! send_to_user(uptr, "The MASTER level has been changed to MANAGER, to avoid confusion. Please see the LEVELS command for a description of all the levels available. Please use MANAGER in all places you previously used MASTER. Thanks! -AfterNET CService Staff.");
return(FALSE);
}
--- 749,753 ----
int c_addmaster(C_PARAM)
{
! send_to_user(uptr, "The MASTER level has been changed to MANAGER, to avoid confusion. Please see the LEVELS command for a description of all the levels available. Please use MANAGER in all places you previously used MASTER. Thanks! -%s CService Staff.",NETWORK);
return(FALSE);
}
***************
*** 1369,1373 ****
{
send_to_user(uptr, "\002Usage: PASS <old password> <new password>\002");
! send_to_user(uptr, "\002Example: /msg %s #AfterNET PASS k48ad p83ad\002", IrcNick);
return(FALSE);
}
--- 1369,1373 ----
{
send_to_user(uptr, "\002Usage: PASS <old password> <new password>\002");
! send_to_user(uptr, "\002Example: /msg %s #Operations PASS k48ad p83ad\002", IrcNick);
return(FALSE);
}
***************
*** 1736,1740 ****
send_to_user(uptr, "\002%s\002 is the channel services bot. Type: /msg %s HELP for info on how to use it.", IrcNick, IrcNick);
if (IsOper(target))
! send_to_user(uptr, "%s is an AfterNet \002IRC Operator\002.", target->Nick);
if (IsGodOper(target))
send_to_user(uptr, "%s has \002security override (+h) \002enabled.", target->Nick);
--- 1736,1740 ----
send_to_user(uptr, "\002%s\002 is the channel services bot. Type: /msg %s HELP for info on how to use it.", IrcNick, IrcNick);
if (IsOper(target))
! send_to_user(uptr, "%s is an \002IRC Operator\002.", target->Nick);
if (IsGodOper(target))
send_to_user(uptr, "%s has \002security override (+h) \002enabled.", target->Nick);
***************
*** 1760,1764 ****
send_to_user(uptr, "%s is not on the %s userlist.", target->Nick, cptr->Name);
if (IsOper(target))
! send_to_user(uptr, "%s is an AfterNet \002IRC Operator\002.", target->Nick);
if (IsGodOper(target))
send_to_user(uptr, "%s has \002security override (+h)\002 enabled.", target->Nick);
--- 1760,1764 ----
send_to_user(uptr, "%s is not on the %s userlist.", target->Nick, cptr->Name);
if (IsOper(target))
! send_to_user(uptr, "%s is an \002IRC Operator\002.", target->Nick);
if (IsGodOper(target))
send_to_user(uptr, "%s has \002security override (+h)\002 enabled.", target->Nick);
***************
*** 2847,2852 ****
send_to_user(uptr, "\002Uptime %d day(s) (%02d:%02d)\002", UpTime / 86400, (UpTime / 3600) % 24, (UpTime / 60) % 60);
send_to_user(uptr, "\002Connected %d day(s) (%02d:%02d)\002", ConTime / 86400, (ConTime / 3600) % 24,(ConTime / 60) % 60);
! send_to_user(uptr, "\002My clock : %s", t2s(buf, time(NULL)));
! send_to_user(uptr, "\002AfterNet clock : %s", t2s(buf, NetTime()));
send_to_user(uptr, "\002%d commands parsed from %d lines processed.\002", TotalCommands, TotalLines);
send_to_user(uptr, "\002%d users signed on.\002", TotalUserCount);
--- 2847,2852 ----
send_to_user(uptr, "\002Uptime %d day(s) (%02d:%02d)\002", UpTime / 86400, (UpTime / 3600) % 24, (UpTime / 60) % 60);
send_to_user(uptr, "\002Connected %d day(s) (%02d:%02d)\002", ConTime / 86400, (ConTime / 3600) % 24,(ConTime / 60) % 60);
! send_to_user(uptr, "\002Local clock : %s", t2s(buf, time(NULL)));
! send_to_user(uptr, "\002Network clock : %s", t2s(buf, NetTime()));
send_to_user(uptr, "\002%d commands parsed from %d lines processed.\002", TotalCommands, TotalLines);
send_to_user(uptr, "\002%d users signed on.\002", TotalUserCount);
***************
*** 2915,2919 ****
if((ServPtr = GetServer(Name)))
{
! if (!strstr(ServPtr->Name, "AfterNET.Services"))
{
if (ServPtr->NumOfUsers != 1)
--- 2915,2919 ----
if((ServPtr = GetServer(Name)))
{
! if (!strstr(ServPtr->Name, ".Services"))
{
if (ServPtr->NumOfUsers != 1)
***************
*** 3040,3044 ****
while (ServPtr)
{
! if(!strstr(ServPtr->Name, "AfterNET.Services") || (strstr(rest, "DEBUG") )) /* filter out AfterNET.Services */
send_to_user(uptr, "\002 %s\002(%d) has %d user(s) <-> \002%s\002", ServPtr->Name, convert2n[(int)ServPtr->numnick], ServPtr->NumOfUsers, ServPtr->LinkName);
ServPtr = ServPtr->NextA;
--- 3040,3044 ----
while (ServPtr)
{
! if(!strstr(ServPtr->Name, ".Services") || (strstr(rest, "DEBUG") )) /* filter out Services */
send_to_user(uptr, "\002 %s\002(%d) has %d user(s) <-> \002%s\002", ServPtr->Name, convert2n[(int)ServPtr->numnick], ServPtr->NumOfUsers, ServPtr->LinkName);
ServPtr = ServPtr->NextA;
***************
*** 3898,3902 ****
while (ListPtr)
{
! if ((!strstr("AfterNet.Services", ListPtr->Serv)) && ((UMODEo & ListPtr->Modes) != 0))
{
if(!(ListPtr->Modes & UMODEk))
--- 3898,3902 ----
while (ListPtr)
{
! if ((!strstr(".Services", ListPtr->Serv)) && ((UMODEo & ListPtr->Modes) != 0))
{
if(!(ListPtr->Modes & UMODEk))
Index: config.h
===================================================================
RCS file: /cvsroot/x2serv/x2/source/config.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** config.h 2001/01/23 14:20:24 1.50
--- config.h 2001/01/24 00:54:17 1.51
***************
*** 44,47 ****
--- 44,50 ----
#define VERSION "X2 v5.0.99 - AfterNET Channel Services"
+ /* This is used to refer to your network in various places. It should be one word, eg "AfterNET" */
+ #define NETWORK "Loxxin"
+
#define OPERHELPFILE "HELP/operhelp.txt"
#define USERHELPFILE "HELP/userhelp.txt"
Index: main.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** main.c 2001/01/23 14:20:25 1.47
--- main.c 2001/01/24 00:54:17 1.48
***************
*** 795,799 ****
KillServerList();
/* Are there any users if there are no servers?? */
! /* KillUserList(); */
ClearAllChans();
OperCount = 0;
--- 795,800 ----
KillServerList();
/* Are there any users if there are no servers?? */
! /* YES! x2 itself. -Rubin */
! KillUserList();
ClearAllChans();
OperCount = 0;
Index: misc.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/misc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** misc.c 2001/01/17 04:00:21 1.37
--- misc.c 2001/01/24 00:54:17 1.38
***************
*** 412,416 ****
if((TheFile = fopen(MESSAGEFILENAME, "r")))
{
! send_to_user(uptr, "\002News from AfterNet CService:\002");
send_to_user(uptr, "=--------------------------------=");
while (fgets(LineBuf, MAXLEN, TheFile))
--- 412,416 ----
if((TheFile = fopen(MESSAGEFILENAME, "r")))
{
! send_to_user(uptr, "\002News from %s CService:\002", NETWORK);
send_to_user(uptr, "=--------------------------------=");
while (fgets(LineBuf, MAXLEN, TheFile))
Index: route.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/route.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** route.c 2001/01/22 07:24:33 1.10
--- route.c 2001/01/24 00:54:17 1.11
***************
*** 194,201 ****
int port = 0;
- if(feof(routefile))
- {
- break;
- }
line++;
if(s < 1)
--- 194,197 ----
***************
*** 217,224 ****
second = strtok(NULL, " ");
AddRouteServer(Route, server, port, uplink, second);
}
! ChangeRouteUplinks(Route); /* Fix for our center view */
! RankOutsideNess(Route);
return(TRUE);
}
--- 213,221 ----
second = strtok(NULL, " ");
+ Debug(DBGWARNING, "Adding routing server %s", server);
AddRouteServer(Route, server, port, uplink, second);
}
! ChangeRouteUplinks(Route); /* Fix for our center view */
! RankOutsideNess(Route);
return(TRUE);
}
Index: setup.h
===================================================================
RCS file: /cvsroot/x2serv/x2/source/setup.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** setup.h 2000/12/22 14:48:17 1.5
--- setup.h 2001/01/24 00:54:17 1.6
***************
*** 57,59 ****
/* Define if you have the crypt library (-lcrypt). */
! /* #undef HAVE_LIBCRYPT */
--- 57,59 ----
/* Define if you have the crypt library (-lcrypt). */
! #define HAVE_LIBCRYPT 1
|