Changeset 5a8afc3

Timestamp:

2016-11-21T06:58:47Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

3f44e43, f8c9347

Parents:

11d4123

git-author:

dequis <dx@…> (21-11-16 06:40:54)

git-committer:

dequis <dx@…> (21-11-16 06:58:47)

Message:

Manual merge with wilmer's approach to handling missing protocols

Turns out he already implemented pretty much the same thing in the
parson branch... last year.

The differences between the two approaches are subtle (there aren't too
many ways to do this, some lines are the exact same thing) but I decided
I like his version better, so this mostly reverts a handful of my
changes while keeping others. The main advantage of his approach is that
no fake protocols are registered, no actual prpl functions are called,
and the missing prpl is a singleton constant.

New things compared to the implementation in the other branch:

• The explain_unknown_protocol() function.
• Fixed named chatrooms throwing a warning and losing the "account" setting when saving. See changes in irc_im.c
• Fixed the "server" setting dropping when saving. See account.c

Differences with my previous implementation:

• Accounts with missing protocols don't autoconnect
• 'account list' marks them as "(missing!)"

Files:

• irc_im.c (modified) (1 diff)
• protocols/Makefile (modified) (1 diff)
• protocols/account.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/unknown.c (deleted)
• root_commands.c (modified) (4 diffs)
• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)
• storage_xml.c (modified) (9 diffs)

irc_im.c

@@ -1014 +1014 @@
         if (!(acc = account_get(ic->irc->b, value))) {
                 return SET_INVALID;
-        } else if (!acc->prpl->chat_join) {
+        } else if (!acc->prpl->chat_join && acc->prpl != &protocol_missing) {
                 irc_rootmsg(ic->irc, "Named chatrooms not supported on that account.");
                 return SET_INVALID;

protocols/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = account.o bee.o bee_chat.o bee_ft.o bee_user.o nogaim.o unknown.o 
+objects = account.o bee.o bee_chat.o bee_ft.o bee_user.o nogaim.o
 
 

protocols/account.c

@@ -75 +75 @@
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | ACC_SET_LOCKABLE;
         set_setstr(&a->set, "username", user);
+
+        if (prpl == &protocol_missing) {
+                s = set_add(&a->set, "server", NULL, set_eval_account, a);
+                s->flags |= SET_NOSAVE | SET_HIDDEN | ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
+        }
 
         /* Hardcode some more clever tag guesses. */

protocols/nogaim.c

@@ -160 +160 @@
 GList *protocols = NULL;
 GList *disabled_protocols = NULL;
-static struct prpl *unknown_prpl;
 
 void register_protocol(struct prpl *p)
@@ -190 +189 @@
         GList *gl = g_list_find_custom(protocols, name, proto_name_cmp);
         return gl ? gl->data: NULL;
-}
-
-struct prpl *make_unknown_protocol(const char *name)
-{
-        struct prpl *ret = g_memdup(unknown_prpl, sizeof(struct prpl));
-        ret->name = g_strdup(name);
-        register_protocol(ret);
-        return ret;
 }
 
@@ -250 +241 @@
         extern void twitter_initmodule();
         extern void purple_initmodule();
-        extern void unknown_prpl_initmodule();
-
-        unknown_prpl_initmodule(&unknown_prpl);
 
 #ifdef WITH_MSN

protocols/nogaim.h

@@ -159 +159 @@
         /* The protocol is not suitable for OTR, see OPT_NOOTR */
         PRPL_OPT_NOOTR = 1 << 12,
-
-        /* This prpl is a placeholder for a missing protocol */
-        PRPL_OPT_UNKNOWN_PROTOCOL = 1 << 13,
 } prpl_options_t;
 
@@ -324 +321 @@
 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
 G_MODULE_EXPORT gboolean is_protocol_disabled(const char *name);
-G_MODULE_EXPORT struct prpl *make_unknown_protocol(const char *name);
 G_MODULE_EXPORT char *explain_unknown_protocol(const char *name);
 /* When registering a new protocol, you should allocate space for a new prpl

root_commands.c

@@ -498 +498 @@
 
                 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 @@
                         }
 
-                        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++;
@@ -524 +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 "
@@ -584 +591 @@
                         irc_rootmsg(irc, "Enter password for account %s "
                                     "first (use /OPER)", a->tag);
+                } else if (a->prpl == &protocol_missing) {
+                        char *proto = set_getstr(&a->set, "_protocol_name");
+                        char *msg = explain_unknown_protocol(proto);
+                        irc_rootmsg(irc, "Unknown protocol `%s'", proto);
+                        irc_rootmsg(irc, msg);
+                        g_free(msg);
                 } else {
                         account_on(irc->b, a);

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

@@ -60 +60 @@
 }
 
-static void handle_settings(struct xt_node *node, set_t **head, gboolean add_unknowns)
+static void handle_settings(struct xt_node *node, set_t **head)
 {
         struct xt_node *c;
@@ -70 +70 @@
 
                 if (!name) {
-                        continue;
-                }
-
-                if (add_unknowns && !set_find(head, name)) {
-                        s = set_add(head, name, NULL, NULL, NULL);
-                        s->flags |= ACC_SET_ONLINE_ONLY;
-                        s->value = g_strdup(c->text);
                         continue;
                 }
@@ -93 +86 @@
                         }
                 }
+        }
+}
+
+/* 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;
         }
 }
@@ -106 +118 @@
         account_t *acc;
         struct xt_node *c;
-        gboolean is_unknown = FALSE;
 
         handle = xt_find_attr(node, "handle");
@@ -120 +131 @@
                 if (!prpl) {
                         irc_rootmsg(xd->irc, "Warning: Protocol not found: `%s'", protocol);
-                        prpl = make_unknown_protocol(protocol);
-                }
-                is_unknown = (prpl->options & PRPL_OPT_UNKNOWN_PROTOCOL) != 0;
+                        prpl = (struct prpl*) &protocol_missing;
+                }
                 local = protocol_account_islocal(protocol);
         }
@@ -158 +168 @@
                 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, is_unknown);
+        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) {
@@ -201 +220 @@
         }
 
-        handle_settings(node, &ic->set, FALSE);
+        handle_settings(node, &ic->set);
 
         return XT_HANDLED;
@@ -279 +298 @@
         }
 
-        handle_settings(node, &xd->irc->b->set, FALSE);
+        handle_settings(node, &xd->irc->b->set);
 
 error:
@@ -351 +370 @@
 
                 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);