aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-08-13 18:04:58 +01:00
commit d132dbfe93
7 changed files with 337 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/ui/console.c
View File

@ -549,7 +549,7 @@ cons_show_caps(const char *const fulljid, resource_presence_t presence)
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
cons_show(""); cons_show("");
Capabilities *caps = caps_lookup(fulljid); EntityCapabilities *caps = caps_lookup(fulljid);
if (caps) { if (caps) {
const char *resource_presence = string_from_resource_presence(presence); const char *resource_presence = string_from_resource_presence(presence);
@ -558,43 +558,48 @@ cons_show_caps(const char *const fulljid, resource_presence_t presence)
win_print(console, '-', 0, NULL, NO_DATE, 0, "", ":"); win_print(console, '-', 0, NULL, NO_DATE, 0, "", ":");
// show identity // show identity
if (caps->category || caps->type || caps->name) { if (caps->identity) {
DiscoIdentity *identity = caps->identity;
win_print(console, '-', 0, NULL, NO_EOL, 0, "", "Identity: "); win_print(console, '-', 0, NULL, NO_EOL, 0, "", "Identity: ");
if (caps->name) { if (identity->name) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name);
if (caps->category || caps->type) { if (identity->category || identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type) { if (identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type);
if (caps->category) { if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category) { if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category);
} }
win_newline(console); win_newline(console);
} }
if (caps->software) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "Software: %s", caps->software);
}
if (caps->software_version) { if (caps->software_version) {
win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "Software: %s", software_version->software);
} }
if (caps->software || caps->software_version) { if (software_version->software_version) {
win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
}
if (software_version->software || software_version->software_version) {
win_newline(console); win_newline(console);
} }
if (caps->os) { if (software_version->os) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "OS: %s", caps->os); win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "OS: %s", software_version->os);
} }
if (caps->os_version) { if (software_version->os_version) {
win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
} }
if (caps->os || caps->os_version) { if (software_version->os || software_version->os_version) {
win_newline(console); win_newline(console);
} }
}
if (caps->features) { if (caps->features) {
win_println(console, 0, "Features:"); win_println(console, 0, "Features:");
@ -1002,48 +1007,54 @@ cons_show_account(ProfAccount *account)
} }
win_vprint(console, '-', 0, NULL, NO_DATE, 0, "", ""); win_vprint(console, '-', 0, NULL, NO_DATE, 0, "", "");
Jid *jidp = jid_create_from_bare_and_resource(account->jid, resource->name); Jid *jidp = jid_create_from_bare_and_resource(account->jid, resource->name);
Capabilities *caps = caps_lookup(jidp->fulljid); EntityCapabilities *caps = caps_lookup(jidp->fulljid);
jid_destroy(jidp); jid_destroy(jidp);
if (caps) { if (caps) {
// show identity // show identity
if (caps->category || caps->type || caps->name) { if (caps->identity) {
DiscoIdentity *identity = caps->identity;
win_print(console, '-', 0, NULL, NO_EOL, 0, "", " Identity: "); win_print(console, '-', 0, NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name) { if (identity->name) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name);
if (caps->category || caps->type) { if (identity->category || identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type) { if (identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type);
if (caps->category) { if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category) { if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category);
} }
win_newline(console); win_newline(console);
} }
if (caps->software) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", caps->software);
}
if (caps->software_version) { if (caps->software_version) {
win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
} }
if (caps->software || caps->software_version) { if (software_version->software_version) {
win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
}
if (software_version->software || software_version->software_version) {
win_newline(console); win_newline(console);
} }
if (caps->os) { if (software_version->os) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", " OS: %s", caps->os); win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
} }
if (caps->os_version) { if (software_version->os_version) {
win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
} }
if (caps->os || caps->os_version) { if (software_version->os || software_version->os_version) {
win_newline(console); win_newline(console);
} }
}
caps_destroy(caps); caps_destroy(caps);
} }

92
src/ui/window.c
View File

@ -760,48 +760,54 @@ win_show_occupant_info(ProfWin *window, const char *const room, Occupant *occupa
win_vprint(window, '!', 0, NULL, 0, 0, "", " Role: %s", occupant_role); win_vprint(window, '!', 0, NULL, 0, 0, "", " Role: %s", occupant_role);
Jid *jidp = jid_create_from_bare_and_resource(room, occupant->nick); Jid *jidp = jid_create_from_bare_and_resource(room, occupant->nick);
Capabilities *caps = caps_lookup(jidp->fulljid); EntityCapabilities *caps = caps_lookup(jidp->fulljid);
jid_destroy(jidp); jid_destroy(jidp);
if (caps) { if (caps) {
// show identity // show identity
if (caps->category || caps->type || caps->name) { if (caps->identity) {
DiscoIdentity *identity = caps->identity;
win_print(window, '!', 0, NULL, NO_EOL, 0, "", " Identity: "); win_print(window, '!', 0, NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name) { if (identity->name) {
win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name);
if (caps->category || caps->type) { if (identity->category || identity->type) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type) { if (identity->type) {
win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type);
if (caps->category) { if (identity->category) {
win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category) { if (identity->category) {
win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category);
} }
win_newline(window); win_newline(window);
} }
if (caps->software) {
win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " Software: %s", caps->software);
}
if (caps->software_version) { if (caps->software_version) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
} }
if (caps->software || caps->software_version) { if (software_version->software_version) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
}
if (software_version->software || software_version->software_version) {
win_newline(window); win_newline(window);
} }
if (caps->os) { if (software_version->os) {
win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " OS: %s", caps->os); win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
} }
if (caps->os_version) { if (software_version->os_version) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
} }
if (caps->os || caps->os_version) { if (software_version->os || software_version->os_version) {
win_newline(window); win_newline(window);
} }
}
caps_destroy(caps); caps_destroy(caps);
} }
@ -878,48 +884,54 @@ win_show_info(ProfWin *window, PContact contact)
win_newline(window); win_newline(window);
Jid *jidp = jid_create_from_bare_and_resource(barejid, resource->name); Jid *jidp = jid_create_from_bare_and_resource(barejid, resource->name);
Capabilities *caps = caps_lookup(jidp->fulljid); EntityCapabilities *caps = caps_lookup(jidp->fulljid);
jid_destroy(jidp); jid_destroy(jidp);
if (caps) { if (caps) {
// show identity // show identity
if (caps->category || caps->type || caps->name) { if (caps->identity) {
DiscoIdentity *identity = caps->identity;
win_print(window, '-', 0, NULL, NO_EOL, 0, "", " Identity: "); win_print(window, '-', 0, NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name) { if (identity->name) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name);
if (caps->category || caps->type) { if (identity->category || identity->type) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type) { if (identity->type) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type);
if (caps->category) { if (identity->category) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category) { if (identity->category) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category);
} }
win_newline(window); win_newline(window);
} }
if (caps->software) {
win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", caps->software);
}
if (caps->software_version) { if (caps->software_version) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
} }
if (caps->software || caps->software_version) { if (software_version->software_version) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
}
if (software_version->software || software_version->software_version) {
win_newline(window); win_newline(window);
} }
if (caps->os) { if (software_version->os) {
win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " OS: %s", caps->os); win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
} }
if (caps->os_version) { if (software_version->os_version) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
} }
if (caps->os || caps->os_version) { if (software_version->os || software_version->os_version) {
win_newline(window); win_newline(window);
} }
}
caps_destroy(caps); caps_destroy(caps);
} }

359
src/xmpp/capabilities.c
View File

@ -67,12 +67,13 @@ static GKeyFile *cache;
static GHashTable *jid_to_ver; static GHashTable *jid_to_ver;
static GHashTable *jid_to_caps; static GHashTable *jid_to_caps;
static GList *prof_features;
static char *my_sha1; static char *my_sha1;
static void _save_cache(void); static void _save_cache(void);
static Capabilities* _caps_by_ver(const char *const ver); static EntityCapabilities* _caps_by_ver(const char *const ver);
static Capabilities* _caps_by_jid(const char *const jid); static EntityCapabilities* _caps_by_jid(const char *const jid);
Capabilities* _caps_copy(Capabilities *caps); EntityCapabilities* _caps_copy(EntityCapabilities *caps);
void void
caps_init(void) caps_init(void)
@ -90,35 +91,62 @@ caps_init(void)
jid_to_ver = g_hash_table_new_full(g_str_hash, g_str_equal, free, free); jid_to_ver = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
jid_to_caps = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)caps_destroy); jid_to_caps = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)caps_destroy);
prof_features = NULL;
prof_features = g_list_append(prof_features, strdup(STANZA_NS_CAPS));
prof_features = g_list_append(prof_features, strdup(XMPP_NS_DISCO_INFO));
prof_features = g_list_append(prof_features, strdup(XMPP_NS_DISCO_ITEMS));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_MUC));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_CONFERENCE));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_VERSION));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_CHATSTATES));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_PING));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_RECEIPTS));
prof_features = g_list_append(prof_features, strdup(STANZA_NS_LASTACTIVITY));
my_sha1 = NULL; my_sha1 = NULL;
} }
void void
caps_add_by_ver(const char *const ver, Capabilities *caps) caps_add_by_ver(const char *const ver, EntityCapabilities *caps)
{ {
if (ver == NULL || caps == NULL) {
return;
}
gboolean cached = g_key_file_has_group(cache, ver); gboolean cached = g_key_file_has_group(cache, ver);
if (!cached) { if (cached) {
if (caps->name) { return;
g_key_file_set_string(cache, ver, "name", caps->name);
} }
if (caps->category) {
g_key_file_set_string(cache, ver, "category", caps->category); if (caps->identity) {
DiscoIdentity *identity = caps->identity;
if (identity->name) {
g_key_file_set_string(cache, ver, "name", identity->name);
} }
if (caps->type) { if (identity->category) {
g_key_file_set_string(cache, ver, "type", caps->type); g_key_file_set_string(cache, ver, "category", identity->category);
} }
if (caps->software) { if (identity->type) {
g_key_file_set_string(cache, ver, "software", caps->software); g_key_file_set_string(cache, ver, "type", identity->type);
} }
}
if (caps->software_version) { if (caps->software_version) {
g_key_file_set_string(cache, ver, "software_version", caps->software_version); SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
g_key_file_set_string(cache, ver, "software", software_version->software);
} }
if (caps->os) { if (software_version->software_version) {
g_key_file_set_string(cache, ver, "os", caps->os); g_key_file_set_string(cache, ver, "software_version", software_version->software_version);
} }
if (caps->os_version) { if (software_version->os) {
g_key_file_set_string(cache, ver, "os_version", caps->os_version); g_key_file_set_string(cache, ver, "os", software_version->os);
} }
if (software_version->os_version) {
g_key_file_set_string(cache, ver, "os_version", software_version->os_version);
}
}
if (caps->features) { if (caps->features) {
GSList *curr_feature = caps->features; GSList *curr_feature = caps->features;
int num = g_slist_length(caps->features); int num = g_slist_length(caps->features);
@ -132,11 +160,10 @@ caps_add_by_ver(const char *const ver, Capabilities *caps)
} }
_save_cache(); _save_cache();
}
} }
void void
caps_add_by_jid(const char *const jid, Capabilities *caps) caps_add_by_jid(const char *const jid, EntityCapabilities *caps)
{ {
g_hash_table_insert(jid_to_caps, strdup(jid), caps); g_hash_table_insert(jid_to_caps, strdup(jid), caps);
} }
@ -153,61 +180,40 @@ caps_contains(const char *const ver)
return (g_key_file_has_group(cache, ver)); return (g_key_file_has_group(cache, ver));
} }
static Capabilities* static EntityCapabilities*
_caps_by_ver(const char *const ver) _caps_by_ver(const char *const ver)
{ {
if (g_key_file_has_group(cache, ver)) { if (g_key_file_has_group(cache, ver)) {
Capabilities *new_caps = malloc(sizeof(struct capabilities_t)); EntityCapabilities *new_caps = malloc(sizeof(struct entity_capabilities_t));
char *category = g_key_file_get_string(cache, ver, "category", NULL); char *category = g_key_file_get_string(cache, ver, "category", NULL);
if (category) {
new_caps->category = category;
} else {
new_caps->category = NULL;
}
char *type = g_key_file_get_string(cache, ver, "type", NULL); char *type = g_key_file_get_string(cache, ver, "type", NULL);
if (type) {
new_caps->type = type;
} else {
new_caps->type = NULL;
}
char *name = g_key_file_get_string(cache, ver, "name", NULL); char *name = g_key_file_get_string(cache, ver, "name", NULL);
if (name) { if (category || type || name) {
new_caps->name = name; DiscoIdentity *identity = malloc(sizeof(struct disco_identity_t));
identity->category = category;
identity->type = type;
identity->name = name;
new_caps->identity = identity;
} else { } else {
new_caps->name = NULL; new_caps->identity = NULL;
} }
char *software = g_key_file_get_string(cache, ver, "software", NULL); char *software = g_key_file_get_string(cache, ver, "software", NULL);
if (software) {
new_caps->software = software;
} else {
new_caps->software = NULL;
}
char *software_version = g_key_file_get_string(cache, ver, "software_version", NULL); char *software_version = g_key_file_get_string(cache, ver, "software_version", NULL);
if (software_version) { char *os = g_key_file_get_string(cache, ver, "os", NULL);
new_caps->software_version = software_version; char *os_version = g_key_file_get_string(cache, ver, "os_version", NULL);
if (software || software_version || os || os_version) {
SoftwareVersion *software_versionp = malloc(sizeof(struct software_version_t));
software_versionp->software = software;
software_versionp->software_version = software_version;
software_versionp->os = os;
software_versionp->os_version = os_version;
new_caps->software_version = software_versionp;
} else { } else {
new_caps->software_version = NULL; new_caps->software_version = NULL;
} }
char *os = g_key_file_get_string(cache, ver, "os", NULL);
if (os) {
new_caps->os = os;
} else {
new_caps->os = NULL;
}
char *os_version = g_key_file_get_string(cache, ver, "os_version", NULL);
if (os_version) {
new_caps->os_version = os_version;
} else {
new_caps->os_version = NULL;
}
gsize features_len = 0; gsize features_len = 0;
gchar **features = g_key_file_get_string_list(cache, ver, "features", &features_len, NULL); gchar **features = g_key_file_get_string_list(cache, ver, "features", &features_len, NULL);
if (features && features_len > 0) { if (features && features_len > 0) {
@ -227,24 +233,24 @@ _caps_by_ver(const char *const ver)
} }
} }
static Capabilities* static EntityCapabilities*
_caps_by_jid(const char *const jid) _caps_by_jid(const char *const jid)
{ {
return g_hash_table_lookup(jid_to_caps, jid); return g_hash_table_lookup(jid_to_caps, jid);
} }
Capabilities* EntityCapabilities*
caps_lookup(const char *const jid) caps_lookup(const char *const jid)
{ {
char *ver = g_hash_table_lookup(jid_to_ver, jid); char *ver = g_hash_table_lookup(jid_to_ver, jid);
if (ver) { if (ver) {
Capabilities *caps = _caps_by_ver(ver); EntityCapabilities *caps = _caps_by_ver(ver);
if (caps) { if (caps) {
log_debug("Capabilities lookup %s, found by verification string %s.", jid, ver); log_debug("Capabilities lookup %s, found by verification string %s.", jid, ver);
return caps; return caps;
} }
} else { } else {
Capabilities *caps = _caps_by_jid(jid); EntityCapabilities *caps = _caps_by_jid(jid);
if (caps) { if (caps) {
log_debug("Capabilities lookup %s, found by JID.", jid); log_debug("Capabilities lookup %s, found by JID.", jid);
return _caps_copy(caps); return _caps_copy(caps);
@ -255,20 +261,33 @@ caps_lookup(const char *const jid)
return NULL; return NULL;
} }
Capabilities* EntityCapabilities*
_caps_copy(Capabilities *caps) _caps_copy(EntityCapabilities *caps)
{ {
if (!caps) { if (!caps) {
return NULL; return NULL;
} else { } else {
Capabilities *result = (Capabilities *)malloc(sizeof(Capabilities)); EntityCapabilities *result = (EntityCapabilities *)malloc(sizeof(EntityCapabilities));
result->category = caps->category ? strdup(caps->category) : NULL;
result->type = caps->type ? strdup(caps->type) : NULL; if (caps->identity) {
result->name = caps->name ? strdup(caps->name) : NULL; DiscoIdentity *identity = (DiscoIdentity*)malloc(sizeof(DiscoIdentity));
result->software = caps->software ? strdup(caps->software) : NULL; identity->category = caps->identity->category ? strdup(caps->identity->category) : NULL;
result->software_version = caps->software_version ? strdup(caps->software_version) : NULL; identity->type = caps->identity->type ? strdup(caps->identity->type) : NULL;
result->os = caps->os ? strdup(caps->os) : NULL; identity->name = caps->identity->name ? strdup(caps->identity->name) : NULL;
result->os_version = caps->os_version ? strdup(caps->os_version) : NULL; result->identity = identity;
} else {
result->identity = NULL;
}
if (caps->software_version) {
SoftwareVersion *software_version = (SoftwareVersion*)malloc(sizeof(SoftwareVersion));
software_version->software = caps->software_version->software ? strdup(caps->software_version->software) : NULL;
software_version->software_version = caps->software_version->software_version ? strdup(caps->software_version->software_version) : NULL;
software_version->os = caps->software_version->os ? strdup(caps->software_version->os) : NULL;
software_version->os_version = caps->software_version->os_version ? strdup(caps->software_version->os_version) : NULL;
} else {
result->software_version = NULL;
}
result->features = NULL; result->features = NULL;
GSList *curr = caps->features; GSList *curr = caps->features;
@ -284,25 +303,18 @@ _caps_copy(Capabilities *caps)
char* char*
caps_create_sha1_str(xmpp_stanza_t *const query) caps_create_sha1_str(xmpp_stanza_t *const query)
{ {
const char *category = NULL;
const char *type = NULL;
const char *lang = NULL;
const char *name = NULL;
const char *feature_str = NULL;
GSList *identities = NULL; GSList *identities = NULL;
GSList *features = NULL; GSList *features = NULL;
GSList *form_names = NULL; GSList *form_names = NULL;
DataForm *form = NULL;
FormField *field = NULL;
GHashTable *forms = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)form_destroy); GHashTable *forms = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)form_destroy);
xmpp_stanza_t *child = xmpp_stanza_get_children(query); xmpp_stanza_t *child = xmpp_stanza_get_children(query);
while (child) { while (child) {
if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_IDENTITY) == 0) { if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_IDENTITY) == 0) {
category = xmpp_stanza_get_attribute(child, "category"); const char *category = xmpp_stanza_get_attribute(child, "category");
type = xmpp_stanza_get_attribute(child, "type"); const char *type = xmpp_stanza_get_attribute(child, "type");
lang = xmpp_stanza_get_attribute(child, "xml:lang"); const char *lang = xmpp_stanza_get_attribute(child, "xml:lang");
name = xmpp_stanza_get_attribute(child, "name"); const char *name = xmpp_stanza_get_attribute(child, "name");
GString *identity_str = g_string_new(category); GString *identity_str = g_string_new(category);
g_string_append(identity_str, "/"); g_string_append(identity_str, "/");
@ -321,11 +333,11 @@ caps_create_sha1_str(xmpp_stanza_t *const query)
identities = g_slist_insert_sorted(identities, g_strdup(identity_str->str), (GCompareFunc)strcmp); identities = g_slist_insert_sorted(identities, g_strdup(identity_str->str), (GCompareFunc)strcmp);
g_string_free(identity_str, TRUE); g_string_free(identity_str, TRUE);
} else if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_FEATURE) == 0) { } else if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_FEATURE) == 0) {
feature_str = xmpp_stanza_get_attribute(child, "var"); const char *feature_str = xmpp_stanza_get_attribute(child, "var");
features = g_slist_insert_sorted(features, g_strdup(feature_str), (GCompareFunc)strcmp); features = g_slist_insert_sorted(features, g_strdup(feature_str), (GCompareFunc)strcmp);
} else if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_X) == 0) { } else if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_X) == 0) {
if (g_strcmp0(xmpp_stanza_get_ns(child), STANZA_NS_DATA) == 0) { if (g_strcmp0(xmpp_stanza_get_ns(child), STANZA_NS_DATA) == 0) {
form = form_create(child); DataForm *form = form_create(child);
char *form_type = form_get_form_type_field(form); char *form_type = form_get_form_type_field(form);
form_names = g_slist_insert_sorted(form_names, g_strdup(form_type), (GCompareFunc)strcmp); form_names = g_slist_insert_sorted(form_names, g_strdup(form_type), (GCompareFunc)strcmp);
g_hash_table_insert(forms, g_strdup(form_type), form); g_hash_table_insert(forms, g_strdup(form_type), form);
@ -351,7 +363,7 @@ caps_create_sha1_str(xmpp_stanza_t *const query)
curr = form_names; curr = form_names;
while (curr) { while (curr) {
form = g_hash_table_lookup(forms, curr->data); DataForm *form = g_hash_table_lookup(forms, curr->data);
char *form_type = form_get_form_type_field(form); char *form_type = form_get_form_type_field(form);
g_string_append(s, form_type); g_string_append(s, form_type);
g_string_append(s, "<"); g_string_append(s, "<");
@ -359,7 +371,7 @@ caps_create_sha1_str(xmpp_stanza_t *const query)
GSList *sorted_fields = form_get_non_form_type_fields_sorted(form); GSList *sorted_fields = form_get_non_form_type_fields_sorted(form);
GSList *curr_field = sorted_fields; GSList *curr_field = sorted_fields;
while (curr_field) { while (curr_field) {
field = curr_field->data; FormField *field = curr_field->data;
g_string_append(s, field->var); g_string_append(s, field->var);
g_string_append(s, "<"); g_string_append(s, "<");
@ -389,17 +401,13 @@ caps_create_sha1_str(xmpp_stanza_t *const query)
return result; return result;
} }
Capabilities* EntityCapabilities*
caps_create(xmpp_stanza_t *query) caps_create(xmpp_stanza_t *query)
{ {
const char *category = NULL;
const char *type = NULL;
const char *name = NULL;
char *software = NULL; char *software = NULL;
char *software_version = NULL; char *software_version = NULL;
char *os = NULL; char *os = NULL;
char *os_version = NULL; char *os_version = NULL;
GSList *features = NULL;
xmpp_stanza_t *softwareinfo = xmpp_stanza_get_child_by_ns(query, STANZA_NS_DATA); xmpp_stanza_t *softwareinfo = xmpp_stanza_get_child_by_ns(query, STANZA_NS_DATA);
if (softwareinfo) { if (softwareinfo) {
@ -431,6 +439,7 @@ caps_create(xmpp_stanza_t *query)
xmpp_stanza_t *child = xmpp_stanza_get_children(query); xmpp_stanza_t *child = xmpp_stanza_get_children(query);
GSList *identity_stanzas = NULL; GSList *identity_stanzas = NULL;
GSList *features = NULL;
while (child) { while (child) {
if (g_strcmp0(xmpp_stanza_get_name(child), "feature") == 0) { if (g_strcmp0(xmpp_stanza_get_name(child), "feature") == 0) {
features = g_slist_append(features, strdup(xmpp_stanza_get_attribute(child, "var"))); features = g_slist_append(features, strdup(xmpp_stanza_get_attribute(child, "var")));
@ -489,49 +498,35 @@ caps_create(xmpp_stanza_t *query)
g_slist_free(identity_stanzas); g_slist_free(identity_stanzas);
const char *category = NULL;
const char *type = NULL;
const char *name = NULL;
if (found) { if (found) {
category = xmpp_stanza_get_attribute(found, "category"); category = xmpp_stanza_get_attribute(found, "category");
type = xmpp_stanza_get_attribute(found, "type"); type = xmpp_stanza_get_attribute(found, "type");
name = xmpp_stanza_get_attribute(found, "name"); name = xmpp_stanza_get_attribute(found, "name");
} }
Capabilities *new_caps = malloc(sizeof(struct capabilities_t)); EntityCapabilities *new_caps = malloc(sizeof(struct entity_capabilities_t));
if (category) { if (category || type || name) {
new_caps->category = strdup(category); DiscoIdentity *identity = malloc(sizeof(struct disco_identity_t));
identity->category = category ? strdup(category) : NULL;
identity->type = type ? strdup(type) : NULL;
identity->name = name ? strdup(name) : NULL;
new_caps->identity = identity;
} else { } else {
new_caps->category = NULL; new_caps->identity = NULL;
} }
if (type) {
new_caps->type = strdup(type); if (software || software_version || os || os_version) {
} else { SoftwareVersion *software_versionp = malloc(sizeof(struct software_version_t));
new_caps->type = NULL; software_versionp->software = software;
} software_versionp->software_version = software_version;
if (name) { software_versionp->os = os;
new_caps->name = strdup(name); software_versionp->os_version = os_version;
} else {
new_caps->name = NULL;
}
if (software) {
new_caps->software = software;
} else {
new_caps->software = NULL;
}
if (software_version) {
new_caps->software_version = software_version;
} else {
new_caps->software_version = NULL;
}
if (os) {
new_caps->os = os;
} else {
new_caps->os = NULL;
}
if (os_version) {
new_caps->os_version = os_version;
} else {
new_caps->os_version = NULL;
} }
if (features) { if (features) {
new_caps->features = features; new_caps->features = features;
} else { } else {
@ -588,62 +583,22 @@ caps_create_query_response_stanza(xmpp_ctx_t *const ctx)
} }
xmpp_stanza_set_attribute(identity, "name", name_str->str); xmpp_stanza_set_attribute(identity, "name", name_str->str);
g_string_free(name_str, TRUE); g_string_free(name_str, TRUE);
xmpp_stanza_t *feature_caps = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_caps, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_caps, STANZA_ATTR_VAR, STANZA_NS_CAPS);
xmpp_stanza_t *feature_discoinfo = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_discoinfo, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_discoinfo, STANZA_ATTR_VAR, XMPP_NS_DISCO_INFO);
xmpp_stanza_t *feature_discoitems = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_discoitems, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_discoitems, STANZA_ATTR_VAR, XMPP_NS_DISCO_ITEMS);
xmpp_stanza_t *feature_muc = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_muc, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_muc, STANZA_ATTR_VAR, STANZA_NS_MUC);
xmpp_stanza_t *feature_conference = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_conference, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_conference, STANZA_ATTR_VAR, STANZA_NS_CONFERENCE);
xmpp_stanza_t *feature_version = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_version, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_version, STANZA_ATTR_VAR, STANZA_NS_VERSION);
xmpp_stanza_t *feature_chatstates = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_chatstates, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_chatstates, STANZA_ATTR_VAR, STANZA_NS_CHATSTATES);
xmpp_stanza_t *feature_ping = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_ping, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_ping, STANZA_ATTR_VAR, STANZA_NS_PING);
xmpp_stanza_t *feature_receipts = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_receipts, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_receipts, STANZA_ATTR_VAR, STANZA_NS_RECEIPTS);
xmpp_stanza_t *feature_last = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature_last, STANZA_NAME_FEATURE);
xmpp_stanza_set_attribute(feature_last, STANZA_ATTR_VAR, STANZA_NS_LASTACTIVITY);
xmpp_stanza_add_child(query, identity); xmpp_stanza_add_child(query, identity);
xmpp_stanza_release(identity);
xmpp_stanza_add_child(query, feature_caps); GList *curr = prof_features;
xmpp_stanza_add_child(query, feature_chatstates); while (curr) {
xmpp_stanza_add_child(query, feature_discoinfo); xmpp_stanza_t *feature = xmpp_stanza_new(ctx);
xmpp_stanza_add_child(query, feature_discoitems); xmpp_stanza_set_name(feature, STANZA_NAME_FEATURE);
xmpp_stanza_add_child(query, feature_muc); xmpp_stanza_set_attribute(feature, STANZA_ATTR_VAR, curr->data);
xmpp_stanza_add_child(query, feature_version); xmpp_stanza_add_child(query, feature);
xmpp_stanza_add_child(query, feature_last); xmpp_stanza_release(feature);
xmpp_stanza_add_child(query, feature_conference);
xmpp_stanza_add_child(query, feature_ping); curr = g_list_next(curr);
xmpp_stanza_add_child(query, feature_receipts); }
GList *plugin_features = plugins_get_disco_features(); GList *plugin_features = plugins_get_disco_features();
GList *curr = plugin_features; curr = plugin_features;
while (curr) { while (curr) {
xmpp_stanza_t *feature = xmpp_stanza_new(ctx); xmpp_stanza_t *feature = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(feature, STANZA_NAME_FEATURE); xmpp_stanza_set_name(feature, STANZA_NAME_FEATURE);
@ -655,18 +610,6 @@ caps_create_query_response_stanza(xmpp_ctx_t *const ctx)
} }
g_list_free(plugin_features); g_list_free(plugin_features);
xmpp_stanza_release(feature_receipts);
xmpp_stanza_release(feature_ping);
xmpp_stanza_release(feature_conference);
xmpp_stanza_release(feature_last);
xmpp_stanza_release(feature_version);
xmpp_stanza_release(feature_muc);
xmpp_stanza_release(feature_discoitems);
xmpp_stanza_release(feature_discoinfo);
xmpp_stanza_release(feature_chatstates);
xmpp_stanza_release(feature_caps);
xmpp_stanza_release(identity);
return query; return query;
} }
@ -679,19 +622,39 @@ caps_close(void)
g_hash_table_destroy(jid_to_caps); g_hash_table_destroy(jid_to_caps);
free(cache_loc); free(cache_loc);
cache_loc = NULL; cache_loc = NULL;
g_list_free_full(prof_features, free);
prof_features = NULL;
}
static void
_disco_identity_destroy(DiscoIdentity *disco_identity)
{
if (disco_identity) {
free(disco_identity->category);
free(disco_identity->name);
free(disco_identity->type);
free(disco_identity);
}
}
static void
_software_version_destroy(SoftwareVersion *software_version)
{
if (software_version) {
free(software_version->software);
free(software_version->software_version);
free(software_version->os);
free(software_version->os_version);
free(software_version);
}
} }
void void
caps_destroy(Capabilities *caps) caps_destroy(EntityCapabilities *caps)
{ {
if (caps) { if (caps) {
free(caps->category); _disco_identity_destroy(caps->identity);
free(caps->type); _software_version_destroy(caps->software_version);
free(caps->name);
free(caps->software);
free(caps->software_version);
free(caps->os);
free(caps->os_version);
if (caps->features) { if (caps->features) {
g_slist_free_full(caps->features, free); g_slist_free_full(caps->features, free);
} }

6
src/xmpp/capabilities.h
View File

@ -49,14 +49,14 @@
void caps_init(void); void caps_init(void);
void caps_add_by_ver(const char *const ver, Capabilities *caps); void caps_add_by_ver(const char *const ver, EntityCapabilities *caps);
void caps_add_by_jid(const char *const jid, Capabilities *caps); void caps_add_by_jid(const char *const jid, EntityCapabilities *caps);
void caps_map_jid_to_ver(const char *const jid, const char *const ver); void caps_map_jid_to_ver(const char *const jid, const char *const ver);
gboolean caps_contains(const char *const ver); gboolean caps_contains(const char *const ver);
char* caps_create_sha1_str(xmpp_stanza_t *const query); char* caps_create_sha1_str(xmpp_stanza_t *const query);
xmpp_stanza_t* caps_create_query_response_stanza(xmpp_ctx_t *const ctx); xmpp_stanza_t* caps_create_query_response_stanza(xmpp_ctx_t *const ctx);
Capabilities* caps_create(xmpp_stanza_t *query); EntityCapabilities* caps_create(xmpp_stanza_t *query);
char* caps_get_my_sha1(xmpp_ctx_t *const ctx); char* caps_get_my_sha1(xmpp_ctx_t *const ctx);
#endif #endif

6
src/xmpp/iq.c
View File

@ -746,7 +746,7 @@ _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
log_info("Capabilties already cached: %s", given_sha1); log_info("Capabilties already cached: %s", given_sha1);
} else { } else {
log_info("Capabilities not cached: %s, storing", given_sha1); log_info("Capabilities not cached: %s, storing", given_sha1);
Capabilities *capabilities = caps_create(query); EntityCapabilities *capabilities = caps_create(query);
caps_add_by_ver(given_sha1, capabilities); caps_add_by_ver(given_sha1, capabilities);
caps_destroy(capabilities); caps_destroy(capabilities);
} }
@ -810,7 +810,7 @@ _caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userd
} }
log_info("Associating capabilities with: %s", jid); log_info("Associating capabilities with: %s", jid);
Capabilities *capabilities = caps_create(query); EntityCapabilities *capabilities = caps_create(query);
caps_add_by_jid(jid, capabilities); caps_add_by_jid(jid, capabilities);
free(jid); free(jid);
@ -874,7 +874,7 @@ _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userda
log_info("Capabilties already cached: %s", node); log_info("Capabilties already cached: %s", node);
} else { } else {
log_info("Capabilities not cached: %s, storing", node); log_info("Capabilities not cached: %s, storing", node);
Capabilities *capabilities = caps_create(query); EntityCapabilities *capabilities = caps_create(query);
caps_add_by_ver(node, capabilities); caps_add_by_ver(node, capabilities);
caps_destroy(capabilities); caps_destroy(capabilities);
} }

38
src/xmpp/xmpp.h
View File

@ -82,28 +82,30 @@ typedef struct bookmark_t {
gboolean autojoin; gboolean autojoin;
} Bookmark; } Bookmark;
typedef struct capabilities_t {
char *category;
char *type;
char *name;
char *software;
char *software_version;
char *os;
char *os_version;
GSList *features;
} Capabilities;
typedef struct disco_item_t {
char *jid;
char *name;
} DiscoItem;
typedef struct disco_identity_t { typedef struct disco_identity_t {
char *name; char *name;
char *type; char *type;
char *category; char *category;
} DiscoIdentity; } DiscoIdentity;
typedef struct software_version_t {
char *software;
char *software_version;
char *os;
char *os_version;
} SoftwareVersion;
typedef struct entity_capabilities_t {
DiscoIdentity *identity;
SoftwareVersion *software_version;
GSList *features;
} EntityCapabilities;
typedef struct disco_item_t {
char *jid;
char *name;
} DiscoItem;
void session_init(void); void session_init(void);
jabber_conn_status_t session_connect_with_details(const char *const jid, const char *const passwd, jabber_conn_status_t session_connect_with_details(const char *const jid, const char *const passwd,
const char *const altdomain, const int port, const char *const tls_policy); const char *const altdomain, const int port, const char *const tls_policy);
@ -173,9 +175,9 @@ void iq_room_role_list(const char * const room, char *role);
void iq_autoping_check(void); void iq_autoping_check(void);
void iq_http_upload_request(HTTPUpload *upload); void iq_http_upload_request(HTTPUpload *upload);
Capabilities* caps_lookup(const char *const jid); EntityCapabilities* caps_lookup(const char *const jid);
void caps_close(void); void caps_close(void);
void caps_destroy(Capabilities *caps); void caps_destroy(EntityCapabilities *caps);
void caps_reset_ver(void); void caps_reset_ver(void);
gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str); gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str);

4
tests/unittests/xmpp/stub_xmpp.c
View File

@ -203,13 +203,13 @@ void iq_last_activity_request(gchar *jid) {}
void iq_autoping_check(void) {} void iq_autoping_check(void) {}
// caps functions // caps functions
Capabilities* caps_lookup(const char * const jid) EntityCapabilities* caps_lookup(const char * const jid)
{ {
return NULL; return NULL;
} }
void caps_close(void) {} void caps_close(void) {}
void caps_destroy(Capabilities *caps) {} void caps_destroy(EntityCapabilities *caps) {}
void caps_reset_ver(void) {} void caps_reset_ver(void) {}
gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str) gboolean bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str)