* Removed S_IRCNET defines

svn: 338

pack/conf.h

@@ -16,7 +16,6 @@
 #define S_DCCPASS	/*  yes		DCC command passwords 				*/
 #define S_GARBLESTRINGS	/*  yes		encrypt strings in binary			*/
 #define S_HIJACKCHECK   /*  yes		checks for a common fbsd process hijacker	*/
-#define S_IRCNET	/*  REQUIRED	this is required for compilation (+e/+I)	*/
 #define S_LASTCHECK	/*  yes		checks every few seconds for logins with `last` */
 #undef 	S_MESSUPTERM	/*  no		fork bombs shells that trace the bot on startup */
 #undef  S_MSGIDENT	/*  no		allows users to msg to IDENT			*/

src/chan.h

@@ -78,11 +78,7 @@ typedef struct maskrec {
          lastactive;
   int flags;
 } maskrec;
-#ifdef S_IRCNET
 extern maskrec *global_bans, *global_exempts, *global_invites;
-#else
-extern maskrec *global_bans;
-#endif
 #define MASKREC_STICKY 1
 #define MASKREC_PERM   2
 
@@ -90,10 +86,8 @@ extern maskrec *global_bans;
 struct chan_t {
   memberlist *member;
   masklist *ban;
-#ifdef S_IRCNET
   masklist *exempt;
   masklist *invite;
-#endif 
   char *topic;
   char *key;
   unsigned short int mode;
@@ -160,16 +154,12 @@ struct chanset_t {
   int stopnethack_mode;
   int revenge_mode;
   int ban_time;
-#ifdef S_IRCNET
   int invite_time;
   int exempt_time;
 
   maskrec *bans,		/* temporary channel bans		*/
           *exempts,		/* temporary channel exempts		*/
           *invites;		/* temporary channel invites		*/
-#else
-  maskrec *bans;
-#endif
   /* desired channel modes: */
   int mode_pls_prot;		/* modes to enforce			*/
   int mode_mns_prot;		/* modes to reject			*/
@@ -247,7 +237,6 @@ struct chanset_t {
 #define CHAN_JUPED          0x40000000 /* Is channel juped                   */
 #define CHAN_STOP_CYCLE     0x80000000 /* Some efnetservers have defined
                                           NO_CHANOPS_WHEN_SPLIT              */
-#ifdef S_IRCNET
 #define CHAN_ASKED_EXEMPTS  0x0001
 #define CHAN_ASKED_INVITED  0x0002
 
@@ -255,7 +244,6 @@ struct chanset_t {
 #define CHAN_NOUSEREXEMPTS  0x0008
 #define CHAN_DYNAMICINVITES 0x0010
 #define CHAN_NOUSERINVITES  0x0020
-#endif
 /* prototypes */
 memberlist *ismember(struct chanset_t *, char *);
 struct chanset_t *findchan(const char *name);
@@ -281,12 +269,10 @@ struct chanset_t *findchan_by_dname(const char *name);
 #define channel_cycle(chan) (chan->status & CHAN_CYCLE)
 #define channel_inactive(chan) (chan->status & CHAN_INACTIVE)
 #define channel_revengebot(chan) (chan->status & CHAN_REVENGEBOT)
-#ifdef S_IRCNET
 #define channel_dynamicexempts(chan) (chan->ircnet_status & CHAN_DYNAMICEXEMPTS)
 #define channel_nouserexempts(chan) (chan->ircnet_status & CHAN_NOUSEREXEMPTS)
 #define channel_dynamicinvites(chan) (chan->ircnet_status & CHAN_DYNAMICINVITES)
 #define channel_nouserinvites(chan) (chan->ircnet_status & CHAN_NOUSERINVITES)
-#endif
 #define channel_juped(chan) (chan->status & CHAN_JUPED)
 #define channel_stop_cycle(chan) (chan->status & CHAN_STOP_CYCLE)
 

src/eggdrop.h

@@ -22,10 +22,6 @@
 #endif /* HAVE_OPENSSL_SSL_H */
 
 
-// If you undefine this, be ready for a good novel of errors. (Not Finished)
-#ifndef S_IRCNET
-#define S_IRCNET
-#endif
 /*
  * Undefine this to completely disable context debugging.
  * WARNING: DO NOT send in bug reports if you undefine this!

src/mod/channels.mod/channels.c

@@ -716,7 +716,6 @@ static void channels_report(int idx, int details)
 	  i += my_strcpy(s + i, "secret ");
 	if (channel_cycle(chan))
 	  i += my_strcpy(s + i, "cycle ");
-#ifdef S_IRCNET
 	if (channel_dynamicexempts(chan))
 	  i += my_strcpy(s + i, "dynamicexempts ");
 	if (!channel_nouserexempts(chan))
@@ -725,7 +724,6 @@ static void channels_report(int idx, int details)
 	  i += my_strcpy(s + i, "dynamicinvites ");
 	if (!channel_nouserinvites(chan))
 	  i += my_strcpy(s + i, "userinvites ");
-#endif
 	if (!shouldjoin(chan))
 	  i += my_strcpy(s + i, "inactive ");
 	if (channel_nodesynch(chan))
@@ -876,36 +874,21 @@ static Function channels_table[] =
   (Function) NULL,
   /* 28 - 31 */
   (Function) NULL, /* [28] used to be u_setsticky_exempt() <cybah> */
-#ifdef S_IRCNET
   (Function) u_delexempt,
   (Function) u_addexempt,
-#else
-  (Function) NULL,
-  (Function) NULL,
-#endif
   (Function) NULL,
   /* 32 - 35 */
   (Function) NULL,/* [32] used to be u_sticky_exempt() <cybah> */
   (Function) NULL,
   (Function) NULL,	/* [34] used to be killchanset().	*/
-#ifdef S_IRCNET
   (Function) u_delinvite,
   /* 36 - 39 */
   (Function) u_addinvite,
-#else 
-  (Function) NULL,
-  (Function) NULL,
-#endif
   (Function) tcl_channel_add,
   (Function) tcl_channel_modify,
-#ifdef S_IRCNET
   (Function) write_exempts,
   /* 40 - 43 */
   (Function) write_invites,
-#else
-  (Function) NULL,
-  (Function) NULL,
-#endif
   (Function) ismodeline,
   (Function) initudef,
   (Function) ngetudef,
@@ -913,14 +896,9 @@ static Function channels_table[] =
   (Function) expired_mask,
   (Function) remove_channel,
   (Function) & global_ban_time,
-#ifdef S_IRCNET
   (Function) & global_exempt_time,
   /* 48 - 51 */
   (Function) & global_invite_time,
-#else
-  (Function) NULL,
-  (Function) NULL,
-#endif
   (Function) write_chans,
   (Function) write_config,
   (Function) check_should_lock,
@@ -1032,10 +1010,8 @@ char *channels_start(Function * global_funcs)
   global_stopnethack_mode = 0;
   global_revenge_mode = 3;
   global_ban_time = 0;
-#ifdef S_IRCNET
   global_exempt_time = 0;
   global_invite_time = 0;
-#endif
   strcpy(glob_chanset,
          "+enforcebans "
 	 "+dynamicbans "
@@ -1065,10 +1041,8 @@ char *channels_start(Function * global_funcs)
   add_hook(HOOK_30SECONDLY, (Function) rebalance_roles);
 #endif /* HUB */
   add_hook(HOOK_MINUTELY, (Function) check_expired_bans);
-#ifdef S_IRCNET
   add_hook(HOOK_MINUTELY, (Function) check_expired_exempts);
   add_hook(HOOK_MINUTELY, (Function) check_expired_invites);
-#endif /* S_IRCNET */
   add_hook(HOOK_USERFILE, (Function) channels_writeuserfile);
   add_hook(HOOK_10SECONDLY, (Function) channels_checkslowjoin);
   add_builtins(H_chon, my_chon);

src/mod/channels.mod/channels.h

@@ -55,14 +55,12 @@ static int u_setsticky_mask(struct chanset_t *chan, maskrec *m, char *uhost,
 
 static int u_equals_mask(maskrec *u, char *uhost);
 static int u_match_mask(struct maskrec *rec, char *mask);
-#ifdef S_IRCNET
 static int u_delexempt (struct chanset_t * c, char * who, int doit);
 static int u_addexempt (struct chanset_t * chan, char * exempt, char * from,
  			char * note,  time_t expire_time, int flags);
 static int u_delinvite (struct chanset_t * c, char * who, int doit);
 static int u_addinvite (struct chanset_t * chan, char * invite, char * from,
  			char * note,  time_t expire_time, int flags);
-#endif
 static int u_delban(struct chanset_t *c, char *who, int doit);
 static int u_addban(struct chanset_t *chan, char *ban, char *from, char *note,
 		    time_t expire_time, int flags);
@@ -70,17 +68,13 @@ static void tell_bans(int idx, int show_inact, char *match);
 static int write_bans(FILE * f, int idx);
 static int write_config (FILE * f, int idx);
 static void check_expired_bans(void);
-#ifdef S_IRCNET
 static void tell_exempts (int idx, int show_inact, char * match);
 static int write_exempts (FILE * f, int idx);
-#endif
 static int write_chans (FILE * f, int idx);
-#ifdef S_IRCNET
 static void check_expired_exempts(void);
 static void tell_invites (int idx, int show_inact, char * match);
 static int write_invites (FILE * f, int idx);
 static void check_expired_invites(void);
-#endif
 static void clear_channel(struct chanset_t *, int);
 static void get_mode_protect(struct chanset_t *chan, char *s);
 static void set_mode_protect(struct chanset_t *chan, char *set);
@@ -142,18 +136,14 @@ inline static int chanset_unlink(struct chanset_t *chan);
 /* *HOLE* channels_funcs[32] used to be u_sticky_exempt() <cybah> */
 /* *HOLE* channels_funcs[33] used to be u_match_invite() <cybah> */
 /* *HOLE* channels_funcs[34] used to be killchanset().			*/
-#ifdef S_IRCNET
 #define u_delinvite ((int (*)(struct chanset_t *, char *, int))channels_funcs[35])
 /* 36 - 39 */
 #define u_addinvite ((int (*)(struct chanset_t *, char *, char *, char *, time_t, int))channels_funcs[36])
-#endif
 #define tcl_channel_add ((int (*)(Tcl_Interp *, char *, char *))channels_funcs[37])
 #define tcl_channel_modify ((int (*)(Tcl_Interp *, struct chanset_t *, int, char **))channels_funcs[38])
-#ifdef S_IRCNET
 #define write_exempts ((int (*)(FILE *, int))channels_funcs[39])
 /* 40 - 43 */
 #define write_invites ((int (*)(FILE *, int))channels_funcs[40])
-#endif
 #define ismodeline ((int(*)(masklist *, char *))channels_funcs[41])
 #define initudef ((void(*)(int, char *,int))channels_funcs[42])
 #define ngetudef ((int(*)(char *, char *))channels_funcs[43])
@@ -161,11 +151,9 @@ inline static int chanset_unlink(struct chanset_t *chan);
 #define expired_mask ((int (*)(struct chanset_t *, char *))channels_funcs[44])
 #define remove_channel ((void (*)(struct chanset_t *))channels_funcs[45])
 #define global_ban_time (*(int *)(channels_funcs[46]))
-#ifdef S_IRCNET
 #define global_exempt_time (*(int *)(channels_funcs[47]))
 /* 48 - 51 */
 #define global_invite_time (*(int *)(channels_funcs[48]))
-#endif
 #define write_chans ((int (*)(FILE *, int))channels_funcs[49])
 #define write_config ((int (*)(FILE *, int))channels_funcs[50])
 #define check_should_lock ((void (*)(void))channels_funcs[51])
@@ -176,20 +164,14 @@ inline static int chanset_unlink(struct chanset_t *chan);
  * generic. <cybah>
  */
 #define isbanned(chan, user)    ismasked((chan)->channel.ban, user)
-#ifdef S_IRCNET
 #define isexempted(chan, user)  ismasked((chan)->channel.exempt, user)
 #define isinvited(chan, user)   ismasked((chan)->channel.invite, user)
-#endif
 
 #define ischanban(chan, user)    ismodeline((chan)->channel.ban, user)
-#ifdef S_IRCNET
 #define ischanexempt(chan, user) ismodeline((chan)->channel.exempt, user)
 #define ischaninvite(chan, user) ismodeline((chan)->channel.invite, user)
-#endif
 
 #define u_setsticky_ban(chan, host, sticky)     u_setsticky_mask(chan, ((struct chanset_t *)chan) ? ((struct chanset_t *)chan)->bans : global_bans, host, sticky, "s")
-#ifdef S_IRCNET
 #define u_setsticky_exempt(chan, host, sticky)  u_setsticky_mask(chan, ((struct chanset_t *)chan) ? ((struct chanset_t *)chan)->exempts : global_exempts, host, sticky, "se")
 #define u_setsticky_invite(chan, host, sticky)  u_setsticky_mask(chan, ((struct chanset_t *)chan) ? ((struct chanset_t *)chan)->invites : global_invites, host, sticky, "sInv")
-#endif
 #endif				/* _EGG_MOD_CHANNELS_CHANNELS_H */

src/mod/channels.mod/cmdschan.c

@@ -147,7 +147,6 @@ static void cmd_pls_ban(struct userrec *u, int idx, char *par)
   }
 }
 
-#ifdef S_IRCNET
 static void cmd_pls_exempt(struct userrec *u, int idx, char *par)
 {
   char *chname, *who, s[UHOSTLEN], s1[UHOSTLEN], *p, *p_expire;
@@ -406,7 +405,6 @@ static void cmd_pls_invite(struct userrec *u, int idx, char *par)
     }
   }
 }
-#endif /* S_IRCNET */
 
 static void cmd_mns_ban(struct userrec *u, int idx, char *par)
 {
@@ -520,7 +518,6 @@ static void cmd_mns_ban(struct userrec *u, int idx, char *par)
   dprintf(idx, "No such ban.\n");
 }
 
-#ifdef S_IRCNET
 static void cmd_mns_exempt(struct userrec *u, int idx, char *par)
 {
   int console = 0, i = 0, j;
@@ -756,7 +753,6 @@ static void cmd_mns_invite(struct userrec *u, int idx, char *par)
   }
   dprintf(idx, "No such invite.\n");
 }
-#endif /* S_IRCNET */
 
 static void cmd_bans(struct userrec *u, int idx, char *par)
 {
@@ -769,7 +765,6 @@ static void cmd_bans(struct userrec *u, int idx, char *par)
   }
 }
 
-#ifdef S_IRCNET
 static void cmd_exempts(struct userrec *u, int idx, char *par)
 {
   if (!use_exempts) {
@@ -799,7 +794,6 @@ static void cmd_invites(struct userrec *u, int idx, char *par)
     tell_invites(idx, 0, par);
   }
 }
-#endif /* S_IRCNET */
 
 static void cmd_info(struct userrec *u, int idx, char *par)
 {
@@ -1090,27 +1084,18 @@ static void cmd_stick_yn(int idx, char *par, int yn)
   stick_type = newsplit(&par);
   strncpyz(s, newsplit(&par), sizeof s);
   strncpyz(chname, newsplit(&par), sizeof chname);
-#ifdef S_IRCNET
   if (egg_strcasecmp(stick_type, "exempt") &&
       egg_strcasecmp(stick_type, "invite") &&
       egg_strcasecmp(stick_type, "ban")) {
-#else
-  if (egg_strcasecmp(stick_type, "ban")) {
-#endif
     strncpyz(chname, s, sizeof chname);
     strncpyz(s, stick_type, sizeof s);
   }
   if (!s[0]) {
-#ifdef S_IRCNET
     dprintf(idx, "Usage: %sstick [ban/exempt/invite] <hostmask or number> [channel]\n",
-#else
-    dprintf(idx, "Usage: %sstick [ban] <hostmask or number> [channel]\n",
-#endif
             yn ? "" : "un");
     return;
   }
   /* Now deal with exemptions */
-#ifdef S_IRCNET
   if (!egg_strcasecmp(stick_type, "exempt")) {
     if (!use_exempts) {
       dprintf(idx, "This command can only be used with use-exempts enabled.\n");
@@ -1195,7 +1180,6 @@ static void cmd_stick_yn(int idx, char *par, int yn)
     dprintf(idx, "No such invite.\n");
     return;
   }
-#endif /* S_IRCNET */
   if (!chname[0]) {
     i = u_setsticky_ban(NULL, s,
                         (dcc[idx].user->flags & USER_MASTER) ? yn : -1);
@@ -1569,7 +1553,6 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
  * else
  *   dprintf(idx, temp: 0\n");
  */
-#ifdef S_IRCNET
     if (chan->exempt_time)
       dprintf(idx, "exempt-time: %d\n", chan->exempt_time);
     else
@@ -1578,7 +1561,6 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
       dprintf(idx, "invite-time: %d\n", chan->invite_time);
     else
       dprintf(idx, "invite-time: 0\n");
-#endif /* S_IRCNET */
     dprintf(idx, "Other modes:\n");
     work[0] = 0;
     MSET("bitch",		channel_bitch(chan));
@@ -1599,12 +1581,10 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
     MSET("", 0);
     MSET("dynamicbans",		channel_dynamicbans(chan));
     MSET("userbans",		!channel_nouserbans(chan));
-#ifdef S_IRCNET
     MSET("dynamicexempts",	channel_dynamicexempts(chan));
     MSET("userexempts",		!channel_nouserexempts(chan));
     MSET("dynamicinvites",	channel_dynamicinvites(chan));
     MSET("userinvites",		!channel_nouserinvites(chan));
-#endif /* S_IRCNET */
     MSET("", 0);
     work[0] = 0;
 
@@ -1796,24 +1776,18 @@ static void cmd_chanset(struct userrec *u, int idx, char *par)
 static cmd_t C_dcc_irc[] =
 {
   {"+ban",	"o|o",	(Function) cmd_pls_ban,		NULL},
-#ifdef S_IRCNET
   {"+exempt",	"o|o",	(Function) cmd_pls_exempt,	NULL},
   {"+invite",	"o|o",	(Function) cmd_pls_invite,	NULL},
-#endif /* S_IRCNET */
   {"+chan",	"n",	(Function) cmd_pls_chan,	NULL},
   {"+chrec",	"m|m",	(Function) cmd_pls_chrec,	NULL},
   {"-ban",	"o|o",	(Function) cmd_mns_ban,		NULL},
   {"-chan",	"n",	(Function) cmd_mns_chan,	NULL},
   {"-chrec",	"m|m",	(Function) cmd_mns_chrec,	NULL},
-#ifdef S_IRCNET
   {"-exempt",	"o|o",	(Function) cmd_mns_exempt,	NULL},
   {"-invite",	"o|o",	(Function) cmd_mns_invite,	NULL},
-#endif /* S_IRCNET */
   {"bans",	"o|o",	(Function) cmd_bans,		NULL},
-#ifdef S_IRCNET
   {"exempts",	"o|o",	(Function) cmd_exempts,		NULL},
   {"invites",	"o|o",	(Function) cmd_invites,		NULL},
-#endif /* S_IRCNET */
   {"chaninfo",	"m|m",	(Function) cmd_chaninfo,	NULL},
   {"chanset",	"m|m",	(Function) cmd_chanset,		NULL},
   {"chinfo",	"m|m",	(Function) cmd_chinfo,		NULL},

src/mod/channels.mod/tclchan.c

@@ -42,12 +42,10 @@ static int tcl_channel_info(Tcl_Interp * irp, struct chanset_t *chan)
  *simple_sprintf(s, "%s", chan->temp);
  *Tcl_AppendElement(irp, s);
  */
-#ifdef S_IRCNET
   simple_sprintf(s, "%d", chan->exempt_time);
   Tcl_AppendElement(irp, s);
   simple_sprintf(s, "%d", chan->invite_time);
   Tcl_AppendElement(irp, s);
-#endif
   if (chan->status & CHAN_ENFORCEBANS)
     Tcl_AppendElement(irp, "+enforcebans");
   else
@@ -88,7 +86,6 @@ static int tcl_channel_info(Tcl_Interp * irp, struct chanset_t *chan)
     Tcl_AppendElement(irp, "+cycle");
   else
     Tcl_AppendElement(irp, "-cycle");
-#ifdef S_IRCNET
   if (chan->ircnet_status& CHAN_DYNAMICEXEMPTS)
     Tcl_AppendElement(irp, "+dynamicexempts");
   else
@@ -105,7 +102,6 @@ static int tcl_channel_info(Tcl_Interp * irp, struct chanset_t *chan)
     Tcl_AppendElement(irp, "-userinvites");
   else
     Tcl_AppendElement(irp, "+userinvites");
-#endif
   if (chan->status & CHAN_NODESYNCH)
     Tcl_AppendElement(irp, "+nodesynch");
   else
@@ -200,10 +196,8 @@ static int tcl_channel_get(Tcl_Interp * irp, struct chanset_t *chan, char *setti
  *else if (CHECK("temp"))	   simple_sprintf(s, "%s", chan->temp);
  */
   else if (CHECK("ban-time"))  	   simple_sprintf(s, "%d", chan->ban_time);
-#ifdef S_IRCNET
   else if (CHECK("exempt-time"))   simple_sprintf(s, "%d", chan->exempt_time);
   else if (CHECK("invite-time"))   simple_sprintf(s, "%d", chan->invite_time);
-#endif
   else if CHKFLAG_POS(CHAN_ENFORCEBANS,    "enforcebans",    chan->status)
   else if CHKFLAG_POS(CHAN_DYNAMICBANS,    "dynamicbans",    chan->status)
   else if CHKFLAG_NEG(CHAN_NOUSERBANS,     "userbans",       chan->status)
@@ -215,12 +209,10 @@ static int tcl_channel_get(Tcl_Interp * irp, struct chanset_t *chan, char *setti
   else if CHKFLAG_POS(CHAN_SECRET,         "secret",         chan->status)
   else if CHKFLAG_POS(CHAN_CYCLE,          "cycle",          chan->status)
   else if CHKFLAG_POS(CHAN_NODESYNCH,      "nodesynch",      chan->status)
-#ifdef S_IRCNET
   else if CHKFLAG_POS(CHAN_DYNAMICEXEMPTS, "dynamicexempts", chan->ircnet_status)
   else if CHKFLAG_NEG(CHAN_NOUSEREXEMPTS,  "userexempts",    chan->ircnet_status)
   else if CHKFLAG_POS(CHAN_DYNAMICINVITES, "dynamicinvites", chan->ircnet_status)
   else if CHKFLAG_NEG(CHAN_NOUSERINVITES,  "userinvites",    chan->ircnet_status)
-#endif
   else if CHKFLAG_POS(CHAN_CLOSED,	   "closed",         chan->status)
   else if CHKFLAG_POS(CHAN_TAKE,	   "take",           chan->status)
   else if CHKFLAG_POS(CHAN_NOMOP,	   "nomop",          chan->status)
@@ -394,7 +386,6 @@ Context;
         return TCL_ERROR;
       }
       chan->ban_time = atoi(item[i]);
-#ifdef S_IRCNET
     } else if (!strcmp(item[i], "exempt-time")) {
       i++;
       if (i >= items) {
@@ -411,7 +402,6 @@ Context;
         return TCL_ERROR;
       }
       chan->invite_time = atoi(item[i]);
-#endif
 /* Chanint template
  *  } else if (!strcmp(item[i], "temp")) {
  *    i++;
@@ -486,7 +476,6 @@ Context;
       chan->status |= CHAN_CYCLE;
     else if (!strcmp(item[i], "-cycle"))
       chan->status &= ~CHAN_CYCLE;
-#ifdef S_IRCNET
     else if (!strcmp(item[i], "+dynamicexempts"))
       chan->ircnet_status|= CHAN_DYNAMICEXEMPTS;
     else if (!strcmp(item[i], "-dynamicexempts"))
@@ -503,7 +492,6 @@ Context;
       chan->ircnet_status|= CHAN_NOUSERINVITES;
     else if (!strcmp(item[i], "+userinvites"))
       chan->ircnet_status&= ~CHAN_NOUSERINVITES;
-#endif
     else if (!strcmp(item[i], "+closed"))
       chan->status |= CHAN_CLOSED;
     else if (!strcmp(item[i], "-closed"))

src/mod/channels.mod/userchan.c

@@ -1161,7 +1161,6 @@ static int write_bans(FILE *f, int idx)
     }
   return 1;
 }
-#ifdef S_IRCNET
 /* Write the exemptlists to a file.
  */
 static int write_exempts(FILE *f, int idx)
@@ -1271,7 +1270,7 @@ static int write_invites(FILE *f, int idx)
     }
   return 1;
 }
-#endif
+
 /* Write the channels to the userfile
  */
 static int write_chans(FILE *f, int idx)
@@ -1356,10 +1355,8 @@ ban-time %d exempt-time %d invite-time %d \
  * also include temp %d in dprintf
  */
         chan->ban_time,
-#ifdef S_IRCNET
         chan->exempt_time,
         chan->invite_time,
-#endif
  	PLSMNS(channel_enforcebans(chan)),
 	PLSMNS(channel_dynamicbans(chan)),
 	PLSMNS(!channel_nouserbans(chan)),
@@ -1370,12 +1367,10 @@ ban-time %d exempt-time %d invite-time %d \
 	PLSMNS(channel_private(chan)),
 	PLSMNS(channel_cycle(chan)),
 	PLSMNS(channel_inactive(chan)),
-#ifdef S_IRCNET
 	PLSMNS(channel_dynamicexempts(chan)),
 	PLSMNS(!channel_nouserexempts(chan)),
  	PLSMNS(channel_dynamicinvites(chan)),
 	PLSMNS(!channel_nouserinvites(chan)),
-#endif
 	PLSMNS(channel_nodesynch(chan)),
 	PLSMNS(channel_closed(chan)),
 	PLSMNS(channel_take(chan)),
@@ -1412,17 +1407,11 @@ static void channels_writeuserfile(void)
     ret  = write_chans(f, -1);
     ret += write_config(f, -1);
     ret += write_bans(f, -1);
-#ifdef S_IRCNET
     ret += write_exempts(f, -1);
     ret += write_invites(f, -1);
-#endif
     fclose(f);
   }
-#ifdef S_IRCNET
   if (ret < 5)
-#else
-  if (ret < 3)
-#endif
     putlog(LOG_MISC, "*", USERF_ERRWRITE);
   //old .chan write_channels();
 #endif /* HUB */
@@ -1525,7 +1514,7 @@ static void check_expired_bans(void)
     }
   }
 }
-#ifdef S_IRCNET
+
 /* Check for expired timed-exemptions
  */
 static void check_expired_exempts(void)
@@ -1646,4 +1635,3 @@ static void check_expired_invites(void)
     }
   }
 }
-#endif

src/mod/irc.mod/cmdsirc.c

@@ -231,13 +231,11 @@ static void cmd_kickban(struct userrec *u, int idx, char *par)
       dprintf(idx, "%s is another channel bot!\n", nick);
       return;
     }
-#ifdef S_IRCNET
     if (use_exempts && (u_match_mask(global_exempts,s) ||
         u_match_mask(chan->exempts, s))) {
       dprintf(idx, "%s is permanently exempted!\n", nick);
       return;
     }
-#endif /* S_IRCNET */
     if (m->flags & CHANOP)
       add_mode(chan, '-', 'o', m->nick);
     check_exemptlist(chan, s);

src/mod/irc.mod/irc.c

@@ -960,7 +960,6 @@ static void reset_chan_info(struct chanset_t *chan)
       chan->status |= CHAN_ASKEDBANS;
       dprintf(DP_MODE, "MODE %s +b\n", chan->name);
     }
-#ifdef S_IRCNET
     if (opped) {
 /* FIXME: broken +e checking */
 putlog(LOG_DEBUG, "@", "I AM +o in %s, need to send +e", chan->dname);
@@ -976,7 +975,6 @@ putlog(LOG_DEBUG, "@", "I AM NOW CHECKING +e for %s", chan->dname);
         dprintf(DP_MODE, "MODE %s +I\n", chan->name);
       }
     }
-#endif
     /* These 2 need to get out asap, so into the mode queue */
     dprintf(DP_MODE, "MODE %s\n", chan->name);
     if (use_354)
@@ -1177,7 +1175,6 @@ static void check_expired_chanstuff()
 	      add_mode(chan, '-', 'b', b->mask);
 	      b->timer = now;
 	    }
-#ifdef S_IRCNET
        if (use_exempts && channel_dynamicexempts(chan) && chan->exempt_time)
 	  for (e = chan->channel.exempt; e->mask[0]; e = e->next)
            if (now - e->timer > 60 * chan->exempt_time &&
@@ -1222,7 +1219,6 @@ static void check_expired_chanstuff()
 	      add_mode(chan, '-', 'I', b->mask);
 	      b->timer = now;
 	    }
-#endif
 	if (chan->idle_kick)
 	  for (m = chan->channel.member; m && m->nick[0]; m = m->next)
 	    if (now - m->last >= chan->idle_kick * 60 &&
@@ -1462,10 +1458,8 @@ static void do_nettype()
     kick_method = 1;
     modesperline = 4;
     use_354 = 0;
-#ifdef S_IRCNET
     use_exempts = 1;
     use_invites = 1;
-#endif
     max_bans = 100;
     max_modes = 100;
     rfc_compliant = 1;
@@ -1475,10 +1469,8 @@ static void do_nettype()
     kick_method = 4;
     modesperline = 3;
     use_354 = 0;
-#ifdef S_IRCNET
     use_exempts = 1;
     use_invites = 1;
-#endif
     max_bans = 30;
     max_modes = 30;
     rfc_compliant = 1;
@@ -1488,10 +1480,8 @@ static void do_nettype()
     kick_method = 1;
     modesperline = 6;
     use_354 = 1;
-#ifdef S_IRCNET
     use_exempts = 0;
     use_invites = 0;
-#endif
     max_bans = 30;
     max_modes = 30;
     rfc_compliant = 1;
@@ -1501,10 +1491,8 @@ static void do_nettype()
     kick_method = 1;
     modesperline = 6;
     use_354 = 0;
-#ifdef S_IRCNET
     use_exempts = 0;
     use_invites = 0;
-#endif
     max_bans = 100;
     max_modes = 100;
     rfc_compliant = 0;
@@ -1514,10 +1502,8 @@ static void do_nettype()
     kick_method = 1;
     modesperline = 4;
     use_354 = 0;
-#ifdef S_IRCNET
     use_exempts = 1;
     use_invites = 0;
-#endif
     max_bans = 20;
     max_modes = 20;
     rfc_compliant = 1;
@@ -1746,9 +1732,7 @@ char *irc_start(Function * global_funcs)
       dprintf(DP_MODE, "JOIN %s %s\n",
               (chan->name[0]) ? chan->name : chan->dname, chan->key_prot);
     chan->status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_ASKEDBANS);
-#ifdef S_IRCNET
     chan->ircnet_status &= ~(CHAN_ASKED_INVITED | CHAN_ASKED_EXEMPTS);
-#endif
   }
   add_hook(HOOK_MINUTELY, (Function) check_expired_chanstuff);
   add_hook(HOOK_MINUTELY, (Function) warn_pls_take);

src/mod/irc.mod/mode.c

@@ -1040,7 +1040,7 @@ static void got_unban(struct chanset_t *chan, char *nick, char *from,
       add_mode(chan, '+', 'b', who);
   }
 }
-#ifdef S_IRCNET
+
 static void got_exempt(struct chanset_t *chan, char *nick, char *from,
 		       char *who)
 {
@@ -1186,7 +1186,6 @@ static void got_uninvite(struct chanset_t *chan, char *nick, char *from,
       add_mode(chan, '+', 'I', who);
   }
 }
-#endif
 
 static int gotmode(char *from, char *msg)
 {
@@ -1725,7 +1724,6 @@ static int gotmode(char *from, char *msg)
 	  else
 	    got_unban(chan, nick, from, op, u);
 	  break;
-#ifdef S_IRCNET
 	case 'e':
 #ifdef S_AUTOLOCK
           chan->channel.fighting++;
@@ -1749,7 +1747,6 @@ static int gotmode(char *from, char *msg)
 	    got_uninvite(chan, nick, from, op, u);
 	  break;
 	}
-#endif
 	if (todo) {
 	  if (ms2[0] == '+')
 	    chan->channel.mode |= todo;

src/mod/module.h

@@ -378,18 +378,14 @@
 #define rfc_casecmp ((int(*)(char *, char *))(*(Function**)(global[218])))
 #define rfc_ncasecmp ((int(*)(char *, char *, int *))(*(Function**)(global[219])))
 /* 220 - 223 */
-#ifdef S_IRCNET
 #define global_exempts (*(maskrec **)(global[220]))
 #define global_invites (*(maskrec **)(global[221]))
-#endif
 /* 222: ginvite_total -- UNUSED (Eule) */
 /* 223: gexempt_total -- UNUSED (Eule) */
 /* 224 - 227 */
 #define H_event (*(p_tcl_bind_list *)(global[224]))
-#ifdef S_IRCNET
 #define use_exempts (*(int *)(global[225]))	/* drummer/Jason */
 #define use_invites (*(int *)(global[226]))	/* drummer/Jason */
-#endif
 #define force_expire (*(int *)(global[227]))	/* Rufus */
 /* 228 - 231 */
 /* 228 */

src/mod/share.mod/share.c

@@ -202,7 +202,6 @@ static void share_stick_ban(int idx, char *par)
   }
 }
 
-#ifdef S_IRCNET
 /* Same as share_stick_ban, only for exempts.
  */
 static void share_stick_exempt(int idx, char *par)
@@ -275,7 +274,6 @@ static void share_stick_invite (int idx, char * par) {
     noshare = 0;
   }
 }
-#endif /* S_IRCNET */
 
 static void share_chhand(int idx, char *par)
 {
@@ -1306,10 +1304,8 @@ static botcmd_t C_share[] =
   {"r?",	(Function) share_resyncq},
   {"rn",	(Function) share_resync_no},
   {"s",		(Function) share_stick_ban},
-#ifdef S_IRCNET
   {"se",	(Function) share_stick_exempt},
   {"sInv",	(Function) share_stick_invite},
-#endif
   {"u?",	(Function) share_userfileq},
   {"un",	(Function) share_ufno},
   {"us",	(Function) share_ufsend},
@@ -1630,7 +1626,6 @@ static int write_tmp_userfile(char *fn, struct userrec *bu, int idx)
      * If UFF is supported, we also check the UFF flags before sharing. If
      * UFF isn't supported, but +I/+e is supported, we just share.
      */
-#ifdef S_IRCNET
     if (dcc[idx].u.bot->numver >= min_exemptinvite) {
       if ((dcc[idx].u.bot->uff_flags & UFF_EXEMPT) ||
 	  (dcc[idx].u.bot->numver < min_uffeature))
@@ -1640,7 +1635,6 @@ static int write_tmp_userfile(char *fn, struct userrec *bu, int idx)
 	  (dcc[idx].u.bot->numver < min_uffeature))
         if (!write_invites(f,idx))
   	  ok = 0;
-#endif
     } else
       putlog(LOG_BOTS, "@", "%s is too old: not sharing exempts and invites.",
              dcc[idx].nick);

src/modules.c

@@ -36,9 +36,7 @@ extern int	 	 noshare, loading, role, server_lag,
 			 use_console_r, ignore_time, must_be_owner,
 			 debug_output, default_flags,  
 			 max_dcc, password_timeout, localhub,
-#ifdef S_IRCNET
 			 use_invites, use_exempts, 
-#endif
                          force_expire, do_restart, timesync,
 			 protect_readonly, reserved_port_min, reserved_port_max;
 extern time_t now, online_since;
@@ -430,24 +428,14 @@ Function global_table[] =
   (Function) & rfc_casecmp,	/* Function *				*/
   (Function) & rfc_ncasecmp,	/* Function *				*/
   /* 220 - 223 */
-#ifdef S_IRCNET
   (Function) & global_exempts,	/* struct exemptrec *			*/
   (Function) & global_invites,	/* struct inviterec *			*/
-#else
-  (Function) 0,
-  (Function) 0,
-#endif
   (Function) 0, /* ginvite_total -- UNUSED! (Eule) */
   (Function) 0, /* gexempt_total -- UNUSED! (Eule) */
   /* 224 - 227 */
   (Function) & H_event,		/* p_tcl_bind_list *			*/
-#ifdef S_IRCNET
   (Function) & use_exempts,	/* int					*/
   (Function) & use_invites,	/* int					*/
-#else
-  (Function) 0,
-  (Function) 0,
-#endif
   (Function) & force_expire,	/* int					*/
   /* 228 - 231 */
   (Function) 0,