#define PING_TIMEOUT (G_USEC_PER_SEC * 3)
/*! Warn the user after this many PING_TIMEOUT intervals */
-#define PING_TIMEOUT_WARN 3
+#define PING_TIMEOUT_WARN 1
static void ping_send(ObPingTarget *t);
static void ping_end(ObClient *client, gpointer data);
{
ObPingTarget *t;
- /* make sure we're not already pinging the client */
- g_assert(g_hash_table_find(ping_ids, find_client, client) == NULL);
-
+ /* make sure the client supports ping! */
g_assert(client->ping == TRUE);
+ /* make sure we're not already pinging the client */
+ if (g_hash_table_find(ping_ids, find_client, client) != NULL) return;
+
t = g_new0(ObPingTarget, 1);
t->client = client;
t->h = h;
g_assert(g_hash_table_find(ping_ids, find_client, client) != NULL);
}
-void ping_stop(struct _ObClient *c)
-{
- ping_end(c, NULL);
-}
-
void ping_got_pong(guint32 id)
{
ObPingTarget *t;
t->h(t->client, FALSE);
}
t->waiting = 0; /* not waiting for a reply anymore */
+
+ /* we got a pong so we're happy now */
+ ping_end(t->client, NULL);
}
else
ob_debug("Got PONG with id %u but not waiting for one", id);