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

Send private carbons element with message when encrypted

Browse Source
This commit is contained in:
James Booth
2015-03-10 21:16:34 +00:00
parent 3c1e8c4e15
commit 2ff6873cf1
10 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/xmpp/message.c
View File

@@ -93,14 +93,42 @@ message_send_chat(const char * const barejid, const char * const msg)
state = STANZA_NAME_ACTIVE;
}
Jid *jidp = jid_create_from_bare_and_resource(session->barejid, session->resource);
message = stanza_create_message(ctx, jidp->fulljid, STANZA_TYPE_CHAT, msg, state);
message = stanza_create_message(ctx, jidp->fulljid, STANZA_TYPE_CHAT, msg, state, false);
jid_destroy(jidp);
} else {
char *state = NULL;
if (prefs_get_boolean(PREF_STATES)) {
state = STANZA_NAME_ACTIVE;
}
message = stanza_create_message(ctx, barejid, STANZA_TYPE_CHAT, msg, state);
message = stanza_create_message(ctx, barejid, STANZA_TYPE_CHAT, msg, state, false);
}
xmpp_send(conn, message);
xmpp_stanza_release(message);
}
void
message_send_chat_encrypted(const char * const barejid, const char * const msg)
{
xmpp_stanza_t *message;
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
ChatSession *session = chat_session_get(barejid);
if (session) {
char *state = NULL;
if (prefs_get_boolean(PREF_STATES) && session->send_states) {
state = STANZA_NAME_ACTIVE;
}
Jid *jidp = jid_create_from_bare_and_resource(session->barejid, session->resource);
message = stanza_create_message(ctx, jidp->fulljid, STANZA_TYPE_CHAT, msg, state, true);
jid_destroy(jidp);
} else {
char *state = NULL;
if (prefs_get_boolean(PREF_STATES)) {
state = STANZA_NAME_ACTIVE;
}
message = stanza_create_message(ctx, barejid, STANZA_TYPE_CHAT, msg, state, true);
}
xmpp_send(conn, message);
@@ -112,7 +140,7 @@ message_send_private(const char * const fulljid, const char * const msg)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *message = stanza_create_message(ctx, fulljid, STANZA_TYPE_CHAT, msg, NULL);
xmpp_stanza_t *message = stanza_create_message(ctx, fulljid, STANZA_TYPE_CHAT, msg, NULL, false);
xmpp_send(conn, message);
xmpp_stanza_release(message);
@@ -123,7 +151,7 @@ message_send_groupchat(const char * const roomjid, const char * const msg)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *message = stanza_create_message(ctx, roomjid, STANZA_TYPE_GROUPCHAT, msg, NULL);
xmpp_stanza_t *message = stanza_create_message(ctx, roomjid, STANZA_TYPE_GROUPCHAT, msg, NULL, false);
xmpp_send(conn, message);
xmpp_stanza_release(message);
@@ -424,7 +452,7 @@ _chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
}
// check if carbon message
xmpp_stanza_t *received = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CARBONS);
xmpp_stanza_t *received = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CARBONS);
if(received != NULL){
xmpp_stanza_t *forwarded = xmpp_stanza_get_child_by_ns(received, STANZA_NS_FORWARD);
xmpp_stanza_t *message = xmpp_stanza_get_child_by_name(forwarded, STANZA_NAME_MESSAGE);
@@ -434,7 +462,7 @@ _chat_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
gchar *to = xmpp_stanza_get_attribute(message, STANZA_ATTR_TO);
gchar *from = xmpp_stanza_get_attribute(message, STANZA_ATTR_FROM);
// happens when receive a carbon of a self sent message
// happens when receive a carbon of a self sent message
if(to == NULL) {
to = from;
}

10
src/xmpp/stanza.c
View File

@@ -284,7 +284,7 @@ stanza_create_room_subject_message(xmpp_ctx_t *ctx, const char * const room, con
xmpp_stanza_t *
stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
const char * const type, const char * const message,
const char * const state)
const char * const state, gboolean encrypted)
{
xmpp_stanza_t *msg, *body, *text;
@@ -314,6 +314,14 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
xmpp_stanza_release(chat_state);
}
if (encrypted) {
xmpp_stanza_t *private_carbon = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(private_carbon, "private");
xmpp_stanza_set_ns(private_carbon, STANZA_NS_CARBONS);
xmpp_stanza_add_child(msg, private_carbon);
xmpp_stanza_release(private_carbon);
}
return msg;
}

2
src/xmpp/stanza.h
View File

@@ -191,7 +191,7 @@ xmpp_stanza_t* stanza_create_chat_state(xmpp_ctx_t *ctx,
xmpp_stanza_t* stanza_create_message(xmpp_ctx_t *ctx,
const char * const recipient, const char * const type,
const char * const message, const char * const state);
const char * const message, const char * const state, gboolean encrypted);
xmpp_stanza_t* stanza_create_room_join_presence(xmpp_ctx_t * const ctx,
const char * const full_room_jid, const char * const passwd);

1
src/xmpp/xmpp.h
View File

@@ -146,6 +146,7 @@ GList * jabber_get_available_resources(void);
// message functions
void message_send_chat(const char * const barejid, const char * const msg);
void message_send_chat_encrypted(const char * const barejid, const char * const msg);
void message_send_private(const char * const fulljid, const char * const msg);
void message_send_groupchat(const char * const roomjid, const char * const msg);
void message_send_groupchat_subject(const char * const roomjid, const char * const subject);