]> jfr.im git - solanum.git/blobdiff - src/channel.c
capability: change CapabilityIndex.orphaned to (CapabilityIndex.flags & CAP_ORPHANED)
[solanum.git] / src / channel.c
index 1a159f1477904e39bbaf01bc1482f19300ed282b..20c0dc2c53f29ace90b286fbc28464c708b0658a 100644 (file)
@@ -41,6 +41,7 @@
 #include "s_conf.h"            /* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
 #include "logger.h"
+#include "ipv4_from_ipv6.h"
 
 struct config_channel_entry ConfigChannel;
 rb_dlink_list global_channel_list;
@@ -49,19 +50,11 @@ static rb_bh *ban_heap;
 static rb_bh *topic_heap;
 static rb_bh *member_heap;
 
-static int channel_capabs[] = { CAP_EX, CAP_IE,
-       CAP_SERVICE,
-       CAP_TS6
-};
-
-#define NCHCAPS         (sizeof(channel_capabs)/sizeof(int))
-#define NCHCAP_COMBOS   (1 << NCHCAPS)
-
-static struct ChCapCombo chcap_combos[NCHCAP_COMBOS];
-
 static void free_topic(struct Channel *chptr);
 
 static int h_can_join;
+static int h_can_send;
+int h_get_channel_access;
 
 /* init_channels()
  *
@@ -78,6 +71,8 @@ init_channels(void)
        member_heap = rb_bh_create(sizeof(struct membership), MEMBER_HEAP_SIZE, "member_heap");
 
        h_can_join = register_hook("can_join");
+       h_can_send = register_hook("can_send");
+       h_get_channel_access = register_hook("get_channel_access");
 }
 
 /*
@@ -96,16 +91,18 @@ void
 free_channel(struct Channel *chptr)
 {
        rb_free(chptr->chname);
+       rb_free(chptr->mode_lock);
        rb_bh_free(channel_heap, chptr);
 }
 
 struct Ban *
-allocate_ban(const char *banstr, const char *who)
+allocate_ban(const char *banstr, const char *who, const char *forward)
 {
        struct Ban *bptr;
        bptr = rb_bh_alloc(ban_heap);
        bptr->banstr = rb_strdup(banstr);
        bptr->who = rb_strdup(who);
+       bptr->forward = forward ? rb_strdup(forward) : NULL;
 
        return (bptr);
 }
@@ -115,9 +112,31 @@ free_ban(struct Ban *bptr)
 {
        rb_free(bptr->banstr);
        rb_free(bptr->who);
+       rb_free(bptr->forward);
        rb_bh_free(ban_heap, bptr);
 }
 
+/*
+ * send_channel_join()
+ *
+ * input        - channel to join, client joining.
+ * output       - none
+ * side effects - none
+ */
+void
+send_channel_join(struct Channel *chptr, struct Client *client_p)
+{
+       if (!IsClient(client_p))
+               return;
+
+       sendto_channel_local_with_capability(ALL_MEMBERS, NOCAPS, CLICAP_EXTENDED_JOIN, chptr, ":%s!%s@%s JOIN %s",
+                                            client_p->name, client_p->username, client_p->host, chptr->chname);
+
+       sendto_channel_local_with_capability(ALL_MEMBERS, CLICAP_EXTENDED_JOIN, NOCAPS, chptr, ":%s!%s@%s JOIN %s %s :%s",
+                                            client_p->name, client_p->username, client_p->host, chptr->chname,
+                                            EmptyString(client_p->user->suser) ? "*" : client_p->user->suser,
+                                            client_p->info);
+}
 
 /* find_channel_membership()
  *
@@ -487,21 +506,26 @@ del_invite(struct Channel *chptr, struct Client *who)
        rb_dlinkFindDestroy(chptr, &who->user->invited);
 }
 
-/* is_banned()
+/* is_banned_list()
  *
- * input       - channel to check bans for, user to check bans against
- *                optional prebuilt buffers
+ * input       - channel to check bans for, ban list (banlist or quietlist),
+ *                user to check bans against, optional prebuilt buffers,
+ *                optional forward channel pointer
  * output      - 1 if banned, else 0
  * side effects -
  */
-int
-is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
-         const char *s, const char *s2)
+static int
+is_banned_list(struct Channel *chptr, rb_dlink_list *list,
+              struct Client *who, struct membership *msptr,
+              const char *s, const char *s2, const char **forward)
 {
        char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_althost[NICKLEN + USERLEN + HOSTLEN + 6];
+       char src_ip4host[NICKLEN + USERLEN + HOSTLEN + 6];
        char *s3 = NULL;
+       char *s4 = NULL;
+       struct sockaddr_in ip4;
        rb_dlink_node *ptr;
        struct Ban *actualBan = NULL;
        struct Ban *actualExcept = NULL;
@@ -534,15 +558,31 @@ is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
                        s3 = src_althost;
                }
        }
+#ifdef RB_IPV6
+       if(who->localClient->ip.ss_family == AF_INET6 &&
+                       ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4))
+       {
+               rb_sprintf(src_ip4host, "%s!%s@", who->name, who->username);
+               s4 = src_ip4host + strlen(src_ip4host);
+               rb_inet_ntop_sock((struct sockaddr *)&ip4,
+                               s4, src_ip4host + sizeof src_ip4host - s4);
+               s4 = src_ip4host;
+       }
+#endif
 
-       RB_DLINK_FOREACH(ptr, chptr->banlist.head)
+       RB_DLINK_FOREACH(ptr, list->head)
        {
                actualBan = ptr->data;
                if(match(actualBan->banstr, s) ||
                   match(actualBan->banstr, s2) ||
                   match_cidr(actualBan->banstr, s2) ||
                   match_extban(actualBan->banstr, who, chptr, CHFL_BAN) ||
-                  (s3 != NULL && match(actualBan->banstr, s3)))
+                  (s3 != NULL && match(actualBan->banstr, s3))
+#ifdef RB_IPV6
+                  ||
+                  (s4 != NULL && (match(actualBan->banstr, s4) || match_cidr(actualBan->banstr, s4)))
+#endif
+                  )
                        break;
                else
                        actualBan = NULL;
@@ -590,9 +630,27 @@ is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
                }
        }
 
+       if (actualBan && actualBan->forward && forward)
+               *forward = actualBan->forward;
+
        return ((actualBan ? CHFL_BAN : 0));
 }
 
+/* is_banned()
+ *
+ * input       - channel to check bans for, user to check bans against
+ *                optional prebuilt buffers, optional forward channel pointer
+ * output      - 1 if banned, else 0
+ * side effects -
+ */
+int
+is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
+         const char *s, const char *s2, const char **forward)
+{
+       return is_banned_list(chptr, &chptr->banlist, who, msptr, s, s2,
+                       forward);
+}
+
 /* is_quieted()
  *
  * input       - channel to check bans for, user to check bans against
@@ -604,109 +662,19 @@ int
 is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
           const char *s, const char *s2)
 {
-       char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
-       char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char src_althost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char *s3 = NULL;
-       rb_dlink_node *ptr;
-       struct Ban *actualBan = NULL;
-       struct Ban *actualExcept = NULL;
-
-       if(!MyClient(who))
-               return 0;
-
-       /* if the buffers havent been built, do it here */
-       if(s == NULL)
-       {
-               rb_sprintf(src_host, "%s!%s@%s", who->name, who->username, who->host);
-               rb_sprintf(src_iphost, "%s!%s@%s", who->name, who->username, who->sockhost);
-
-               s = src_host;
-               s2 = src_iphost;
-       }
-       if(who->localClient->mangledhost != NULL)
-       {
-               /* if host mangling mode enabled, also check their real host */
-               if(!strcmp(who->host, who->localClient->mangledhost))
-               {
-                       rb_sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->orighost);
-                       s3 = src_althost;
-               }
-               /* if host mangling mode not enabled and no other spoof,
-                * also check the mangled form of their host */
-               else if (!IsDynSpoof(who))
-               {
-                       rb_sprintf(src_althost, "%s!%s@%s", who->name, who->username, who->localClient->mangledhost);
-                       s3 = src_althost;
-               }
-       }
-
-       RB_DLINK_FOREACH(ptr, chptr->quietlist.head)
-       {
-               actualBan = ptr->data;
-               if(match(actualBan->banstr, s) ||
-                  match(actualBan->banstr, s2) ||
-                  match_cidr(actualBan->banstr, s2) ||
-                  match_extban(actualBan->banstr, who, chptr, CHFL_QUIET) ||
-                  (s3 != NULL && match(actualBan->banstr, s3)))
-                       break;
-               else
-                       actualBan = NULL;
-       }
-
-       if((actualBan != NULL) && ConfigChannel.use_except)
-       {
-               RB_DLINK_FOREACH(ptr, chptr->exceptlist.head)
-               {
-                       actualExcept = ptr->data;
-
-                       /* theyre exempted.. */
-                       if(match(actualExcept->banstr, s) ||
-                          match(actualExcept->banstr, s2) ||
-                          match_cidr(actualExcept->banstr, s2) ||
-                          match_extban(actualExcept->banstr, who, chptr, CHFL_EXCEPTION) ||
-                          (s3 != NULL && match(actualExcept->banstr, s3)))
-                       {
-                               /* cache the fact theyre not banned */
-                               if(msptr != NULL)
-                               {
-                                       msptr->bants = chptr->bants;
-                                       msptr->flags &= ~CHFL_BANNED;
-                               }
-
-                               return CHFL_EXCEPTION;
-                       }
-               }
-       }
-
-       /* cache the banned/not banned status */
-       if(msptr != NULL)
-       {
-               msptr->bants = chptr->bants;
-
-               if(actualBan != NULL)
-               {
-                       msptr->flags |= CHFL_BANNED;
-                       return CHFL_BAN;
-               }
-               else
-               {
-                       msptr->flags &= ~CHFL_BANNED;
-                       return 0;
-               }
-       }
-
-       return ((actualBan ? CHFL_BAN : 0));
+       return is_banned_list(chptr, &chptr->quietlist, who, msptr, s, s2,
+                       NULL);
 }
 
 /* can_join()
  *
  * input       - client to check, channel to check for, key
- * output      - reason for not being able to join, else 0
+ * output      - reason for not being able to join, else 0, channel name to forward to
  * side effects -
+ * caveats      - this function should only be called on a local user.
  */
 int
-can_join(struct Client *source_p, struct Channel *chptr, char *key)
+can_join(struct Client *source_p, struct Channel *chptr, const char *key, const char **forward)
 {
        rb_dlink_node *invite = NULL;
        rb_dlink_node *ptr;
@@ -720,6 +688,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
 
        s_assert(source_p->localClient != NULL);
 
+       moduledata.client = source_p;
+       moduledata.chptr = chptr;
+       moduledata.approved = 0;
+
        rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
        rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost);
        if(source_p->localClient->mangledhost != NULL)
@@ -739,8 +711,21 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
                }
        }
 
-       if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN)
-               return (ERR_BANNEDFROMCHAN);
+       if((is_banned(chptr, source_p, NULL, src_host, src_iphost, forward)) == CHFL_BAN)
+       {
+               moduledata.approved = ERR_BANNEDFROMCHAN;
+               goto finish_join_check;
+       }
+
+       if(*chptr->mode.key && (EmptyString(key) || irccmp(chptr->mode.key, key)))
+       {
+               moduledata.approved = ERR_BADCHANNELKEY;
+               goto finish_join_check;
+       }
+
+       /* All checks from this point on will forward... */
+       if(forward)
+               *forward = chptr->mode.forward;
 
        if(chptr->mode.mode & MODE_INVITEONLY)
        {
@@ -752,7 +737,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
                if(invite == NULL)
                {
                        if(!ConfigChannel.use_invex)
-                               return (ERR_INVITEONLYCHAN);
+                               moduledata.approved = ERR_INVITEONLYCHAN;
                        RB_DLINK_FOREACH(ptr, chptr->invexlist.head)
                        {
                                invex = ptr->data;
@@ -764,13 +749,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
                                        break;
                        }
                        if(ptr == NULL)
-                               return (ERR_INVITEONLYCHAN);
+                               moduledata.approved = ERR_INVITEONLYCHAN;
                }
        }
 
-       if(*chptr->mode.key && (EmptyString(key) || irccmp(chptr->mode.key, key)))
-               return (ERR_BADCHANNELKEY);
-
        if(chptr->mode.limit &&
           rb_dlink_list_length(&chptr->members) >= (unsigned long) chptr->mode.limit)
                i = ERR_CHANNELISFULL;
@@ -794,13 +776,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
                                break;
                }
                if (invite == NULL)
-                       return i;
+                       moduledata.approved = i;
        }
 
-       moduledata.client = source_p;
-       moduledata.chptr = chptr;
-       moduledata.approved = 0;
-
+finish_join_check:
        call_hook(h_can_join, &moduledata);
 
        return moduledata.approved;
@@ -815,12 +794,16 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
 int
 can_send(struct Channel *chptr, struct Client *source_p, struct membership *msptr)
 {
+       hook_data_channel_approval moduledata;
+
+       moduledata.approved = CAN_SEND_NONOP;
+
        if(IsServer(source_p) || IsService(source_p))
                return CAN_SEND_OPV;
 
        if(MyClient(source_p) && hash_find_resv(chptr->chname) &&
           !IsOper(source_p) && !IsExemptResv(source_p))
-               return CAN_SEND_NO;
+               moduledata.approved = CAN_SEND_NO;
 
        if(msptr == NULL)
        {
@@ -833,17 +816,16 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt
                         * theres no possibility of caching them --fl
                         */
                        if(chptr->mode.mode & MODE_NOPRIVMSGS || chptr->mode.mode & MODE_MODERATED)
-                               return CAN_SEND_NO;
+                               moduledata.approved = CAN_SEND_NO;
                        else
-                               return CAN_SEND_NONOP;
+                               moduledata.approved = CAN_SEND_NONOP;
+
+                       return moduledata.approved;
                }
        }
 
-       if(is_chanop_voiced(msptr))
-               return CAN_SEND_OPV;
-
        if(chptr->mode.mode & MODE_MODERATED)
-               return CAN_SEND_NO;
+               moduledata.approved = CAN_SEND_NO;
 
        if(MyClient(source_p))
        {
@@ -851,14 +833,80 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt
                if(msptr->bants == chptr->bants)
                {
                        if(can_send_banned(msptr))
-                               return CAN_SEND_NO;
+                               moduledata.approved = CAN_SEND_NO;
                }
-               else if(is_banned(chptr, source_p, msptr, NULL, NULL) == CHFL_BAN
+               else if(is_banned(chptr, source_p, msptr, NULL, NULL, NULL) == CHFL_BAN
                        || is_quieted(chptr, source_p, msptr, NULL, NULL) == CHFL_BAN)
-                       return CAN_SEND_NO;
+                       moduledata.approved = CAN_SEND_NO;
+       }
+
+       if(is_chanop_voiced(msptr))
+               moduledata.approved = CAN_SEND_OPV;
+
+       moduledata.client = source_p;
+       moduledata.chptr = msptr->chptr;
+       moduledata.msptr = msptr;
+       moduledata.target = NULL;
+
+       call_hook(h_can_send, &moduledata);
+
+       return moduledata.approved;
+}
+
+/*
+ * flood_attack_channel
+ * inputs       - flag 0 if PRIVMSG 1 if NOTICE. RFC
+ *                says NOTICE must not auto reply
+ *              - pointer to source Client 
+ *             - pointer to target channel
+ * output      - 1 if target is under flood attack
+ * side effects        - check for flood attack on target chptr
+ */
+int
+flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, char *chname)
+{
+       int delta;
+
+       if(GlobalSetOptions.floodcount && MyClient(source_p))
+       {
+               if((chptr->first_received_message_time + 1) < rb_current_time())
+               {
+                       delta = rb_current_time() - chptr->first_received_message_time;
+                       chptr->received_number_of_privmsgs -= delta;
+                       chptr->first_received_message_time = rb_current_time();
+                       if(chptr->received_number_of_privmsgs <= 0)
+                       {
+                               chptr->received_number_of_privmsgs = 0;
+                               chptr->flood_noticed = 0;
+                       }
+               }
+
+               if((chptr->received_number_of_privmsgs >= GlobalSetOptions.floodcount)
+                  || chptr->flood_noticed)
+               {
+                       if(chptr->flood_noticed == 0)
+                       {
+                               sendto_realops_snomask(SNO_BOTS, *chptr->chname == '&' ? L_ALL : L_NETWIDE,
+                                                    "Possible Flooder %s[%s@%s] on %s target: %s",
+                                                    source_p->name, source_p->username,
+                                                    source_p->orighost,
+                                                    source_p->servptr->name, chptr->chname);
+                               chptr->flood_noticed = 1;
+
+                               /* Add a bit of penalty */
+                               chptr->received_number_of_privmsgs += 2;
+                       }
+                       if(MyClient(source_p) && (p_or_n != 1))
+                               sendto_one(source_p,
+                                          ":%s NOTICE %s :*** Message to %s throttled due to flooding",
+                                          me.name, source_p->name, chptr->chname);
+                       return 1;
+               }
+               else
+                       chptr->received_number_of_privmsgs++;
        }
 
-       return CAN_SEND_NONOP;
+       return 0;
 }
 
 /* find_bannickchange_channel()
@@ -892,7 +940,7 @@ find_bannickchange_channel(struct Client *client_p)
                        if (can_send_banned(msptr))
                                return chptr;
                }
-               else if (is_banned(chptr, client_p, msptr, src_host, src_iphost) == CHFL_BAN
+               else if (is_banned(chptr, client_p, msptr, src_host, src_iphost, NULL) == CHFL_BAN
                        || is_quieted(chptr, client_p, msptr, src_host, src_iphost) == CHFL_BAN)
                        return chptr;
        }
@@ -1073,10 +1121,9 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in
        }
 }
 
-/* channel_modes_real()
+/* channel_modes()
  *
  * inputs       - pointer to channel
- *              - pointer to channel Mode struct
  *              - pointer to client
  * output       - string with simple modes
  * side effects - result from previous calls overwritten
@@ -1084,7 +1131,7 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in
  * Stolen from ShadowIRCd 4 --nenolod
  */
 const char *
-channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *client_p)
+channel_modes(struct Channel *chptr, struct Client *client_p)
 {
        int i;
        char buf1[BUFSIZE];
@@ -1097,40 +1144,41 @@ channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *clie
        *pbuf = '\0';
 
        for (i = 0; i < 256; i++)
-               if(mode->mode & chmode_flags[i])
+               if(chptr->mode.mode & chmode_flags[i])
                        *mbuf++ = i;
 
-       if(mode->limit)
+       if(chptr->mode.limit)
        {
                *mbuf++ = 'l';
 
                if(!IsClient(client_p) || IsMember(client_p, chptr))
-                       pbuf += rb_sprintf(pbuf, " %d", mode->limit);
+                       pbuf += rb_sprintf(pbuf, " %d", chptr->mode.limit);
        }
 
-       if(*mode->key)
+       if(*chptr->mode.key)
        {
                *mbuf++ = 'k';
 
                if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-                       pbuf += rb_sprintf(pbuf, " %s", mode->key);
+                       pbuf += rb_sprintf(pbuf, " %s", chptr->mode.key);
        }
 
-       if(mode->join_num)
+       if(chptr->mode.join_num)
        {
                *mbuf++ = 'j';
 
                if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-                       pbuf += rb_sprintf(pbuf, " %d:%d", mode->join_num,
-                                          mode->join_time);
+                       pbuf += rb_sprintf(pbuf, " %d:%d", chptr->mode.join_num,
+                                          chptr->mode.join_time);
        }
 
-       if(*mode->forward && (ConfigChannel.use_forward || !IsClient(client_p)))
+       if(*chptr->mode.forward &&
+                       (ConfigChannel.use_forward || !IsClient(client_p)))
        {
                *mbuf++ = 'f';
 
                if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-                       pbuf += rb_sprintf(pbuf, " %s", mode->forward);
+                       pbuf += rb_sprintf(pbuf, " %s", chptr->mode.forward);
        }
 
        *mbuf = '\0';
@@ -1140,102 +1188,6 @@ channel_modes_real(struct Channel *chptr, struct Mode *mode, struct Client *clie
        return final;
 }
 
-/* Now lets do some stuff to keep track of what combinations of
- * servers exist...
- * Note that the number of combinations doubles each time you add
- * something to this list. Each one is only quick if no servers use that
- * combination, but if the numbers get too high here MODE will get too
- * slow. I suggest if you get more than 7 here, you consider getting rid
- * of some and merging or something. If it wasn't for irc+cs we would
- * probably not even need to bother about most of these, but unfortunately
- * we do. -A1kmm
- */
-
-/* void init_chcap_usage_counts(void)
- *
- * Inputs      - none
- * Output      - none
- * Side-effects        - Initialises the usage counts to zero. Fills in the
- *                chcap_yes and chcap_no combination tables.
- */
-void
-init_chcap_usage_counts(void)
-{
-       unsigned long m, c, y, n;
-
-       memset(chcap_combos, 0, sizeof(chcap_combos));
-
-       /* For every possible combination */
-       for (m = 0; m < NCHCAP_COMBOS; m++)
-       {
-               /* Check each capab */
-               for (c = y = n = 0; c < NCHCAPS; c++)
-               {
-                       if((m & (1 << c)) == 0)
-                               n |= channel_capabs[c];
-                       else
-                               y |= channel_capabs[c];
-               }
-               chcap_combos[m].cap_yes = y;
-               chcap_combos[m].cap_no = n;
-       }
-}
-
-/* void set_chcap_usage_counts(struct Client *serv_p)
- * Input: serv_p; The client whose capabs to register.
- * Output: none
- * Side-effects: Increments the usage counts for the correct capab
- *               combination.
- */
-void
-set_chcap_usage_counts(struct Client *serv_p)
-{
-       int n;
-
-       for (n = 0; n < NCHCAP_COMBOS; n++)
-       {
-               if(IsCapable(serv_p, chcap_combos[n].cap_yes) &&
-                  NotCapable(serv_p, chcap_combos[n].cap_no))
-               {
-                       chcap_combos[n].count++;
-                       return;
-               }
-       }
-
-       /* This should be impossible -A1kmm. */
-       s_assert(0);
-}
-
-/* void set_chcap_usage_counts(struct Client *serv_p)
- *
- * Inputs      - serv_p; The client whose capabs to register.
- * Output      - none
- * Side-effects        - Decrements the usage counts for the correct capab
- *                combination.
- */
-void
-unset_chcap_usage_counts(struct Client *serv_p)
-{
-       int n;
-
-       for (n = 0; n < NCHCAP_COMBOS; n++)
-       {
-               if(IsCapable(serv_p, chcap_combos[n].cap_yes) &&
-                  NotCapable(serv_p, chcap_combos[n].cap_no))
-               {
-                       /* Hopefully capabs can't change dynamically or anything... */
-                       s_assert(chcap_combos[n].count > 0);
-
-                       if(chcap_combos[n].count > 0)
-                               chcap_combos[n].count--;
-                       return;
-               }
-       }
-
-       /* This should be impossible -A1kmm. */
-       s_assert(0);
-}
-
 /* void send_cap_mode_changes(struct Client *client_p,
  *                        struct Client *source_p,
  *                        struct Channel *chptr, int cap, int nocap)
@@ -1247,6 +1199,9 @@ unset_chcap_usage_counts(struct Client *serv_p)
  * Reverted back to my original design, except that we now keep a count
  * of the number of servers which each combination as an optimisation, so
  * the capabs combinations which are not needed are not worked out. -A1kmm
+ *
+ * Removed most code here because we don't need to be compatible with ircd
+ * 2.8.21+CSr and stuff.  --nenolod
  */
 void
 send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
@@ -1257,109 +1212,100 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
        int i, mbl, pbl, nc, mc, preflen, len;
        char *pbuf;
        const char *arg;
-       int dir;
-       int j;
        int cap;
        int nocap;
+       int dir;
        int arglen;
 
        /* Now send to servers... */
-       for (j = 0; j < NCHCAP_COMBOS; j++)
+       mc = 0;
+       nc = 0;
+       pbl = 0;
+       parabuf[0] = 0;
+       pbuf = parabuf;
+       dir = MODE_QUERY;
+
+       mbl = preflen = rb_sprintf(modebuf, ":%s TMODE %ld %s ",
+                                  use_id(source_p), (long) chptr->channelts,
+                                  chptr->chname);
+
+       /* loop the list of - modes we have */
+       for (i = 0; i < mode_count; i++)
        {
-               if(chcap_combos[j].count == 0)
+               /* if they dont support the cap we need, or they do support a cap they
+                * cant have, then dont add it to the modebuf.. that way they wont see
+                * the mode
+                */
+               if (mode_changes[i].letter == 0)
                        continue;
 
-               mc = 0;
-               nc = 0;
-               pbl = 0;
-               parabuf[0] = 0;
-               pbuf = parabuf;
-               dir = MODE_QUERY;
-
-               cap = chcap_combos[j].cap_yes;
-               nocap = chcap_combos[j].cap_no;
+               cap = mode_changes[i].caps;
+               nocap = mode_changes[i].nocaps;
 
-               mbl = preflen = rb_sprintf(modebuf, ":%s TMODE %ld %s ",
-                                          use_id(source_p), (long) chptr->channelts,
-                                          chptr->chname);
+               if (!EmptyString(mode_changes[i].id))
+                       arg = mode_changes[i].id;
+               else
+                       arg = mode_changes[i].arg;
 
-               /* loop the list of - modes we have */
-               for (i = 0; i < mode_count; i++)
+               if(arg)
                {
-                       /* if they dont support the cap we need, or they do support a cap they
-                        * cant have, then dont add it to the modebuf.. that way they wont see
-                        * the mode
-                        */
-                       if((mode_changes[i].letter == 0) ||
-                          ((cap & mode_changes[i].caps) != mode_changes[i].caps)
-                          || ((nocap & mode_changes[i].nocaps) != mode_changes[i].nocaps))
-                               continue;
+                       arglen = strlen(arg);
 
-                       if(!EmptyString(mode_changes[i].id))
-                               arg = mode_changes[i].id;
-                       else
-                               arg = mode_changes[i].arg;
-
-                       if(arg)
-                       {
-                               arglen = strlen(arg);
-
-                               /* dont even think about it! --fl */
-                               if(arglen > MODEBUFLEN - 5)
-                                       continue;
-                       }
+                       /* dont even think about it! --fl */
+                       if(arglen > MODEBUFLEN - 5)
+                               continue;
+               }
 
-                       /* if we're creeping past the buf size, we need to send it and make
-                        * another line for the other modes
-                        * XXX - this could give away server topology with uids being
-                        * different lengths, but not much we can do, except possibly break
-                        * them as if they were the longest of the nick or uid at all times,
-                        * which even then won't work as we don't always know the uid -A1kmm.
-                        */
-                       if(arg && ((mc == MAXMODEPARAMSSERV) ||
-                                  ((mbl + pbl + arglen + 4) > (BUFSIZE - 3))))
-                       {
-                               if(nc != 0)
-                                       sendto_server(client_p, chptr, cap, nocap,
-                                                     "%s %s", modebuf, parabuf);
-                               nc = 0;
-                               mc = 0;
-
-                               mbl = preflen;
-                               pbl = 0;
-                               pbuf = parabuf;
-                               parabuf[0] = 0;
-                               dir = MODE_QUERY;
-                       }
+               /* if we're creeping past the buf size, we need to send it and make
+                * another line for the other modes
+                * XXX - this could give away server topology with uids being
+                * different lengths, but not much we can do, except possibly break
+                * them as if they were the longest of the nick or uid at all times,
+                * which even then won't work as we don't always know the uid -A1kmm.
+                */
+               if(arg && ((mc == MAXMODEPARAMSSERV) ||
+                          ((mbl + pbl + arglen + 4) > (BUFSIZE - 3))))
+               {
+                       if(nc != 0)
+                               sendto_server(client_p, chptr, cap, nocap,
+                                             "%s %s", modebuf, parabuf);
+                       nc = 0;
+                       mc = 0;
+
+                       mbl = preflen;
+                       pbl = 0;
+                       pbuf = parabuf;
+                       parabuf[0] = 0;
+                       dir = MODE_QUERY;
+               }
 
-                       if(dir != mode_changes[i].dir)
-                       {
-                               modebuf[mbl++] = (mode_changes[i].dir == MODE_ADD) ? '+' : '-';
-                               dir = mode_changes[i].dir;
-                       }
+               if(dir != mode_changes[i].dir)
+               {
+                       modebuf[mbl++] = (mode_changes[i].dir == MODE_ADD) ? '+' : '-';
+                       dir = mode_changes[i].dir;
+               }
 
-                       modebuf[mbl++] = mode_changes[i].letter;
-                       modebuf[mbl] = 0;
-                       nc++;
+               modebuf[mbl++] = mode_changes[i].letter;
+               modebuf[mbl] = 0;
+               nc++;
 
-                       if(arg != NULL)
-                       {
-                               len = rb_sprintf(pbuf, "%s ", arg);
-                               pbuf += len;
-                               pbl += len;
-                               mc++;
-                       }
+               if(arg != NULL)
+               {
+                       len = rb_sprintf(pbuf, "%s ", arg);
+                       pbuf += len;
+                       pbl += len;
+                       mc++;
                }
+       }
 
-               if(pbl && parabuf[pbl - 1] == ' ')
-                       parabuf[pbl - 1] = 0;
+       if(pbl && parabuf[pbl - 1] == ' ')
+               parabuf[pbl - 1] = 0;
 
-               if(nc != 0)
-                       sendto_server(client_p, chptr, cap, nocap, "%s %s", modebuf, parabuf);
-       }
+       if(nc != 0)
+               sendto_server(client_p, chptr, cap, nocap, "%s %s", modebuf, parabuf);
 }
 
-void 
+void
 resv_chan_forcepart(const char *name, const char *reason, int temp_time)
 {
        rb_dlink_node *ptr;