# HG changeset patch # User Nicolas Cornu # Date 1281826284 -7200 # Node ID 8969dc3e2f145cae4c8eb0f02b5d1dc09712174c # Parent 3a3c0e16ea001482dfda5784cbcad0903b4f271a JIBB: buffering diff -r 3a3c0e16ea00 -r 8969dc3e2f14 jingle-ibb/ibb.c --- a/jingle-ibb/ibb.c Sat Aug 14 21:02:49 2010 +0200 +++ b/jingle-ibb/ibb.c Sun Aug 15 00:51:24 2010 +0200 @@ -22,6 +22,7 @@ #include "config.h" #include +#include #include #include @@ -33,6 +34,7 @@ #include #include #include +#include #include "ibb.h" @@ -43,7 +45,9 @@ void jingle_ibb_tomessage(gconstpointer data, LmMessageNode *node); const gchar* jingle_ibb_xmlns(void); gconstpointer jingle_ibb_new(void); -void jingle_ibb_send(session_content *sc, const gchar *to, gconstpointer data, gchar *buf, gsize size); +void jingle_ibb_send(session_content *sc, gconstpointer data, gchar *buf, gsize size); +static void _send_internal(session_content *sc, const gchar *to, gchar *buf, + gsize size, const gchar *sid, gint64 *seq); static void jingle_ibb_init(void); static void jingle_ibb_uninit(void); @@ -103,10 +107,11 @@ if (ibb->blocksize < 0 || ibb->blocksize > IBB_BLOCK_SIZE_MAX) { g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_BADVALUE, "block-size is negative"); + g_free(ibb->sid); g_free(ibb); return NULL; } - + return (gconstpointer) ibb; } @@ -192,6 +197,7 @@ { JingleIBB *jibb = (JingleIBB*) data; gchar *bsize = g_strdup_printf("%i", jibb->blocksize); + if (lm_message_node_get_child(node, "transport") != NULL) return; @@ -207,23 +213,39 @@ static void jingle_ibb_handle_ack_iq_send(LmMessage *mess, gpointer data) { // TODO: check the sub type (error ??) - handle_trans_next((session_content*)data); + session_content *sc = (session_content *)data; + JingleSession *sess = session_find_by_sid(sc->sid, sc->from); + SessionContent *sc2 = session_find_sessioncontent(sess, sc->name); + + JingleIBB *jibb = (JingleIBB *)sc2->transport; + + // We look if there is enough data staying + if (jibb->dataleft > jibb->blocksize) { + gchar *buf = g_memdup(jibb->buf, jibb->blocksize); + jibb->dataleft-=jibb->blocksize; + g_memmove(jibb->buf, jibb->buf+jibb->blocksize, jibb->dataleft); + _send_internal(sc, sess->to, buf, jibb->blocksize, sess->sid, &jibb->seq); + g_free(buf); + } else { // ask for more data + handle_trans_next(sc); + } } -void jingle_ibb_send(session_content *sc, const gchar *to, gconstpointer data, gchar *buf, gsize size) +static void _send_internal(session_content *sc, const gchar *to, gchar *buf, + gsize size, const gchar *sid, gint64 *seq) { - JingleIBB *jibb = (JingleIBB*)data; JingleAckHandle *ackhandle; - LmMessageNode *node; + LmMessage *r = lm_message_new_with_sub_type(to, LM_MESSAGE_TYPE_IQ, + LM_MESSAGE_SUB_TYPE_SET); + LmMessageNode *node = lm_message_get_node(r); + gchar *base64 = g_base64_encode((const guchar *)buf, size); - gchar *seq = g_strdup_printf("%" G_GINT64_FORMAT, jibb->seq); - - LmMessage *r = lm_message_new_with_sub_type(to, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET); - LmMessageNode *node2 = lm_message_get_node(r); - node = lm_message_node_add_child(node2, "data", NULL); + gchar *strseq = g_strdup_printf("%" G_GINT64_FORMAT, *seq); + + node = lm_message_node_add_child(node, "data", NULL); lm_message_node_set_attributes(node, "xmlns", NS_TRANSPORT_IBB, - "sid", jibb->sid, - "seq", seq, + "sid", sid, + "seq", strseq, NULL); lm_message_node_set_value(node, base64); @@ -236,9 +258,47 @@ lm_message_unref(r); // The next packet will be seq++ - jibb->seq++; + ++(*seq); g_free(base64); + g_free(strseq); +} + +void jingle_ibb_send(session_content *sc, gconstpointer data, gchar *buf, + gsize size) +{ + JingleIBB *jibb = (JingleIBB*)data; + + if (jibb->size_buf >= size + jibb->dataleft) { + g_memmove(jibb->buf + jibb->dataleft, buf, size); + jibb->dataleft+=size; + } else { + jibb->size_buf = size + jibb->dataleft; + jibb->buf = g_realloc(jibb->buf, jibb->size_buf); + g_memmove(jibb->buf + jibb->dataleft, buf, size); + jibb->dataleft = jibb->size_buf; + } + + // We need more data + if (jibb->dataleft < jibb->blocksize) { + handle_trans_next(sc); + return; + } + + // It's enough + { + JingleSession *sess = session_find_by_sid(sc->sid, sc->from); + + gchar *buffer = g_memdup(jibb->buf, jibb->blocksize); + + jibb->dataleft-=jibb->blocksize; + + g_memmove(jibb->buf, jibb->buf+jibb->blocksize, jibb->dataleft); + + _send_internal(sc, sess->to, buffer, jibb->blocksize, sess->sid, &jibb->seq); + + g_free(buf); + } } static void jingle_ibb_unregister_lm_handlers(void) diff -r 3a3c0e16ea00 -r 8969dc3e2f14 jingle-ibb/ibb.h --- a/jingle-ibb/ibb.h Sat Aug 14 21:02:49 2010 +0200 +++ b/jingle-ibb/ibb.h Sun Aug 15 00:51:24 2010 +0200 @@ -11,8 +11,14 @@ guint blocksize; /* The identifiant of the transfer */ - const gchar *sid; + gchar *sid; + gchar *buf; + + gint size_buf; + + gint dataleft; + gint64 seq; } JingleIBB; diff -r 3a3c0e16ea00 -r 8969dc3e2f14 jingle-socks5/socks5.c --- a/jingle-socks5/socks5.c Sat Aug 14 21:02:49 2010 +0200 +++ b/jingle-socks5/socks5.c Sun Aug 15 00:51:24 2010 +0200 @@ -41,8 +41,8 @@ void jingle_socks5_tomessage(gconstpointer data, LmMessageNode *node); const gchar* jingle_socks5_xmlns(void); gconstpointer jingle_socks5_new(void); -void jingle_socks5_send(session_content *sc, const gchar *to, - gconstpointer data, gchar *buf, gsize size); +void jingle_socks5_send(session_content *sc, gconstpointer data, gchar *buf, + gsize size); static void jingle_socks5_init(void); static void jingle_socks5_uninit(void); diff -r 3a3c0e16ea00 -r 8969dc3e2f14 jingle/register.h --- a/jingle/register.h Sat Aug 14 21:02:49 2010 +0200 +++ b/jingle/register.h Sun Aug 15 00:51:24 2010 +0200 @@ -47,7 +47,7 @@ typedef gboolean (*JingleTransportCmp) (gconstpointer data1, gconstpointer data2); typedef const gchar* (*JingleTransportxmlns) (void); typedef gconstpointer (*JingleTransportNew) (void); -typedef void (*JingleTransportSend) (session_content *sc, const gchar *to, gconstpointer data, gchar *buf, gsize size); +typedef void (*JingleTransportSend) (session_content *sc, gconstpointer data, gchar *buf, gsize size); typedef struct { /* check if the description of a JingleContent is correct */ diff -r 3a3c0e16ea00 -r 8969dc3e2f14 jingle/sessions.c --- a/jingle/sessions.c Sat Aug 14 21:02:49 2010 +0200 +++ b/jingle/sessions.c Sun Aug 15 00:51:24 2010 +0200 @@ -301,5 +301,5 @@ sc2->sid = sess->sid; sc2->from = (sess->origin == JINGLE_SESSION_INCOMING) ? sess->from : sess->to; sc2->name = sc->name; - sc->transfuncs->send(sc2, sess->to, sc->transport, data, size); + sc->transfuncs->send(sc2, sc->transport, data, size); }