diff --git a/source/src/log.cpp b/source/src/log.cpp index 587151b8..dad66d54 100644 --- a/source/src/log.cpp +++ b/source/src/log.cpp @@ -103,15 +103,17 @@ struct posixsyslog : log } }; -struct log *newlogger(const char *identity) +struct log *newlogger(const char *identity, int facility) { + const int facilities[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 }; + facility &= 7; s_sprintfd(id)("AssaultCube %s", identity); - return new posixsyslog(LOG_LOCAL6, id); + return new posixsyslog(facilities[facility], id); } #else -struct log *newlogger(const char *identity) +struct log *newlogger(const char *identity, int facility) { s_sprintfd(file)("serverlog_%s.txt", identity); return new filelog(file); diff --git a/source/src/protocol.h b/source/src/protocol.h index 4b86da28..122ea0a2 100644 --- a/source/src/protocol.h +++ b/source/src/protocol.h @@ -113,7 +113,8 @@ enum GMODE_BOTONESHOTONEKILL, GMODE_HUNTTHEFLAG, // 13 GMODE_TEAMKEEPTHEFLAG, - GMODE_KEEPTHEFLAG + GMODE_KEEPTHEFLAG, + GMODE_NUM }; #define m_lms (gamemode==3 || gamemode==4) @@ -133,7 +134,7 @@ enum #define m_teammode (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11 || gamemode==13 || gamemode==14) #define m_tarena (m_arena && m_teammode) #define m_botmode (gamemode==7 || gamemode == 8 || gamemode==12) -#define m_valid(mode) (((mode)>=0 && (mode)<=15) || (mode) == -1) +#define m_valid(mode) (((mode)>=0 && (mode)=0 && (mode)!=7 && (mode)!=8 && (mode)!=12) #define m_demo (gamemode==-1) #define m_flags (m_ctf || m_htf || m_ktf) diff --git a/source/src/protos.h b/source/src/protos.h index fb6b803f..d0fb101e 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -723,18 +723,18 @@ struct log virtual void close() = 0; }; -extern struct log *newlogger(const char *identity); +extern struct log *newlogger(const char *identity, int facility); // server commandline parsing struct servercommandline { - int uprate, serverport, maxdemos, maxclients, kickthreshold, banthreshold, verbose; + int uprate, serverport, syslogfacility, maxdemos, maxclients, kickthreshold, banthreshold, verbose; const char *ip, *master, *logident, *serverpassword, *adminpasswd, *demopath, *maprot, *pwdfile, *blfile; bool demoeverymatch; string motd, servdesc_full, servdesc_pre, servdesc_suf, voteperm; - servercommandline() : uprate(0), serverport(CUBE_DEFAULT_SERVER_PORT), maxdemos(5), + servercommandline() : uprate(0), serverport(CUBE_DEFAULT_SERVER_PORT), syslogfacility(6), maxdemos(5), maxclients(DEFAULTCLIENTS), kickthreshold(-5), banthreshold(-6), verbose(0), ip(""), master(NULL), logident(""), serverpassword(""), adminpasswd(""), demopath(""), maprot("config/maprot.cfg"), pwdfile("config/serverpwd.cfg"), blfile("config/serverblacklist.cfg"), @@ -755,6 +755,7 @@ struct servercommandline case 'i': ip = a; break; case 'm': master = a; break; case 'N': logident = a; break; + case 'F': if(isdigit(*a) && ai >= 0 && ai <= 7) syslogfacility = ai; case 'c': if(ai > 0) maxclients = min(ai, MAXCLIENTS); break; case 'k': if(ai < 0) kickthreshold = ai; break; case 'y': if(ai < 0) banthreshold = ai; break; diff --git a/source/src/server.cpp b/source/src/server.cpp index 32f338a0..fd4df3f2 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -3571,7 +3571,7 @@ void initserver(bool dedicated) string identity; if(scl.logident[0]) s_sprintf(identity)("[%s]", scl.logident); else s_sprintf(identity)("%s[%d]", scl.ip[0] ? scl.ip : "local", scl.serverport); - logger = newlogger(identity); + logger = newlogger(identity, scl.syslogfacility); if(dedicated) logger->open(); // log on ded servers only logger->writeline(log::info, "logging local AssaultCube server (version %d, protocol %d/%d) now..", AC_VERSION, PROTOCOL_VERSION, EXT_VERSION);