diff --git a/README.md b/README.md index e8a4af8..23bedae 100644 --- a/README.md +++ b/README.md @@ -23,28 +23,6 @@ aptitude install libstrophe-dev make ``` -## Usage - -``` -xmppc --jid user@domain.tld --pwd "password" --mode roster list -xmppc -j user@domain.tld -p "password" -m roster list -xmppc -j user@domain.tld -p "password" -m roster export -xmppc -j user@domain.tld -p "password" -m message chat friend@domain.tld "Message" -xmppc -j user@domain.tld -p "password" -m pgp chat friend@domain.tld "Message" -xmppc -j user@domain.tld -p "password" -m openpgp signcrypt friend@domain.tld "Message" -xmppc -j user@domain.tld -p "password" -m omemo list -xmppc -j user@domain.tld -p "password" -m monitor stanza -xmppc -a alice -m mam list bob@domain.tld -xmppc -m bookmark list -xmppc -m discovery info domain.tld -xmppc -m discovery item conference.domain.tld -``` -Use xmppc with [pass](https://packages.debian.org/buster/pass) - -``` -xmppc --jid user@domain.tld --pwd $(pass XMPP/domain.tld/user) --mode roster list -``` - ## Config file Config file: ` ~/.config/xmppc.conf` @@ -59,11 +37,19 @@ jid=account1@domain.tld pwd=YourSecret ``` +## Usage + +``` +xmppc --jid user@domain.tld --pwd "password" --mode roster list +xmppc -j user@domain.tld -p "password" -m roster list +xmppc -a alice -m mam list bob@domain.tld +xmppc -m bookmark list +xmppc -h +``` + +More command and information see: [Wiki](https://codeberg.org/Anoxinon_e.V./xmppc/wiki) + ## Documentation * [Wiki](https://codeberg.org/Anoxinon_e.V./xmppc/wiki) -## Contact details - -* MUC: [xmpp:xmpp-messenger@conference.anoxinon.me?join](xmpp:xmpp-messenger@conference.anoxinon.me?join) - diff --git a/src/main.c b/src/main.c index a497669..3f5bfbe 100644 --- a/src/main.c +++ b/src/main.c @@ -293,15 +293,15 @@ void conn_handler(xmpp_conn_t *const conn, const xmpp_conn_event_t status, return; } - if( xmpp_conn_is_secured(conn) ) { - logInfo(callback->xmppc, "Secure connection!\n"); - } else { - logWarn(callback->xmppc, "Connection not secure!\n"); - } switch (status) { case XMPP_CONN_CONNECT: logInfo(callback->xmppc, "Connected\n"); + if( xmpp_conn_is_secured(conn) ) { + logInfo(callback->xmppc, "Secure connection!\n"); + } else { + logWarn(callback->xmppc, "Connection not secure!\n"); + } callback->callback(callback->xmppc, callback->argc, callback->argv); break; case XMPP_CONN_RAW_CONNECT: @@ -487,38 +487,49 @@ static void _show_help() { #else printf("%s\n", PACKAGE_STRING); #endif - printf("Usage: xmppc --account --jid --pwd --mode \n"); + printf("Usage: xmppc [--account ] [ --jid --pwd ] --mode [ ...]\n"); printf("Options:\n"); - printf(" -h / --help Display this information.\n"); - printf(" -j / --jid Jabber ID\n"); - printf(" -p / --pwd Passwort\n"); - printf(" -a / --account Passwort\n"); - printf(" -m / --mode xmppc mode\n"); + printf(" -h / --help Display this information.\n"); + printf(" -j / --jid Jabber ID\n"); + printf(" -p / --pwd Passwort\n"); + printf(" -a / --account Account\n"); + printf(" -m / --mode xmppc mode\n"); printf("\n"); printf("Modes:\n"); - printf(" -m --mode roster xmppc roster mode\n"); - printf(" list List all contacts\n"); - printf(" export Exports all contacts\n"); + printf(" -m --mode roster xmppc roster mode\n"); + printf(" list List all contacts\n"); + printf(" export Exports all contacts\n"); printf("\n"); - printf(" -m --mode message xmppc message mode\n"); - printf(" chat Sending unencrypted message to jid\n"); + printf(" -m --mode message xmppc message mode\n"); + printf(" chat Sending unencrypted message to jid\n"); printf("\n"); - printf(" -m --mode pgp xmppc pgp mode (XEP-0027) \n"); - printf(" chat Sending pgp encrypted message to jid\n"); + printf(" -m --mode pgp xmppc pgp mode (XEP-0027) \n"); + printf(" chat Sending pgp encrypted message to jid\n"); printf("\n"); - printf(" -m --mode omemo xmppc omemo mode\n"); - printf(" list List the device IDs and fingerprints\n"); + printf(" -m --mode omemo xmppc omemo mode (XEP-0384)\n"); + printf(" list List the device IDs and fingerprints\n"); printf("\n"); - printf(" -m --mode openpgp xmppc openpgp mode (XEP-0373)\n"); - printf(" signcrypt Sending pgp signed and encrypted message to jid\n"); + printf(" -m --mode openpgp xmppc openpgp mode (XEP-0373)\n"); + printf(" signcrypt Sending pgp signed and encrypted message to jid\n"); printf("\n"); - printf(" -m --mode monitor Monitot mode"); - printf(" stanza Stanza Monitor\n"); - printf(" monitor microblog Monitor microblog (XEP-0277: Microblogging over XMPP)\n"); + printf(" -m --mode monitor Monitot mode\n"); + printf(" stanza Stanza Monitor\n"); + printf(" monitor microblog Monitor microblog (XEP-0277)\n"); + printf("\n"); + printf(" -m --mode bookmark Bookmark mode (XEP-0048)\n"); + printf(" list List bookmarks\n"); + printf("\n"); + printf(" -m --mode mam Message Archive Management (XEP-0313)\n"); + printf(" list List messages from \n"); + printf("\n"); + printf(" -m --mode discovery Service Discovery (XEP-0030)\n"); + printf(" info info request for \n"); + printf(" item item request for \n"); printf("\n"); printf("\n"); printf("Examples:\n"); printf(" Usage: xmppc --jid user@domain.tld --pwd \"secret\" --mode roster list\n"); printf(" Usage: xmppc --jid user@domain.tld --pwd \"secret\" --mode pgp chat friend@domain.tld \"Hello\"\n"); - + printf(" Usage: xmppc -a account1 --mode discovery item conference@domain.tld\n"); + printf(" Usage: xmppc --mode bookmark list\n"); }