jabber.developer2
da7b32cbba
The GTimer objects created in verify_any() and verify_last() functions were never freed, causing memory leaks detected by Valgrind. This fix adds g_timer_destroy(timer) calls after the while loops to properly release the allocated timer resources.
111 lines
2.7 KiB
C
111 lines
2.7 KiB
C
/*
|
|
* verify.c
|
|
*
|
|
* Copyright (C) 2015 James Booth <boothj5@gmail.com>
|
|
*
|
|
* This file is part of Stabber.
|
|
*
|
|
* Stabber is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Stabber is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Stabber. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <expat.h>
|
|
|
|
#include "server/stanza.h"
|
|
#include "server/stanzas.h"
|
|
#include "server/log.h"
|
|
|
|
static int timeoutsecs = 0;
|
|
|
|
void
|
|
verify_set_timeout(int seconds)
|
|
{
|
|
log_println(STBBR_LOGDEBUG, "Setting timeout: %d seconds", seconds);
|
|
|
|
if (seconds <= 0) {
|
|
timeoutsecs = 0;
|
|
} else {
|
|
timeoutsecs = seconds;
|
|
}
|
|
}
|
|
|
|
int
|
|
verify_any(char *stanza_text, gboolean ign_timeout)
|
|
{
|
|
XMPPStanza *stanza = stanza_parse(stanza_text);
|
|
|
|
int result = 0;
|
|
if (timeoutsecs <= 0 || ign_timeout) {
|
|
result = stanzas_verify_any(stanza);
|
|
} else {
|
|
double elapsed = 0.0;
|
|
GTimer *timer = g_timer_new();
|
|
while (elapsed < timeoutsecs * 1.0) {
|
|
result = stanzas_verify_any(stanza);
|
|
if (result) {
|
|
break;
|
|
}
|
|
|
|
usleep(1000 * 50);
|
|
elapsed = g_timer_elapsed(timer, NULL);
|
|
}
|
|
g_timer_destroy(timer);
|
|
}
|
|
|
|
if (result) {
|
|
log_println(STBBR_LOGINFO, "VERIFY SUCCESS: %s", stanza_text);
|
|
} else {
|
|
log_println(STBBR_LOGINFO, "VERIFY FAIL: %s", stanza_text);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
int
|
|
verify_last(char *stanza_text)
|
|
{
|
|
XMPPStanza *stanza = stanza_parse(stanza_text);
|
|
|
|
int result = 0;
|
|
if (timeoutsecs <= 0) {
|
|
result = stanzas_verify_last(stanza);
|
|
} else {
|
|
double elapsed = 0.0;
|
|
GTimer *timer = g_timer_new();
|
|
while (elapsed < timeoutsecs * 1.0) {
|
|
result = stanzas_verify_last(stanza);
|
|
if (result) {
|
|
break;
|
|
}
|
|
|
|
usleep(1000 * 50);
|
|
elapsed = g_timer_elapsed(timer, NULL);
|
|
}
|
|
g_timer_destroy(timer);
|
|
}
|
|
|
|
if (result) {
|
|
log_println(STBBR_LOGINFO, "VERIFY LAST SUCCESS: %s", stanza_text);
|
|
} else {
|
|
log_println(STBBR_LOGINFO, "VERIFY LAST FAIL: %s", stanza_text);
|
|
// Debug: show what was actually received
|
|
stanzas_debug_last();
|
|
}
|
|
|
|
return result;
|
|
}
|