--- a/jingle-filetransfer/filetransfer.h Sun Aug 15 16:37:32 2010 +0200
+++ b/jingle-filetransfer/filetransfer.h Sun Aug 15 17:35:41 2010 +0200
@@ -24,13 +24,19 @@
/* the size, in bytes, of the data to be sent */
guint64 size;
+ /* Data already send/receive*/
+ guint64 transmit;
+
/* descriptor to the output file */
GIOChannel *outfile;
+ /* Is it an offer or a request ? */
JingleFTType type;
+ /* A little description of the transfer */
gchar *desc;
+ /* Where we compute the hash */
GChecksum *md5;
} JingleFT;
--- a/jingle-ibb/ibb.c Sun Aug 15 16:37:32 2010 +0200
+++ b/jingle-ibb/ibb.c Sun Aug 15 17:35:41 2010 +0200
@@ -43,7 +43,6 @@
static gconstpointer check(JingleContent *cn, GError **err);
static gboolean cmp(gconstpointer data1, gconstpointer data2);
static void tomessage(gconstpointer data, LmMessageNode *node);
-static const gchar* xmlns(void);
static gconstpointer new(void);
static void send(session_content *sc, gconstpointer data, gchar *buf, gsize size);
static void init(session_content *sc, gconstpointer data);
@@ -60,7 +59,6 @@
const gchar *deps[] = { "jingle", NULL };
static JingleTransportFuncs funcs = {
- .xmlns = xmlns,
.check = check,
.tomessage = tomessage,
.cmp = cmp,
@@ -81,12 +79,6 @@
.next = NULL,
};
-
-static const gchar* xmlns(void)
-{
- return NS_JINGLE_TRANSPORT_IBB;
-}
-
static gconstpointer check(JingleContent *cn, GError **err)
{
JingleIBB *ibb = NULL;
--- a/jingle-socks5/socks5.c Sun Aug 15 16:37:32 2010 +0200
+++ b/jingle-socks5/socks5.c Sun Aug 15 17:35:41 2010 +0200
@@ -39,7 +39,6 @@
gconstpointer jingle_socks5_check(JingleContent *cn, GError **err);
gboolean jingle_socks5_cmp(gconstpointer data1, gconstpointer data2);
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, gconstpointer data, gchar *buf,
gsize size);
@@ -51,7 +50,6 @@
const gchar *deps[] = { "jingle", NULL };
static JingleTransportFuncs funcs = {
- jingle_socks5_xmlns,
jingle_socks5_check,
jingle_socks5_tomessage,
jingle_socks5_cmp,
@@ -96,11 +94,6 @@
return -1;
}
-const gchar* jingle_socks5_xmlns(void)
-{
- return NS_JINGLE_TRANSPORT_SOCKS5;
-}
-
gconstpointer jingle_socks5_check(JingleContent *cn, GError **err)
{
JingleSocks5 *js5b;
--- a/jingle/register.c Sun Aug 15 16:37:32 2010 +0200
+++ b/jingle/register.c Sun Aug 15 17:35:41 2010 +0200
@@ -108,7 +108,8 @@
/**
* Determine which transport is better suited for a given app.
*/
-JingleTransportFuncs *jingle_transport_for_app(const gchar *appxmlns, GSList **forbid)
+const gchar *jingle_transport_for_app(const gchar *appxmlns,
+ GSList **forbid)
{
AppHandlerEntry *app = jingle_find_app(appxmlns);
GSList *entry;
@@ -138,7 +139,7 @@
if (forbid != NULL)
*forbid = g_slist_append(*forbid, besttransport->xmlns);
- return besttransport != NULL?besttransport->funcs:NULL;
+ return besttransport != NULL?besttransport->xmlns:NULL;
}
/**
--- a/jingle/register.h Sun Aug 15 16:37:32 2010 +0200
+++ b/jingle/register.h Sun Aug 15 17:35:41 2010 +0200
@@ -45,7 +45,6 @@
typedef gconstpointer (*JingleTransportCheck) (JingleContent *cn, GError **err);
typedef void (*JingleTransportToMessage) (gconstpointer data, LmMessageNode *node);
typedef gboolean (*JingleTransportCmp) (gconstpointer data1, gconstpointer data2);
-typedef const gchar* (*JingleTransportxmlns) (void);
typedef gconstpointer (*JingleTransportNew) (void);
typedef void (*JingleTransportSend) (session_content *sc, gconstpointer data, gchar *buf, gsize size);
typedef void (*JingleTransportInit) (session_content *sc, gconstpointer data);
@@ -74,8 +73,6 @@
} JingleAppFuncs;
typedef struct {
- JingleTransportxmlns xmlns;
-
JingleTransportCheck check;
JingleTransportToMessage tomessage;
@@ -102,6 +99,6 @@
JingleTransportFuncs *jingle_get_transportfuncs(const gchar *xmlns);
void jingle_unregister_app(const gchar *xmlns);
void jingle_unregister_transport(const gchar *xmlns);
-JingleTransportFuncs *jingle_transport_for_app(const gchar *appxmlns, GSList **forbid);
+const gchar *jingle_transport_for_app(const gchar *appxmlns, GSList **forbid);
#endif
--- a/jingle/sessions.c Sun Aug 15 16:37:32 2010 +0200
+++ b/jingle/sessions.c Sun Aug 15 17:35:41 2010 +0200
@@ -229,14 +229,15 @@
const gchar *xmlns_app, gconstpointer app,
const gchar *to)
{
- JingleTransportFuncs *trans = jingle_transport_for_app(xmlns_app, NULL);
+ const gchar *xmlns = jingle_transport_for_app(xmlns_app, NULL);
+ JingleTransportFuncs *trans = jingle_get_transportfuncs(xmlns);
if (trans == NULL) {
scr_LogPrint(LPRINT_LOGNORM, "Unable to find a transport for %s", xmlns_app);
return;
}
- session_add_trans(sess, name, trans->xmlns(), trans->new());
+ session_add_trans(sess, name, xmlns, trans->new());
jingle_send_session_initiate(sess);
}