Changes preparing for 2.2.0 release

CHANGES

@@ -1,3 +1,34 @@
+Changes for 2.2.0:
+------------------
+rasengan (2):
+     Search for WEBIRC users using /rwho (PR #139)
+     Added /stats P to show listening ports (PR #134)
+
+Ryan Smith (8):
+     Override clone limits with SVSCLONE (PR #148)
+     Updates to user hostmasking (PR #175)
+     Do not attempt to mask the Staff_Address for opers. (PR #175)
+     Do not allow opers who are already hostmasked to set +H as this results in weird /whois results. (PR #175)
+     Added new config.h option: NO_UMODE_H_FLOOD. Do not allow the user to change user mode H too often, to prevent WATCH flooding. (PR #175)
+     Do not allow user mode H to be changed if the user is in any channels. This is to prevent potential client-side weirdness from happening if a user's host changes while they're already in one or more channels. (PR #175)
+     Send out WATCH notifications if the hostname changes due to a mode H change. (PR #175)
+     Minor typo fixes.
+
+Emilio Escobar (4):
+     Fixed oper block corruption when two opers share the same IP (PR #181)
+     Override softlimits with SVSCLONE (PR #162)
+     Decrease unknown count if cptr is in unknown state (PR #160)
+     Enable channel half ops (PR #184)
+
+Kobi Shmueli (1):
+     Change user hostmask to send user's IP (PR #179)
+
+Ned T. Crigler (1):
+     Make configure test support for extra compiler flags (PR #167)
+
+jeian (1):
+     Add XFLAG documentation (PR #155)
+
 Changes for 2.1.6:
 ------------------
 Ryan Smith (4):

INSTALL

@@ -16,7 +16,7 @@ HOW TO BUILD:
 4.  "make install" will install the ircd, config converter, and documents
     to the directory set by ./configure
 
-5.  Edit example.conf in your install directory, and move it to "ircd.conf".
+5.  Edit template.conf in your install directory, and move it to "ircd.conf".
 
 6.  Run the binary!  ircd will look in the directory you are executing from
     for an ircd.conf first, then it will look to the directory local to itself.

doc/Bahamut-team

@@ -1,7 +1,7 @@
 Bahamut was taken on by a group of loosely knit coders that decided that
 Dreamforge just was eating up too much CPU to handle DALnet's growing user
 base.  Originally starting out as the DFhybrid project, it slowly grew
-into the Bahamut project as the peices started falling together.
+into the Bahamut project as the pieces started falling together.
 
 Bahamut is based upon the hybrid IRCd, developed for EFnet, and we most
 surely wouldn't be where we are today without the dedication of the coders

doc/CODING_STANDARD

@@ -4,7 +4,7 @@ The following are the Coding Standards for Bahamut.
 2)  All indentations shall be 4 characters long - no tab characters '\t'
 3)  All variable names shall begin with a lowercase letter.
 4)  All variables defined as macros shall be in all Upper Case
-5)  All preprocessor directive shall be at char posistion 0 with no
+5)  All preprocessor directive shall be at char position 0 with no
     spaces after the #.
 6)  all conditional/loop statements shall have the brace on a line
     by themselves

include/config.h

@@ -873,15 +873,6 @@
  */
 #define USER_HOSTMASKING
 
-/* USER_HOSTMASKING_FALLBACK_TO_IP is used to hostmask using the user's IP
- * address if we are unable to hostmask using their hostname. This usually
- * happens if they're using a domain name without a lot of labels:
- * somehost.com or company.co.uk or similar.
- */
-#ifdef USER_HOSTMASKING
-#define USER_HOSTMASKING_FALLBACK_TO_IP
-#endif
-
 /* SPAMFILTER is used to enable spam filtering on the network.
  * If you are connected to the main DALnet network, you should
  * have this enabled.
@@ -906,7 +897,7 @@
 /*
  * Don't allow local clients to use +h/-h until all servers and services are upgraded.
  */
-#define NO_LOCAL_CMODE_h
+#undef NO_LOCAL_CMODE_h
 
 /* ------------------------- END CONFIGURATION SECTION -------------------- */
 #ifdef APOLLO

include/h.h

@@ -260,6 +260,7 @@ extern int  	  do_numeric(int, aClient *, aClient *, int, char **);
 extern int  	  hunt_server(aClient *, aClient *, char *, int, int, char **);
 extern aClient 	 *next_client(aClient *, char *);
 extern aClient 	 *next_client_double(aClient *, char *);
+extern inline void verbose_to_opers(aClient *sptr, aChannel *chptr, char *cmd, char *reason); /* for m_message() */
 
 extern int  	  m_umode(aClient *, aClient *, int, char **);
 extern int  	  m_names(aClient *, aClient *, int, char **);

include/patchlevel.h

@@ -21,8 +21,8 @@
 
 #define BASENAME "bahamut"
 #define MAJOR 2
-#define MINOR 1
-#define PATCH 6
+#define MINOR 2
+#define PATCH 0
 
 #define PATCHES ""
 

include/struct.h

@@ -314,7 +314,9 @@ typedef struct SServicesTag ServicesTag;
 #define UMODE_I     0x8000000   /* umode +I - invisible oper (masked) */
 #define UMODE_S     0x10000000  /* umode +S - User is using SSL */
 #define UMODE_C     0x20000000  /* umode +C - User is only accepting private messages from users who share a common channel with them */
+#define UMODE_W     0x30000000 /* umode +W - User is connected from WEBIRC */
 #define UMODE_H     0x40000000  /* umode +H - User is host-masked */
+
 /* WARNING: Do not add any values greater than 0x40000000 unless you change Client->umode to unsigned long
             (and change everything else to support it) -Kobi & xPsycho. */
 
@@ -339,7 +341,7 @@ typedef struct SServicesTag ServicesTag;
  *  that mode will be 'silent.'
  */
 
-#define SEND_UMODES (UMODE_a|UMODE_i|UMODE_o|UMODE_r|UMODE_A|UMODE_I|UMODE_R|UMODE_S|UMODE_C|UMODE_H|UMODE_P)
+#define SEND_UMODES (UMODE_a|UMODE_i|UMODE_o|UMODE_r|UMODE_A|UMODE_I|UMODE_R|UMODE_S|UMODE_C|UMODE_H|UMODE_P|UMODE_W)
 #define ALL_UMODES (SEND_UMODES|UMODE_b|UMODE_c|UMODE_d|UMODE_e|UMODE_f|\
                     UMODE_g|UMODE_h|UMODE_j|UMODE_k|UMODE_m|UMODE_n|UMODE_s|\
                     UMODE_w|UMODE_y|UMODE_F|UMODE_K|UMODE_O)
@@ -356,6 +358,7 @@ typedef struct SServicesTag ServicesTag;
 
 #define	IsOper(x)		((x)->umode & UMODE_o)
 #define	IsLocOp(x)		((x)->umode & UMODE_O)
+#define IsWebIRC(x)     ((x)->umode & UMODE_W)
 #define	IsInvisible(x)		((x)->umode & UMODE_i)
 #define	IsAnOper(x)		((x)->umode & (UMODE_o|UMODE_O))
 #define	CanBeOper(x)		((x)->umode & (UMODE_o|UMODE_O|UMODE_I))

src/m_nick.c

@@ -40,7 +40,6 @@ extern int del_dccallow(aClient *, aClient *, int);
 
 extern int is_xflags_exempted(aClient *sptr, aChannel *chptr);
 extern int verbose_to_relaychan(aClient *sptr, aChannel *chptr, char *cmd, char *reason);
-extern inline void verbose_to_opers(aClient *sptr, aChannel *chptr, char *cmd, char *reason);
 
 extern int user_modes[];
 

src/m_rwho.c

@@ -983,9 +983,9 @@ static int rwho_match(aClient *cptr, int *failcode, aClient **failclient)
 	    return 0;
     }
 
-    if (MyClient(cptr) && (rwho_opts.check[0] & RWM_WEBIRC) && !cptr->webirc_ip)
+    if ((rwho_opts.check[0] & RWM_WEBIRC) && !IsWebIRC(cptr))
         return 0;
-    else if (MyClient(cptr) && (rwho_opts.check[1] & RWM_WEBIRC) && cptr->webirc_ip)
+    else if ((rwho_opts.check[1] & RWM_WEBIRC) && IsWebIRC(cptr))
         return 0;
 
     if (rwho_opts.check[1] & RWM_IP)

src/s_user.c

@@ -59,7 +59,6 @@ extern int send_lusers(aClient *,aClient *,int, char **);
 #endif
 extern int is_xflags_exempted(aClient *sptr, aChannel *chptr); /* for m_message() */
 extern int verbose_to_relaychan(aClient *sptr, aChannel *chptr, char *cmd, char *reason); /* for m_message() */
-extern inline void verbose_to_opers(aClient *sptr, aChannel *chptr, char *cmd, char *reason); /* for m_message() */
 extern time_t get_user_jointime(aClient *cptr, aChannel *chptr); /* for send_msg_error() */
 extern time_t get_user_lastmsgtime(aClient *cptr, aChannel *chptr); /* also for send_msg_error() -Holbrook */
 extern int server_was_split;
@@ -104,6 +103,7 @@ int  user_modes[] =
     UMODE_S, 'S',
     UMODE_K, 'K',
     UMODE_I, 'I',
+    UMODE_W, 'W',
 #ifdef SPAMFILTER
     UMODE_P, 'P',
 #endif
@@ -460,11 +460,6 @@ char *mask_host(char *orghost, char *orgip, int type)
 
     if (call_hooks(CHOOK_MASKHOST, orghost, orgip, &newhost, type) == UHM_SUCCESS) return newhost;
 
-#ifdef USER_HOSTMASKING_FALLBACK_TO_IP
-    // If the initial call fails, the user has a short hostname that we couldn't mask, so retry masking with the IP.
-    if (call_hooks(CHOOK_MASKHOST, orgip, &newhost, type) == UHM_SUCCESS) return newhost;
-#endif
-
     return orghost; /* I guess the user won't be host-masked after all... :( */
 }
 
@@ -2375,6 +2370,11 @@ do_user(char *nick, aClient *cptr, aClient *sptr, char *username, char *host,
         if((uhm_type > 0) && (uhm_umodeh == 1)) sptr->umode |= UMODE_H;
         else sptr->umode &= ~UMODE_H;
 #endif
+        if (cptr->webirc_ip)
+           sptr->umode |= UMODE_W;
+        else
+           sptr->umode &= ~UMODE_W;
+
         user->server = me.name;
     }
     strncpyzt(sptr->info, realname, sizeof(sptr->info));
@@ -3356,6 +3356,7 @@ m_umode(aClient *cptr, aClient *sptr, int parc, char *parv[])
                 case 'r':
                 case 'x':
                 case 'X':
+                case 'W':
                 case 'S':
                     break; /* users can't set themselves +r,+x,+X or +S! */
 #ifdef USER_HOSTMASKING
@@ -3412,6 +3413,11 @@ m_umode(aClient *cptr, aClient *sptr, int parc, char *parv[])
                             hash_check_watch(sptr, RPL_LOGON);
                         }
                     }
+                    else
+                    {
+                        sendto_one(sptr, ":%s NOTICE %s :*** Notice -- Server has not received hostmask type, please contact %s staff.",
+                               me.name, sptr->name, Network_Name);
+                    }
                     break;
 #endif
                 case 'A':