ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-09 21:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to dingaling (rm ./libs/libdingaling/.complete

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1312 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2006-05-01 18:55:04 +00:00
parent 913104b50c
commit 607109bfaa
3 changed files with 118 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libdingaling/src/libdingaling.c
+31 -10
View File
@@ -386,7 +386,7 @@ static ldl_status parse_session_code(ldl_handle_t *handle, char *id, char *from,
}
if (handle->session_callback && signal) {
handle->session_callback(handle, session, signal, msg);
handle->session_callback(handle, session, signal, from, id, msg);
}
return LDL_STATUS_SUCCESS;
@@ -549,8 +549,14 @@ static int on_stream(ldl_handle_t *handle, int type, iks * node)
}
} else if (strcmp("failure", iks_name(node)) == 0) {
globals.logger(DL_LOG_DEBUG, "sasl authentication failed\n");
if (handle->session_callback) {
handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_FAILURE, "core", "Login Failure", handle->login);
}
} else if (strcmp("success", iks_name(node)) == 0) {
globals.logger(DL_LOG_DEBUG, "XMPP server connected\n");
if (handle->session_callback) {
handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_SUCCESS, "core", "Login Success", handle->login);
}
iks_send_header(handle->parser, handle->acc->server);
ldl_set_flag(handle, LDL_FLAG_AUTHORIZED);
} else {
@@ -583,19 +589,18 @@ static int on_msg(void *user_data, ikspak *pak)
{
char *cmd = iks_find_cdata(pak->x, "body");
char *from = iks_find_attrib(pak->x, "from");
char *subject = iks_find_attrib(pak->x, "subject");
ldl_handle_t *handle = user_data;
ldl_session_t *session = NULL;
if (from && (session = apr_hash_get(handle->sessions, from, APR_HASH_KEY_STRING))) {
if (handle->session_callback) {
handle->session_callback(handle, session, LDL_SIGNAL_MSG, cmd);
}
if (from) {
session = apr_hash_get(handle->sessions, from, APR_HASH_KEY_STRING);
}
if (handle->session_callback) {
handle->session_callback(handle, session, LDL_SIGNAL_MSG, from, subject ? subject : "N/A", cmd);
}
//printf("%s %s\n", handle->login, cmd);
return 0;
}
@@ -870,12 +875,28 @@ void *ldl_session_get_private(ldl_session_t *session)
return session->private_data;
}
void *ldl_handle_get_private(ldl_handle_t *handle)
{
return handle->private_info;
}
void ldl_handle_send_msg(ldl_handle_t *handle, char *to, char *subject, char *body)
{
iks *msg;
assert(handle != NULL);
assert(body != NULL);
msg = iks_make_msg(IKS_TYPE_NONE, to, body);
if (subject) {
iks_insert_attrib(msg, "subject", subject);
}
apr_queue_push(handle->queue, msg);
}
void ldl_global_set_logger(ldl_logger_t logger)
{
globals.logger = logger;
libs/libdingaling/src/libdingaling.h
+14 -2
View File
@@ -108,7 +108,9 @@ typedef enum {
LDL_SIGNAL_CANDIDATES,
LDL_SIGNAL_MSG,
LDL_SIGNAL_TERMINATE,
LDL_SIGNAL_ERROR
LDL_SIGNAL_ERROR,
LDL_SIGNAL_LOGIN_SUCCESS,
LDL_SIGNAL_LOGIN_FAILURE,
} ldl_signal_t;
typedef enum {
@@ -138,7 +140,7 @@ typedef enum {
#define DL_LOG_EMERG DL_PRE, 0
typedef ldl_status (*ldl_loop_callback_t)(ldl_handle_t *);
typedef ldl_status (*ldl_session_callback_t)(ldl_handle_t *, ldl_session_t *, ldl_signal_t, char *);
typedef ldl_status (*ldl_session_callback_t)(ldl_handle_t *, ldl_session_t *, ldl_signal_t, char *, char *, char *);
typedef ldl_status (*ldl_response_callback_t)(ldl_handle_t *, char *);
typedef void (*ldl_logger_t)(char *file, const char *func, int line, int level, char *fmt, ...);
@@ -272,6 +274,16 @@ unsigned int ldl_session_terminate(ldl_session_t *session);
*/
void *ldl_handle_get_private(ldl_handle_t *handle);
/*!
\brief Send a message
\param handle the conection handle
\param to the message recipiant
\param subject optional subject
\param body body of the message
*/
void ldl_handle_send_msg(ldl_handle_t *handle, char *to, char *subject, char *body);
/*!
\brief Offer candidates to a potential session
\param session the session to send candidates on