1
0
Fork 0

Only send ping requests to client that support it

This commit is contained in:
James Booth 2017-06-16 00:59:21 +01:00
parent 970ab94ed3
commit f189dbc687
4 changed files with 105 additions and 9 deletions

View File

@ -5868,6 +5868,11 @@ cmd_ping(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
if (args[0] != NULL && caps_jid_has_feature(args[0], XMPP_FEATURE_PING) == FALSE) {
cons_show("%s does not support ping requests.", args[0]);
return TRUE;
}
iq_send_ping(args[0]);
if (args[0] == NULL) {

View File

@ -35,9 +35,11 @@ int main(int argc, char* argv[]) {
PROF_FUNC_TEST(connect_bad_password),
PROF_FUNC_TEST(connect_shows_presence_updates),
PROF_FUNC_TEST(ping_multiple),
PROF_FUNC_TEST(ping_not_supported),
PROF_FUNC_TEST(ping_responds),
PROF_FUNC_TEST(ping_server),
PROF_FUNC_TEST(ping_server_not_supported),
PROF_FUNC_TEST(ping_responds_to_server_request),
PROF_FUNC_TEST(ping_jid),
PROF_FUNC_TEST(ping_jid_not_supported),
PROF_FUNC_TEST(rooms_query),

View File

@ -12,7 +12,7 @@
#include "proftest.h"
void
ping_multiple(void **state)
ping_server(void **state)
{
stbbr_for_id("prof_disco_info_onconnect_2",
"<iq id='prof_disco_info_onconnect_2' to='stabber@localhost/profanity' type='result' from='localhost'>"
@ -50,7 +50,7 @@ ping_multiple(void **state)
}
void
ping_not_supported(void **state)
ping_server_not_supported(void **state)
{
stbbr_for_id("prof_disco_info_onconnect_2",
"<iq id='prof_disco_info_onconnect_2' to='stabber@localhost/profanity' type='result' from='localhost'>"
@ -67,7 +67,7 @@ ping_not_supported(void **state)
}
void
ping_responds(void **state)
ping_responds_to_server_request(void **state)
{
prof_connect();
@ -81,3 +81,90 @@ ping_responds(void **state)
"<iq id='pingtest1' type='result' from='stabber@localhost/profanity' to='localhost'/>"
));
}
void ping_jid(void **state)
{
stbbr_for_id("prof_caps_4",
"<iq id='prof_caps_4' to='stabber@localhost/profanity' type='result' from='buddy1@localhost/mobile'>"
"<query xmlns='http://jabber.org/protocol/disco#info' node='http://www.profanity.im#LpT2xs3nun7jC2sq4gg3WRDQFZ4='>"
"<identity category='client' type='console' name='Profanity0.6.0'/>"
"<feature var='urn:xmpp:ping'/>"
"<feature var='http://jabber.org/protocol/disco#info'/>"
"<feature var='http://jabber.org/protocol/caps'/>"
"</query>"
"</iq>"
);
prof_connect();
stbbr_send(
"<presence to='stabber@localhost' from='buddy1@localhost/mobile'>"
"<priority>10</priority>"
"<status>I'm here</status>"
"<c "
"hash='sha-1' "
"xmlns='http://jabber.org/protocol/caps' "
"node='http://www.profanity.im' "
"ver='LpT2xs3nun7jC2sq4gg3WRDQFZ4='"
"/>"
"</presence>"
);
assert_true(prof_output_exact("Buddy1 (mobile) is online, \"I'm here\""));
assert_true(stbbr_received(
"<iq id='prof_caps_4' to='buddy1@localhost/mobile' type='get'>"
"<query xmlns='http://jabber.org/protocol/disco#info' node='http://www.profanity.im#LpT2xs3nun7jC2sq4gg3WRDQFZ4='/>"
"</iq>"
));
stbbr_for_id("prof_ping_5",
"<iq from='buddy1@localhost/mobile' to='stabber@localhost' id='prof_ping_5' type='result'/>"
);
prof_input("/ping buddy1@localhost/mobile");
assert_true(stbbr_received(
"<iq id='prof_ping_5' type='get' to='buddy1@localhost/mobile'>"
"<ping xmlns='urn:xmpp:ping'/>"
"</iq>"
));
assert_true(prof_output_exact("Ping response from buddy1@localhost/mobile"));
}
void ping_jid_not_supported(void **state)
{
stbbr_for_id("prof_caps_4",
"<iq id='prof_caps_4' to='stabber@localhost/profanity' type='result' from='buddy1@localhost/mobile'>"
"<query xmlns='http://jabber.org/protocol/disco#info' node='http://www.profanity.im#LpT2xs3nun7jC2sq4gg3WRDQFZ4='>"
"<identity category='client' type='console' name='Profanity0.6.0'/>"
"<feature var='http://jabber.org/protocol/disco#info'/>"
"<feature var='http://jabber.org/protocol/caps'/>"
"</query>"
"</iq>"
);
prof_connect();
stbbr_send(
"<presence to='stabber@localhost' from='buddy1@localhost/mobile'>"
"<priority>10</priority>"
"<status>I'm here</status>"
"<c "
"hash='sha-1' "
"xmlns='http://jabber.org/protocol/caps' "
"node='http://www.profanity.im' "
"ver='LpT2xs3nun7jC2sq4gg3WRDQFZ4='"
"/>"
"</presence>"
);
assert_true(prof_output_exact("Buddy1 (mobile) is online, \"I'm here\""));
assert_true(stbbr_received(
"<iq id='prof_caps_4' to='buddy1@localhost/mobile' type='get'>"
"<query xmlns='http://jabber.org/protocol/disco#info' node='http://www.profanity.im#LpT2xs3nun7jC2sq4gg3WRDQFZ4='/>"
"</iq>"
));
prof_input("/ping buddy1@localhost/mobile");
assert_true(prof_output_exact("buddy1@localhost/mobile does not support ping requests."));
}

View File

@ -1,3 +1,5 @@
void ping_multiple(void **state);
void ping_not_supported(void **state);
void ping_responds(void **state);
void ping_server(void **state);
void ping_server_not_supported(void **state);
void ping_responds_to_server_request(void **state);
void ping_jid(void **state);
void ping_jid_not_supported(void **state);