Changeset 90cd6c4

Timestamp:

2010-03-14T18:22:43Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

21d48d9

Parents:

ceebeb1

Message:

Allow disabling certain IM protocols at runtime, patch from
misc@…, bug #381.

Files:

• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)

bitlbee.conf

@@ -120 +120 @@
 ## Proxy = socks5://socksproxy.localnet.com
 
+## Protocols offered by bitlbee
+## 
+## As recompiling may be quite unpractical for some people, this option
+## allows to remove the support of protocol, even if compiled in. If
+## nothing is given, there are no restrictions.
+## 
+## Protocols = jabber yahoo
+
 
 [defaults]

conf.c

@@ -63 +63 @@
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->protocols = NULL;
         proxytype = 0;
         
@@ -307 +308 @@
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "protocols" ) == 0 )
+                        {
+                                g_strfreev( conf->protocols );
+                                conf->protocols = g_strsplit_set( ini->value, " \t,;", -1 );
+                        }
                         else
                         {

conf.h

@@ -50 +50 @@
         int ping_timeout;
         char *user;
+        char **protocols;
 } conf_t;
 

protocols/nogaim.c

@@ -98 +98 @@
 void register_protocol (struct prpl *p)
 {
-        protocols = g_list_append(protocols, p);
+        int i;
+        gboolean refused = global.conf->protocols != NULL;
+ 
+        for (i = 0; global.conf->protocols && global.conf->protocols[i]; i++)
+        {
+                if (g_strcasecmp(p->name, global.conf->protocols[i]) == 0)
+                        refused = FALSE;
+        }
+
+        if (refused)
+                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
+        else
+                protocols = g_list_append(protocols, p);
 }