Changeset 471573f

Timestamp:

2006-06-26T15:06:08Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

90bbb0e

Parents:

c9f0c79 (diff), 2f13222 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from devel (IRC protocol compliance stuff).

Files:

• irc.c (modified) (9 diffs)
• irc_commands.c (modified) (2 diffs)

irc.c

@@ -657 +657 @@
                 c = conv_findchannel( channel );
         
-        /* RFC's say there is no error reply allowed on NAMES, so when the
+        /* RFCs say there is no error reply allowed on NAMES, so when the
            channel is invalid, just give an empty reply. */
         
@@ -671 +671 @@
                                         s = "";
                                 
-                                irc_reply( irc, 353, "@ %s :%s%s", channel, s, u->nick );
+                                irc_reply( irc, 353, "= %s :%s%s", channel, s, u->nick );
                         }
                         else if( !u->gc )
@@ -682 +682 @@
                                         s = "";
                                 
-                                irc_reply( irc, 353, "@ %s :%s%s", channel, s, u->nick );
+                                irc_reply( irc, 353, "= %s :%s%s", channel, s, u->nick );
                         }
                 }
@@ -697 +697 @@
                 for( l = c->in_room; l; l = l->next )
                         if( ( u = user_findhandle( c->gc, l->data ) ) )
-                                irc_reply( irc, 353, "@ %s :%s%s", channel, "", u->nick );
+                                irc_reply( irc, 353, "= %s :%s%s", channel, "", u->nick );
         }
         
@@ -735 +735 @@
         irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
+        irc->umode[0] = '\0';
         irc_umode_set( irc, "+" UMODE, 1 );
 
@@ -842 +843 @@
         char m[256], st = 1, *t;
         int i;
+        char changes[512], *p, st2 = 2;
+        char badflag = 0;
         
         memset( m, 0, sizeof( m ) );
@@ -847 +850 @@
         for( t = irc->umode; *t; t ++ )
                 m[(int)*t] = 1;
-        
+
+        p = changes;
         for( t = s; *t; t ++ )
         {
@@ -853 +857 @@
                         st = *t == '+';
                 else if( st == 0 || ( strchr( UMODES, *t ) || ( allow_priv && strchr( UMODES_PRIV, *t ) ) ) )
+                {
+                        if( m[(int)*t] != st)
+                        {
+                                if( st != st2 )
+                                        st2 = st, *p++ = st ? '+' : '-';
+                                *p++ = *t;
+                        }
                         m[(int)*t] = st;
-        }
+                }
+                else
+                        badflag = 1;
+        }
+        *p = '\0';
         
         memset( irc->umode, 0, sizeof( irc->umode ) );
@@ -862 +877 @@
                         irc->umode[strlen(irc->umode)] = i;
         
-        irc_reply( irc, 221, "+%s", irc->umode );
+        if( badflag )
+                irc_reply( irc, 501, ":Unknown MODE flag" );
+        /* Deliberately no !user@host on the prefix here */
+        if( *changes )
+                irc_write( irc, ":%s MODE %s %s", irc->nick, irc->nick, changes );
 }
 

irc_commands.c

@@ -119 +119 @@
                         if( cmd[2] )
                                 irc_umode_set( irc, cmd[2], 0 );
+                        else
+                                irc_reply( irc, 221, "+%s", irc->umode );
                 }
                 else
@@ -637 +639 @@
                         }
                         
-                        break;
-                }
-}
+                        return;
+                }
+        
+        if( irc->status >= USTATUS_LOGGED_IN )
+                irc_reply( irc, 421, "%s :Unknown command", cmd[0] );
+}