Resolve shfit/reduce conflict in timespec production (#54)

[solanum.git] / ircd / channel.c

diff --git a/ircd/channel.c b/ircd/channel.c
index 91cf998f7cb57bb02b0d06f79203b9ec288c8034..c09a717d12c1bf797a3a919b78cac85d90c4e0d4 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -221,6 +221,7 @@ void
 add_user_to_channel(struct Channel *chptr, struct Client *client_p, int flags)
 {
        struct membership *msptr;
+       rb_dlink_node *p;
 
        s_assert(client_p->user != NULL);
        if(client_p->user == NULL)
@@ -232,7 +233,17 @@ add_user_to_channel(struct Channel *chptr, struct Client *client_p, int flags)
        msptr->client_p = client_p;
        msptr->flags = flags;
 
-       rb_dlinkAdd(msptr, &msptr->usernode, &client_p->user->channel);
+       RB_DLINK_FOREACH(p, client_p->user->channel.head)
+       {
+               struct membership *ms2 = p->data;
+               if (irccmp(chptr->chname, ms2->chptr->chname) < 0)
+                       break;
+       }
+       if (p == NULL)
+               rb_dlinkAddTail(msptr, &msptr->usernode, &client_p->user->channel);
+       else
+               rb_dlinkAddBefore(p, msptr, &msptr->usernode, &client_p->user->channel);
+
        rb_dlinkAdd(msptr, &msptr->channode, &chptr->members);
 
        if(MyClient(client_p))
@@ -423,6 +434,47 @@ channel_pub_or_secret(struct Channel *chptr)
        return ("*");
 }
 
+int
+iter_comm_channels_step(rb_dlink_node *pos1, rb_dlink_node *pos2,
+               struct membership **ms1, struct membership **ms2,
+               struct Channel **chptr)
+{
+       *ms1 = pos1 ? pos1->data : NULL;
+       *ms2 = pos2 ? pos2->data : NULL;
+
+       /* we're at the end */
+       if (*ms1 == NULL && *ms2 == NULL)
+               return 0;
+
+       /* one side is at the end, keep stepping the other one */
+       if (*ms1 == NULL || *ms2 == NULL)
+       {
+               *chptr = *ms1 != NULL ? (*ms1)->chptr : (*ms2)->chptr;
+               return 1;
+       }
+
+       /* common channel */
+       if ((*ms1)->chptr == (*ms2)->chptr)
+       {
+               *chptr = (*ms1)->chptr;
+               return 1;
+       }
+
+       /* null out the channel that's further ahead; we'll get to it later */
+       if (irccmp((*ms1)->chptr->chname, (*ms2)->chptr->chname) > 0)
+       {
+               *ms1 = NULL;
+               *chptr = (*ms2)->chptr;
+               return 1;
+       }
+       else
+       {
+               *ms2 = NULL;
+               *chptr = (*ms1)->chptr;
+               return 1;
+       }
+}
+
 /* channel_member_names()
  *
  * input       - channel to list, client to list to, show endofnames
@@ -571,7 +623,7 @@ is_banned_list(struct Channel *chptr, rb_dlink_list *list,
 
                        /* theyre exempted.. */
                        if (matches_mask(ms, actualExcept->banstr) ||
-                                       match_extban(actualExcept->banstr, who, chptr, CHFL_BAN))
+                                       match_extban(actualExcept->banstr, who, chptr, CHFL_EXCEPTION))
                        {
                                /* cache the fact theyre not banned */
                                if(msptr != NULL)
@@ -1122,7 +1174,7 @@ channel_modes(struct Channel *chptr, struct Client *client_p)
 
        for (i = 0; i < 256; i++)
        {
-               if(chmode_table[i].set_func == chm_hidden && (!IsOper(client_p) || !IsClient(client_p)))
+               if(chmode_table[i].set_func == chm_hidden && (!HasPrivilege(client_p, "auspex:cmodes") || !IsClient(client_p)))
                        continue;
                if(chptr->mode.mode & chmode_flags[i])
                        *mbuf++ = i;