reorg: ping

src/ping.c

@@ -22,3 +22,27 @@ handle_ping_reply(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
     state->keepalive_fail = 0;
     return 1;
 }
+
+    void
+xmppipe_ping(xmppipe_state_t *state)
+{
+    xmpp_stanza_t *iq = NULL;
+    xmpp_stanza_t *ping = NULL;
+
+    iq = xmppipe_stanza_new(state->ctx);
+    xmppipe_stanza_set_name(iq, "iq");
+    xmppipe_stanza_set_type(iq, "get");
+    xmppipe_stanza_set_id(iq, "c2s1");
+    xmppipe_stanza_set_attribute(iq, "from", xmpp_conn_get_bound_jid(state->conn));
+
+    ping = xmppipe_stanza_new(state->ctx);
+    xmppipe_stanza_set_name(ping, "ping");
+    xmppipe_stanza_set_ns(ping, "urn:xmpp:ping");
+
+    xmppipe_stanza_add_child(iq, ping);
+
+    xmppipe_send(state, iq);
+    (void)xmpp_stanza_release(iq);
+
+    state->keepalive_fail++;
+}

src/xmppipe.c

@@ -44,8 +44,6 @@ void xmppipe_muc_join(xmppipe_state_t *);
 void xmppipe_muc_unlock(xmppipe_state_t *);
 void xmppipe_muc_subject(xmppipe_state_t *, char *);
 
-void xmppipe_ping(xmppipe_state_t *);
-
 enum {
     OPT_NO_TLS_VERIFY = 1,
     OPT_CHAT,
@@ -783,30 +781,6 @@ xmppipe_muc_subject(xmppipe_state_t *state, char *buf)
     (void)xmpp_stanza_release(message);
 }
 
-    void
-xmppipe_ping(xmppipe_state_t *state)
-{
-    xmpp_stanza_t *iq = NULL;
-    xmpp_stanza_t *ping = NULL;
-
-    iq = xmppipe_stanza_new(state->ctx);
-    xmppipe_stanza_set_name(iq, "iq");
-    xmppipe_stanza_set_type(iq, "get");
-    xmppipe_stanza_set_id(iq, "c2s1");
-    xmppipe_stanza_set_attribute(iq, "from", xmpp_conn_get_bound_jid(state->conn));
-
-    ping = xmppipe_stanza_new(state->ctx);
-    xmppipe_stanza_set_name(ping, "ping");
-    xmppipe_stanza_set_ns(ping, "urn:xmpp:ping");
-
-    xmppipe_stanza_add_child(iq, ping);
-
-    xmppipe_send(state, iq);
-    (void)xmpp_stanza_release(iq);
-
-    state->keepalive_fail++;
-}
-
     static long long
 xmppipe_strtonum(xmppipe_state_t *state, const char *nptr, long long minval,
         long long maxval)

src/xmppipe.h

@@ -106,6 +106,7 @@ int handle_message(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_null(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_ping_reply(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_presence(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
+void xmppipe_ping(xmppipe_state_t *);
 int handle_presence_error(xmpp_conn_t * const, xmpp_stanza_t * const,
             void * const);
 int handle_sm_ack(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);