Changes in / [9f03c47:537d9b9]

Files:

• .gitignore (modified) (1 diff)
• configure (modified) (12 diffs)
• irc_channel.c (modified) (2 diffs)
• irc_commands.c (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• lib/json.c (deleted)
• lib/json.h (deleted)
• lib/json_util.c (deleted)
• lib/json_util.h (deleted)
• lib/misc.c (modified) (2 diffs)
• lib/misc.h (modified) (1 diff)
• lib/oauth2.c (modified) (3 diffs)
• lib/parson.c (added)
• lib/parson.h (added)
• protocols/account.c (modified) (2 diffs)
• protocols/account.h (modified) (2 diffs)
• protocols/nogaim.c (modified) (6 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• protocols/purple/purple.c (modified) (1 diff)
• protocols/rpc/Makefile (added)
• protocols/rpc/rpc.c (added)
• protocols/twitter/twitter_lib.c (modified) (53 diffs)
• python/implugin.py (added)
• python/newsblur.py (added)
• python/wa.py (added)
• root_commands.c (modified) (7 diffs)
• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)
• storage_xml.c (modified) (5 diffs)

.gitignore

@@ -32 +32 @@
 bitlbee.service
 bitlbee@.service
+*.pyc

configure

@@ -16 +16 @@
 config='/var/lib/bitlbee/'
 plugindir='$prefix/lib/bitlbee/'
+rpcplugindir='$plugindir/rpc/'
 includedir='$prefix/include/bitlbee/'
 systemdsystemunitdir=''
@@ -39 +40 @@
 twitter=1
 purple=0
+rpc=1
 
 doc=1
@@ -123 +125 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
+--rpcplugindir=...                                      $rpcplugindir
 --systemdsystemunitdir=...                              $systemdsystemunitdir
 --pidfile=...                                           $pidfile
@@ -135 +138 @@
 --purple=0/1    Disable/enable libpurple support        $purple
                 (automatically disables other protocol modules)
+--rpc=0/1       Disable/enable RPC plugin interface     $rpc
 
 --pam=0/1       Disable/enable PAM authentication       $pam
@@ -173 +177 @@
 config=$(eval echo "$config/" | sed 's/\/\{1,\}/\//g')
 plugindir=$(eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g')
+rpcplugindir=$(eval echo "$rpcplugindir/" | sed 's/\/\{1,\}/\//g')
 includedir=$(eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g')
 libevent=$(eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g')
@@ -194 +199 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
+RPCPLUGINDIR=$rpcplugindir
 CONFIG=$config
 INCLUDEDIR=$includedir
@@ -243 +249 @@
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
+#define RPCPLUGINDIR "$rpcplugindir"
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
@@ -283 +290 @@
         LDFLAGS="$LDFLAGS -fsanitize=address"
         debug=1
+fi
+
+if [ "$tsan" = "1" ]; then
+        echo
+        echo "Threaded BitlBee? Have a nice tall glass of http://imgur.com/gallery/tX4qxzS"
+        echo "No need to sanitise threads in a single-threaded process!"
 fi
 
@@ -706 +719 @@
 fi
 
+if [ "$rpc" = 0 ]; then
+        # Somewhat pointless at this stage already but at least this keeps it
+        # out of bitlbee.pc which is probably a good thing.
+        rpcplugindir=""
+fi
+
 otrprefix=""
 if [ "$otr" = "auto" ]; then
@@ -784 +803 @@
 includedir=$includedir
 plugindir=$plugindir
+rpcplugindir=$rpcplugindir
 
 Name: bitlbee
@@ -876 +896 @@
         protocols=$protocols'twitter '
         protoobjs=$protoobjs'twitter_mod.o '
+fi
+
+if [ "$rpc" = 0 ]; then
+        echo '#undef WITH_RPC' >> config.h
+else
+        echo '#define WITH_RPC' >> config.h
+        protocols=$protocols'rpc '
+        protoobjs=$protoobjs'rpc_mod.o '
 fi
 
@@ -965 +993 @@
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl
-#echo '  Building with these storage backends: '$STORAGES
 
 if [ -n "$protocols" ]; then

irc_channel.c

@@ -757 +757 @@
         }
 
+        if (!bu->ic->acc->prpl->add_buddy) {
+                irc_send_num(ic->irc, 482, "%s :IM protocol does not support contact list modification", ic->name);
+                return FALSE;
+        }
+
         bu->ic->acc->prpl->add_buddy(bu->ic, bu->handle,
                                      icc->group ? icc->group->name : NULL);
@@ -774 +779 @@
         if (icc->type != IRC_CC_TYPE_GROUP) {
                 irc_send_num(ic->irc, 482, "%s :Kicks are only possible to fill_by=group channels", ic->name);
+                return;
+        }
+
+        if (!bu->ic->acc->prpl->remove_buddy) {
+                irc_send_num(ic->irc, 482, "%s :IM protocol does not support contact list modification", ic->name);
                 return;
         }

irc_commands.c

@@ -287 +287 @@
                            showed an error message, or is doing some work
                            before the join should be confirmed. (In the
-                           latter case, the caller should take care of that
+                           latter case, the callee should take care of that
                            confirmation.) TRUE means all's good, let the
                            user join the channel right away. */

lib/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o oauth2.o parson.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
 
 LFLAGS += -r

lib/misc.c

@@ -431 +431 @@
 }
 
-int is_bool(char *value)
+int is_bool(const char *value)
 {
         if (*value == 0) {
@@ -457 +457 @@
 }
 
-int bool2int(char *value)
+int bool2int(const char *value)
 {
         int i;

lib/misc.h

@@ -137 +137 @@
 G_MODULE_EXPORT void random_bytes(unsigned char *buf, int count);
 
-G_MODULE_EXPORT int is_bool(char *value);
-G_MODULE_EXPORT int bool2int(char *value);
+G_MODULE_EXPORT int is_bool(const char *value);
+G_MODULE_EXPORT int bool2int(const char *value);
 
 G_MODULE_EXPORT struct ns_srv_reply **srv_lookup(char *service, char *protocol, char *domain);

lib/oauth2.c

@@ -42 +42 @@
 #include "oauth2.h"
 #include "oauth.h"
-#include "json.h"
-#include "json_util.h"
+#include "parson.h"
 #include "url.h"
+
+#define JSON_O_FOREACH(o, k, v) \
+    const char *k; const JSON_Value *v; int __i; \
+    for (__i = 0; json_object_get_tuple(o, __i, &k, &v); __i++)
 
 char *oauth2_url(const struct oauth2_service *sp)
@@ -113 +116 @@
 }
 
-static char* oauth2_parse_error(json_value *e)
+static char* oauth2_parse_error(const JSON_Value *e)
 {
         /* This does a reasonable job with some of the flavours of error
            responses I've seen. Because apparently it's not standardised. */
 
-        if (e->type == json_object) {
+        if (json_type(e) == JSONObject) {
                 /* Facebook style */
-                const char *msg = json_o_str(e, "message");
-                const char *type = json_o_str(e, "type");
-                json_value *code_o = json_o_get(e, "code");
-                int code = 0;
-
-                if (code_o && code_o->type == json_integer) {
-                        code = code_o->u.integer;
-                }
-
+                const char *msg = json_object_get_string(json_object(e), "message");
+                const char *type = json_object_get_string(json_object(e), "type");
+                JSON_Value *code_o = json_object_get_value(json_object(e), "code");
+                int code = json_value_get_integer(code_o);
                 return g_strdup_printf("Error %d: %s", code, msg ? msg : type ? type : "Unknown error");
-        } else if (e->type == json_string) {
-                return g_strdup(e->u.string.ptr);
+        } else if (json_type(e) == JSONString) {
+                return g_strdup(json_string(e));
         }
         return NULL;
@@ -156 +154 @@
         if (content_type && (strstr(content_type, "application/json") ||
                              strstr(content_type, "text/javascript"))) {
-                json_value *js = json_parse(req->reply_body, req->body_size);
-                if (js && js->type == json_object) {
-                        JSON_O_FOREACH(js, k, v){
+                JSON_Value *js = json_parse_string(req->reply_body);
+                if (js && json_type(js) == JSONObject) {
+                        JSON_O_FOREACH(json_object(js), k, v){
                                 if (strcmp(k, "error") == 0) {
                                         error = oauth2_parse_error(v);
                                 }
-                                if (v->type != json_string) {
+                                if (json_type(v) != JSONString) {
                                         continue;
                                 }
                                 if (strcmp(k, "access_token") == 0) {
-                                        atoken = g_strdup(v->u.string.ptr);
+                                        atoken = g_strdup(json_string(v));
                                 }
                                 if (strcmp(k, "refresh_token") == 0) {
-                                        rtoken = g_strdup(v->u.string.ptr);
+                                        rtoken = g_strdup(json_string(v));
                                 }
                         }

protocols/account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
-
-static const char* account_protocols_local[] = {
-        "gg", "whatsapp", NULL
-};
 
 static char *set_eval_nick_source(set_t *set, char *value);
@@ -461 +457 @@
         return a->auto_reconnect_delay;
 }
-
-int protocol_account_islocal(const char* protocol)
-{
-        const char** p = account_protocols_local;
-
-        do {
-                if (strcmp(*p, protocol) == 0) {
-                        return 1;
-                }
-        } while (*(++p));
-        return 0;
-}

protocols/account.h

@@ -58 +58 @@
 int account_reconnect_delay(account_t *a);
 
-int protocol_account_islocal(const char* protocol);
-
 typedef enum {
         ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
@@ -70 +68 @@
         ACC_FLAG_STATUS_MESSAGE = 0x02, /* Supports status messages (without being away). */
         ACC_FLAG_HANDLE_DOMAINS = 0x04, /* Contact handles need a domain portion. */
-        ACC_FLAG_LOCAL = 0x08,          /* Contact list is local. */
+        ACC_FLAG_LOCAL_CONTACTS = 0x08, /* Contact list is local. */
         ACC_FLAG_LOCKED = 0x10,         /* Account is locked (cannot be deleted, certain settings can't changed) */
 } account_flag_t;

protocols/nogaim.c

@@ -204 +204 @@
         extern void twitter_initmodule();
         extern void purple_initmodule();
+        extern void rpc_initmodule();
 
 #ifdef WITH_MSN
@@ -227 +228 @@
 #ifdef WITH_PURPLE
         purple_initmodule();
+#endif
+
+#ifdef WITH_RPC
+        rpc_initmodule();
 #endif
 
@@ -392 +397 @@
         }
 
-        if (ic->acc->flags & ACC_FLAG_LOCAL) {
+        if ((ic->acc->flags & ACC_FLAG_LOCAL_CONTACTS) &&
+            !(ic->flags & OPT_LOCAL_CONTACTS_SENT) &&
+            ic->acc->prpl->add_buddy) {
                 GHashTableIter nicks;
-                gpointer k, v;
+                gpointer handle;
                 g_hash_table_iter_init(&nicks, ic->acc->nicks);
-                while (g_hash_table_iter_next(&nicks, &k, &v)) {
-                        ic->acc->prpl->add_buddy(ic, (char *) k, NULL);
+                while (g_hash_table_iter_next(&nicks, &handle, NULL)) {
+                        ic->acc->prpl->add_buddy(ic, (char *) handle, NULL);
                 }
         }
@@ -492 +499 @@
         query_del_by_conn((irc_t *) ic->bee->ui_data, ic);
 
+        /* Throw away groupchats owned by this account. Historically this was only
+           ever done by IM modules which is a bug. But it gives them opportunity
+           to clean up protocol-specific bits as well so keep it that way, just
+           do another cleanup here as a fallback. Don't want to leave any dangling
+           pointers! */
+        while (ic->groupchats) {
+                imcb_chat_free(ic->groupchats->data);
+        }
+
         if (!a) {
                 /* Uhm... This is very sick. */
@@ -590 +606 @@
 }
 
+/* Returns the local contacts for an IM account (based on assigned nicks).
+   Linked list should be freed, the strings themselves not! So look at it
+   like a GSList<const char*> I guess? Empty list means NULL retval (as
+   always with GSList). */
+GSList *imcb_get_local_contacts(struct im_connection *ic)
+{
+        GHashTableIter nicks;
+        GSList *ret = NULL;
+        
+        if (!(ic->acc->flags & ACC_FLAG_LOCAL_CONTACTS)) {
+                /* Only allow protocols that indicate local contact list
+                   support to use this function. */
+                return ret;
+        }
+        
+        g_hash_table_iter_init(&nicks, ic->acc->nicks);
+        gpointer handle;
+        while (g_hash_table_iter_next(&nicks, &handle, NULL)) {
+                ret = g_slist_prepend(ret, (char *) handle);
+        }
+        
+        /* If the protocol asked for the list, assume we won't have to send it
+           anymore in imcb_connected(). */
+        ic->flags |= OPT_LOCAL_CONTACTS_SENT;
+        
+        return ret;
+}
+
+
 struct imcb_ask_cb_data {
         struct im_connection *ic;
@@ -647 +692 @@
         struct imcb_ask_cb_data *cbd = data;
 
-        cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
+        if (cbd->ic->acc->prpl->add_buddy) {
+                cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
+        }
 
         imcb_ask_cb_free(data);

protocols/nogaim.h

@@ -57 +57 @@
 
 /* Sharing flags between all kinds of things. I just hope I won't hit any
-   limits before 32-bit machines become extinct. ;-) */
+   limits before 32-bit machines become extinct. ;-)
+   
+   Argh! This needs to be renamed to be more clear which field they're used
+   for. As said it's currently mixed which is nonsense. Some are for the
+   im_connection flags field, some for imcb_buddy_status(), some for typing
+   notifications, and who knows what else... */
 #define OPT_LOGGED_IN   0x00000001
 #define OPT_LOGGING_OUT 0x00000002
@@ -70 +75 @@
 #define OPT_PONGS       0x00010000 /* Service sends us keep-alives */
 #define OPT_PONGED      0x00020000 /* Received a keep-alive during last interval */
+#define OPT_LOCAL_CONTACTS_SENT 0x00040000 /* Protocol already requested local contact list, so don't send it after finishing login. */
 #define OPT_SELFMESSAGE 0x00080000 /* A message sent by self from another location */
 
@@ -371 +377 @@
 G_MODULE_EXPORT void imcb_buddy_nick_change(struct im_connection *ic, const char *handle, const char *nick);
 G_MODULE_EXPORT void imcb_buddy_action_response(bee_user_t *bu, const char *action, char * const args[], void *data);
+G_MODULE_EXPORT GSList *imcb_get_local_contacts(struct im_connection *ic);
 
 G_MODULE_EXPORT void imcb_buddy_typing(struct im_connection *ic, const char *handle, guint32 flags);

protocols/purple/purple.c

@@ -298 +298 @@
         }
         purple_accounts_remove(pa);
+        
+        /* Last, some protocols want their contact lists locally. */
+        if (strcmp(acc->prpl->name, "whatsapp") == 0 || strcmp(acc->prpl->name, "gg") == 0) {
+                acc->flags |= ACC_FLAG_LOCAL_CONTACTS;
+        }
 }
 

protocols/twitter/twitter_lib.c

@@ -36 +36 @@
 #include "base64.h"
 #include "twitter_lib.h"
-#include "json_util.h"
+#include "parson.h"
 #include <ctype.h>
 #include <errno.h>
@@ -64 +64 @@
         gboolean from_filter;
 };
+
+#define JSON_O_FOREACH(o, k, v) \
+    const char *k; const JSON_Value *v; int __i; \
+    for (__i = 0; json_object_get_tuple(o, __i, &k, &v); __i++)
 
 /**
@@ -166 +170 @@
 {
         static char *ret = NULL;
-        json_value *root, *err;
+        JSON_Value *root, *err;
 
         g_free(ret);
@@ -172 +176 @@
 
         if (req->body_size > 0) {
-                root = json_parse(req->reply_body, req->body_size);
-                err = json_o_get(root, "errors");
-                if (err && err->type == json_array && (err = err->u.array.values[0]) &&
-                    err->type == json_object) {
-                        const char *msg = json_o_str(err, "message");
+                root = json_parse_string(req->reply_body);
+                err = json_object_get_value(json_object(root), "errors");
+                if (err && json_type(err) == JSONArray &&
+                    (err = json_array_get_value(json_array(err), 0)) &&
+                    json_type(err) == JSONObject) {
+                        const char *msg = json_object_get_string(json_object(err), "message");
                         if (msg) {
                                 ret = g_strdup_printf("%s (%s)", req->status_string, msg);
@@ -189 +194 @@
 /* WATCH OUT: This function might or might not destroy your connection.
    Sub-optimal indeed, but just be careful when this returns NULL! */
-static json_value *twitter_parse_response(struct im_connection *ic, struct http_request *req)
+static JSON_Value *twitter_parse_response(struct im_connection *ic, struct http_request *req)
 {
         gboolean logging_in = !(ic->flags & OPT_LOGGED_IN);
         gboolean periodic;
         struct twitter_data *td = ic->proto_data;
-        json_value *ret;
+        JSON_Value *ret;
         char path[64] = "", *s;
 
@@ -232 +237 @@
         }
 
-        if ((ret = json_parse(req->reply_body, req->body_size)) == NULL) {
+        if ((ret = json_parse_string(req->reply_body)) == NULL) {
                 imcb_error(ic, "Could not retrieve %s: %s",
                            path, "XML parse error");
@@ -289 +294 @@
  * Fill a list of ids.
  */
-static gboolean twitter_xt_get_friends_id_list(json_value *node, struct twitter_xml_list *txl)
-{
-        json_value *c;
+static gboolean twitter_xt_get_friends_id_list(JSON_Value *node, struct twitter_xml_list *txl)
+{
+        JSON_Array *c;
         int i;
 
@@ -297 +302 @@
         txl->type = TXL_ID;
 
-        c = json_o_get(node, "ids");
-        if (!c || c->type != json_array) {
+        if (!(c = json_object_get_array(json_object(node), "ids"))) {
                 return FALSE;
         }
 
-        for (i = 0; i < c->u.array.length; i++) {
-                if (c->u.array.values[i]->type != json_integer) {
-                        continue;
-                }
+        for (i = 0; i < json_array_get_count(c); i++) {
+                jint id = json_array_get_integer(c, i);
 
                 txl->list = g_slist_prepend(txl->list,
-                                            g_strdup_printf("%" PRIu64, c->u.array.values[i]->u.integer));
-        }
-
-        c = json_o_get(node, "next_cursor");
-        if (c && c->type == json_integer) {
-                txl->next_cursor = c->u.integer;
+                                            g_strdup_printf("%lld", id));
+        }
+
+        JSON_Value *next = json_object_get_value(json_object(node), "next_cursor");
+        if (next && json_type(next) == JSONInteger) {
+                txl->next_cursor = json_integer(next);
         } else {
                 txl->next_cursor = -1;
@@ -329 +331 @@
 {
         struct im_connection *ic;
-        json_value *parsed;
+        JSON_Value *parsed;
         struct twitter_xml_list *txl;
         struct twitter_data *td;
@@ -373 +375 @@
 {
         struct im_connection *ic = req->data;
-        json_value *parsed;
+        JSON_Value *parsed;
         struct twitter_xml_list *txl;
         struct twitter_data *td;
@@ -418 +420 @@
 {
         struct im_connection *ic = req->data;
-        json_value *parsed;
+        JSON_Value *parsed;
         struct twitter_xml_list *txl;
         struct twitter_data *td;
@@ -444 +446 @@
         // Process the retweet ids
         txl->type = TXL_ID;
-        if (parsed->type == json_array) {
+        if (json_type(parsed) == JSONArray) {
+                JSON_Array *arr = json_array(parsed);
                 unsigned int i;
-                for (i = 0; i < parsed->u.array.length; i++) {
-                        json_value *c = parsed->u.array.values[i];
-                        if (c->type != json_integer) {
-                                continue;
-                        }
+                for (i = 0; i < json_array_get_count(arr); i++) {
+                        jint id = json_array_get_integer(arr, i);
                         txl->list = g_slist_prepend(txl->list,
-                                                    g_strdup_printf("%"PRIu64, c->u.integer));
+                                                    g_strdup_printf("%lld", id));
                 }
         }
@@ -463 +463 @@
 }
 
-static gboolean twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl);
+static gboolean twitter_xt_get_users(JSON_Value *node, struct twitter_xml_list *txl);
 static void twitter_http_get_users_lookup(struct http_request *req);
 
@@ -504 +504 @@
 {
         struct im_connection *ic = req->data;
-        json_value *parsed;
+        JSON_Value *parsed;
         struct twitter_xml_list *txl;
         GSList *l = NULL;
@@ -537 +537 @@
 }
 
-struct twitter_xml_user *twitter_xt_get_user(const json_value *node)
+struct twitter_xml_user *twitter_xt_get_user(const JSON_Object *node)
 {
         struct twitter_xml_user *txu;
-        json_value *jv;
+        
+        if (!node)
+                return NULL;
 
         txu = g_new0(struct twitter_xml_user, 1);
-        txu->name = g_strdup(json_o_str(node, "name"));
-        txu->screen_name = g_strdup(json_o_str(node, "screen_name"));
-
-        jv = json_o_get(node, "id");
-        txu->uid = jv->u.integer;
+        txu->name = g_strdup(json_object_get_string(node, "name"));
+        txu->screen_name = g_strdup(json_object_get_string(node, "screen_name"));
+        txu->uid = json_object_get_integer(node, "id");
 
         return txu;
@@ -557 +557 @@
  *  - all <user>s from the <users> element.
  */
-static gboolean twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl)
+static gboolean twitter_xt_get_users(JSON_Value *node, struct twitter_xml_list *txl)
 {
         struct twitter_xml_user *txu;
@@ -565 +565 @@
         txl->type = TXL_USER;
 
-        if (!node || node->type != json_array) {
+        if (json_type(node) != JSONArray) {
                 return FALSE;
         }
-
+        
         // The root <users> node should hold the list of users <user>
         // Walk over the nodes children.
-        for (i = 0; i < node->u.array.length; i++) {
-                txu = twitter_xt_get_user(node->u.array.values[i]);
+        JSON_Array *arr = json_array(node);
+        for (i = 0; i < json_array_get_count(arr); i++) {
+                JSON_Object *o = json_array_get_object(arr, i);
+                if (!o)
+                        continue;
+                txu = twitter_xt_get_user(o);
                 if (txu) {
                         txl->list = g_slist_prepend(txl->list, txu);
@@ -587 +591 @@
 #endif
 
-static void expand_entities(char **text, const json_value *node, const json_value *extended_node);
+static void expand_entities(char **text, const JSON_Object *node, const JSON_Object *extended_node);
 
 /**
@@ -597 +601 @@
  *  - the user in a twitter_xml_user struct.
  */
-static struct twitter_xml_status *twitter_xt_get_status(const json_value *node)
+static struct twitter_xml_status *twitter_xt_get_status(const JSON_Object *node)
 {
         struct twitter_xml_status *txs = {0};
-        const json_value *rt = NULL;
-        const json_value *text_value = NULL;
-        const json_value *extended_node = NULL;
-
-        if (node->type != json_object) {
+        const JSON_Object *rt = NULL;
+        const JSON_Value *text_value = NULL;
+        const JSON_Object *extended_node = NULL;
+
+        if (!node) {
                 return FALSE;
         }
@@ -610 +614 @@
 
         JSON_O_FOREACH(node, k, v) {
-                if (strcmp("text", k) == 0 && v->type == json_string && text_value == NULL) {
+                if (strcmp("text", k) == 0 && json_type(v) == JSONString && text_value == NULL) {
                         text_value = v;
-                } else if (strcmp("full_text", k) == 0 && v->type == json_string) {
+                } else if (strcmp("full_text", k) == 0 && json_type(v) == JSONString) {
                         text_value = v;
-                } else if (strcmp("extended_tweet", k) == 0 && v->type == json_object) {
-                        text_value = json_o_get(v, "full_text");
-                        extended_node = v;
-                } else if (strcmp("retweeted_status", k) == 0 && v->type == json_object) {
-                        rt = v;
-                } else if (strcmp("created_at", k) == 0 && v->type == json_string) {
+                } else if (strcmp("extended_tweet", k) == 0 && json_type(v) == JSONObject) {
+                        text_value = json_object_get_value(json_object(v), "full_text");
+                        extended_node = json_object(v);
+                } else if (strcmp("retweeted_status", k) == 0 && (rt = json_object(v))) {
+                        // Handling below.
+                } else if (strcmp("created_at", k) == 0 && json_type(v) == JSONString) {
                         struct tm parsed;
 
@@ -625 +629 @@
                            this field. :-( Also assumes the timezone used
                            is UTC since C time handling functions suck. */
-                        if (strptime(v->u.string.ptr, TWITTER_TIME_FORMAT, &parsed) != NULL) {
+                        if (strptime(json_string(v), TWITTER_TIME_FORMAT, &parsed) != NULL) {
                                 txs->created_at = mktime_utc(&parsed);
                         }
-                } else if (strcmp("user", k) == 0 && v->type == json_object) {
-                        txs->user = twitter_xt_get_user(v);
-                } else if (strcmp("id", k) == 0 && v->type == json_integer) {
-                        txs->rt_id = txs->id = v->u.integer;
-                } else if (strcmp("in_reply_to_status_id", k) == 0 && v->type == json_integer) {
-                        txs->reply_to = v->u.integer;
+                } else if (strcmp("user", k) == 0 && json_type(v) == JSONObject) {
+                        txs->user = twitter_xt_get_user(json_object(v));
+                } else if (strcmp("id", k) == 0 && json_type(v) == JSONInteger) {
+                        txs->rt_id = txs->id = json_integer(v);
+                } else if (strcmp("in_reply_to_status_id", k) == 0 && json_type(v) == JSONInteger) {
+                        txs->reply_to = json_integer(v);
                 }
         }
@@ -646 +650 @@
                         txs_free(rtxs);
                 }
-        } else if (text_value && text_value->type == json_string) {
-                txs->text = g_memdup(text_value->u.string.ptr, text_value->u.string.length + 1);
+        } else if (text_value && json_type(text_value) == JSONString) {
+                txs->text = g_strdup(json_string(text_value));
                 strip_html(txs->text);
                 expand_entities(&txs->text, node, extended_node);
@@ -663 +667 @@
  * Function to fill a twitter_xml_status struct (DM variant).
  */
-static struct twitter_xml_status *twitter_xt_get_dm(const json_value *node)
+static struct twitter_xml_status *twitter_xt_get_dm(const JSON_Object *node)
 {
         struct twitter_xml_status *txs;
 
-        if (node->type != json_object) {
+        if (!node) {
                 return FALSE;
         }
@@ -673 +677 @@
 
         JSON_O_FOREACH(node, k, v) {
-                if (strcmp("text", k) == 0 && v->type == json_string) {
-                        txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
+                if (strcmp("text", k) == 0 && (txs->text = g_strdup(json_string(v)))) {
                         strip_html(txs->text);
-                } else if (strcmp("created_at", k) == 0 && v->type == json_string) {
+                } else if (strcmp("created_at", k) == 0 && json_type(v) == JSONString) {
                         struct tm parsed;
 
@@ -682 +685 @@
                            this field. :-( Also assumes the timezone used
                            is UTC since C time handling functions suck. */
-                        if (strptime(v->u.string.ptr, TWITTER_TIME_FORMAT, &parsed) != NULL) {
+                        if (strptime(json_string(v), TWITTER_TIME_FORMAT, &parsed) != NULL) {
                                 txs->created_at = mktime_utc(&parsed);
                         }
-                } else if (strcmp("sender", k) == 0 && v->type == json_object) {
-                        txs->user = twitter_xt_get_user(v);
-                } else if (strcmp("id", k) == 0 && v->type == json_integer) {
-                        txs->id = v->u.integer;
+                } else if (strcmp("sender", k) == 0 && json_type(v) == JSONObject) {
+                        txs->user = twitter_xt_get_user(json_object(v));
+                } else if (strcmp("id", k) == 0 && json_type(v) == JSONInteger) {
+                        txs->id = json_integer(v);
                 }
         }
@@ -702 +705 @@
 }
 
-static void expand_entities(char **text, const json_value *node, const json_value *extended_node)
-{
-        json_value *entities, *extended_entities, *quoted;
+static void expand_entities(char **text, const JSON_Object *node, const JSON_Object *extended_node)
+{
+        JSON_Object *entities, *extended_entities, *quoted;
         char *quote_url = NULL, *quote_text = NULL;
 
-        if (!((entities = json_o_get(node, "entities")) && entities->type == json_object))
-                return;
-        if ((quoted = json_o_get(node, "quoted_status")) && quoted->type == json_object) {
+        if (!(entities = json_object_get_object(node, "entities")))
+                return;
+        if ((quoted = json_object_get_object(node, "quoted_status"))) {
                 /* New "retweets with comments" feature. Note that this info
                  * seems to be included in the streaming API only! Grab the
@@ -723 +726 @@
 
         if (extended_node) {
-                extended_entities = json_o_get(extended_node, "entities");
-                if (extended_entities && extended_entities->type == json_object) {
+                extended_entities = json_object_get_object(extended_node, "entities");
+                if (extended_entities) {
                         entities = extended_entities;
                 }
@@ -732 +735 @@
                 int i;
 
-                if (v->type != json_array) {
+                if (json_type(v) != JSONArray) {
                         continue;
                 }
@@ -739 +742 @@
                 }
 
-                for (i = 0; i < v->u.array.length; i++) {
+                for (i = 0; i < json_array_get_count(json_array(v)); i++) {
                         const char *format = "%s%s <%s>%s";
-
-                        if (v->u.array.values[i]->type != json_object) {
+                        JSON_Object *r = json_array_get_object(json_array(v), i);
+
+                        if (!r) {
                                 continue;
                         }
 
-                        const char *kort = json_o_str(v->u.array.values[i], "url");
-                        const char *disp = json_o_str(v->u.array.values[i], "display_url");
-                        const char *full = json_o_str(v->u.array.values[i], "expanded_url");
+                        const char *kort = json_object_get_string(r, "url");
+                        const char *disp = json_object_get_string(r, "display_url");
+                        const char *full = json_object_get_string(r, "expanded_url");
                         char *pos, *new;
 
@@ -777 +781 @@
  *  - the next_cursor.
  */
-static gboolean twitter_xt_get_status_list(struct im_connection *ic, const json_value *node,
+static gboolean twitter_xt_get_status_list(struct im_connection *ic, const JSON_Value *node,
                                            struct twitter_xml_list *txl)
 {
@@ -786 +790 @@
         txl->type = TXL_STATUS;
 
-        if (node->type != json_array) {
+        if (json_type(node) != JSONArray) {
                 return FALSE;
         }
@@ -792 +796 @@
         // The root <statuses> node should hold the list of statuses <status>
         // Walk over the nodes children.
-        for (i = 0; i < node->u.array.length; i++) {
-                txs = twitter_xt_get_status(node->u.array.values[i]);
+        for (i = 0; i < json_array_get_count(json_array(node)); i++) {
+                txs = twitter_xt_get_status(json_array_get_object(json_array(node), i));
                 if (!txs) {
                         continue;
@@ -978 +982 @@
         
         /* Check this is not a tweet that should be muted */
-        uid_str = g_strdup_printf("%" PRIu64, status->user->uid);
+        uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, status->user->uid);
 
         if (g_slist_find_custom(td->mutes_ids, uid_str, (GCompareFunc)strcmp)) {
@@ -1013 +1017 @@
 }
 
-static gboolean twitter_stream_handle_object(struct im_connection *ic, json_value *o, gboolean from_filter);
+static gboolean twitter_stream_handle_object(struct im_connection *ic, JSON_Object *o, gboolean from_filter);
 
 static void twitter_http_stream(struct http_request *req)
@@ -1019 +1023 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        json_value *parsed;
+        JSON_Value *parsed;
         int len = 0;
         char c, *nl;
@@ -1060 +1064 @@
                 req->reply_body[len] = '\0';
 
-                if ((parsed = json_parse(req->reply_body, req->body_size))) {
+                if ((parsed = json_parse_string(req->reply_body))) {
                         from_filter = (req == td->filter_stream);
-                        twitter_stream_handle_object(ic, parsed, from_filter);
+                        twitter_stream_handle_object(ic, json_object(parsed), from_filter);
                 }
                 json_value_free(parsed);
@@ -1076 +1080 @@
 }
 
-static gboolean twitter_stream_handle_event(struct im_connection *ic, json_value *o);
+static gboolean twitter_stream_handle_event(struct im_connection *ic, JSON_Object *o);
 static gboolean twitter_stream_handle_status(struct im_connection *ic, struct twitter_xml_status *txs);
 
-static gboolean twitter_stream_handle_object(struct im_connection *ic, json_value *o, gboolean from_filter)
+static gboolean twitter_stream_handle_object(struct im_connection *ic, JSON_Object *o, gboolean from_filter)
 {
         struct twitter_data *td = ic->proto_data;
         struct twitter_xml_status *txs;
-        json_value *c;
+        JSON_Object *c;
 
         if ((txs = twitter_xt_get_status(o))) {
@@ -1090 +1094 @@
                 txs_free(txs);
                 return ret;
-        } else if ((c = json_o_get(o, "direct_message")) &&
+        } else if ((c = json_object_get_object(o, "direct_message")) &&
                    (txs = twitter_xt_get_dm(c))) {
                 if (g_strcasecmp(txs->user->screen_name, td->user) != 0) {
@@ -1098 +1102 @@
                 txs_free(txs);
                 return TRUE;
-        } else if ((c = json_o_get(o, "event")) && c->type == json_string) {
+        } else if (json_object_get_string(o, "event")) {
                 twitter_stream_handle_event(ic, o);
                 return TRUE;
-        } else if ((c = json_o_get(o, "disconnect")) && c->type == json_object) {
+        } else if ((c = json_object_get_object(o, "disconnect"))) {
                 /* HACK: Because we're inside an event handler, we can't just
                    disconnect here. Instead, just change the HTTP status string
                    into a Twitter status string. */
-                char *reason = json_o_strdup(c, "reason");
+                char *reason = g_strdup(json_object_get_string(c, "reason"));
                 if (reason) {
                         g_free(td->stream->status_string);
@@ -1144 +1148 @@
 }
 
-static gboolean twitter_stream_handle_event(struct im_connection *ic, json_value *o)
+static gboolean twitter_stream_handle_event(struct im_connection *ic, JSON_Object *o)
 {
         struct twitter_data *td = ic->proto_data;
-        json_value *source = json_o_get(o, "source");
-        json_value *target = json_o_get(o, "target");
-        const char *type = json_o_str(o, "event");
+        JSON_Object *source = json_object_get_object(o, "source");
+        JSON_Object *target = json_object_get_object(o, "target");
+        const char *type = json_object_get_string(o, "event");
         struct twitter_xml_user *us = NULL;
         struct twitter_xml_user *ut = NULL;
 
-        if (!type || !source || source->type != json_object
-            || !target || target->type != json_object) {
+        if (!type || !source || !target) {
                 return FALSE;
         }
@@ -1168 +1171 @@
                 char *uid_str;
                 ut = twitter_xt_get_user(target);
-                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
+                uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid);
                 if (!(found = g_slist_find_custom(td->mutes_ids, uid_str,
                                                   (GCompareFunc)strcmp))) {
@@ -1175 +1178 @@
                 twitter_log(ic, "Muted user %s", ut->screen_name);
                 if (getenv("BITLBEE_DEBUG")) {
-                        fprintf(stderr, "New mute: %s %"PRIu64"\n",
+                        fprintf(stderr, "New mute: %s %"G_GUINT64_FORMAT"\n",
                                 ut->screen_name, ut->uid);
                 }
@@ -1182 +1185 @@
                 char *uid_str;
                 ut = twitter_xt_get_user(target);
-                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
+                uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid);
                 if ((found = g_slist_find_custom(td->mutes_ids, uid_str,
                                                 (GCompareFunc)strcmp))) {
@@ -1192 +1195 @@
                 twitter_log(ic, "Unmuted user %s", ut->screen_name);
                 if (getenv("BITLBEE_DEBUG")) {
-                        fprintf(stderr, "New unmute: %s %"PRIu64"\n",
+                        fprintf(stderr, "New unmute: %s %"G_GUINT64_FORMAT"\n",
                                 ut->screen_name, ut->uid);
                 }
@@ -1283 +1286 @@
         struct twitter_filter *tf;
         GList *users = NULL;
-        json_value *parsed;
-        json_value *id;
-        const char *name;
+        JSON_Value *parsed;
         GString *fstr;
         GSList *l;
@@ -1310 +1311 @@
         }
 
-        if (parsed->type != json_array) {
+        if (json_type(parsed) != JSONArray) {
                 goto finish;
         }
 
-        for (i = 0; i < parsed->u.array.length; i++) {
-                id = json_o_get(parsed->u.array.values[i], "id");
-                name = json_o_str(parsed->u.array.values[i], "screen_name");
-
-                if (!name || !id || id->type != json_integer) {
+        for (i = 0; i < json_array_get_count(json_array(parsed)); i++) {
+                JSON_Object *o = json_array_get_object(json_array(parsed), i);
+                jint id = json_object_get_integer(o, "id");
+                const char *name = json_object_get_string(o, "screen_name");
+
+                if (!name || !id) {
                         continue;
                 }
@@ -1326 +1328 @@
 
                         if (g_strcasecmp(tf->text, name) == 0) {
-                                tf->uid = id->u.integer;
+                                tf->uid = id;
                                 users = g_list_delete_link(users, u);
                                 break;
@@ -1571 +1573 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        json_value *parsed;
+        JSON_Value *parsed;
         struct twitter_xml_list *txl;
 
@@ -1611 +1613 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        json_value *parsed;
+        JSON_Value *parsed;
         struct twitter_xml_list *txl;
 
@@ -1652 +1654 @@
         struct im_connection *ic = req->data;
         struct twitter_data *td;
-        json_value *parsed, *id;
+        JSON_Value *parsed;
+        jint id;
 
         // Check if the connection is still active.
@@ -1666 +1669 @@
         }
 
-        if ((id = json_o_get(parsed, "id")) && id->type == json_integer) {
-                td->last_status_id = id->u.integer;
+        if ((id = json_object_get_integer(json_object(parsed), "id"))) {
+                td->last_status_id = id;
         }
 
@@ -1788 +1791 @@
 {
         struct im_connection *ic = req->data;
-        json_value *parsed, *id;
+        JSON_Value *parsed;
+        uint64_t id;
         const char *name;
 
@@ -1800 +1804 @@
         }
 
-        /* for the parson branch:
         name = json_object_dotget_string(json_object(parsed), "user.screen_name");
         id = json_object_get_integer(json_object(parsed), "id");
-        */
-
-        name = json_o_str(json_o_get(parsed, "user"), "screen_name");
-        id = json_o_get(parsed, "id");
-
-        if (name && id && id->type == json_integer) {
-                twitter_log(ic, "https://twitter.com/%s/status/%" G_GUINT64_FORMAT, name, id->u.integer);
+
+        if (name && id) {
+                twitter_log(ic, "https://twitter.com/%s/status/%" G_GUINT64_FORMAT, name, id);
         } else {
                 twitter_log(ic, "Error: could not fetch tweet url.");

root_commands.c

@@ -499 +499 @@
 
                 for (a = irc->b->accounts; a; a = a->next) {
-                        char *con;
+                        char *con = NULL, *protocol = NULL;
 
                         if (a->ic && (a->ic->flags & OPT_LOGGED_IN)) {
@@ -510 +510 @@
                                 con = "";
                         }
-
-                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con);
+                        if (a->prpl == &protocol_missing) {
+                                protocol = g_strdup_printf("%s (missing!)", set_getstr(&a->set, "_protocol_name"));
+                        } else {
+                                protocol = g_strdup(a->prpl->name);
+                        }
+
+                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, protocol, a->user, con);
+                        g_free(protocol);
 
                         i++;
@@ -525 +531 @@
 
                         for (a = irc->b->accounts; a; a = a->next) {
-                                if (!a->ic && a->auto_connect) {
+                                if (!a->ic && a->auto_connect && a->prpl != &protocol_missing) {
                                         if (strcmp(a->pass, PASSWORD_PENDING) == 0) {
                                                 irc_rootmsg(irc, "Enter password for account %s "
@@ -585 +591 @@
                         irc_rootmsg(irc, "Enter password for account %s "
                                     "first (use /OPER)", a->tag);
+                } else if (a->prpl == &protocol_missing) {
+                        irc_rootmsg(irc, "Protocol `%s' not recognised (plugin may be missing or not running?)",
+                                    set_getstr(&a->set, "_protocol_name"));
                 } else {
                         account_on(irc->b, a);
@@ -689 +698 @@
                 irc_rootmsg(irc, "That account is not on-line");
                 return;
+        } else if (add_on_server && !a->prpl->add_buddy) {
+                irc_rootmsg(irc, "IM protocol does not support contact list modification");
+                return;
+        }
+
+        if ((a->flags & ACC_FLAG_HANDLE_DOMAINS) && cmd[2][0] != '_' &&
+            (!(s = strchr(cmd[2], '@')) || s[1] == '\0')) {
+                /* If there's no @ or it's the last char, append the user's
+                   domain name now. Exclude handles starting with a _ so
+                   adding _xmlconsole will keep working. */
+                if (s) {
+                        *s = '\0';
+                }
+                if ((s = strchr(a->user, '@'))) {
+                        cmd[2] = handle = g_strconcat(cmd[2], s, NULL);
+                }
         }
 
@@ -703 +728 @@
         }
 
-        if ((a->flags & ACC_FLAG_HANDLE_DOMAINS) && cmd[2][0] != '_' &&
-            (!(s = strchr(cmd[2], '@')) || s[1] == '\0')) {
-                /* If there's no @ or it's the last char, append the user's
-                   domain name now. Exclude handles starting with a _ so
-                   adding _xmlconsole will keep working. */
-                if (s) {
-                        *s = '\0';
-                }
-                if ((s = strchr(a->user, '@'))) {
-                        cmd[2] = handle = g_strconcat(cmd[2], s, NULL);
-                }
-        }
-
         if (add_on_server) {
                 irc_channel_t *ic;
@@ -759 +771 @@
         s = g_strdup(bu->handle);
 
-        bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
+        if (bu->ic->acc->prpl->remove_buddy) {
+                bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
+        } else {
+                irc_rootmsg(irc, "IM protocol does not support contact list modification, "
+                                 "removal will likely not be permanent");
+        }
+
         nick_del(bu);
         if (g_slist_find(irc->users, iu)) {

storage.c

@@ -32 +32 @@
 
 static GList *storage_backends = NULL;
+
+const struct prpl protocol_missing = {
+        .name = "_unknown",
+};
 
 void register_storage_backend(storage_t *backend)

storage.h

@@ -63 +63 @@
 G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);
 
+extern const struct prpl protocol_missing;
+
 #endif /* __STORAGE_H__ */

storage_xml.c

@@ -89 +89 @@
 }
 
+/* Use for unsupported/not-found protocols. Save settings as-is but don't allow changes. */
+static void handle_settings_raw(struct xt_node *node, set_t **head)
+{
+        struct xt_node *c;
+
+        for (c = node->children; (c = xt_find_node(c, "setting")); c = c->next) {
+                char *name = xt_find_attr(c, "name");
+
+                if (!name) {
+                        continue;
+                }
+
+                set_t *s = set_add(head, name, NULL, NULL, NULL);
+                set_setstr(head, name, c->text);
+                s->flags |= SET_HIDDEN |
+                            ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
+        }
+}
+
 static xt_status handle_account(struct xt_node *node, gpointer data)
 {
@@ -95 +114 @@
         char *pass_b64 = NULL;
         unsigned char *pass_cr = NULL;
-        int pass_len, local = 0;
+        int pass_len;
         struct prpl *prpl = NULL;
         account_t *acc;
@@ -111 +130 @@
                 prpl = find_protocol(protocol);
                 if (!prpl) {
-                        irc_rootmsg(xd->irc, "Error loading user config: Protocol not found: `%s'", protocol);
-                        return XT_ABORT;
-                }
-                local = protocol_account_islocal(protocol);
+                        irc_rootmsg(xd->irc, "Warning: Protocol not found: `%s'", protocol);
+                        prpl = (struct prpl*) &protocol_missing;
+                }
         }
 
@@ -143 +161 @@
                 set_setstr(&acc->set, "tag", tag);
         }
-        if (local) {
-                acc->flags |= ACC_FLAG_LOCAL;
-        }
         if (locked && !g_strcasecmp(locked, "true")) {
                 acc->flags |= ACC_FLAG_LOCKED;
         }
+        if (prpl == &protocol_missing) {
+                set_t *s = set_add(&acc->set, "_protocol_name", protocol, NULL, NULL);
+                s->flags |= SET_HIDDEN | SET_NOSAVE |
+                            ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
+        }
 
         g_free(pass_cr);
         g_free(password);
 
-        handle_settings(node, &acc->set);
+        if (prpl == &protocol_missing) {
+                handle_settings_raw(node, &acc->set);
+        } else {
+                handle_settings(node, &acc->set);
+        }
 
         for (c = node->children; (c = xt_find_node(c, "buddy")); c = c->next) {
@@ -342 +366 @@
 
                 cur = xt_new_node("account", NULL, NULL);
-                xt_add_attr(cur, "protocol", acc->prpl->name);
+                if (acc->prpl == &protocol_missing) {
+                        xt_add_attr(cur, "protocol", set_getstr(&acc->set, "_protocol_name"));
+                } else {
+                        xt_add_attr(cur, "protocol", acc->prpl->name);
+                }
                 xt_add_attr(cur, "handle", acc->user);
                 xt_add_attr(cur, "password", pass_b64);