devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: remove extra const keyword from interfaces

Browse Source 
Const variables in prototypes don't add much value, but make the code
larger and redundant. Remove these const keywords.
Note, this doesn't apply to pointers to const memory.
This commit is contained in:
Dmitry Podgorny
2021-03-19 22:12:15 +02:00
parent 2d5424bcff
commit db8a511f68
33 changed files with 547 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/active.c
View File

@@ -19,9 +19,7 @@
#include <strophe.h> #include <strophe.h>
int handle_reply(xmpp_conn_t *const conn, int handle_reply(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
xmpp_stanza_t *query, *item; xmpp_stanza_t *query, *item;
const char *type; const char *type;
@@ -46,11 +44,11 @@ int handle_reply(xmpp_conn_t *const conn,
return 0; return 0;
} }
void conn_handler(xmpp_conn_t *const conn, void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
xmpp_stanza_t *iq, *query; xmpp_stanza_t *iq, *query;

10
examples/basic.c
View File

@@ -19,11 +19,11 @@
#define KA_INTERVAL 1 #define KA_INTERVAL 1
/* define a handler for connection events */ /* define a handler for connection events */
void conn_handler(xmpp_conn_t *const conn, void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
int secured; int secured;

18
examples/bot.c
View File

@@ -22,9 +22,7 @@
#include <strophe.h> #include <strophe.h>
int version_handler(xmpp_conn_t *const conn, int version_handler(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
xmpp_stanza_t *reply, *query, *name, *version, *text; xmpp_stanza_t *reply, *query, *name, *version, *text;
const char *ns; const char *ns;
@@ -70,9 +68,7 @@ int version_handler(xmpp_conn_t *const conn,
return 1; return 1;
} }
int message_handler(xmpp_conn_t *const conn, int message_handler(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
xmpp_stanza_t *body, *reply; xmpp_stanza_t *body, *reply;
@@ -118,11 +114,11 @@ int message_handler(xmpp_conn_t *const conn,
} }
/* define a handler for connection events */ /* define a handler for connection events */
void conn_handler(xmpp_conn_t *const conn, void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;

10
examples/component.c
View File

@@ -20,11 +20,11 @@
#include <strophe.h> #include <strophe.h>
/* define a handler for connection events */ /* define a handler for connection events */
void conn_handler(xmpp_conn_t *const conn, void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;

37
examples/register.c
View File

@@ -102,9 +102,7 @@ iq_reg_send_form(xmpp_reg_t *reg, xmpp_conn_t *conn, xmpp_stanza_t *stanza)
} }
} }
static int iq_reg2_cb(xmpp_conn_t *const conn, static int iq_reg2_cb(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
const char *type; const char *type;
@@ -129,9 +127,7 @@ quit:
return 0; return 0;
} }
static int iq_reg_cb(xmpp_conn_t *const conn, static int iq_reg_cb(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
xmpp_reg_t *reg = (xmpp_reg_t *)userdata; xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
xmpp_stanza_t *registered = NULL; xmpp_stanza_t *registered = NULL;
@@ -166,9 +162,8 @@ quit:
return 0; return 0;
} }
static int _handle_error(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_error(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
(void)stanza; (void)stanza;
(void)userdata; (void)userdata;
@@ -179,9 +174,9 @@ static int _handle_error(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_proceedtls_default(xmpp_conn_t *const conn, static int _handle_proceedtls_default(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata) void *userdata)
{ {
const char *name = xmpp_stanza_get_name(stanza); const char *name = xmpp_stanza_get_name(stanza);
@@ -201,8 +196,7 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_missing_features(xmpp_conn_t *const conn, static int _handle_missing_features(xmpp_conn_t *conn, void *userdata)
void *const userdata)
{ {
(void)userdata; (void)userdata;
@@ -212,9 +206,8 @@ static int _handle_missing_features(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_features(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_features(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
xmpp_reg_t *reg = (xmpp_reg_t *)userdata; xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
xmpp_ctx_t *ctx = reg->ctx; xmpp_ctx_t *ctx = reg->ctx;
@@ -265,11 +258,11 @@ static int _handle_features(xmpp_conn_t *const conn,
return 0; return 0;
} }
static void conn_handler(xmpp_conn_t *const conn, static void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
xmpp_reg_t *reg = (xmpp_reg_t *)userdata; xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
int secured; int secured;

14
examples/roster.c
View File

@@ -18,9 +18,7 @@
#include <strophe.h> #include <strophe.h>
int handle_reply(xmpp_conn_t *const conn, int handle_reply(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
xmpp_stanza_t *query, *item; xmpp_stanza_t *query, *item;
const char *type, *name; const char *type, *name;
@@ -51,11 +49,11 @@ int handle_reply(xmpp_conn_t *const conn,
return 0; return 0;
} }
void conn_handler(xmpp_conn_t *const conn, void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
xmpp_stanza_t *iq, *query; xmpp_stanza_t *iq, *query;

16
examples/vcard.c
View File

@@ -160,7 +160,7 @@ exit:
return cb; return cb;
} }
static int timedout(xmpp_conn_t *const conn, void *const userdata) static int timedout(xmpp_conn_t *conn, void *userdata)
{ {
(void)userdata; (void)userdata;
@@ -170,9 +170,7 @@ static int timedout(xmpp_conn_t *const conn, void *const userdata)
return 0; return 0;
} }
static int recv_vcard(xmpp_conn_t *const conn, static int recv_vcard(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
xmpp_stanza_t *const stanza,
void *const userdata)
{ {
vcard_t *vc = userdata; vcard_t *vc = userdata;
vcard_cb_t cb; vcard_cb_t cb;
@@ -217,11 +215,11 @@ static void send_vcard_req(xmpp_conn_t *conn, const char *to, const char *id)
xmpp_conn_get_bound_jid(conn), to, id); xmpp_conn_get_bound_jid(conn), to, id);
} }
static void conn_handler(xmpp_conn_t *const conn, static void conn_handler(xmpp_conn_t *conn,
const xmpp_conn_event_t status, xmpp_conn_event_t status,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata) void *userdata)
{ {
vcard_t *vc = userdata; vcard_t *vc = userdata;

170
src/auth.c
View File

@@ -60,51 +60,43 @@
#define HANDSHAKE_TIMEOUT 15000 /* 15 seconds */ #define HANDSHAKE_TIMEOUT 15000 /* 15 seconds */
#endif #endif
static void _auth(xmpp_conn_t *const conn); static void _auth(xmpp_conn_t *conn);
static void _auth_legacy(xmpp_conn_t *conn); static void _auth_legacy(xmpp_conn_t *conn);
static void _handle_open_sasl(xmpp_conn_t *const conn); static void _handle_open_sasl(xmpp_conn_t *conn);
static void _handle_open_tls(xmpp_conn_t *const conn); static void _handle_open_tls(xmpp_conn_t *conn);
static int _handle_component_auth(xmpp_conn_t *const conn); static int _handle_component_auth(xmpp_conn_t *conn);
static int _handle_component_hs_response(xmpp_conn_t *const conn, static int _handle_component_hs_response(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata); void *userdata);
static int _handle_features_sasl(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_features_sasl(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata);
void *const userdata); static int
static int _handle_sasl_result(xmpp_conn_t *const conn, _handle_sasl_result(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata);
xmpp_stanza_t *const stanza, static int _handle_digestmd5_challenge(xmpp_conn_t *conn,
void *const userdata); xmpp_stanza_t *stanza,
static int _handle_digestmd5_challenge(xmpp_conn_t *const conn, void *userdata);
xmpp_stanza_t *const stanza, static int _handle_digestmd5_rspauth(xmpp_conn_t *conn,
void *const userdata); xmpp_stanza_t *stanza,
static int _handle_digestmd5_rspauth(xmpp_conn_t *const conn, void *userdata);
xmpp_stanza_t *const stanza, static int _handle_scram_challenge(xmpp_conn_t *conn,
void *const userdata); xmpp_stanza_t *stanza,
static int _handle_scram_challenge(xmpp_conn_t *const conn, void *userdata);
xmpp_stanza_t *const stanza, static char *_make_scram_init_msg(xmpp_conn_t *conn);
void *const userdata);
static char *_make_scram_init_msg(xmpp_conn_t *const conn);
static int _handle_missing_features_sasl(xmpp_conn_t *const conn, static int _handle_missing_features_sasl(xmpp_conn_t *conn, void *userdata);
void *const userdata); static int _handle_missing_bind(xmpp_conn_t *conn, void *userdata);
static int _handle_missing_bind(xmpp_conn_t *const conn, void *const userdata); static int
static int _handle_bind(xmpp_conn_t *const conn, _handle_bind(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata);
xmpp_stanza_t *const stanza, static int
void *const userdata); _handle_session(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata);
static int _handle_session(xmpp_conn_t *const conn, static int _handle_missing_session(xmpp_conn_t *conn, void *userdata);
xmpp_stanza_t *const stanza, static int _handle_missing_handshake(xmpp_conn_t *conn, void *userdata);
void *const userdata);
static int _handle_missing_session(xmpp_conn_t *const conn,
void *const userdata);
static int _handle_missing_handshake(xmpp_conn_t *const conn,
void *const userdata);
/* stream:error handler */ /* stream:error handler */
static int _handle_error(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_error(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
xmpp_stanza_t *child; xmpp_stanza_t *child;
const char *name; const char *name;
@@ -199,8 +191,7 @@ static int _handle_error(xmpp_conn_t *const conn,
} }
/* stream:features handlers */ /* stream:features handlers */
static int _handle_missing_features(xmpp_conn_t *const conn, static int _handle_missing_features(xmpp_conn_t *conn, void *userdata)
void *const userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -212,9 +203,8 @@ static int _handle_missing_features(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_features(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_features(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
xmpp_stanza_t *child, *mech; xmpp_stanza_t *child, *mech;
const char *ns; const char *ns;
@@ -279,7 +269,7 @@ static int _handle_features(xmpp_conn_t *const conn,
/* returns the correct auth id for a component or a client. /* returns the correct auth id for a component or a client.
* returned string must be freed by caller */ * returned string must be freed by caller */
static char *_get_authid(xmpp_conn_t *const conn) static char *_get_authid(xmpp_conn_t *conn)
{ {
char *authid = NULL; char *authid = NULL;
@@ -293,9 +283,9 @@ static char *_get_authid(xmpp_conn_t *const conn)
return authid; return authid;
} }
static int _handle_proceedtls_default(xmpp_conn_t *const conn, static int _handle_proceedtls_default(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata) void *userdata)
{ {
const char *name; const char *name;
@@ -319,9 +309,8 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_sasl_result(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_sasl_result(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
const char *name; const char *name;
@@ -355,9 +344,9 @@ static int _handle_sasl_result(xmpp_conn_t *const conn,
} }
/* handle the challenge phase of digest auth */ /* handle the challenge phase of digest auth */
static int _handle_digestmd5_challenge(xmpp_conn_t *const conn, static int _handle_digestmd5_challenge(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata) void *userdata)
{ {
char *text; char *text;
char *response; char *response;
@@ -414,9 +403,9 @@ static int _handle_digestmd5_challenge(xmpp_conn_t *const conn,
} }
/* handle the rspauth phase of digest auth */ /* handle the rspauth phase of digest auth */
static int _handle_digestmd5_rspauth(xmpp_conn_t *const conn, static int _handle_digestmd5_rspauth(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata) void *userdata)
{ {
xmpp_stanza_t *auth; xmpp_stanza_t *auth;
const char *name; const char *name;
@@ -451,9 +440,9 @@ struct scram_user_data {
}; };
/* handle the challenge phase of SCRAM-SHA-1 auth */ /* handle the challenge phase of SCRAM-SHA-1 auth */
static int _handle_scram_challenge(xmpp_conn_t *const conn, static int _handle_scram_challenge(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata) void *userdata)
{ {
char *text; char *text;
char *response; char *response;
@@ -532,7 +521,7 @@ err:
return 0; return 0;
} }
static char *_make_scram_init_msg(xmpp_conn_t *const conn) static char *_make_scram_init_msg(xmpp_conn_t *conn)
{ {
xmpp_ctx_t *ctx = conn->ctx; xmpp_ctx_t *ctx = conn->ctx;
size_t message_len; size_t message_len;
@@ -555,7 +544,7 @@ static char *_make_scram_init_msg(xmpp_conn_t *const conn)
return message; return message;
} }
static xmpp_stanza_t *_make_starttls(xmpp_conn_t *const conn) static xmpp_stanza_t *_make_starttls(xmpp_conn_t *conn)
{ {
xmpp_stanza_t *starttls; xmpp_stanza_t *starttls;
@@ -569,8 +558,7 @@ static xmpp_stanza_t *_make_starttls(xmpp_conn_t *const conn)
return starttls; return starttls;
} }
static xmpp_stanza_t *_make_sasl_auth(xmpp_conn_t *const conn, static xmpp_stanza_t *_make_sasl_auth(xmpp_conn_t *conn, const char *mechanism)
const char *const mechanism)
{ {
xmpp_stanza_t *auth; xmpp_stanza_t *auth;
@@ -590,7 +578,7 @@ static xmpp_stanza_t *_make_sasl_auth(xmpp_conn_t *const conn,
* this will get called again until one auth method succeeds or every * this will get called again until one auth method succeeds or every
* method fails * method fails
*/ */
static void _auth(xmpp_conn_t *const conn) static void _auth(xmpp_conn_t *conn)
{ {
xmpp_stanza_t *auth; xmpp_stanza_t *auth;
xmpp_stanza_t *authdata; xmpp_stanza_t *authdata;
@@ -796,7 +784,7 @@ static void _auth(xmpp_conn_t *const conn)
* *
* @param conn a Strophe connection object * @param conn a Strophe connection object
*/ */
void auth_handle_open(xmpp_conn_t *const conn) void auth_handle_open(xmpp_conn_t *conn)
{ {
/* reset all timed handlers */ /* reset all timed handlers */
handler_reset_timed(conn, 0); handler_reset_timed(conn, 0);
@@ -812,7 +800,7 @@ void auth_handle_open(xmpp_conn_t *const conn)
} }
/* called when stream:stream tag received after TLS establishment */ /* called when stream:stream tag received after TLS establishment */
static void _handle_open_tls(xmpp_conn_t *const conn) static void _handle_open_tls(xmpp_conn_t *conn)
{ {
/* setup handlers for incoming <stream:features> */ /* setup handlers for incoming <stream:features> */
handler_add(conn, _handle_features, XMPP_NS_STREAMS, "features", NULL, handler_add(conn, _handle_features, XMPP_NS_STREAMS, "features", NULL,
@@ -821,7 +809,7 @@ static void _handle_open_tls(xmpp_conn_t *const conn)
} }
/* called when stream:stream tag received after SASL auth */ /* called when stream:stream tag received after SASL auth */
static void _handle_open_sasl(xmpp_conn_t *const conn) static void _handle_open_sasl(xmpp_conn_t *conn)
{ {
xmpp_debug(conn->ctx, "xmpp", "Reopened stream successfully."); xmpp_debug(conn->ctx, "xmpp", "Reopened stream successfully.");
@@ -832,9 +820,8 @@ static void _handle_open_sasl(xmpp_conn_t *const conn)
NULL); NULL);
} }
static int _handle_features_sasl(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_features_sasl(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
xmpp_stanza_t *bind, *session, *iq, *res, *text, *opt; xmpp_stanza_t *bind, *session, *iq, *res, *text, *opt;
const char *ns; const char *ns;
@@ -939,8 +926,7 @@ static int _handle_features_sasl(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_missing_features_sasl(xmpp_conn_t *const conn, static int _handle_missing_features_sasl(xmpp_conn_t *conn, void *userdata)
void *const userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -951,9 +937,8 @@ static int _handle_missing_features_sasl(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_bind(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_bind(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
const char *type; const char *type;
xmpp_stanza_t *iq, *session; xmpp_stanza_t *iq, *session;
@@ -1025,7 +1010,7 @@ static int _handle_bind(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_missing_bind(xmpp_conn_t *const conn, void *const userdata) static int _handle_missing_bind(xmpp_conn_t *conn, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -1034,9 +1019,8 @@ static int _handle_missing_bind(xmpp_conn_t *const conn, void *const userdata)
return 0; return 0;
} }
static int _handle_session(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_session(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
const char *type; const char *type;
@@ -1065,8 +1049,7 @@ static int _handle_session(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_missing_session(xmpp_conn_t *const conn, static int _handle_missing_session(xmpp_conn_t *conn, void *userdata)
void *const userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -1075,7 +1058,7 @@ static int _handle_missing_session(xmpp_conn_t *const conn,
return 0; return 0;
} }
static int _handle_missing_legacy(xmpp_conn_t *const conn, void *const userdata) static int _handle_missing_legacy(xmpp_conn_t *conn, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -1086,9 +1069,8 @@ static int _handle_missing_legacy(xmpp_conn_t *const conn, void *const userdata)
return 0; return 0;
} }
static int _handle_legacy(xmpp_conn_t *const conn, static int
xmpp_stanza_t *const stanza, _handle_legacy(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
void *const userdata)
{ {
const char *type; const char *type;
const char *name; const char *name;
@@ -1219,7 +1201,7 @@ err:
disconnect_mem_error(conn); disconnect_mem_error(conn);
} }
void auth_handle_component_open(xmpp_conn_t *const conn) void auth_handle_component_open(xmpp_conn_t *conn)
{ {
int rc; int rc;
@@ -1239,7 +1221,7 @@ void auth_handle_component_open(xmpp_conn_t *const conn)
} }
/* Will compute SHA1 and authenticate the component to the server */ /* Will compute SHA1 and authenticate the component to the server */
int _handle_component_auth(xmpp_conn_t *const conn) int _handle_component_auth(xmpp_conn_t *conn)
{ {
uint8_t md_value[SHA1_DIGEST_SIZE]; uint8_t md_value[SHA1_DIGEST_SIZE];
SHA1_CTX mdctx; SHA1_CTX mdctx;
@@ -1289,9 +1271,9 @@ int _handle_component_auth(xmpp_conn_t *const conn)
/* Check if the received stanza is <handshake/> and set auth to true /* Check if the received stanza is <handshake/> and set auth to true
* and fire connection handler. * and fire connection handler.
*/ */
int _handle_component_hs_response(xmpp_conn_t *const conn, int _handle_component_hs_response(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata) void *userdata)
{ {
const char *name; const char *name;
@@ -1321,7 +1303,7 @@ int _handle_component_hs_response(xmpp_conn_t *const conn,
return 0; return 0;
} }
int _handle_missing_handshake(xmpp_conn_t *const conn, void *const userdata) int _handle_missing_handshake(xmpp_conn_t *conn, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -1330,7 +1312,7 @@ int _handle_missing_handshake(xmpp_conn_t *const conn, void *const userdata)
return 0; return 0;
} }
void auth_handle_open_raw(xmpp_conn_t *const conn) void auth_handle_open_raw(xmpp_conn_t *conn)
{ {
handler_reset_timed(conn, 0); handler_reset_timed(conn, 0);
/* user handlers are not called before authentication is completed. */ /* user handlers are not called before authentication is completed. */
@@ -1338,7 +1320,7 @@ void auth_handle_open_raw(xmpp_conn_t *const conn)
conn->conn_handler(conn, XMPP_CONN_CONNECT, 0, NULL, conn->userdata); conn->conn_handler(conn, XMPP_CONN_CONNECT, 0, NULL, conn->userdata);
} }
void auth_handle_open_stub(xmpp_conn_t *const conn) void auth_handle_open_stub(xmpp_conn_t *conn)
{ {
xmpp_warn(conn->ctx, "auth", "Stub callback is called."); xmpp_warn(conn->ctx, "auth", "Stub callback is called.");
} }

84
src/common.h
View File

@@ -87,33 +87,21 @@ struct _xmpp_ctx_t {
}; };
/* convenience functions for accessing the context */ /* convenience functions for accessing the context */
void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size); void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size);
void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size); void *xmpp_realloc(const xmpp_ctx_t *ctx, void *p, size_t size);
char *xmpp_strdup(const xmpp_ctx_t *const ctx, const char *const s); char *xmpp_strdup(const xmpp_ctx_t *ctx, const char *s);
void xmpp_log(const xmpp_ctx_t *const ctx, void xmpp_log(const xmpp_ctx_t *ctx,
const xmpp_log_level_t level, const xmpp_log_level_t level,
const char *const area, const char *area,
const char *const fmt, const char *fmt,
va_list ap); va_list ap);
/* wrappers for xmpp_log at specific levels */ /* wrappers for xmpp_log at specific levels */
void xmpp_error(const xmpp_ctx_t *const ctx, void xmpp_error(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
const char *const area, void xmpp_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
const char *const fmt, void xmpp_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
...); void xmpp_debug(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
void xmpp_warn(const xmpp_ctx_t *const ctx,
const char *const area,
const char *const fmt,
...);
void xmpp_info(const xmpp_ctx_t *const ctx,
const char *const area,
const char *const fmt,
...);
void xmpp_debug(const xmpp_ctx_t *const ctx,
const char *const area,
const char *const fmt,
...);
/** connection **/ /** connection **/
@@ -153,7 +141,7 @@ enum {
XMPP_PORT_COMPONENT = 5347, XMPP_PORT_COMPONENT = 5347,
}; };
typedef void (*xmpp_open_handler)(xmpp_conn_t *const conn); typedef void (*xmpp_open_handler)(xmpp_conn_t *conn);
struct _xmpp_conn_t { struct _xmpp_conn_t {
unsigned int ref; unsigned int ref;
@@ -225,13 +213,13 @@ struct _xmpp_conn_t {
xmpp_handlist_t *handlers; xmpp_handlist_t *handlers;
}; };
void conn_disconnect(xmpp_conn_t *const conn); void conn_disconnect(xmpp_conn_t *conn);
void conn_disconnect_clean(xmpp_conn_t *const conn); void conn_disconnect_clean(xmpp_conn_t *conn);
void conn_established(xmpp_conn_t *const conn); void conn_established(xmpp_conn_t *conn);
void conn_open_stream(xmpp_conn_t *const conn); void conn_open_stream(xmpp_conn_t *conn);
int conn_tls_start(xmpp_conn_t *const conn); int conn_tls_start(xmpp_conn_t *conn);
void conn_prepare_reset(xmpp_conn_t *const conn, xmpp_open_handler handler); void conn_prepare_reset(xmpp_conn_t *conn, xmpp_open_handler handler);
void conn_parser_reset(xmpp_conn_t *const conn); void conn_parser_reset(xmpp_conn_t *conn);
typedef enum { typedef enum {
XMPP_STANZA_UNKNOWN, XMPP_STANZA_UNKNOWN,
@@ -256,32 +244,32 @@ struct _xmpp_stanza_t {
}; };
/* handler management */ /* handler management */
void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza); void handler_fire_stanza(xmpp_conn_t *conn, xmpp_stanza_t *stanza);
uint64_t handler_fire_timed(xmpp_ctx_t *const ctx); uint64_t handler_fire_timed(xmpp_ctx_t *ctx);
void handler_reset_timed(xmpp_conn_t *conn, int user_only); void handler_reset_timed(xmpp_conn_t *conn, int user_only);
void handler_add_timed(xmpp_conn_t *const conn, void handler_add_timed(xmpp_conn_t *conn,
xmpp_timed_handler handler, xmpp_timed_handler handler,
const unsigned long period, unsigned long period,
void *const userdata); void *userdata);
void handler_add_id(xmpp_conn_t *const conn, void handler_add_id(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id, const char *id,
void *const userdata); void *userdata);
void handler_add(xmpp_conn_t *const conn, void handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const ns, const char *ns,
const char *const name, const char *name,
const char *const type, const char *type,
void *const userdata); void *userdata);
void handler_system_delete_all(xmpp_conn_t *conn); void handler_system_delete_all(xmpp_conn_t *conn);
/* utility functions */ /* utility functions */
void disconnect_mem_error(xmpp_conn_t *const conn); void disconnect_mem_error(xmpp_conn_t *conn);
/* auth functions */ /* auth functions */
void auth_handle_open(xmpp_conn_t *const conn); void auth_handle_open(xmpp_conn_t *conn);
void auth_handle_component_open(xmpp_conn_t *const conn); void auth_handle_component_open(xmpp_conn_t *conn);
void auth_handle_open_raw(xmpp_conn_t *const conn); void auth_handle_open_raw(xmpp_conn_t *conn);
void auth_handle_open_stub(xmpp_conn_t *const conn); void auth_handle_open_stub(xmpp_conn_t *conn);
#endif /* __LIBSTROPHE_COMMON_H__ */ #endif /* __LIBSTROPHE_COMMON_H__ */

138
src/conn.c
View File

@@ -48,8 +48,8 @@
#define CONNECT_TIMEOUT 5000 /* 5 seconds */ #define CONNECT_TIMEOUT 5000 /* 5 seconds */
#endif #endif
static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata); static int _disconnect_cleanup(xmpp_conn_t *conn, void *userdata);
static char *_conn_build_stream_tag(xmpp_conn_t *const conn, static char *_conn_build_stream_tag(xmpp_conn_t *conn,
char **attributes, char **attributes,
size_t attributes_len); size_t attributes_len);
static void _conn_attributes_new(xmpp_conn_t *conn, static void _conn_attributes_new(xmpp_conn_t *conn,
@@ -59,24 +59,21 @@ static void _conn_attributes_new(xmpp_conn_t *conn,
static void _conn_attributes_destroy(xmpp_conn_t *conn, static void _conn_attributes_destroy(xmpp_conn_t *conn,
char **attributes, char **attributes,
size_t attributes_len); size_t attributes_len);
static void static void _handle_stream_start(char *name, char **attrs, void *userdata);
_handle_stream_start(char *name, char **attrs, void *const userdata); static void _handle_stream_end(char *name, void *userdata);
static void _handle_stream_end(char *name, void *const userdata); static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *userdata);
static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *const userdata); static unsigned short _conn_default_port(xmpp_conn_t *conn,
static unsigned short _conn_default_port(xmpp_conn_t *const conn,
xmpp_conn_type_t type); xmpp_conn_type_t type);
static void _conn_reset(xmpp_conn_t *const conn); static void _conn_reset(xmpp_conn_t *conn);
static int _conn_connect(xmpp_conn_t *const conn, static int _conn_connect(xmpp_conn_t *conn,
const char *const domain, const char *domain,
const char *const host, const char *host,
unsigned short port, unsigned short port,
xmpp_conn_type_t type, xmpp_conn_type_t type,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata); void *userdata);
void xmpp_send_error(xmpp_conn_t *const conn, void xmpp_send_error(xmpp_conn_t *conn, xmpp_error_type_t type, char *text)
xmpp_error_type_t const type,
char *const text)
{ {
xmpp_stanza_t *error = xmpp_error_new(conn->ctx, type, text); xmpp_stanza_t *error = xmpp_error_new(conn->ctx, type, text);
@@ -93,7 +90,7 @@ void xmpp_send_error(xmpp_conn_t *const conn,
* *
* @ingroup Connections * @ingroup Connections
*/ */
xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx) xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *ctx)
{ {
xmpp_conn_t *conn = NULL; xmpp_conn_t *conn = NULL;
xmpp_connlist_t *tail, *item; xmpp_connlist_t *tail, *item;
@@ -201,7 +198,7 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
* *
* @ingroup Connections * @ingroup Connections
*/ */
xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *const conn) xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *conn)
{ {
conn->ref++; conn->ref++;
return conn; return conn;
@@ -219,7 +216,7 @@ xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_conn_set_keepalive(xmpp_conn_t *const conn, int timeout, int interval) void xmpp_conn_set_keepalive(xmpp_conn_t *conn, int timeout, int interval)
{ {
int ret = 0; int ret = 0;
@@ -245,7 +242,7 @@ void xmpp_conn_set_keepalive(xmpp_conn_t *const conn, int timeout, int interval)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_release(xmpp_conn_t *const conn) int xmpp_conn_release(xmpp_conn_t *conn)
{ {
xmpp_ctx_t *ctx; xmpp_ctx_t *ctx;
xmpp_connlist_t *item, *prev; xmpp_connlist_t *item, *prev;
@@ -353,7 +350,7 @@ int xmpp_conn_release(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
const char *xmpp_conn_get_jid(const xmpp_conn_t *const conn) const char *xmpp_conn_get_jid(const xmpp_conn_t *conn)
{ {
return conn->jid; return conn->jid;
} }
@@ -371,7 +368,7 @@ const char *xmpp_conn_get_jid(const xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *const conn) const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *conn)
{ {
return conn->bound_jid; return conn->bound_jid;
} }
@@ -387,7 +384,7 @@ const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_conn_set_jid(xmpp_conn_t *const conn, const char *const jid) void xmpp_conn_set_jid(xmpp_conn_t *conn, const char *jid)
{ {
if (conn->jid) if (conn->jid)
xmpp_free(conn->ctx, conn->jid); xmpp_free(conn->ctx, conn->jid);
@@ -402,7 +399,7 @@ void xmpp_conn_set_jid(xmpp_conn_t *const conn, const char *const jid)
* *
* @ingroup Connections * @ingroup Connections
*/ */
const char *xmpp_conn_get_pass(const xmpp_conn_t *const conn) const char *xmpp_conn_get_pass(const xmpp_conn_t *conn)
{ {
return conn->pass; return conn->pass;
} }
@@ -416,7 +413,7 @@ const char *xmpp_conn_get_pass(const xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_conn_set_pass(xmpp_conn_t *const conn, const char *const pass) void xmpp_conn_set_pass(xmpp_conn_t *conn, const char *pass)
{ {
if (conn->pass) if (conn->pass)
xmpp_free(conn->ctx, conn->pass); xmpp_free(conn->ctx, conn->pass);
@@ -430,7 +427,7 @@ void xmpp_conn_set_pass(xmpp_conn_t *const conn, const char *const pass)
* *
* @ingroup Connections * @ingroup Connections
*/ */
xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *const conn) xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *conn)
{ {
return conn->ctx; return conn->ctx;
} }
@@ -456,11 +453,11 @@ xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_connect_client(xmpp_conn_t *const conn, int xmpp_connect_client(xmpp_conn_t *conn,
const char *const altdomain, const char *altdomain,
unsigned short altport, unsigned short altport,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata) void *userdata)
{ {
resolver_srv_rr_t *srv_rr_list = NULL; resolver_srv_rr_t *srv_rr_list = NULL;
resolver_srv_rr_t *rr; resolver_srv_rr_t *rr;
@@ -536,11 +533,11 @@ int xmpp_connect_client(xmpp_conn_t *const conn,
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_connect_component(xmpp_conn_t *const conn, int xmpp_connect_component(xmpp_conn_t *conn,
const char *const server, const char *server,
unsigned short port, unsigned short port,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata) void *userdata)
{ {
/* The server domain, jid and password MUST be specified. */ /* The server domain, jid and password MUST be specified. */
if (!(server && conn->jid && conn->pass)) if (!(server && conn->jid && conn->pass))
@@ -583,18 +580,18 @@ int xmpp_connect_component(xmpp_conn_t *const conn,
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_connect_raw(xmpp_conn_t *const conn, int xmpp_connect_raw(xmpp_conn_t *conn,
const char *const altdomain, const char *altdomain,
unsigned short altport, unsigned short altport,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata) void *userdata)
{ {
conn->is_raw = 1; conn->is_raw = 1;
return xmpp_connect_client(conn, altdomain, altport, callback, userdata); return xmpp_connect_client(conn, altdomain, altport, callback, userdata);
} }
/* Called when tcp connection is established. */ /* Called when tcp connection is established. */
void conn_established(xmpp_conn_t *const conn) void conn_established(xmpp_conn_t *conn)
{ {
if (conn->tls_legacy_ssl && !conn->is_raw) { if (conn->tls_legacy_ssl && !conn->is_raw) {
xmpp_debug(conn->ctx, "xmpp", "using legacy SSL connection"); xmpp_debug(conn->ctx, "xmpp", "using legacy SSL connection");
@@ -628,7 +625,7 @@ void conn_established(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_open_stream_default(xmpp_conn_t *const conn) int xmpp_conn_open_stream_default(xmpp_conn_t *conn)
{ {
if (!conn->is_raw) if (!conn->is_raw)
return XMPP_EINVOP; return XMPP_EINVOP;
@@ -655,7 +652,7 @@ int xmpp_conn_open_stream_default(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_open_stream(xmpp_conn_t *const conn, int xmpp_conn_open_stream(xmpp_conn_t *conn,
char **attributes, char **attributes,
size_t attributes_len) size_t attributes_len)
{ {
@@ -681,7 +678,7 @@ int xmpp_conn_open_stream(xmpp_conn_t *const conn,
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_tls_start(xmpp_conn_t *const conn) int xmpp_conn_tls_start(xmpp_conn_t *conn)
{ {
return conn_tls_start(conn); return conn_tls_start(conn);
} }
@@ -692,7 +689,7 @@ int xmpp_conn_tls_start(xmpp_conn_t *const conn)
* *
* @param conn a Strophe connection object * @param conn a Strophe connection object
*/ */
void conn_disconnect_clean(xmpp_conn_t *const conn) void conn_disconnect_clean(xmpp_conn_t *conn)
{ {
/* remove the timed handler */ /* remove the timed handler */
xmpp_timed_handler_delete(conn, _disconnect_cleanup); xmpp_timed_handler_delete(conn, _disconnect_cleanup);
@@ -706,7 +703,7 @@ void conn_disconnect_clean(xmpp_conn_t *const conn)
* *
* @param conn a Strophe connection object * @param conn a Strophe connection object
*/ */
void conn_disconnect(xmpp_conn_t *const conn) void conn_disconnect(xmpp_conn_t *conn)
{ {
xmpp_debug(conn->ctx, "xmpp", "Closing socket."); xmpp_debug(conn->ctx, "xmpp", "Closing socket.");
conn->state = XMPP_STATE_DISCONNECTED; conn->state = XMPP_STATE_DISCONNECTED;
@@ -724,14 +721,14 @@ void conn_disconnect(xmpp_conn_t *const conn)
/* prepares a parser reset. this is called from handlers. we can't /* prepares a parser reset. this is called from handlers. we can't
* reset the parser immediately as it is not re-entrant. */ * reset the parser immediately as it is not re-entrant. */
void conn_prepare_reset(xmpp_conn_t *const conn, xmpp_open_handler handler) void conn_prepare_reset(xmpp_conn_t *conn, xmpp_open_handler handler)
{ {
conn->reset_parser = 1; conn->reset_parser = 1;
conn->open_handler = handler; conn->open_handler = handler;
} }
/* reset the parser */ /* reset the parser */
void conn_parser_reset(xmpp_conn_t *const conn) void conn_parser_reset(xmpp_conn_t *conn)
{ {
conn->reset_parser = 0; conn->reset_parser = 0;
parser_reset(conn->parser); parser_reset(conn->parser);
@@ -746,7 +743,7 @@ void conn_parser_reset(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_disconnect(xmpp_conn_t *const conn) void xmpp_disconnect(xmpp_conn_t *conn)
{ {
if (conn->state != XMPP_STATE_CONNECTING && if (conn->state != XMPP_STATE_CONNECTING &&
conn->state != XMPP_STATE_CONNECTED) conn->state != XMPP_STATE_CONNECTED)
@@ -772,7 +769,7 @@ void xmpp_disconnect(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...) void xmpp_send_raw_string(xmpp_conn_t *conn, const char *fmt, ...)
{ {
va_list ap; va_list ap;
size_t len; size_t len;
@@ -821,9 +818,7 @@ void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_send_raw(xmpp_conn_t *const conn, void xmpp_send_raw(xmpp_conn_t *conn, const char *data, size_t len)
const char *const data,
const size_t len)
{ {
xmpp_send_queue_t *item; xmpp_send_queue_t *item;
@@ -867,7 +862,7 @@ void xmpp_send_raw(xmpp_conn_t *const conn,
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_send(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza) void xmpp_send(xmpp_conn_t *conn, xmpp_stanza_t *stanza)
{ {
char *buf; char *buf;
size_t len; size_t len;
@@ -887,7 +882,7 @@ void xmpp_send(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
* *
* @param conn a Strophe connection object * @param conn a Strophe connection object
*/ */
void conn_open_stream(xmpp_conn_t *const conn) void conn_open_stream(xmpp_conn_t *conn)
{ {
xmpp_send_raw_string(conn, xmpp_send_raw_string(conn,
"<?xml version=\"1.0\"?>" "<?xml version=\"1.0\"?>"
@@ -902,7 +897,7 @@ void conn_open_stream(xmpp_conn_t *const conn)
XMPP_NS_STREAMS); XMPP_NS_STREAMS);
} }
int conn_tls_start(xmpp_conn_t *const conn) int conn_tls_start(xmpp_conn_t *conn)
{ {
int rc; int rc;
@@ -942,7 +937,7 @@ int conn_tls_start(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
long xmpp_conn_get_flags(const xmpp_conn_t *const conn) long xmpp_conn_get_flags(const xmpp_conn_t *conn)
{ {
long flags; long flags;
@@ -977,7 +972,7 @@ long xmpp_conn_get_flags(const xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_set_flags(xmpp_conn_t *const conn, long flags) int xmpp_conn_set_flags(xmpp_conn_t *conn, long flags)
{ {
if (conn->state != XMPP_STATE_DISCONNECTED) { if (conn->state != XMPP_STATE_DISCONNECTED) {
xmpp_error(conn->ctx, "conn", xmpp_error(conn->ctx, "conn",
@@ -1012,7 +1007,7 @@ int xmpp_conn_set_flags(xmpp_conn_t *const conn, long flags)
* *
* @ingroup Connections * @ingroup Connections
*/ */
void xmpp_conn_disable_tls(xmpp_conn_t *const conn) void xmpp_conn_disable_tls(xmpp_conn_t *conn)
{ {
long flags = xmpp_conn_get_flags(conn); long flags = xmpp_conn_get_flags(conn);
@@ -1026,7 +1021,7 @@ void xmpp_conn_disable_tls(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_is_secured(xmpp_conn_t *const conn) int xmpp_conn_is_secured(xmpp_conn_t *conn)
{ {
return conn->secured && !conn->tls_failed && conn->tls != NULL; return conn->secured && !conn->tls_failed && conn->tls != NULL;
} }
@@ -1036,7 +1031,7 @@ int xmpp_conn_is_secured(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_is_connecting(xmpp_conn_t *const conn) int xmpp_conn_is_connecting(xmpp_conn_t *conn)
{ {
return conn->state == XMPP_STATE_CONNECTING; return conn->state == XMPP_STATE_CONNECTING;
} }
@@ -1046,7 +1041,7 @@ int xmpp_conn_is_connecting(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_is_connected(xmpp_conn_t *const conn) int xmpp_conn_is_connected(xmpp_conn_t *conn)
{ {
return conn->state == XMPP_STATE_CONNECTED; return conn->state == XMPP_STATE_CONNECTED;
} }
@@ -1056,13 +1051,13 @@ int xmpp_conn_is_connected(xmpp_conn_t *const conn)
* *
* @ingroup Connections * @ingroup Connections
*/ */
int xmpp_conn_is_disconnected(xmpp_conn_t *const conn) int xmpp_conn_is_disconnected(xmpp_conn_t *conn)
{ {
return conn->state == XMPP_STATE_DISCONNECTED; return conn->state == XMPP_STATE_DISCONNECTED;
} }
/* timed handler for cleanup if normal disconnect procedure takes too long */ /* timed handler for cleanup if normal disconnect procedure takes too long */
static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata) static int _disconnect_cleanup(xmpp_conn_t *conn, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
@@ -1073,7 +1068,7 @@ static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata)
return 0; return 0;
} }
static char *_conn_build_stream_tag(xmpp_conn_t *const conn, static char *_conn_build_stream_tag(xmpp_conn_t *conn,
char **attributes, char **attributes,
size_t attributes_len) size_t attributes_len)
{ {
@@ -1190,7 +1185,7 @@ static char *_get_stream_attribute(char **attrs, char *name)
return NULL; return NULL;
} }
static void _handle_stream_start(char *name, char **attrs, void *const userdata) static void _handle_stream_start(char *name, char **attrs, void *userdata)
{ {
xmpp_conn_t *conn = (xmpp_conn_t *)userdata; xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
char *id; char *id;
@@ -1226,7 +1221,7 @@ static void _handle_stream_start(char *name, char **attrs, void *const userdata)
} }
} }
static void _handle_stream_end(char *name, void *const userdata) static void _handle_stream_end(char *name, void *userdata)
{ {
xmpp_conn_t *conn = (xmpp_conn_t *)userdata; xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
@@ -1237,7 +1232,7 @@ static void _handle_stream_end(char *name, void *const userdata)
conn_disconnect_clean(conn); conn_disconnect_clean(conn);
} }
static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *const userdata) static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *userdata)
{ {
xmpp_conn_t *conn = (xmpp_conn_t *)userdata; xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
char *buf; char *buf;
@@ -1251,7 +1246,7 @@ static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *const userdata)
handler_fire_stanza(conn, stanza); handler_fire_stanza(conn, stanza);
} }
static unsigned short _conn_default_port(xmpp_conn_t *const conn, static unsigned short _conn_default_port(xmpp_conn_t *conn,
xmpp_conn_type_t type) xmpp_conn_type_t type)
{ {
switch (type) { switch (type) {
@@ -1265,7 +1260,7 @@ static unsigned short _conn_default_port(xmpp_conn_t *const conn,
}; };
} }
static void _conn_reset(xmpp_conn_t *const conn) static void _conn_reset(xmpp_conn_t *conn)
{ {
xmpp_ctx_t *ctx = conn->ctx; xmpp_ctx_t *ctx = conn->ctx;
xmpp_send_queue_t *sq, *tsq; xmpp_send_queue_t *sq, *tsq;
@@ -1316,13 +1311,13 @@ static void _conn_reset(xmpp_conn_t *const conn)
handler_system_delete_all(conn); handler_system_delete_all(conn);
} }
static int _conn_connect(xmpp_conn_t *const conn, static int _conn_connect(xmpp_conn_t *conn,
const char *const domain, const char *domain,
const char *const host, const char *host,
unsigned short port, unsigned short port,
xmpp_conn_type_t type, xmpp_conn_type_t type,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata) void *userdata)
{ {
xmpp_open_handler open_handler; xmpp_open_handler open_handler;
@@ -1352,10 +1347,9 @@ static int _conn_connect(xmpp_conn_t *const conn,
conn->conn_handler = callback; conn->conn_handler = callback;
conn->userdata = userdata; conn->userdata = userdata;
open_handler = conn->is_raw open_handler = conn->is_raw ? auth_handle_open_stub
? auth_handle_open_stub : type == XMPP_CLIENT ? auth_handle_open
: type == XMPP_CLIENT ? auth_handle_open : auth_handle_component_open;
: auth_handle_component_open;
conn_prepare_reset(conn, open_handler); conn_prepare_reset(conn, open_handler);
/* FIXME: it could happen that the connect returns immediately as /* FIXME: it could happen that the connect returns immediately as

13
src/crypto.c
View File

@@ -244,15 +244,14 @@ static const char _base64_charmap[65] = {
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '='}; '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '='};
static size_t base64_encoded_len(const size_t len) static size_t base64_encoded_len(size_t len)
{ {
/* encoded steam is 4 bytes for every three, rounded up */ /* encoded steam is 4 bytes for every three, rounded up */
return ((len + 2) / 3) << 2; return ((len + 2) / 3) << 2;
} }
static char *base64_encode(xmpp_ctx_t *ctx, static char *
const unsigned char *const buffer, base64_encode(xmpp_ctx_t *ctx, const unsigned char *buffer, size_t len)
const size_t len)
{ {
size_t clen; size_t clen;
char *cbuf, *c; char *cbuf, *c;
@@ -304,7 +303,7 @@ static char *base64_encode(xmpp_ctx_t *ctx,
return cbuf; return cbuf;
} }
static size_t base64_decoded_len(const char *const buffer, const size_t len) static size_t base64_decoded_len(const char *buffer, size_t len)
{ {
size_t nudge = 0; size_t nudge = 0;
unsigned char c; unsigned char c;
@@ -331,8 +330,8 @@ static size_t base64_decoded_len(const char *const buffer, const size_t len)
} }
static void base64_decode(xmpp_ctx_t *ctx, static void base64_decode(xmpp_ctx_t *ctx,
const char *const buffer, const char *buffer,
const size_t len, size_t len,
unsigned char **out, unsigned char **out,
size_t *outlen) size_t *outlen)
{ {

58
src/ctx.c
View File

@@ -122,19 +122,19 @@ int xmpp_version_check(int major, int minor)
/* Wrap stdlib routines malloc, free, and realloc for default memory /* Wrap stdlib routines malloc, free, and realloc for default memory
* management. * management.
*/ */
static void *_malloc(const size_t size, void *const userdata) static void *_malloc(size_t size, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
return malloc(size); return malloc(size);
} }
static void _free(void *p, void *const userdata) static void _free(void *p, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
free(p); free(p);
} }
static void *_realloc(void *p, const size_t size, void *const userdata) static void *_realloc(void *p, size_t size, void *userdata)
{ {
UNUSED(userdata); UNUSED(userdata);
return realloc(p, size); return realloc(p, size);
@@ -146,8 +146,7 @@ static xmpp_mem_t xmpp_default_mem = {
_free, _realloc, NULL}; _free, _realloc, NULL};
/* log levels and names */ /* log levels and names */
static const char *const _xmpp_log_level_name[4] = {"DEBUG", "INFO", "WARN", static const char *_xmpp_log_level_name[4] = {"DEBUG", "INFO", "WARN", "ERROR"};
"ERROR"};
static const xmpp_log_level_t _xmpp_default_logger_levels[] = { static const xmpp_log_level_t _xmpp_default_logger_levels[] = {
XMPP_LEVEL_DEBUG, XMPP_LEVEL_INFO, XMPP_LEVEL_WARN, XMPP_LEVEL_ERROR}; XMPP_LEVEL_DEBUG, XMPP_LEVEL_INFO, XMPP_LEVEL_WARN, XMPP_LEVEL_ERROR};
@@ -160,10 +159,10 @@ static const xmpp_log_level_t _xmpp_default_logger_levels[] = {
* @param area the area the log message is for * @param area the area the log message is for
* @param msg the log message * @param msg the log message
*/ */
static void xmpp_default_logger(void *const userdata, static void xmpp_default_logger(void *userdata,
const xmpp_log_level_t level, xmpp_log_level_t level,
const char *const area, const char *area,
const char *const msg) const char *msg)
{ {
xmpp_log_level_t filter_level = *(xmpp_log_level_t *)userdata; xmpp_log_level_t filter_level = *(xmpp_log_level_t *)userdata;
if (level >= filter_level) if (level >= filter_level)
@@ -212,7 +211,7 @@ static xmpp_log_t xmpp_default_log = {NULL, NULL};
* *
* @return a pointer to the allocated memory or NULL on an error * @return a pointer to the allocated memory or NULL on an error
*/ */
void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size) void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size)
{ {
return ctx->mem->alloc(size, ctx->mem->userdata); return ctx->mem->alloc(size, ctx->mem->userdata);
} }
@@ -223,7 +222,7 @@ void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size)
* @param ctx a Strophe context object * @param ctx a Strophe context object
* @param p a pointer referencing memory to be freed * @param p a pointer referencing memory to be freed
*/ */
void xmpp_free(const xmpp_ctx_t *const ctx, void *p) void xmpp_free(const xmpp_ctx_t *ctx, void *p)
{ {
ctx->mem->free(p, ctx->mem->userdata); ctx->mem->free(p, ctx->mem->userdata);
} }
@@ -237,7 +236,7 @@ void xmpp_free(const xmpp_ctx_t *const ctx, void *p)
* *
* @return a pointer to the reallocated memory or NULL on an error * @return a pointer to the reallocated memory or NULL on an error
*/ */
void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size) void *xmpp_realloc(const xmpp_ctx_t *ctx, void *p, size_t size)
{ {
return ctx->mem->realloc(p, size, ctx->mem->userdata); return ctx->mem->realloc(p, size, ctx->mem->userdata);
} }
@@ -255,10 +254,10 @@ void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size)
* @param fmt a printf-style format string for the message * @param fmt a printf-style format string for the message
* @param ap variable argument list supplied for the format string * @param ap variable argument list supplied for the format string
*/ */
void xmpp_log(const xmpp_ctx_t *const ctx, void xmpp_log(const xmpp_ctx_t *ctx,
const xmpp_log_level_t level, xmpp_log_level_t level,
const char *const area, const char *area,
const char *const fmt, const char *fmt,
va_list ap) va_list ap)
{ {
int oldret, ret; int oldret, ret;
@@ -306,10 +305,7 @@ void xmpp_log(const xmpp_ctx_t *const ctx,
* @param fmt a printf-style format string followed by a variable list of * @param fmt a printf-style format string followed by a variable list of
* arguments to format * arguments to format
*/ */
void xmpp_error(const xmpp_ctx_t *const ctx, void xmpp_error(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
const char *const area,
const char *const fmt,
...)
{ {
va_list ap; va_list ap;
@@ -328,10 +324,7 @@ void xmpp_error(const xmpp_ctx_t *const ctx,
* @param fmt a printf-style format string followed by a variable list of * @param fmt a printf-style format string followed by a variable list of
* arguments to format * arguments to format
*/ */
void xmpp_warn(const xmpp_ctx_t *const ctx, void xmpp_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
const char *const area,
const char *const fmt,
...)
{ {
va_list ap; va_list ap;
@@ -350,10 +343,7 @@ void xmpp_warn(const xmpp_ctx_t *const ctx,
* @param fmt a printf-style format string followed by a variable list of * @param fmt a printf-style format string followed by a variable list of
* arguments to format * arguments to format
*/ */
void xmpp_info(const xmpp_ctx_t *const ctx, void xmpp_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
const char *const area,
const char *const fmt,
...)
{ {
va_list ap; va_list ap;
@@ -372,10 +362,7 @@ void xmpp_info(const xmpp_ctx_t *const ctx,
* @param fmt a printf-style format string followed by a variable list of * @param fmt a printf-style format string followed by a variable list of
* arguments to format * arguments to format
*/ */
void xmpp_debug(const xmpp_ctx_t *const ctx, void xmpp_debug(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
const char *const area,
const char *const fmt,
...)
{ {
va_list ap; va_list ap;
@@ -398,8 +385,7 @@ void xmpp_debug(const xmpp_ctx_t *const ctx,
* *
* @ingroup Context * @ingroup Context
*/ */
xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem, xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *mem, const xmpp_log_t *log)
const xmpp_log_t *const log)
{ {
xmpp_ctx_t *ctx = NULL; xmpp_ctx_t *ctx = NULL;
@@ -439,7 +425,7 @@ xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem,
* *
* @ingroup Context * @ingroup Context
*/ */
void xmpp_ctx_free(xmpp_ctx_t *const ctx) void xmpp_ctx_free(xmpp_ctx_t *ctx)
{ {
/* mem and log are owned by their suppliers */ /* mem and log are owned by their suppliers */
xmpp_rand_free(ctx, ctx->rand); xmpp_rand_free(ctx, ctx->rand);
@@ -453,7 +439,7 @@ void xmpp_ctx_free(xmpp_ctx_t *const ctx)
* *
* @ingroup Context * @ingroup Context
*/ */
void xmpp_ctx_set_timeout(xmpp_ctx_t *const ctx, const unsigned long timeout) void xmpp_ctx_set_timeout(xmpp_ctx_t *ctx, unsigned long timeout)
{ {
ctx->timeout = timeout; ctx->timeout = timeout;
} }

2
src/event.c
View File

@@ -73,7 +73,7 @@
* *
* @ingroup EventLoop * @ingroup EventLoop
*/ */
void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout) void xmpp_run_once(xmpp_ctx_t *ctx, unsigned long timeout)
{ {
xmpp_connlist_t *connitem; xmpp_connlist_t *connitem;
xmpp_conn_t *conn; xmpp_conn_t *conn;

87
src/handler.c
View File

@@ -53,7 +53,7 @@ static void _handler_item_remove(xmpp_handlist_t **head, xmpp_handlist_t *item)
* @param conn a Strophe connection object * @param conn a Strophe connection object
* @param stanza a Strophe stanza object * @param stanza a Strophe stanza object
*/ */
void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza) void handler_fire_stanza(xmpp_conn_t *conn, xmpp_stanza_t *stanza)
{ {
xmpp_handlist_t *item, *next, *head, *head_old; xmpp_handlist_t *item, *next, *head, *head_old;
const char *id, *ns, *name, *type; const char *id, *ns, *name, *type;
@@ -144,7 +144,7 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
* *
* @return the time in milliseconds until the next handler will be ready * @return the time in milliseconds until the next handler will be ready
*/ */
uint64_t handler_fire_timed(xmpp_ctx_t *const ctx) uint64_t handler_fire_timed(xmpp_ctx_t *ctx)
{ {
xmpp_connlist_t *connitem; xmpp_connlist_t *connitem;
xmpp_handlist_t *item, *next; xmpp_handlist_t *item, *next;
@@ -253,9 +253,9 @@ void handler_reset_timed(xmpp_conn_t *conn, int user_only)
static void _timed_handler_add(xmpp_ctx_t *ctx, static void _timed_handler_add(xmpp_ctx_t *ctx,
xmpp_handlist_t **handlers_list, xmpp_handlist_t **handlers_list,
xmpp_void_handler handler, xmpp_void_handler handler,
const unsigned long period, unsigned long period,
void *const userdata, void *userdata,
const int user_handler) int user_handler)
{ {
xmpp_handlist_t *item; xmpp_handlist_t *item;
@@ -311,16 +311,15 @@ static void _timed_handler_delete(xmpp_ctx_t *ctx,
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_timed_handler_delete(xmpp_conn_t *const conn, void xmpp_timed_handler_delete(xmpp_conn_t *conn, xmpp_timed_handler handler)
xmpp_timed_handler handler)
{ {
_timed_handler_delete(conn->ctx, &conn->timed_handlers, handler); _timed_handler_delete(conn->ctx, &conn->timed_handlers, handler);
} }
static void _id_handler_add(xmpp_conn_t *const conn, static void _id_handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id, const char *id,
void *const userdata, void *userdata,
int user_handler) int user_handler)
{ {
xmpp_handlist_t *item, *tail; xmpp_handlist_t *item, *tail;
@@ -373,9 +372,9 @@ static void _id_handler_add(xmpp_conn_t *const conn,
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_id_handler_delete(xmpp_conn_t *const conn, void xmpp_id_handler_delete(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id) const char *id)
{ {
xmpp_handlist_t *item, *prev, *next; xmpp_handlist_t *item, *prev, *next;
@@ -406,12 +405,12 @@ void xmpp_id_handler_delete(xmpp_conn_t *const conn,
} }
/* add a stanza handler */ /* add a stanza handler */
static void _handler_add(xmpp_conn_t *const conn, static void _handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const ns, const char *ns,
const char *const name, const char *name,
const char *const type, const char *type,
void *const userdata, void *userdata,
int user_handler) int user_handler)
{ {
xmpp_handlist_t *item, *tail; xmpp_handlist_t *item, *tail;
@@ -489,7 +488,7 @@ static void _handler_add(xmpp_conn_t *const conn,
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler) void xmpp_handler_delete(xmpp_conn_t *conn, xmpp_handler handler)
{ {
xmpp_handlist_t *prev, *item; xmpp_handlist_t *prev, *item;
@@ -536,10 +535,10 @@ void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler)
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_timed_handler_add(xmpp_conn_t *const conn, void xmpp_timed_handler_add(xmpp_conn_t *conn,
xmpp_timed_handler handler, xmpp_timed_handler handler,
const unsigned long period, unsigned long period,
void *const userdata) void *userdata)
{ {
_timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period, _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
userdata, 1); userdata, 1);
@@ -554,10 +553,10 @@ void xmpp_timed_handler_add(xmpp_conn_t *const conn,
* @param period the time in milliseconds between firings * @param period the time in milliseconds between firings
* @param userdata an opaque data pointer that will be passed to the handler * @param userdata an opaque data pointer that will be passed to the handler
*/ */
void handler_add_timed(xmpp_conn_t *const conn, void handler_add_timed(xmpp_conn_t *conn,
xmpp_timed_handler handler, xmpp_timed_handler handler,
const unsigned long period, unsigned long period,
void *const userdata) void *userdata)
{ {
_timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period, _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
userdata, 0); userdata, 0);
@@ -579,10 +578,10 @@ void handler_add_timed(xmpp_conn_t *const conn,
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_id_handler_add(xmpp_conn_t *const conn, void xmpp_id_handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id, const char *id,
void *const userdata) void *userdata)
{ {
_id_handler_add(conn, handler, id, userdata, 1); _id_handler_add(conn, handler, id, userdata, 1);
} }
@@ -596,10 +595,10 @@ void xmpp_id_handler_add(xmpp_conn_t *const conn,
* @param id a string with the id * @param id a string with the id
* @param userdata an opaque data pointer that will be passed to the handler * @param userdata an opaque data pointer that will be passed to the handler
*/ */
void handler_add_id(xmpp_conn_t *const conn, void handler_add_id(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id, const char *id,
void *const userdata) void *userdata)
{ {
_id_handler_add(conn, handler, id, userdata, 0); _id_handler_add(conn, handler, id, userdata, 0);
} }
@@ -626,12 +625,12 @@ void handler_add_id(xmpp_conn_t *const conn,
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_handler_add(xmpp_conn_t *const conn, void xmpp_handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const ns, const char *ns,
const char *const name, const char *name,
const char *const type, const char *type,
void *const userdata) void *userdata)
{ {
_handler_add(conn, handler, ns, name, type, userdata, 1); _handler_add(conn, handler, ns, name, type, userdata, 1);
} }
@@ -647,12 +646,12 @@ void xmpp_handler_add(xmpp_conn_t *const conn,
* @param type a string with the 'type' attribute value to match * @param type a string with the 'type' attribute value to match
* @param userdata an opaque data pointer that will be passed to the handler * @param userdata an opaque data pointer that will be passed to the handler
*/ */
void handler_add(xmpp_conn_t *const conn, void handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const ns, const char *ns,
const char *const name, const char *name,
const char *const type, const char *type,
void *const userdata) void *userdata)
{ {
_handler_add(conn, handler, ns, name, type, userdata, 0); _handler_add(conn, handler, ns, name, type, userdata, 0);
} }
@@ -762,10 +761,10 @@ void handler_system_delete_all(xmpp_conn_t *conn)
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx, void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,
xmpp_global_timed_handler handler, xmpp_global_timed_handler handler,
const unsigned long period, unsigned long period,
void *const userdata) void *userdata)
{ {
_timed_handler_add(ctx, &ctx->timed_handlers, handler, period, userdata, 1); _timed_handler_add(ctx, &ctx->timed_handlers, handler, period, userdata, 1);
} }
@@ -777,7 +776,7 @@ void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx,
* *
* @ingroup Handlers * @ingroup Handlers
*/ */
void xmpp_global_timed_handler_delete(xmpp_ctx_t *const ctx, void xmpp_global_timed_handler_delete(xmpp_ctx_t *ctx,
xmpp_global_timed_handler handler) xmpp_global_timed_handler handler)
{ {
_timed_handler_delete(ctx, &ctx->timed_handlers, handler); _timed_handler_delete(ctx, &ctx->timed_handlers, handler);

9
src/hash.c
View File

@@ -46,8 +46,7 @@ struct _hash_iterator_t {
}; };
/** allocate and initialize a new hash table */ /** allocate and initialize a new hash table */
hash_t * hash_t *hash_new(xmpp_ctx_t *ctx, int size, hash_free_func free_func)
hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func)
{ {
hash_t *result = NULL; hash_t *result = NULL;
@@ -72,14 +71,14 @@ hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func)
} }
/** obtain a new reference to an existing hash table */ /** obtain a new reference to an existing hash table */
hash_t *hash_clone(hash_t *const table) hash_t *hash_clone(hash_t *table)
{ {
table->ref++; table->ref++;
return table; return table;
} }
/** release a hash table that is no longer needed */ /** release a hash table that is no longer needed */
void hash_release(hash_t *const table) void hash_release(hash_t *table)
{ {
xmpp_ctx_t *ctx = table->ctx; xmpp_ctx_t *ctx = table->ctx;
hashentry_t *entry, *next; hashentry_t *entry, *next;
@@ -143,7 +142,7 @@ hashentry_t *_hash_entry_find(hash_t *table, const char *key)
* each key can appear only once; the value of any * each key can appear only once; the value of any
* identical key will be replaced * identical key will be replaced
*/ */
int hash_add(hash_t *table, const char *const key, void *data) int hash_add(hash_t *table, const char *key, void *data)
{ {
xmpp_ctx_t *ctx = table->ctx; xmpp_ctx_t *ctx = table->ctx;
hashentry_t *entry = NULL; hashentry_t *entry = NULL;

11
src/hash.h
View File

@@ -18,23 +18,22 @@
typedef struct _hash_t hash_t; typedef struct _hash_t hash_t;
typedef void (*hash_free_func)(const xmpp_ctx_t *const ctx, void *p); typedef void (*hash_free_func)(const xmpp_ctx_t *ctx, void *p);
/** allocate and initialize a new hash table */ /** allocate and initialize a new hash table */
hash_t * hash_t *hash_new(xmpp_ctx_t *ctx, int size, hash_free_func free_func);
hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func);
/** allocate a new reference to an existing hash table */ /** allocate a new reference to an existing hash table */
hash_t *hash_clone(hash_t *const table); hash_t *hash_clone(hash_t *table);
/** release a hash table when no longer needed */ /** release a hash table when no longer needed */
void hash_release(hash_t *const table); void hash_release(hash_t *table);
/** add a key, value pair to a hash table. /** add a key, value pair to a hash table.
* each key can appear only once; the value of any * each key can appear only once; the value of any
* identical key will be replaced * identical key will be replaced
*/ */
int hash_add(hash_t *table, const char *const key, void *data); int hash_add(hash_t *table, const char *key, void *data);
/** look up a key in a hash table */ /** look up a key in a hash table */
void *hash_get(hash_t *table, const char *key); void *hash_get(hash_t *table, const char *key);

9
src/parser.h
View File

@@ -20,12 +20,9 @@
typedef struct _parser_t parser_t; typedef struct _parser_t parser_t;
typedef void (*parser_start_callback)(char *name, typedef void (*parser_start_callback)(char *name, char **attrs, void *userdata);
char **attrs, typedef void (*parser_end_callback)(char *name, void *userdata);
void *const userdata); typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza, void *userdata);
typedef void (*parser_end_callback)(char *name, void *const userdata);
typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza,
void *const userdata);
parser_t *parser_new(xmpp_ctx_t *ctx, parser_t *parser_new(xmpp_ctx_t *ctx,
parser_start_callback startcb, parser_start_callback startcb,

2
src/sasl.c
View File

@@ -65,7 +65,7 @@ char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password)
/** helpers for digest auth */ /** helpers for digest auth */
/* create a new, null-terminated string from a substring */ /* create a new, null-terminated string from a substring */
static char *_make_string(xmpp_ctx_t *ctx, const char *s, const unsigned len) static char *_make_string(xmpp_ctx_t *ctx, const char *s, unsigned len)
{ {
char *result; char *result;

4
src/sha1.c
View File

@@ -206,9 +206,7 @@ void crypto_SHA1_Init(SHA1_CTX *context)
} }
/* Run your data through this. */ /* Run your data through this. */
void crypto_SHA1_Update(SHA1_CTX *context, void crypto_SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
const uint8_t *data,
const size_t len)
{ {
size_t i, j; size_t i, j;

4
src/sha1.h
View File

@@ -24,9 +24,7 @@ typedef struct {
#define SHA1_DIGEST_SIZE 20 #define SHA1_DIGEST_SIZE 20
void crypto_SHA1_Init(SHA1_CTX *context); void crypto_SHA1_Init(SHA1_CTX *context);
void crypto_SHA1_Update(SHA1_CTX *context, void crypto_SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len);
const uint8_t *data,
const size_t len);
void crypto_SHA1_Final(SHA1_CTX *context, uint8_t *digest); void crypto_SHA1_Final(SHA1_CTX *context, uint8_t *digest);
void crypto_SHA1(const uint8_t *data, size_t len, uint8_t *digest); void crypto_SHA1(const uint8_t *data, size_t len, uint8_t *digest);

18
src/sock.c
View File

@@ -69,7 +69,7 @@ static int _in_progress(int error)
#endif #endif
} }
sock_t sock_connect(const char *const host, const unsigned short port) sock_t sock_connect(const char *host, unsigned short port)
{ {
sock_t sock; sock_t sock;
char service[6]; char service[6];
@@ -109,7 +109,7 @@ sock_t sock_connect(const char *const host, const unsigned short port)
return sock; return sock;
} }
int sock_set_keepalive(const sock_t sock, int timeout, int interval) int sock_set_keepalive(sock_t sock, int timeout, int interval)
{ {
int ret; int ret;
int optval = (timeout && interval) ? 1 : 0; int optval = (timeout && interval) ? 1 : 0;
@@ -154,7 +154,7 @@ int sock_set_keepalive(const sock_t sock, int timeout, int interval)
return ret; return ret;
} }
int sock_close(const sock_t sock) int sock_close(sock_t sock)
{ {
#ifdef _WIN32 #ifdef _WIN32
return closesocket(sock); return closesocket(sock);
@@ -180,27 +180,27 @@ static int _sock_set_blocking_mode(sock_t sock, int blocking)
#endif #endif
} }
int sock_set_blocking(const sock_t sock) int sock_set_blocking(sock_t sock)
{ {
return _sock_set_blocking_mode(sock, 1); return _sock_set_blocking_mode(sock, 1);
} }
int sock_set_nonblocking(const sock_t sock) int sock_set_nonblocking(sock_t sock)
{ {
return _sock_set_blocking_mode(sock, 0); return _sock_set_blocking_mode(sock, 0);
} }
int sock_read(const sock_t sock, void *const buff, const size_t len) int sock_read(sock_t sock, void *buff, size_t len)
{ {
return recv(sock, buff, len, 0); return recv(sock, buff, len, 0);
} }
int sock_write(const sock_t sock, const void *const buff, const size_t len) int sock_write(sock_t sock, const void *buff, size_t len)
{ {
return send(sock, buff, len, 0); return send(sock, buff, len, 0);
} }
int sock_is_recoverable(const int error) int sock_is_recoverable(int error)
{ {
#ifdef _WIN32 #ifdef _WIN32
return (error == WSAEINTR || error == WSAEWOULDBLOCK || return (error == WSAEINTR || error == WSAEWOULDBLOCK ||
@@ -210,7 +210,7 @@ int sock_is_recoverable(const int error)
#endif #endif
} }
int sock_connect_error(const sock_t sock) int sock_connect_error(sock_t sock)
{ {
struct sockaddr_storage ss; struct sockaddr_storage ss;
struct sockaddr *sa = (struct sockaddr *)&ss; struct sockaddr *sa = (struct sockaddr *)&ss;

18
src/sock.h
View File

@@ -30,16 +30,16 @@ void sock_shutdown(void);
int sock_error(void); int sock_error(void);
sock_t sock_connect(const char *const host, const unsigned short port); sock_t sock_connect(const char *host, unsigned short port);
int sock_close(const sock_t sock); int sock_close(sock_t sock);
int sock_set_blocking(const sock_t sock); int sock_set_blocking(sock_t sock);
int sock_set_nonblocking(const sock_t sock); int sock_set_nonblocking(sock_t sock);
int sock_read(const sock_t sock, void *const buff, const size_t len); int sock_read(sock_t sock, void *buff, size_t len);
int sock_write(const sock_t sock, const void *const buff, const size_t len); int sock_write(sock_t sock, const void *buff, size_t len);
int sock_is_recoverable(const int error); int sock_is_recoverable(int error);
/* checks for an error after connect, return 0 if connect successful */ /* checks for an error after connect, return 0 if connect successful */
int sock_connect_error(const sock_t sock); int sock_connect_error(sock_t sock);
int sock_set_keepalive(const sock_t sock, int timeout, int interval); int sock_set_keepalive(sock_t sock, int timeout, int interval);
#endif /* __LIBSTROPHE_SOCK_H__ */ #endif /* __LIBSTROPHE_SOCK_H__ */

135
src/stanza.c
View File

@@ -64,7 +64,7 @@ xmpp_stanza_t *xmpp_stanza_new(xmpp_ctx_t *ctx)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *const stanza) xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *stanza)
{ {
stanza->ref++; stanza->ref++;
@@ -74,8 +74,7 @@ xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *const stanza)
/* /*
* Copy the attributes of stanza src into stanza dst. Return -1 on error. * Copy the attributes of stanza src into stanza dst. Return -1 on error.
*/ */
static int _stanza_copy_attributes(xmpp_stanza_t *dst, static int _stanza_copy_attributes(xmpp_stanza_t *dst, const xmpp_stanza_t *src)
const xmpp_stanza_t *const src)
{ {
hash_iterator_t *iter; hash_iterator_t *iter;
const char *key; const char *key;
@@ -114,7 +113,7 @@ static int _stanza_copy_attributes(xmpp_stanza_t *dst,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza) xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *stanza)
{ {
xmpp_stanza_t *copy, *child, *copychild, *tail; xmpp_stanza_t *copy, *child, *copychild, *tail;
@@ -169,7 +168,7 @@ copy_error:
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_release(xmpp_stanza_t *const stanza) int xmpp_stanza_release(xmpp_stanza_t *stanza)
{ {
int released = 0; int released = 0;
xmpp_stanza_t *child, *tchild; xmpp_stanza_t *child, *tchild;
@@ -205,7 +204,7 @@ int xmpp_stanza_release(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza) xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *stanza)
{ {
return stanza->ctx; return stanza->ctx;
} }
@@ -218,7 +217,7 @@ xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_is_text(xmpp_stanza_t *const stanza) int xmpp_stanza_is_text(xmpp_stanza_t *stanza)
{ {
return (stanza && stanza->type == XMPP_STANZA_TEXT); return (stanza && stanza->type == XMPP_STANZA_TEXT);
} }
@@ -231,7 +230,7 @@ int xmpp_stanza_is_text(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_is_tag(xmpp_stanza_t *const stanza) int xmpp_stanza_is_tag(xmpp_stanza_t *stanza)
{ {
return (stanza && stanza->type == XMPP_STANZA_TAG); return (stanza && stanza->type == XMPP_STANZA_TAG);
} }
@@ -242,7 +241,7 @@ int xmpp_stanza_is_tag(xmpp_stanza_t *const stanza)
* On failure, returns NULL. * On failure, returns NULL.
*/ */
static char *_escape_xml(xmpp_ctx_t *const ctx, char *text) static char *_escape_xml(xmpp_ctx_t *ctx, char *text)
{ {
size_t len = 0; size_t len = 0;
char *src; char *src;
@@ -295,11 +294,8 @@ static char *_escape_xml(xmpp_ctx_t *const ctx, char *text)
} }
/* small helper function */ /* small helper function */
static void _render_update(int *written, static void _render_update(
const int length, int *written, int length, int lastwrite, size_t *left, char **ptr)
const int lastwrite,
size_t *left,
char **ptr)
{ {
*written += lastwrite; *written += lastwrite;
@@ -317,9 +313,8 @@ static void _render_update(int *written,
* return values < 0 indicate some error occurred, * return values < 0 indicate some error occurred,
* and return values > buflen indicate buffer was not large enough * and return values > buflen indicate buffer was not large enough
*/ */
static int _render_stanza_recursive(xmpp_stanza_t *stanza, static int
char *const buf, _render_stanza_recursive(xmpp_stanza_t *stanza, char *buf, size_t buflen)
size_t const buflen)
{ {
char *ptr = buf; char *ptr = buf;
size_t left = buflen; size_t left = buflen;
@@ -444,9 +439,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_to_text(xmpp_stanza_t *stanza, int xmpp_stanza_to_text(xmpp_stanza_t *stanza, char **buf, size_t *buflen)
char **const buf,
size_t *const buflen)
{ {
char *buffer, *tmp; char *buffer, *tmp;
size_t length; size_t length;
@@ -507,7 +500,7 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name) int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *name)
{ {
if (stanza->type == XMPP_STANZA_TEXT) if (stanza->type == XMPP_STANZA_TEXT)
return XMPP_EINVOP; return XMPP_EINVOP;
@@ -531,7 +524,7 @@ int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_name(xmpp_stanza_t *stanza)
{ {
if (stanza->type == XMPP_STANZA_TEXT) if (stanza->type == XMPP_STANZA_TEXT)
return NULL; return NULL;
@@ -546,7 +539,7 @@ const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza) int xmpp_stanza_get_attribute_count(xmpp_stanza_t *stanza)
{ {
if (stanza->attributes == NULL) { if (stanza->attributes == NULL) {
return 0; return 0;
@@ -569,7 +562,7 @@ int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_get_attributes(xmpp_stanza_t *const stanza, int xmpp_stanza_get_attributes(xmpp_stanza_t *stanza,
const char **attr, const char **attr,
int attrlen) int attrlen)
{ {
@@ -611,9 +604,9 @@ int xmpp_stanza_get_attributes(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza, int xmpp_stanza_set_attribute(xmpp_stanza_t *stanza,
const char *const key, const char *key,
const char *const value) const char *value)
{ {
char *val; char *val;
int rc; int rc;
@@ -652,7 +645,7 @@ int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_ns(xmpp_stanza_t *const stanza, const char *const ns) int xmpp_stanza_set_ns(xmpp_stanza_t *stanza, const char *ns)
{ {
return xmpp_stanza_set_attribute(stanza, "xmlns", ns); return xmpp_stanza_set_attribute(stanza, "xmlns", ns);
} }
@@ -727,7 +720,7 @@ int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text) int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *text)
{ {
if (stanza->type == XMPP_STANZA_TAG) if (stanza->type == XMPP_STANZA_TAG)
return XMPP_EINVOP; return XMPP_EINVOP;
@@ -756,8 +749,8 @@ int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text)
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza, int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
const char *const text, const char *text,
const size_t size) size_t size)
{ {
if (stanza->type == XMPP_STANZA_TAG) if (stanza->type == XMPP_STANZA_TAG)
return XMPP_EINVOP; return XMPP_EINVOP;
@@ -786,7 +779,7 @@ int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_id(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_id(xmpp_stanza_t *stanza)
{ {
return xmpp_stanza_get_attribute(stanza, "id"); return xmpp_stanza_get_attribute(stanza, "id");
} }
@@ -801,7 +794,7 @@ const char *xmpp_stanza_get_id(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_ns(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_ns(xmpp_stanza_t *stanza)
{ {
return xmpp_stanza_get_attribute(stanza, "xmlns"); return xmpp_stanza_get_attribute(stanza, "xmlns");
} }
@@ -816,7 +809,7 @@ const char *xmpp_stanza_get_ns(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_type(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_type(xmpp_stanza_t *stanza)
{ {
return xmpp_stanza_get_attribute(stanza, "type"); return xmpp_stanza_get_attribute(stanza, "type");
} }
@@ -831,7 +824,7 @@ const char *xmpp_stanza_get_type(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_to(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_to(xmpp_stanza_t *stanza)
{ {
return xmpp_stanza_get_attribute(stanza, "to"); return xmpp_stanza_get_attribute(stanza, "to");
} }
@@ -846,7 +839,7 @@ const char *xmpp_stanza_get_to(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_from(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_from(xmpp_stanza_t *stanza)
{ {
return xmpp_stanza_get_attribute(stanza, "from"); return xmpp_stanza_get_attribute(stanza, "from");
} }
@@ -862,8 +855,8 @@ const char *xmpp_stanza_get_from(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *stanza,
const char *const name) const char *name)
{ {
xmpp_stanza_t *child; xmpp_stanza_t *child;
@@ -888,8 +881,8 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *stanza,
const char *const ns) const char *ns)
{ {
xmpp_stanza_t *child; xmpp_stanza_t *child;
const char *child_ns; const char *child_ns;
@@ -916,9 +909,9 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *stanza,
const char *const name, const char *name,
const char *const ns) const char *ns)
{ {
xmpp_stanza_t *child; xmpp_stanza_t *child;
const char *child_ns; const char *child_ns;
@@ -947,7 +940,7 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *const stanza) xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *stanza)
{ {
return stanza->children; return stanza->children;
} }
@@ -960,7 +953,7 @@ xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *const stanza) xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *stanza)
{ {
return stanza->next; return stanza->next;
} }
@@ -976,7 +969,7 @@ xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza) char *xmpp_stanza_get_text(xmpp_stanza_t *stanza)
{ {
size_t len, clen; size_t len, clen;
xmpp_stanza_t *child; xmpp_stanza_t *child;
@@ -1027,7 +1020,7 @@ char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza) const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *stanza)
{ {
if (stanza->type == XMPP_STANZA_TEXT) if (stanza->type == XMPP_STANZA_TEXT)
return stanza->data; return stanza->data;
@@ -1046,7 +1039,7 @@ const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id) int xmpp_stanza_set_id(xmpp_stanza_t *stanza, const char *id)
{ {
return xmpp_stanza_set_attribute(stanza, "id", id); return xmpp_stanza_set_attribute(stanza, "id", id);
} }
@@ -1062,7 +1055,7 @@ int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type) int xmpp_stanza_set_type(xmpp_stanza_t *stanza, const char *type)
{ {
return xmpp_stanza_set_attribute(stanza, "type", type); return xmpp_stanza_set_attribute(stanza, "type", type);
} }
@@ -1079,7 +1072,7 @@ int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to) int xmpp_stanza_set_to(xmpp_stanza_t *stanza, const char *to)
{ {
return xmpp_stanza_set_attribute(stanza, "to", to); return xmpp_stanza_set_attribute(stanza, "to", to);
} }
@@ -1096,7 +1089,7 @@ int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from) int xmpp_stanza_set_from(xmpp_stanza_t *stanza, const char *from)
{ {
return xmpp_stanza_set_attribute(stanza, "from", from); return xmpp_stanza_set_attribute(stanza, "from", from);
} }
@@ -1112,8 +1105,7 @@ int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
const char *xmpp_stanza_get_attribute(xmpp_stanza_t *const stanza, const char *xmpp_stanza_get_attribute(xmpp_stanza_t *stanza, const char *name)
const char *const name)
{ {
if (stanza->type != XMPP_STANZA_TAG) if (stanza->type != XMPP_STANZA_TAG)
return NULL; return NULL;
@@ -1133,8 +1125,7 @@ const char *xmpp_stanza_get_attribute(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza, int xmpp_stanza_del_attribute(xmpp_stanza_t *stanza, const char *name)
const char *const name)
{ {
if (stanza->type != XMPP_STANZA_TAG) if (stanza->type != XMPP_STANZA_TAG)
return -1; return -1;
@@ -1157,7 +1148,7 @@ int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza,
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza) xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *stanza)
{ {
xmpp_stanza_t *copy = NULL; xmpp_stanza_t *copy = NULL;
const char *from; const char *from;
@@ -1212,10 +1203,10 @@ copy_error:
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *stanza,
const char *const error_type, const char *error_type,
const char *const condition, const char *condition,
const char *const text) const char *text)
{ {
xmpp_ctx_t *ctx = stanza->ctx; xmpp_ctx_t *ctx = stanza->ctx;
xmpp_stanza_t *reply = NULL; xmpp_stanza_t *reply = NULL;
@@ -1277,10 +1268,10 @@ quit_err:
} }
static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx, static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
const char *const name, const char *name,
const char *const type, const char *type,
const char *const id, const char *id,
const char *const to) const char *to)
{ {
xmpp_stanza_t *stanza = xmpp_stanza_new(ctx); xmpp_stanza_t *stanza = xmpp_stanza_new(ctx);
int ret; int ret;
@@ -1314,9 +1305,9 @@ static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx, xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx,
const char *const type, const char *type,
const char *const to, const char *to,
const char *const id) const char *id)
{ {
return _stanza_new_with_attrs(ctx, "message", type, id, to); return _stanza_new_with_attrs(ctx, "message", type, id, to);
} }
@@ -1355,7 +1346,7 @@ char *xmpp_message_get_body(xmpp_stanza_t *msg)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text) int xmpp_message_set_body(xmpp_stanza_t *msg, const char *text)
{ {
xmpp_ctx_t *ctx = msg->ctx; xmpp_ctx_t *ctx = msg->ctx;
xmpp_stanza_t *body; xmpp_stanza_t *body;
@@ -1401,8 +1392,7 @@ int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t * xmpp_stanza_t *xmpp_iq_new(xmpp_ctx_t *ctx, const char *type, const char *id)
xmpp_iq_new(xmpp_ctx_t *ctx, const char *const type, const char *const id)
{ {
return _stanza_new_with_attrs(ctx, "iq", type, id, NULL); return _stanza_new_with_attrs(ctx, "iq", type, id, NULL);
} }
@@ -1433,9 +1423,8 @@ xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx)
* *
* @ingroup Stanza * @ingroup Stanza
*/ */
xmpp_stanza_t *xmpp_error_new(xmpp_ctx_t *ctx, xmpp_stanza_t *
xmpp_error_type_t const type, xmpp_error_new(xmpp_ctx_t *ctx, xmpp_error_type_t type, const char *text)
const char *const text)
{ {
xmpp_stanza_t *error = xmpp_stanza_t *error =
_stanza_new_with_attrs(ctx, "stream:error", NULL, NULL, NULL); _stanza_new_with_attrs(ctx, "stream:error", NULL, NULL, NULL);

4
src/tls.h
View File

@@ -35,8 +35,8 @@ int tls_stop(tls_t *tls);
int tls_error(tls_t *tls); int tls_error(tls_t *tls);
int tls_pending(tls_t *tls); int tls_pending(tls_t *tls);
int tls_read(tls_t *tls, void *const buff, const size_t len); int tls_read(tls_t *tls, void *buff, size_t len);
int tls_write(tls_t *tls, const void *const buff, const size_t len); int tls_write(tls_t *tls, const void *buff, size_t len);
int tls_clear_pending_write(tls_t *tls); int tls_clear_pending_write(tls_t *tls);
int tls_is_recoverable(int error); int tls_is_recoverable(int error);

4
src/tls_dummy.c
View File

@@ -78,7 +78,7 @@ int tls_pending(tls_t *tls)
return 0; return 0;
} }
int tls_read(tls_t *tls, void *const buff, const size_t len) int tls_read(tls_t *tls, void *buff, size_t len)
{ {
UNUSED(tls); UNUSED(tls);
UNUSED(buff); UNUSED(buff);
@@ -86,7 +86,7 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
return -1; return -1;
} }
int tls_write(tls_t *tls, const void *const buff, const size_t len) int tls_write(tls_t *tls, const void *buff, size_t len)
{ {
UNUSED(tls); UNUSED(tls);
UNUSED(buff); UNUSED(buff);

4
src/tls_gnutls.c
View File

@@ -120,7 +120,7 @@ int tls_pending(tls_t *tls)
return gnutls_record_check_pending(tls->session); return gnutls_record_check_pending(tls->session);
} }
int tls_read(tls_t *tls, void *const buff, const size_t len) int tls_read(tls_t *tls, void *buff, size_t len)
{ {
int ret; int ret;
@@ -130,7 +130,7 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
return ret; return ret;
} }
int tls_write(tls_t *tls, const void *const buff, const size_t len) int tls_write(tls_t *tls, const void *buff, size_t len)
{ {
int ret; int ret;

4
src/tls_openssl.c
View File

@@ -405,7 +405,7 @@ int tls_pending(tls_t *tls)
return SSL_pending(tls->ssl); return SSL_pending(tls->ssl);
} }
int tls_read(tls_t *tls, void *const buff, const size_t len) int tls_read(tls_t *tls, void *buff, size_t len)
{ {
int ret; int ret;
@@ -415,7 +415,7 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
return ret; return ret;
} }
int tls_write(tls_t *tls, const void *const buff, const size_t len) int tls_write(tls_t *tls, const void *buff, size_t len)
{ {
int ret; int ret;

4
src/tls_schannel.c
View File

@@ -412,7 +412,7 @@ int tls_pending(tls_t *tls)
return 0; return 0;
} }
int tls_read(tls_t *tls, void *const buff, const size_t len) int tls_read(tls_t *tls, void *buff, size_t len)
{ {
int bytes; int bytes;
@@ -557,7 +557,7 @@ int tls_clear_pending_write(tls_t *tls)
return 1; return 1;
} }
int tls_write(tls_t *tls, const void *const buff, const size_t len) int tls_write(tls_t *tls, const void *buff, size_t len)
{ {
SecBufferDesc sbdenc; SecBufferDesc sbdenc;
SecBuffer sbenc[4]; SecBuffer sbenc[4];

4
src/util.c
View File

@@ -38,7 +38,7 @@
* *
* @return a new allocates string with the same data as s or NULL on error * @return a new allocates string with the same data as s or NULL on error
*/ */
char *xmpp_strdup(const xmpp_ctx_t *const ctx, const char *const s) char *xmpp_strdup(const xmpp_ctx_t *ctx, const char *s)
{ {
size_t len; size_t len;
char *copy; char *copy;
@@ -135,7 +135,7 @@ uint64_t time_elapsed(uint64_t t1, uint64_t t2)
* *
* @param conn a Strophe connection object * @param conn a Strophe connection object
*/ */
void disconnect_mem_error(xmpp_conn_t *const conn) void disconnect_mem_error(xmpp_conn_t *conn)
{ {
xmpp_error(conn->ctx, "xmpp", "Memory allocation error"); xmpp_error(conn->ctx, "xmpp", "Memory allocation error");
xmpp_disconnect(conn); xmpp_disconnect(conn);

270
strophe.h
View File

@@ -122,18 +122,17 @@ typedef struct _xmpp_log_t xmpp_log_t;
/* opaque run time context containing the above hooks */ /* opaque run time context containing the above hooks */
typedef struct _xmpp_ctx_t xmpp_ctx_t; typedef struct _xmpp_ctx_t xmpp_ctx_t;
xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem, xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *mem, const xmpp_log_t *log);
const xmpp_log_t *const log); void xmpp_ctx_free(xmpp_ctx_t *ctx);
void xmpp_ctx_free(xmpp_ctx_t *const ctx);
/* free some blocks returned by other APIs, for example the /* free some blocks returned by other APIs, for example the
buffer you get from xmpp_stanza_to_text */ buffer you get from xmpp_stanza_to_text */
void xmpp_free(const xmpp_ctx_t *const ctx, void *p); void xmpp_free(const xmpp_ctx_t *ctx, void *p);
struct _xmpp_mem_t { struct _xmpp_mem_t {
void *(*alloc)(const size_t size, void *const userdata); void *(*alloc)(size_t size, void *userdata);
void (*free)(void *p, void *const userdata); void (*free)(void *p, void *userdata);
void *(*realloc)(void *p, const size_t size, void *const userdata); void *(*realloc)(void *p, size_t size, void *userdata);
void *userdata; void *userdata;
}; };
@@ -146,10 +145,10 @@ typedef enum {
typedef enum { XMPP_UNKNOWN, XMPP_CLIENT, XMPP_COMPONENT } xmpp_conn_type_t; typedef enum { XMPP_UNKNOWN, XMPP_CLIENT, XMPP_COMPONENT } xmpp_conn_type_t;
typedef void (*xmpp_log_handler)(void *const userdata, typedef void (*xmpp_log_handler)(void *userdata,
const xmpp_log_level_t level, xmpp_log_level_t level,
const char *const area, const char *area,
const char *const msg); const char *msg);
struct _xmpp_log_t { struct _xmpp_log_t {
xmpp_log_handler handler; xmpp_log_handler handler;
@@ -219,112 +218,103 @@ typedef struct {
xmpp_stanza_t *stanza; xmpp_stanza_t *stanza;
} xmpp_stream_error_t; } xmpp_stream_error_t;
typedef void (*xmpp_conn_handler)(xmpp_conn_t *const conn, typedef void (*xmpp_conn_handler)(xmpp_conn_t *conn,
const xmpp_conn_event_t event, xmpp_conn_event_t event,
const int error, int error,
xmpp_stream_error_t *const stream_error, xmpp_stream_error_t *stream_error,
void *const userdata); void *userdata);
void xmpp_send_error(xmpp_conn_t *const conn, void xmpp_send_error(xmpp_conn_t *conn, xmpp_error_type_t type, char *text);
xmpp_error_type_t const type, xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *ctx);
char *const text); xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *conn);
xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx); int xmpp_conn_release(xmpp_conn_t *conn);
xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *const conn);
int xmpp_conn_release(xmpp_conn_t *const conn);
long xmpp_conn_get_flags(const xmpp_conn_t *const conn); long xmpp_conn_get_flags(const xmpp_conn_t *conn);
int xmpp_conn_set_flags(xmpp_conn_t *const conn, long flags); int xmpp_conn_set_flags(xmpp_conn_t *conn, long flags);
const char *xmpp_conn_get_jid(const xmpp_conn_t *const conn); const char *xmpp_conn_get_jid(const xmpp_conn_t *conn);
const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *const conn); const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *conn);
void xmpp_conn_set_jid(xmpp_conn_t *const conn, const char *const jid); void xmpp_conn_set_jid(xmpp_conn_t *conn, const char *jid);
const char *xmpp_conn_get_pass(const xmpp_conn_t *const conn); const char *xmpp_conn_get_pass(const xmpp_conn_t *conn);
void xmpp_conn_set_pass(xmpp_conn_t *const conn, const char *const pass); void xmpp_conn_set_pass(xmpp_conn_t *conn, const char *pass);
xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *const conn); xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *conn);
void xmpp_conn_disable_tls(xmpp_conn_t *const conn); void xmpp_conn_disable_tls(xmpp_conn_t *conn);
int xmpp_conn_is_secured(xmpp_conn_t *const conn); int xmpp_conn_is_secured(xmpp_conn_t *conn);
void xmpp_conn_set_keepalive(xmpp_conn_t *const conn, void xmpp_conn_set_keepalive(xmpp_conn_t *conn, int timeout, int interval);
int timeout, int xmpp_conn_is_connecting(xmpp_conn_t *conn);
int interval); int xmpp_conn_is_connected(xmpp_conn_t *conn);
int xmpp_conn_is_connecting(xmpp_conn_t *const conn); int xmpp_conn_is_disconnected(xmpp_conn_t *conn);
int xmpp_conn_is_connected(xmpp_conn_t *const conn);
int xmpp_conn_is_disconnected(xmpp_conn_t *const conn);
int xmpp_connect_client(xmpp_conn_t *const conn, int xmpp_connect_client(xmpp_conn_t *conn,
const char *const altdomain, const char *altdomain,
unsigned short altport, unsigned short altport,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata); void *userdata);
int xmpp_connect_component(xmpp_conn_t *const conn, int xmpp_connect_component(xmpp_conn_t *conn,
const char *const server, const char *server,
unsigned short port, unsigned short port,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata); void *userdata);
int xmpp_connect_raw(xmpp_conn_t *const conn, int xmpp_connect_raw(xmpp_conn_t *conn,
const char *const altdomain, const char *altdomain,
unsigned short altport, unsigned short altport,
xmpp_conn_handler callback, xmpp_conn_handler callback,
void *const userdata); void *userdata);
int xmpp_conn_open_stream_default(xmpp_conn_t *const conn); int xmpp_conn_open_stream_default(xmpp_conn_t *conn);
int xmpp_conn_open_stream(xmpp_conn_t *const conn, int xmpp_conn_open_stream(xmpp_conn_t *conn,
char **attributes, char **attributes,
size_t attributes_len); size_t attributes_len);
int xmpp_conn_tls_start(xmpp_conn_t *const conn); int xmpp_conn_tls_start(xmpp_conn_t *conn);
void xmpp_disconnect(xmpp_conn_t *const conn); void xmpp_disconnect(xmpp_conn_t *conn);
void xmpp_send(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza); void xmpp_send(xmpp_conn_t *conn, xmpp_stanza_t *stanza);
void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...); void xmpp_send_raw_string(xmpp_conn_t *conn, const char *fmt, ...);
void xmpp_send_raw(xmpp_conn_t *const conn, void xmpp_send_raw(xmpp_conn_t *conn, const char *data, size_t len);
const char *const data,
const size_t len);
/* handlers */ /* handlers */
/* if the handler returns false it is removed */ /* if the handler returns false it is removed */
typedef int (*xmpp_timed_handler)(xmpp_conn_t *const conn, typedef int (*xmpp_timed_handler)(xmpp_conn_t *conn, void *userdata);
void *const userdata);
void xmpp_timed_handler_add(xmpp_conn_t *const conn, void xmpp_timed_handler_add(xmpp_conn_t *conn,
xmpp_timed_handler handler, xmpp_timed_handler handler,
const unsigned long period, unsigned long period,
void *const userdata); void *userdata);
void xmpp_timed_handler_delete(xmpp_conn_t *const conn, void xmpp_timed_handler_delete(xmpp_conn_t *conn, xmpp_timed_handler handler);
xmpp_timed_handler handler);
/* if the handler returns false it is removed */ /* if the handler returns false it is removed */
typedef int (*xmpp_global_timed_handler)(xmpp_ctx_t *const ctx, typedef int (*xmpp_global_timed_handler)(xmpp_ctx_t *ctx, void *userdata);
void *const userdata);
void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx, void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,
xmpp_global_timed_handler handler, xmpp_global_timed_handler handler,
const unsigned long period, unsigned long period,
void *const userdata); void *userdata);
void xmpp_global_timed_handler_delete(xmpp_ctx_t *const ctx, void xmpp_global_timed_handler_delete(xmpp_ctx_t *ctx,
xmpp_global_timed_handler handler); xmpp_global_timed_handler handler);
/* if the handler returns false it is removed */ /* if the handler returns false it is removed */
typedef int (*xmpp_handler)(xmpp_conn_t *const conn, typedef int (*xmpp_handler)(xmpp_conn_t *conn,
xmpp_stanza_t *const stanza, xmpp_stanza_t *stanza,
void *const userdata); void *userdata);
void xmpp_handler_add(xmpp_conn_t *const conn, void xmpp_handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const ns, const char *ns,
const char *const name, const char *name,
const char *const type, const char *type,
void *const userdata); void *userdata);
void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler); void xmpp_handler_delete(xmpp_conn_t *conn, xmpp_handler handler);
void xmpp_id_handler_add(xmpp_conn_t *const conn, void xmpp_id_handler_add(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id, const char *id,
void *const userdata); void *userdata);
void xmpp_id_handler_delete(xmpp_conn_t *const conn, void xmpp_id_handler_delete(xmpp_conn_t *conn,
xmpp_handler handler, xmpp_handler handler,
const char *const id); const char *id);
/* /*
void xmpp_register_stanza_handler(conn, stanza, xmlns, type, handler) void xmpp_register_stanza_handler(conn, stanza, xmlns, type, handler)
@@ -337,94 +327,88 @@ xmpp_stanza_t *xmpp_stanza_new(xmpp_ctx_t *ctx);
xmpp_stanza_t *xmpp_stanza_new_from_string(xmpp_ctx_t *ctx, const char *str); xmpp_stanza_t *xmpp_stanza_new_from_string(xmpp_ctx_t *ctx, const char *str);
/* clone a stanza */ /* clone a stanza */
xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *const stanza); xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *stanza);
/* copies a stanza and all children */ /* copies a stanza and all children */
xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza); xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *stanza);
/* free a stanza object and it's contents */ /* free a stanza object and it's contents */
int xmpp_stanza_release(xmpp_stanza_t *const stanza); int xmpp_stanza_release(xmpp_stanza_t *stanza);
xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza); xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *stanza);
int xmpp_stanza_is_text(xmpp_stanza_t *const stanza); int xmpp_stanza_is_text(xmpp_stanza_t *stanza);
int xmpp_stanza_is_tag(xmpp_stanza_t *const stanza); int xmpp_stanza_is_tag(xmpp_stanza_t *stanza);
/* marshall a stanza into text for transmission or display */ /* marshall a stanza into text for transmission or display */
int xmpp_stanza_to_text(xmpp_stanza_t *stanza, int xmpp_stanza_to_text(xmpp_stanza_t *stanza, char **buf, size_t *buflen);
char **const buf,
size_t *const buflen);
xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *const stanza); xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *stanza);
xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *stanza,
const char *const name); const char *name);
xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *stanza,
const char *const ns); const char *ns);
xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *stanza,
const char *const name, const char *name,
const char *const ns); const char *ns);
xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *const stanza); xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *stanza);
int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child); int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child);
int xmpp_stanza_add_child_ex(xmpp_stanza_t *stanza, int xmpp_stanza_add_child_ex(xmpp_stanza_t *stanza,
xmpp_stanza_t *child, xmpp_stanza_t *child,
int do_clone); int do_clone);
const char *xmpp_stanza_get_attribute(xmpp_stanza_t *const stanza, const char *xmpp_stanza_get_attribute(xmpp_stanza_t *stanza, const char *name);
const char *const name); int xmpp_stanza_get_attribute_count(xmpp_stanza_t *stanza);
int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza); int xmpp_stanza_get_attributes(xmpp_stanza_t *stanza,
int xmpp_stanza_get_attributes(xmpp_stanza_t *const stanza,
const char **attr, const char **attr,
int attrlen); int attrlen);
/* concatenate all child text nodes. this function /* concatenate all child text nodes. this function
* returns a string that must be freed by the caller */ * returns a string that must be freed by the caller */
char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza); char *xmpp_stanza_get_text(xmpp_stanza_t *stanza);
const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *stanza);
const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_name(xmpp_stanza_t *stanza);
/* set_attribute adds/replaces attributes */ /* set_attribute adds/replaces attributes */
int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza, int xmpp_stanza_set_attribute(xmpp_stanza_t *stanza,
const char *const key, const char *key,
const char *const value); const char *value);
int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name); int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *name);
int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text); int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *text);
int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza, int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
const char *const text, const char *text,
const size_t size); size_t size);
int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza, int xmpp_stanza_del_attribute(xmpp_stanza_t *stanza, const char *name);
const char *const name);
/* common stanza helpers */ /* common stanza helpers */
const char *xmpp_stanza_get_ns(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_ns(xmpp_stanza_t *stanza);
const char *xmpp_stanza_get_type(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_type(xmpp_stanza_t *stanza);
const char *xmpp_stanza_get_id(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_id(xmpp_stanza_t *stanza);
const char *xmpp_stanza_get_to(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_to(xmpp_stanza_t *stanza);
const char *xmpp_stanza_get_from(xmpp_stanza_t *const stanza); const char *xmpp_stanza_get_from(xmpp_stanza_t *stanza);
int xmpp_stanza_set_ns(xmpp_stanza_t *const stanza, const char *const ns); int xmpp_stanza_set_ns(xmpp_stanza_t *stanza, const char *ns);
int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id); int xmpp_stanza_set_id(xmpp_stanza_t *stanza, const char *id);
int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type); int xmpp_stanza_set_type(xmpp_stanza_t *stanza, const char *type);
int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to); int xmpp_stanza_set_to(xmpp_stanza_t *stanza, const char *to);
int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from); int xmpp_stanza_set_from(xmpp_stanza_t *stanza, const char *from);
/* allocate and initialize a stanza in reply to another */ /* allocate and initialize a stanza in reply to another */
xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza); xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *stanza);
xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza, xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *stanza,
const char *const error_type, const char *error_type,
const char *const condition, const char *condition,
const char *const text); const char *text);
/* stanza subclasses */ /* stanza subclasses */
xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx, xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx,
const char *const type, const char *type,
const char *const to, const char *to,
const char *const id); const char *id);
char *xmpp_message_get_body(xmpp_stanza_t *msg); char *xmpp_message_get_body(xmpp_stanza_t *msg);
int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text); int xmpp_message_set_body(xmpp_stanza_t *msg, const char *text);
xmpp_stanza_t * xmpp_stanza_t *xmpp_iq_new(xmpp_ctx_t *ctx, const char *type, const char *id);
xmpp_iq_new(xmpp_ctx_t *ctx, const char *const type, const char *const id);
xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx); xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx);
xmpp_stanza_t *xmpp_error_new(xmpp_ctx_t *ctx, xmpp_stanza_t *
xmpp_error_type_t const type, xmpp_error_new(xmpp_ctx_t *ctx, xmpp_error_type_t type, const char *text);
const char *const text);
/* jid */ /* jid */
@@ -440,10 +424,10 @@ char *xmpp_jid_resource(xmpp_ctx_t *ctx, const char *jid);
/* event loop */ /* event loop */
void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout); void xmpp_run_once(xmpp_ctx_t *ctx, unsigned long timeout);
void xmpp_run(xmpp_ctx_t *ctx); void xmpp_run(xmpp_ctx_t *ctx);
void xmpp_stop(xmpp_ctx_t *ctx); void xmpp_stop(xmpp_ctx_t *ctx);
void xmpp_ctx_set_timeout(xmpp_ctx_t *const ctx, const unsigned long timeout); void xmpp_ctx_set_timeout(xmpp_ctx_t *ctx, unsigned long timeout);
/* UUID */ /* UUID */

6
tests/test.c
View File

@@ -16,9 +16,9 @@
static uint8_t char_to_bin(char c) static uint8_t char_to_bin(char c)
{ {
return c <= '9' return c <= '9' ? (uint8_t)(c - '0')
? (uint8_t)(c - '0') : c <= 'Z' ? (uint8_t)(c - 'A' + 10)
: c <= 'Z' ? (uint8_t)(c - 'A' + 10) : (uint8_t)(c - 'a' + 10); : (uint8_t)(c - 'a' + 10);
} }
void test_hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len) void test_hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len)

14
tests/test_ctx.c
View File

@@ -22,7 +22,7 @@ static int mem_alloc_called = 0;
static int mem_free_called = 0; static int mem_free_called = 0;
static int mem_realloc_called = 0; static int mem_realloc_called = 0;
void *my_alloc(const size_t size, void *const userdata) void *my_alloc(size_t size, void *userdata)
{ {
(void)userdata; (void)userdata;
@@ -30,7 +30,7 @@ void *my_alloc(const size_t size, void *const userdata)
return malloc(size); return malloc(size);
} }
void my_free(void *p, void *const userdata) void my_free(void *p, void *userdata)
{ {
(void)userdata; (void)userdata;
@@ -38,7 +38,7 @@ void my_free(void *p, void *const userdata)
return free(p); return free(p);
} }
void *my_realloc(void *p, const size_t size, void *const userdata) void *my_realloc(void *p, size_t size, void *userdata)
{ {
(void)userdata; (void)userdata;
@@ -46,10 +46,10 @@ void *my_realloc(void *p, const size_t size, void *const userdata)
return realloc(p, size); return realloc(p, size);
} }
void my_logger(void *const userdata, void my_logger(void *userdata,
const xmpp_log_level_t level, xmpp_log_level_t level,
const char *const area, const char *area,
const char *const msg) const char *msg)
{ {
if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG && if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG &&
strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0) strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0)

4
tests/test_rand.c
View File

@@ -21,14 +21,14 @@
#include "rand.c" #include "rand.c"
/* stubs to build test without whole libstrophe */ /* stubs to build test without whole libstrophe */
void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size) void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size)
{ {
(void)ctx; (void)ctx;
(void)size; (void)size;
return NULL; return NULL;
} }
void xmpp_free(const xmpp_ctx_t *const ctx, void *p) void xmpp_free(const xmpp_ctx_t *ctx, void *p)
{ {
(void)ctx; (void)ctx;
(void)p; (void)p;