From 5cb7647e751bf180eaee92557e926afb80ebb16c Mon Sep 17 00:00:00 2001 From: Michael Santos Date: Thu, 31 Jan 2019 10:35:54 -0500 Subject: [PATCH] reorg: stream management: check if enabled --- src/stream_management.c | 24 ++++++++++++++++++++++++ src/xmppipe.c | 10 ---------- src/xmppipe.h | 1 + 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 src/stream_management.c diff --git a/src/stream_management.c b/src/stream_management.c new file mode 100644 index 0000000..9769410 --- /dev/null +++ b/src/stream_management.c @@ -0,0 +1,24 @@ +/* Copyright (c) 2015-2019, Michael Santos + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +#include "xmppipe.h" + + int +handle_sm_enabled(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, + void * const userdata) +{ + xmppipe_state_t *state = userdata; + state->sm_enabled = 1; + return 0; +} diff --git a/src/xmppipe.c b/src/xmppipe.c index a3622d6..ff1ca2c 100644 --- a/src/xmppipe.c +++ b/src/xmppipe.c @@ -33,7 +33,6 @@ int handle_disco_items(xmpp_conn_t * const, xmpp_stanza_t * const, int handle_disco_info(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); int handle_sm_request(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); -int handle_sm_enabled(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); int handle_sm_ack(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); int xmppipe_connect_init(xmppipe_state_t *); @@ -605,15 +604,6 @@ handle_connection(xmpp_conn_t * const conn, const xmpp_conn_event_t status, } } - int -handle_sm_enabled(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, - void * const userdata) -{ - xmppipe_state_t *state = userdata; - state->sm_enabled = 1; - return 0; -} - int handle_sm_request(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata) diff --git a/src/xmppipe.h b/src/xmppipe.h index ddfaf5e..4115281 100644 --- a/src/xmppipe.h +++ b/src/xmppipe.h @@ -108,6 +108,7 @@ 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); int handle_presence_error(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); +int handle_sm_enabled(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); int handle_version(xmpp_conn_t * const, xmpp_stanza_t * const, void * const); void xmppipe_send_stanza(xmppipe_state_t *, char *, size_t);