devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 7 Actions Packages Projects 1 Releases Wiki Activity

wip - refactoring capabilities

Browse Source
This commit is contained in:
James Booth
2014-09-19 00:49:48 +01:00
parent 93058636ce
commit 99c0b3f2cf
7 changed files with 311 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/xmpp/presence.c
View File

@@ -581,12 +581,46 @@ _available_handler(xmpp_conn_t * const conn,
free(priority_str);
}
// get capabilities key
char *caps_key = NULL;
// send disco info for capabilities, if not cached
if (stanza_contains_caps(stanza)) {
caps_key = _get_caps_key(stanza);
log_info("Presence contains capabilities.");
char *hash = stanza_caps_get_hash(stanza);
// hash supported xep-0115
if (g_strcmp0(hash, "sha-1") == 0) {
log_info("Hash %s supported");
char *ver = stanza_get_caps_ver(stanza);
if (caps_contains(ver)) {
log_info("Capabilities cached");
} else {
log_info("Capabilities not cached, sending service discovery request");
char *node = stanza_caps_get_node(stanza);
char *id = create_unique_id("caps");
iq_send_caps_request(from, id, node, ver);
// send service discovery request
// with id handler to validate response,
// generate hash,
// if match, cache against hash
}
// no hash, or not supported
} else {
if (hash) {
log_info("Hash %s not supported, not sending service discovery request");
// send service discovery request, cache against from full jid
} else {
log_info("No hash specified, not sending service discovery request");
// do legacy
}
}
}
char *caps_key = strdup("hello");
// create Resource
Resource *resource = NULL;
resource_presence_t presence = resource_presence_from_string(show_str);
@@ -648,8 +682,6 @@ _get_caps_key(xmpp_stanza_t * const stanza)
char *caps_key = NULL;
char *id = NULL;
log_debug("Presence contains capabilities.");
if (node == NULL) {
return NULL;
}