--- a/CMakeLists.txt Fri Aug 20 21:22:13 2010 +0200
+++ b/CMakeLists.txt Sat Aug 21 12:43:26 2010 +0200
@@ -30,7 +30,7 @@
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(LM REQUIRED loudmouth-1.0)
pkg_check_modules(MCABBER REQUIRED mcabber)
-link_directories(${GLIB_LIBRARY_DIRS} ${MCABBER_LIBRARY_DIRS})
+link_directories(${GLIB_LIBRARY_DIRS} ${LM_LIBRARY_DIRS} ${MCABBER_LIBRARY_DIRS})
## Compiler setup
configure_file(config.h.in config.h)
@@ -40,7 +40,7 @@
add_subdirectory(jingle)
add_subdirectory(jingle-ft)
add_subdirectory(jingle-ibb)
-add_subdirectory(jingle-socks5)
+add_subdirectory(jingle-s5b)
## Packaging information
set(CPACK_PACKAGE_NAME mcabber-jingle)
--- a/jingle-ft/CMakeLists.txt Fri Aug 20 21:22:13 2010 +0200
+++ b/jingle-ft/CMakeLists.txt Sat Aug 21 12:43:26 2010 +0200
@@ -1,4 +1,5 @@
add_library(jingle-ft MODULE filetransfer.c)
set_target_properties(jingle-ft PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
include_directories(${CMAKE_SOURCE_DIR})
+target_link_libraries(jingle-ft ${GLIB_LIBRARIES} ${LM_LIBRARIES})
install(TARGETS jingle-ft DESTINATION lib/mcabber)
--- a/jingle-ibb/CMakeLists.txt Fri Aug 20 21:22:13 2010 +0200
+++ b/jingle-ibb/CMakeLists.txt Sat Aug 21 12:43:26 2010 +0200
@@ -1,4 +1,5 @@
add_library(jingle-ibb MODULE ibb.c ibb.h)
set_target_properties(jingle-ibb PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
include_directories(${CMAKE_SOURCE_DIR})
+target_link_libraries(jingle-ibb ${GLIB_LIBRARIES} ${LM_LIBRARIES})
install(TARGETS jingle-ibb DESTINATION lib/mcabber)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jingle-s5b/CMakeLists.txt Sat Aug 21 12:43:26 2010 +0200
@@ -0,0 +1,11 @@
+add_library(jingle-s5b MODULE socks5.c socks5.h)
+set_target_properties(jingle-s5b PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
+pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
+pkg_check_modules(GIO REQUIRED gio-2.0)
+link_directories(${GOBJECT_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS})
+include_directories(SYSTEM ${GOBJECT_SOURCE_DIR} ${GIO_SOURCE_DIR})
+target_link_libraries(jingle-s5b -lgio-2.0)#${GLIB_LIBRARIES} ${LM_LIBRARIES}
+ #${GIO_LIBRARIES} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES})
+include_directories(${CMAKE_SOURCE_DIR})
+install(TARGETS jingle-s5b DESTINATION lib/mcabber)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jingle-s5b/socks5.c Sat Aug 21 12:43:26 2010 +0200
@@ -0,0 +1,321 @@
+/*
+ * socks5.c
+ *
+ * Copyrigth (C) 2010 Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <sys/types.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <netinet/in.h>
+
+#include <mcabber/xmpp.h>
+#include <mcabber/modules.h>
+#include <mcabber/utils.h>
+#include <mcabber/xmpp_helper.h>
+#include <mcabber/logprint.h>
+#include <mcabber/hooks.h>
+
+#include <jingle/jingle.h>
+#include <jingle/check.h>
+#include <jingle/register.h>
+
+#include "socks5.h"
+
+static gconstpointer check(JingleContent *cn, GError **err);
+static void tomessage(gconstpointer data, LmMessageNode *node);
+// static void _send(session_content *sc, gconstpointer data, gchar *buf, gsize size);
+static void init(session_content *sc, gconstpointer data);
+static void end(session_content *sc, gconstpointer data);
+
+static void handle_sock_io(GSocket *sock, GIOCondition cond, gpointer data);
+static GSList *get_all_local_ips();
+static void jingle_socks5_init(void);
+static void jingle_socks5_uninit(void);
+
+
+const gchar *deps[] = { "jingle", NULL };
+
+static JingleTransportFuncs funcs = {
+ .check = check,
+ .tomessage = tomessage,
+ .new = NULL,
+ .send = NULL,
+ .init = init,
+ .end = end
+};
+
+module_info_t info_jingle_s5b = {
+ .branch = MCABBER_BRANCH,
+ .api = MCABBER_API_VERSION,
+ .version = PROJECT_VERSION,
+ .description = "Jingle SOCKS5 Bytestream (XEP-0260)\n",
+ .requires = deps,
+ .init = jingle_socks5_init,
+ .uninit = jingle_socks5_uninit,
+ .next = NULL,
+};
+
+static const gchar *jingle_s5b_types[] = {
+ "assisted",
+ "direct",
+ "proxy",
+ "tunnel",
+ NULL
+};
+
+static const gchar *jingle_s5b_modes[] = {
+ "tcp",
+ "udp",
+ NULL
+};
+
+/**
+ * @brief Linked list of candidates to send on session-initiate
+ */
+GSList *local_candidates = NULL;
+
+
+static gint index_in_array(const gchar *str, const gchar **array)
+{
+ gint i;
+ for (i = 0; array[i]; i++) {
+ if (!g_strcmp0(array[i], str)) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+static gint prioritycmp(gconstpointer a, gconstpointer b)
+{
+ S5BCandidate *s1 = (S5BCandidate *)a, *s2 = (S5BCandidate *)b;
+ if (s1->priority < s2->priority) {
+ return 1;
+ } else if (s1->priority > s2->priority) {
+ return -1;
+ } else {
+ return 0;
+ }
+}
+
+static gconstpointer check(JingleContent *cn, GError **err)
+{
+ JingleS5B *js5b;
+ LmMessageNode *node = cn->transport, *node2;
+ const gchar *modestr;
+
+ js5b = g_new0(JingleS5B, 1);
+ modestr = lm_message_node_get_attribute(node, "mode");
+ js5b->mode = index_in_array(modestr, jingle_s5b_modes);
+ js5b->sid = g_strdup(lm_message_node_get_attribute(node, "sid"));
+
+ if (!js5b->sid) {
+ g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_MISSING,
+ "an attribute of the transport element is missing");
+ g_free(js5b);
+ return NULL;
+ }
+
+ for (node2 = node->children; node2; node2 = node2->next) {
+ if (!g_strcmp0(node->name, "candidate")) {
+ const gchar *portstr, *prioritystr, *typestr;
+ S5BCandidate *jc = g_new0(S5BCandidate, 1);
+ jc->cid = g_strdup(lm_message_node_get_attribute(node2, "cid"));
+ jc->host = g_strdup(lm_message_node_get_attribute(node2, "host"));
+ jc->jid = g_strdup(lm_message_node_get_attribute(node2, "jid"));
+ portstr = lm_message_node_get_attribute(node2, "port");
+ prioritystr = lm_message_node_get_attribute(node2, "priority");
+ typestr = lm_message_node_get_attribute(node2, "type");
+
+ if (!jc->cid || !jc->host || !jc->jid || !prioritystr) {
+ g_free(jc);
+ continue;
+ }
+ jc->port = g_ascii_strtoull(portstr, NULL, 10);
+ jc->priority = g_ascii_strtoull(prioritystr, NULL, 10);
+ jc->type = index_in_array(typestr, jingle_s5b_types);
+
+ if (jc->type == -1) {
+ g_free(jc);
+ continue;
+ }
+
+ js5b->candidates = g_slist_prepend(js5b->candidates, jc);
+ }
+ js5b->candidates = g_slist_sort(js5b->candidates, prioritycmp);
+ }
+
+ return (gconstpointer) js5b;
+}
+
+static void tomessage(gconstpointer data, LmMessageNode *node)
+{
+ JingleS5B *js5 = (JingleS5B *)data;
+ S5BCandidate *js5c;
+
+ LmMessageNode *node2, *node3;
+ gchar *port;
+ gchar *priority;
+ GSList *el;
+
+ if (lm_message_node_get_child(node, "transport") != NULL)
+ return;
+
+ node2 = lm_message_node_add_child(node, "transport", NULL);
+
+ lm_message_node_set_attributes(node2, "xmlns", NS_JINGLE_TRANSPORT_SOCKS5,
+ "sid", js5->sid,
+ "mode", jingle_s5b_modes[js5->mode],
+ NULL);
+ for (el = js5->candidates; el; el = el->next) {
+ js5c = (S5BCandidate*) el->data;
+ node3 = lm_message_node_add_child(node2, "candidate", NULL);
+
+ port = g_strdup_printf("%" G_GUINT16_FORMAT, js5c->port);
+ priority = g_strdup_printf("%" G_GUINT64_FORMAT, js5c->priority);
+
+ lm_message_node_set_attributes(node3, "cid", js5c->cid,
+ "host", js5c->host,
+ "jid", js5c->jid,
+ "port", port,
+ "priority", priority,
+ "type", jingle_s5b_types[js5c->type],
+ NULL);
+ g_free(port);
+ g_free(priority);
+ }
+}
+
+static void init(session_content *sc, gconstpointer data)
+{
+ JingleS5B *js5 = (JingleS5B *)data;
+ GInetAddress *addr;
+ GSocketAddress *saddr;
+ GSource *socksource;
+ GError *err = NULL;
+ g_assert(js5->sock == NULL);
+
+ addr = g_inet_address_new_from_string(((S5BCandidate *)js5->candidates->data)->host);
+ js5->sock = g_socket_new(g_inet_address_get_family(addr), G_SOCKET_TYPE_STREAM,
+ G_SOCKET_PROTOCOL_TCP, &err);
+ if (js5->sock == NULL) {
+ scr_LogPrint(LPRINT_LOGNORM, "Jingle SOCKS5: Error while creating a new socket: %s",
+ err->message != NULL ? err->message : "(no message)");
+ return; // TODO: we need a way to return errors...
+ }
+ g_socket_set_blocking(js5->sock, FALSE);
+ socksource = g_socket_create_source(js5->sock, ~0, NULL);
+
+ g_source_set_callback(socksource, (GSourceFunc)handle_sock_io, NULL, NULL);
+ g_source_attach(socksource, NULL);
+ g_source_unref(socksource);
+
+ saddr = g_inet_socket_address_new(addr, 31337);
+ if (!g_socket_connect(js5->sock, saddr, NULL, &err)) {
+ scr_LogPrint(LPRINT_LOGNORM, "Jingle SOCKS5: Error while connecting to the host: %s",
+ err->message != NULL ? err->message : "(no message)");
+ return;
+ }
+
+}
+
+/**
+ * Handle any event on a sock
+ */
+static void handle_sock_io(GSocket *sock, GIOCondition cond, gpointer data)
+{
+ switch (cond) {
+ case G_IO_IN:
+ break;
+ case G_IO_OUT:
+ break;
+ case G_IO_ERR:
+ break;
+ case G_IO_HUP:
+ break;
+ default:
+ ;
+ // ?!
+ }
+}
+
+/**
+ * @brief Discover all IPs of this computer
+ * @return A linked list of GInetAddress
+ */
+static GSList *get_all_local_ips() {
+ GSList *addresses = NULL;
+ GInetAddress *thisaddr;
+ GSocketFamily family;
+ struct ifaddrs *first, *ifaddr;
+ struct sockaddr_in *native;
+ struct sockaddr_in6 *native6;
+ const guint8 *addrdata;
+ int rval;
+
+ rval = getifaddrs(&first);
+
+ for (ifaddr = first; ifaddr; ifaddr = ifaddr->ifa_next) {
+ if (!(ifaddr->ifa_flags & IFF_UP) || ifaddr->ifa_flags & IFF_LOOPBACK)
+ continue;
+
+ if (ifaddr->ifa_addr->sa_family == AF_INET) {
+ native = (struct sockaddr_in *)ifaddr->ifa_addr;
+ addrdata = (const guint8 *)&native->sin_addr.s_addr;
+ family = G_SOCKET_FAMILY_IPV4;
+ } else if (ifaddr->ifa_addr->sa_family == AF_INET6) {
+ native6 = (struct sockaddr_in6 *)ifaddr->ifa_addr;
+ addrdata = (const guint8 *)&native6->sin6_addr.s6_addr;
+ family = G_SOCKET_FAMILY_IPV6;
+ } else
+ continue;
+
+ thisaddr = g_inet_address_new_from_bytes(addrdata, family);
+ if (g_inet_address_get_is_link_local(thisaddr)) {
+ g_object_unref(thisaddr);
+ continue;
+ }/* else if (g_inset_address_get_is_site_local(thisaddr)) {
+ // TODO: should we offer a way the offer of LAN ips ?
+ } */
+ addresses = g_slist_prepend(addresses, thisaddr);
+ }
+ return addresses;
+}
+
+static void jingle_socks5_init(void)
+{
+ g_type_init();
+ jingle_register_transport(NS_JINGLE_TRANSPORT_SOCKS5, &funcs,
+ JINGLE_TRANSPORT_STREAMING,
+ JINGLE_TRANSPORT_PRIO_HIGH);
+ xmpp_add_feature(NS_JINGLE_TRANSPORT_SOCKS5);
+ local_candidates = get_all_local_ips();
+}
+
+static void jingle_socks5_uninit(void)
+{
+ xmpp_del_feature(NS_JINGLE_TRANSPORT_SOCKS5);
+ jingle_unregister_transport(NS_JINGLE_TRANSPORT_SOCKS5);
+ g_slist_foreach(local_candidates, (GFunc)g_object_unref, NULL);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jingle-s5b/socks5.h Sat Aug 21 12:43:26 2010 +0200
@@ -0,0 +1,42 @@
+#ifndef __JINGLESOCKS5_H__
+#define __JINGLESOCKS5_H__ 1
+
+#define NS_JINGLE_TRANSPORT_SOCKS5 "urn:xmpp:jingle:transports:s5b:1"
+
+typedef enum {
+ JINGLE_S5B_ASSISTED,
+ JINGLE_S5B_DIRECT,
+ JINGLE_S5B_PROXY,
+ JINGLE_S5B_TUNNEL
+} JingleS5BType;
+
+typedef enum {
+ JINGLE_S5B_TCP,
+ JINGLE_S5B_UDP
+} JingleS5BModes;
+
+typedef struct {
+ JingleS5BModes mode;
+
+ const gchar *sid;
+
+ GSocket *sock;
+
+ GSList *candidates;
+} JingleS5B;
+
+typedef struct {
+ const gchar *cid;
+
+ const gchar *host;
+
+ const gchar *jid;
+
+ guint16 port;
+
+ guint64 priority;
+
+ JingleS5BType type;
+} S5BCandidate;
+
+#endif
--- a/jingle-socks5/CMakeLists.txt Fri Aug 20 21:22:13 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-add_library(jingle-socks5 MODULE socks5.c socks5.h)
-set_target_properties(jingle-socks5 PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
-include_directories(${CMAKE_SOURCE_DIR})
-install(TARGETS jingle-socks5 DESTINATION lib/mcabber)
--- a/jingle-socks5/socks5.c Fri Aug 20 21:22:13 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-/*
- * socks5.c
- *
- * Copyrigth (C) 2010 Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <gio/gio.h>
-
-#include <mcabber/xmpp.h>
-#include <mcabber/modules.h>
-#include <mcabber/utils.h>
-#include <mcabber/xmpp_helper.h>
-#include <mcabber/logprint.h>
-#include <mcabber/hooks.h>
-
-#include <jingle/jingle.h>
-#include <jingle/check.h>
-#include <jingle/register.h>
-
-#include "socks5.h"
-
-static gconstpointer check(JingleContent *cn, GError **err);
-static void tomessage(gconstpointer data, LmMessageNode *node);
-static void send(session_content *sc, gconstpointer data, gchar *buf, gsize size);
-static void init(session_content *sc, gconstpointer data);
-static void end(session_content *sc, gconstpointer data);
-
-static void handle_sock_io(GSocket *sock, GIOCondition cond, gpointer data);
-static void jingle_socks5_init(void);
-static void jingle_socks5_uninit(void);
-
-
-const gchar *deps[] = { "jingle", NULL };
-
-static JingleTransportFuncs funcs = {
- .check = check,
- .tomessage = tomessage,
- .new = NULL,
- .send = send,
- .init = init,
- .end = end
-};
-
-module_info_t info_jingle_socks5bytestream = {
- .branch = MCABBER_BRANCH,
- .api = MCABBER_API_VERSION,
- .version = PROJECT_VERSION,
- .description = "Jingle Socks5 Bytestream (XEP-0260)\n",
- .requires = deps,
- .init = jingle_socks5_init,
- .uninit = jingle_socks5_uninit,
- .next = NULL,
-};
-
-static const gchar *jingle_s5b_types[] = {
- "assisted",
- "direct",
- "proxy",
- "tunnel",
- NULL
-};
-
-static const gchar *jingle_s5b_modes[] = {
- "tcp",
- "udp",
- NULL
-};
-
-
-static gint index_in_array(const gchar *str, const gchar **array)
-{
- gint i;
- for (i = 0; array[i]; i++) {
- if (!g_strcmp0(array[i], str)) {
- return i;
- }
- }
- return -1;
-}
-
-static gconstpointer check(JingleContent *cn, GError **err)
-{
- JingleS5B *js5b;
- LmMessageNode *node = cn->transport, *node2;
- const gchar *modestr;
-
- js5b = g_new0(JingleS5B, 1);
- modestr = lm_message_node_get_attribute(node, "mode");
- js5b->mode = index_in_array(modestr, jingle_s5b_modes);
- js5b->sid = g_strdup(lm_message_node_get_attribute(node, "sid"));
-
- if (!js5b->sid) {
- g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_MISSING,
- "an attribute of the transport element is missing");
- g_free(js5b);
- return NULL;
- }
-
- for (node2 = node->children; node2; node2 = node2->next) {
- if (!g_strcmp0(node->name, "candidate")) {
- const gchar *portstr, *prioritystr, *typestr;
- S5BCandidate *jc = g_new0(S5BCandidate, 1);
- jc->cid = g_strdup(lm_message_node_get_attribute(node2, "cid"));
- jc->host = g_strdup(lm_message_node_get_attribute(node2, "host"));
- jc->jid = g_strdup(lm_message_node_get_attribute(node2, "jid"));
- portstr = lm_message_node_get_attribute(node2, "port");
- prioritystr = lm_message_node_get_attribute(node2, "priority");
- typestr = lm_message_node_get_attribute(node2, "type");
-
- if (!jc->cid || !jc->host || !jc->jid || !prioritystr) {
- g_free(jc);
- continue;
- }
- jc->port = g_ascii_strtoull(portstr, NULL, 10);
- jc->priority = g_ascii_strtoull(prioritystr, NULL, 10);
- jc->type = index_in_array(typestr, jingle_s5b_types);
-
- if (jc->type == -1) {
- g_free(jc);
- continue;
- }
-
- js5b->candidates = g_slist_append(js5b->candidates, jc);
- }
- }
-
- return (gconstpointer) js5b;
-}
-
-static void tomessage(gconstpointer data, LmMessageNode *node)
-{
- JingleS5B *js5 = (JingleS5B *)data;
- S5BCandidate *js5c;
-
- LmMessageNode *node2, *node3;
- gchar *port;
- gchar *priority;
- GSList *el;
-
- if (lm_message_node_get_child(node, "transport") != NULL)
- return;
-
- node2 = lm_message_node_add_child(node, "transport", NULL);
-
- lm_message_node_set_attributes(node2, "xmlns", NS_JINGLE_TRANSPORT_SOCKS5,
- "sid", js5->sid,
- "mode", jingle_s5b_modes[js5->mode],
- NULL);
- for (el = js5->candidates; el; el = el->next) {
- js5c = (S5BCandidate*) el->data;
- node3 = lm_message_node_add_child(node2, "candidate", NULL);
-
- port = g_strdup_printf("%" G_GUINT16_FORMAT, js5c->port);
- priority = g_strdup_printf("%" G_GUINT64_FORMAT, js5c->priority);
-
- lm_message_node_set_attributes(node3, "cid", js5c->cid,
- "host", js5c->host,
- "jid", js5c->jid,
- "port", port,
- "priority", priority,
- "type", jingle_s5b_types[js5c->type],
- NULL);
- g_free(port);
- g_free(priority);
- }
-}
-
-static void init(session_content *sc, gconstpointer data)
-{
- JingleS5B *js5 = (JingleS5B *)data;
- GInetAddress *addr;
- GSocketAddress *saddr;
- GSource *socksource;
- GError *err = NULL;
- g_assert(js5->sock == NULL);
-
- addr = g_inet_address_new_from_string("127.0.0.1");
- js5->sock = g_socket_new(g_inet_address_get_family(addr), G_SOCKET_TYPE_STREAM,
- G_SOCKET_PROTOCOL_TCP, &err);
- if (js5->sock == NULL) {
- scr_LogPrint(LPRINT_LOGNORM, "Jingle SOCKS5: Error while creating a new socket: %s",
- err->message != NULL ? err->message : "(no message)");
- return; // TODO: we need a way to return errors...
- }
- g_socket_set_blocking(js5->sock, FALSE);
- socksource = g_socket_create_source(js5->sock, ~0, NULL);
-
- g_source_set_callback(socksource, (GSourceFunc)handle_sock_io, NULL, NULL);
- g_source_attach(socksource, NULL);
- g_source_unref(socksource);
-
- saddr = g_inet_socket_address_new(addr, 31337);
- if (!g_socket_connect(js5->sock, saddr, NULL, &err)) {
- scr_LogPrint(LPRINT_LOGNORM, "Jingle SOCKS5: Error while connecting to the host: %s",
- err->message != NULL ? err->message : "(no message)");
- return;
- }
-
-}
-
-/**
- * Handle any event on a sock
- */
-static void handle_sock_io(GSocket *sock, GIOCondition cond, gpointer data)
-{
- switch (cond) {
- case G_IO_IN:
- break;
- case G_IO_OUT:
- break;
- case G_IO_ERR:
- break;
- case G_IO_HUP:
- break;
- default:
- ;
- // ?!
- }
-}
-
-static void jingle_socks5_init(void)
-{
- jingle_register_transport(NS_JINGLE_TRANSPORT_SOCKS5, &funcs,
- JINGLE_TRANSPORT_STREAMING,
- JINGLE_TRANSPORT_PRIO_HIGH);
- xmpp_add_feature(NS_JINGLE_TRANSPORT_SOCKS5);
-}
-
-static void jingle_socks5_uninit(void)
-{
- xmpp_del_feature(NS_JINGLE_TRANSPORT_SOCKS5);
- jingle_unregister_transport(NS_JINGLE_TRANSPORT_SOCKS5);
-}
--- a/jingle-socks5/socks5.h Fri Aug 20 21:22:13 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#ifndef __JINGLESOCKS5_H__
-#define __JINGLESOCKS5_H__ 1
-
-#define NS_JINGLE_TRANSPORT_SOCKS5 "urn:xmpp:jingle:transports:s5b:1"
-
-typedef enum {
- JINGLE_S5B_ASSISTED,
- JINGLE_S5B_DIRECT,
- JINGLE_S5B_PROXY,
- JINGLE_S5B_TUNNEL
-} JingleS5BType;
-
-typedef enum {
- JINGLE_S5B_TCP,
- JINGLE_S5B_UDP
-} JingleS5BModes;
-
-typedef struct {
- JingleS5BModes mode;
-
- const gchar *sid;
-
- GSocket *sock;
-
- GSList *candidates;
-} JingleS5B;
-
-typedef struct {
- const gchar *cid;
-
- const gchar *host;
-
- const gchar *jid;
-
- guint16 port;
-
- guint64 priority;
-
- JingleS5BType type;
-} S5BCandidate;
-
-#endif
--- a/jingle/CMakeLists.txt Fri Aug 20 21:22:13 2010 +0200
+++ b/jingle/CMakeLists.txt Sat Aug 21 12:43:26 2010 +0200
@@ -1,5 +1,5 @@
add_library(jingle MODULE jingle.c jingle.h check.c check.h action-handlers.c action-handlers.c register.c register.h sessions.c sessions.h send.c send.h)
set_target_properties(jingle PROPERTIES COMPILE_FLAGS "-Wall -O2 -g")
include_directories(${LM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
-target_link_libraries(jingle ${LM_LIBRARIES})
+target_link_libraries(jingle ${GLIB_LIBRARIES} ${LM_LIBRARIES})
install(TARGETS jingle DESTINATION lib/mcabber)