-
-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Jingle: XEP-0166, XEP-0234, XEP-0261, XEP-0047
Jingle is a session negotiation protocol, it can not transfer data by itself, but it enables us to transfer data over negotiated channels. To transfer files over Jingle, the IBB is a required channel, it's very stable (over XMPP), but it's slow. It's planned to add Socks5 and over protocols in the future updates, but for now this is a minimal setup to use the Jingle for file transfer. Special thanks to the @jubalh and @jaeckel for their support and contributions.
- Loading branch information
1 parent
0de0594
commit 99b327d
Showing
19 changed files
with
2,043 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2726,12 +2726,34 @@ static const struct cmd_t command_defs[] = { | |
"session_alarm to configure an alarm when more clients log in.") | ||
CMD_ARGS( | ||
{ "logging on|redact|off", "Switch chat logging. This will also disable logging in the internally used SQL database. Your messages will not be saved anywhere locally. This might have unintended consequences, such as not being able to decrypt OMEMO encrypted messages received later via MAM, and should be used with caution." }, | ||
{ "os on|off", "Choose whether to include the OS name if a user asks for software information (XEP-0092)." } | ||
) | ||
{ "os on|off", "Choose whether to include the OS name if a user asks for software information (XEP-0092)." }) | ||
CMD_EXAMPLES( | ||
"/privacy logging off", | ||
"/privacy os off") | ||
}, | ||
|
||
{ CMD_PREAMBLE("/jingle", // TODO: autocomplete | ||
parse_args, 2, 1000, NULL) | ||
CMD_MAINFUNC(cmd_jingle) | ||
CMD_TAGS( | ||
CMD_TAG_CHAT) | ||
CMD_SYN( | ||
"/jingle session accept|reject|cancel [<session_id|jid>]", | ||
"/jingle sendfiles [<jid>] <file1> <file2> ... <fileN>") | ||
CMD_DESC( | ||
"Manage Jingle sessions. " | ||
"Jingle (XEP-0166) allows you to set up sessions for files transfer and A/V calls. " | ||
"Currently only file transfer is supported. " | ||
"WARNING: files are transfered in PLAIN TEXT format, it means that your " | ||
"or your recipient's XMPP provider can access the file's content.") | ||
CMD_ARGS( | ||
{ "session accept|reject|cancel <session_id|jid>", "Accept/reject session upon the request from other user (e.g. accept file transfer) or to cancel ongoing session." }, | ||
{ "sendfiles <jid> <file1> <file2> ...", "Send a file(s) to recipient." }) | ||
CMD_EXAMPLES( | ||
"/jingle session accept SESSION_ID", | ||
"/jingle session reject [email protected]", | ||
"/jingle sendfiles [email protected] meme.jpg naked_valkyrie.png") // TODO: remove joke before release | ||
}, | ||
// NEXT-COMMAND (search helper) | ||
}; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.