--- a/jingle-filetransfer/filetransfer.c	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle-filetransfer/filetransfer.c	Sat Jul 03 18:41:36 2010 +0200
@@ -35,6 +35,7 @@
 
 
 gconstpointer jingle_ft_check(JingleContent *cn, GError **err, gpointer *data);
+gconstpointer jingle_ft_parse(JingleContent *cn, GError **err, gpointer *data);
 static void jingle_ft_init(void);
 static void jingle_ft_uninit(void);
 
@@ -61,7 +62,7 @@
   LmMessageNode *node;
   const gchar *datestr, *sizestr;
 
-  node = lm_message_node_get_child(cn->description, "offer");
+  node = lm_message_node_get_child(cn->node, "description");
   if (!node) {
     g_set_error(err, JINGLE_CHECK_ERROR, JINGLE_CHECK_ERROR_MISSING,
                 "the offer element is missing");

--- a/jingle/CMakeLists.txt	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle/CMakeLists.txt	Sat Jul 03 18:41:36 2010 +0200
@@ -1,4 +1,4 @@
-add_library(jingle MODULE jingle.c check.c action-handlers.c register.c sessions.c)
+add_library(jingle MODULE jingle.c check.c action-handlers.c register.c sessions.c send.c)
 set_target_properties(jingle PROPERTIES COMPILE_FLAGS "")
 include_directories(${LM_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
 target_link_libraries(jingle ${LM_LIBRARIES})

--- a/jingle/action-handlers.c	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle/action-handlers.c	Sat Jul 03 18:41:36 2010 +0200
@@ -25,11 +25,24 @@
 
 #include <jingle/jingle.h>
 #include <jingle/check.h>
+#include <jingle/sessions.h>
+#include <jingle/register.h>
+#include <jingle/send.h>
 
+/* The session-initiate action is used to request negotiation of a new Jingle
+ * session. When sending a session-initiate with one <content/> element, the
+ * value of the <content/> element's 'disposition' attribute MUST be "session"
+ * (if there are multiple <content/> elements then at least one MUST have a
+ * disposition of "session"); if this rule is violated, the responder MUST
+ * return a <bad-request/> error to the initiator.
+ */
 
 void handle_session_initiate(LmMessage *m, JingleNode *jn)
 {
   GError *err = NULL;
+  gboolean is_session = FALSE;
+  GSList *child = NULL;
+  JingleContent *cn;
 
   if (!check_contents(jn, &err)) {
     scr_log_print(LPRINT_DEBUG, "jingle: One of the content element was invalid (%s)",
@@ -43,22 +56,47 @@
     jingle_send_iq_error(m, "cancel", "bad-request", NULL);
     return;
   }
-
-
-
-  /*// if a session with the same sid already exists
-  if (session_find(jn) != NULL) {
+  
+  // one of the content element must be a "session"
+  for (child = jn->content; child && !is_session; child = child->next) {
+    if(g_strcmp0(((JingleContent*)(child->data))->disposition, "session") ||
+       ((JingleContent*)(child->data))->disposition == NULL) // default: session
+      is_session=TRUE;
+  }
+  if(!is_session) {
+    jingle_send_iq_error(m, "cancel", "bad-request", NULL);
+    return;  
+  }
+  
+  // if a session with the same sid already exists
+  if (session_find(jn->sid, jn->from) != NULL) {
     jingle_send_iq_error(m, "cancel", "unexpected-request", "out-of-order");
     return;
-  }*/
+  }
+
+  // the important from is one in the session-initiate
+  jn->from = lm_message_node_get_attribute(lm_message_get_node(m), "from");
+  
+  
+  jingle_ack_iq(m);
 
-  jingle_ack_iq(m);
+  is_session = FALSE;  
+  // Do we support any of this xmlns ?
+  for (child = jn->content; child && !is_session; child = child->next) {
+    if(jingle_get_appfuncs(((JingleContent*)(child->data))->xmlns_desc) != NULL)
+      is_session = TRUE;
+  }
+  if(!is_session) { // None of the app is supported
+    jingle_send_session_terminate(m, "unsupported-applications");
+  }
 }
 
 void handle_session_terminate(LmMessage *m, JingleNode *jn)
 {
-  /*if (session_find(jn) == NULL) {
+  JingleSession *sess;
+  if ((sess = session_find(jn->sid, jn->from)) == NULL) {
     jingle_send_iq_error(m, "cancel", "item-not-found", "unknown-session");
     return;
-  }*/
+  }
+  session_delete(sess);
 }

--- a/jingle/jingle.c	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle/jingle.c	Sat Jul 03 18:41:36 2010 +0200
@@ -86,8 +86,7 @@
 
 
 LmHandlerResult jingle_handle_iq(LmMessageHandler *handler,
-                                 LmConnection *connection,
-                                 LmMessage *message,
+                                 LmConnection *connection, LmMessage *message,
                                  gpointer user_data)
 {
   LmMessageSubType iqtype = lm_message_get_sub_type(message);

--- a/jingle/jingle.h	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle/jingle.h	Sat Jul 03 18:41:36 2010 +0200
@@ -63,6 +63,8 @@
   /* Random session identifier generated by the initator. */
   const gchar *sid;
 
+  const gchar *from;
+  
   /* Linked list of JingleContent. */
   GSList *content;
 

--- a/jingle/register.c	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle/register.c	Sat Jul 03 18:41:36 2010 +0200
@@ -48,9 +48,8 @@
 GSList *jingle_transport_handlers = NULL;
 
 
-void jingle_register_app(const gchar *xmlns,
-                             JingleAppFuncs *funcs,
-                             gpointer data)
+void jingle_register_app(const gchar *xmlns, JingleAppFuncs *funcs,
+                         gpointer data)
 {
   if (!g_str_has_prefix(xmlns, NS_JINGLE_APP_PREFIX)) return;
 
@@ -63,8 +62,7 @@
   jingle_app_handlers = g_slist_append(jingle_app_handlers, h);
 }
 
-void jingle_register_transport(const gchar *xmlns,
-                                   JingleTransportFuncs *funcs,
+void jingle_register_transport(const gchar *xmlns, JingleTransportFuncs *funcs,
                                    gpointer data)
 {
   if (!g_str_has_prefix(xmlns, NS_JINGLE_TRANSPORT_PREFIX)) return;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jingle/send.c	Sat Jul 03 18:41:36 2010 +0200
@@ -0,0 +1,44 @@
+/*
+ * send.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 <glib.h>
+#include <loudmouth/loudmouth.h>
+
+#include <jingle/send.h>
+
+void jingle_send_session_terminate(const LmMessage *m, const gchar *reason) {
+  LmMessage *r;
+  LmMessageNode *err;
+
+  r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_SET);
+
+  if(reason != NULL) {  
+    err = lm_message_node_add_child(r->node, "reason", NULL);
+    lm_message_node_add_child(err, reason, NULL);
+  }
+
+  // TODO vérifier que reason est connu
+
+  if (r) {
+	  lm_connection_send(lconnection, r, NULL);
+	  lm_message_unref(r);
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jingle/send.h	Sat Jul 03 18:41:36 2010 +0200
@@ -0,0 +1,6 @@
+#ifndef __SEND_H__
+#define __SEND_H__ 1
+
+void jingle_send_session_terminate(LmMessage *m, const gchar *reason);
+
+#endif

--- a/jingle/sessions.h	Fri Jul 02 17:04:41 2010 +0200
+++ b/jingle/sessions.h	Sat Jul 03 18:41:36 2010 +0200
@@ -19,7 +19,7 @@
 
 JingleSession *session_new(JingleNode *jn, LmMessageNode *app,
                            LmMessageNode *transport);
-JingleSession *session_find();
+JingleSession *session_find(const gchar *sid, const gchar *from);
 void session_delete(JingleSession *sess);
 void session_remove(JingleSession *sess);
 void session_free(JingleSession *sess);