Changeset 4be8239

Timestamp:

2010-03-27T02:39:08Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b9e020a

Parents:

ebaebfe

Message:

Simple IRC channel interface, use it to represent the control channel.

Files:

• Makefile (modified) (1 diff)
• irc.c (modified) (1 diff)
• irc.h (modified) (4 diffs)
• irc_channel.c (added)
• irc_send.c (modified) (5 diffs)
• protocols/bee.o (deleted)

Makefile

@@ -11 +11 @@
 # Program variables
 #objects = bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
-objects = bitlbee.o help.o ipc.o irc.o irc_commands.o irc_send.o irc_user.o nick.o set.o
+objects = bitlbee.o help.o ipc.o irc.o irc_channel.o irc_commands.o irc_send.o irc_user.o nick.o set.o
 headers = account.h bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols

irc.c

@@ -586 +586 @@
                 else
                 {
+                        irc_channel_t *ic;
+                        irc_user_t *iu = irc->user;
+                        
+                        irc->user = irc_user_new( irc, iu->nick );
+                        irc->user->user = iu->user;
+                        irc->user->fullname = iu->fullname;
+                        g_free( iu->nick );
+                        g_free( iu );
+                        
+                        irc->umode[0] = '\0';
+                        /*irc_umode_set( irc, "+" UMODE, 1 );*/
+                        
+                        if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
+                                ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
+                        
+                        irc->status |= USTATUS_LOGGED_IN;
+                        
+                        /* This is for bug #209 (use PASS to identify to NickServ). */
+                        if( irc->password != NULL )
+                        {
+                                char *send_cmd[] = { "identify", g_strdup( irc->password ), NULL };
+                                
+                                /*irc_setpass( irc, NULL );*/
+                                /*root_command( irc, send_cmd );*/
+                                g_free( send_cmd[1] );
+                        }
+                        
                         irc_send_login( irc );
+                        
+                        ic = irc_channel_new( irc, ROOT_CHAN );
+                        irc_channel_set_topic( ic, CONTROL_TOPIC );
+                        irc_channel_add_user( ic, irc->user );
+                        
                         return 1;
                 }

irc.h

@@ -73 +73 @@
         struct account *accounts;
         GSList *file_transfers;
-        struct chat *chatrooms;
         
-        GSList *users;
+        GSList *users, *channels;
         GHashTable *nick_user_hash;
         GHashTable *watches;
@@ -106 +105 @@
 } irc_user_t;
 
+typedef enum
+{
+        IRC_CHANNEL_JOINED = 1,
+} irc_channel_flags_t;
+
+typedef struct irc_channel
+{
+        irc_t *irc;
+        int flags;
+        char *name;
+        char *topic;
+        char mode[8];
+        GSList *users;
+        struct set *set;
+} irc_channel_t;
+
 #include "user.h"
 
@@ -125 +140 @@
 int irc_check_login( irc_t *irc );
 
+/* irc_channel.c */
+irc_channel_t *irc_channel_new( irc_t *irc, const char *name );
+int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );
+int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu );
+int irc_channel_set_topic( irc_channel_t *ic, const char *topic );
+
 /* irc_commands.c */
 void irc_exec( irc_t *irc, char **cmd );
@@ -132 +153 @@
 void irc_send_login( irc_t *irc );
 void irc_send_motd( irc_t *irc );
-int irc_usermsg( irc_t *irc, char *format, ... );
+void irc_usermsg( irc_t *irc, char *format, ... );
+void irc_send_join( irc_channel_t *ic, irc_user_t *iu );
+void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );
+void irc_send_names( irc_channel_t *ic );
+void irc_send_topic( irc_channel_t *ic );
 
 /* irc_user.c */

irc_send.c

@@ -34 +34 @@
         g_vsnprintf( text, IRC_MAX_LINE, format, params );
         va_end( params );
+        
         irc_write( irc, ":%s %03d %s %s", irc->root->host, code, irc->user->nick ? : "*", text );
-        
-        return;
 }
 
 void irc_send_login( irc_t *irc )
 {
-        irc_user_t *iu = irc->user;
-        
-        irc->user = irc_user_new( irc, iu->nick );
-        irc->user->user = iu->user;
-        irc->user->fullname = iu->fullname;
-        g_free( iu->nick );
-        g_free( iu );
-        
         irc_send_num( irc,   1, ":Welcome to the BitlBee gateway, %s", irc->user->nick );
         irc_send_num( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->root->host );
@@ -57 +48 @@
                                 CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
         irc_send_motd( irc );
-        irc->umode[0] = '\0';
-        /*irc_umode_set( irc, "+" UMODE, 1 );*/
         
         irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\n"
@@ -66 +55 @@
                           "If you already have an account on this server, just use the "
                           "\x02identify\x02 command to identify yourself." );
-        
-        if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
-                ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
-        
-        irc->status |= USTATUS_LOGGED_IN;
-        
-        /* This is for bug #209 (use PASS to identify to NickServ). */
-        if( irc->password != NULL )
-        {
-                char *send_cmd[] = { "identify", g_strdup( irc->password ), NULL };
-                
-                /*irc_setpass( irc, NULL );*/
-                /*root_command( irc, send_cmd );*/
-                g_free( send_cmd[1] );
-        }
 }
 
@@ -136 +110 @@
 
 /* FIXME/REPLACEME */
-int irc_usermsg( irc_t *irc, char *format, ... )
+void irc_usermsg( irc_t *irc, char *format, ... )
 {
         char text[1024];
@@ -148 +122 @@
         fprintf( stderr, "%s\n", text );
         
-        return 1;
-        
         /*return( irc_msgfrom( irc, u->nick, text ) );*/
 }
+
+void irc_send_join( irc_channel_t *ic, irc_user_t *iu )
+{
+        irc_t *irc = ic->irc;
+        
+        irc_write( irc, ":%s!%s@%s JOIN :%s", iu->nick, iu->user, iu->host, ic->name );
+        
+        if( iu == irc->user )
+        {
+                irc_write( irc, ":%s MODE %s +%s", irc->root->host, ic->name, ic->mode );
+                irc_send_names( ic );
+                irc_send_topic( ic );
+        }
+}
+
+void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason )
+{
+        irc_write( ic->irc, ":%s!%s@%s PART %s :%s", iu->nick, iu->user, iu->host, ic->name, reason );
+}
+
+void irc_send_names( irc_channel_t *ic )
+{
+        GSList *l;
+        irc_user_t *iu;
+        char namelist[385] = "";
+        struct groupchat *c = NULL;
+        char *ops = set_getstr( &ic->irc->b->set, "ops" );
+        
+        /* RFCs say there is no error reply allowed on NAMES, so when the
+           channel is invalid, just give an empty reply. */
+        for( l = ic->users; l; l = l->next )
+        {
+                irc_user_t *iu = l->data;
+                
+                if( strlen( namelist ) + strlen( iu->nick ) > sizeof( namelist ) - 4 )
+                {
+                        irc_send_num( ic->irc, 353, "= %s :%s", ic->name, namelist );
+                        *namelist = 0;
+                }
+                
+                /*
+                if( u->ic && !u->away && set_getbool( &irc->set, "away_devoice" ) )
+                        strcat( namelist, "+" );
+                else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
+                         ( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) == 0 ) ) )
+                        strcat( namelist, "@" );
+                */
+                
+                strcat( namelist, iu->nick );
+                strcat( namelist, " " );
+        }
+        
+        if( *namelist )
+                irc_send_num( ic->irc, 353, "= %s :%s", ic->name, namelist );
+        
+        irc_send_num( ic->irc, 366, "%s :End of /NAMES list", ic->name );
+}
+
+void irc_send_topic( irc_channel_t *ic )
+{
+        if( ic->topic )
+                irc_send_num( ic->irc, 332, "%s :%s", ic->name, ic->topic );
+        else
+                irc_send_num( ic->irc, 331, "%s :No topic for this channel", ic->name );
+}