mod-mcabber-jingle: comparison jingle/action-handlers.c

equal deleted inserted replaced

-:f3408f4fe61a
+:0b9a7b505079
 for (child = jn->content; child; child = child->next) {
 cn = (JingleContent *)(child->data);
 session_changestate_sessioncontent(sess, cn->name, JINGLE_SESSION_STATE_ACTIVE);
 }
+jingle_free_jinglenode(jn);
 }
 void handle_content_add(JingleNode *jn)
 {
 GError *err = NULL;
 if (err != NULL) {
 // TODO
 }
 }
 }
+jingle_free_jinglenode(jn);
 }
 void handle_content_reject(JingleNode *jn)
 {
 GError *err = NULL;
 if (g_slist_length(sess->content) == 0) {
 jingle_send_session_terminate(sess, "success");
 session_delete(sess);
 return;
 }
+jingle_free_jinglenode(jn);
 }
 void handle_content_remove(JingleNode *jn)
 {
 GError *err = NULL;
 if (!check_contents(jn, &err)) {
 scr_log_print(LPRINT_DEBUG, "jingle: One of the content element was invalid (%s)",
 err->message);
 jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
+jingle_free_jinglenode(jn);
 return;
 }
 /* it's better if there is at least one content elem */
 if (g_slist_length(jn->content) < 1) {
 jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
+jingle_free_jinglenode(jn);
 return;
 }
 // if a session with the same sid doesn't already exists
 if ((sess = session_find(jn)) == NULL) {
-jingle_send_iq_error(jn->message, "cancel", "item-not-found", "unknown-session");
+// TODO: look if it's really that
+jingle_send_iq_error(jn->message, "cancel", "item-not-found", "unknown-session");
+jingle_free_jinglenode(jn);
 return;
 }
 jingle_ack_iq(jn->message);
 for (child = jn->content; child; child = child->next) {
 cn = (JingleContent *)(child->data);
 session_remove_sessioncontent(sess, cn->name);
 }
+jingle_free_jinglenode(jn);
 }
 void handle_session_initiate(JingleNode *jn)
 {
 GError *err = NULL;
 JingleContent *cn;
 GString *sbuf;
 GSList *child = NULL;
 LmMessage *r;
 gchar *disp;
+JingleSession *sess;
+const gchar *xmlns;
+JingleAppFuncs *appfuncs;
+JingleTransportFuncs *transfuncs;
+gconstpointer description, transport;
 // Make sure the request come from an user in our roster
 disp = jidtodisp(lm_message_get_from(jn->message));
 if (!roster_find(disp, jidsearch, 0)) {
-// jingle_send_session_terminate(jn, "decline");
+// We say that we doesn't support jingle.
+jingle_send_iq_error(jn->message, "cancel", "service-unavailable", NULL);
 jingle_free_jinglenode(jn);
 g_free(disp);
 return;
 }
 if (!check_contents(jn, &err)) {
 scr_log_print(LPRINT_DEBUG, "jingle: One of the content element was invalid (%s)",
 err->message);
 jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
+jingle_free_jinglenode(jn);
 g_free(disp);
 return;
 }
 // a session-initiate message must contains at least one <content> element
 if (g_slist_length(jn->content) < 1) {
 jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
+jingle_free_jinglenode(jn);
 g_free(disp);
 return;
 }
 /* When sending a session-initiate at least one <content/> element MUST have
 valid_disposition = TRUE;
 }
 if (!valid_disposition) {
 jingle_send_iq_error(jn->message, "cancel", "bad-request", NULL);
 g_free(disp);
+jingle_free_jinglenode(jn);
 return;
 }
 // if a session with the same sid already exists
 if (session_find(jn) != NULL) {
 jingle_send_iq_error(jn->message, "cancel", "unexpected-request", "out-of-order");
 g_free(disp);
-return;
+jingle_free_jinglenode(jn);
-}
+return;
+}
-jingle_ack_iq(jn->message);
+jingle_ack_iq(jn->message);
+// We create a session
+sess = session_new_from_jinglenode(jn);
+for (child = jn->content; child; child = child->next) {
+cn = (JingleContent *)(child->data);
+xmlns = lm_message_node_get_attribute(cn->description, "xmlns");
+appfuncs = jingle_get_appfuncs(xmlns);
+if (appfuncs == NULL) continue;
+xmlns = lm_message_node_get_attribute(cn->transport, "xmlns");
+transfuncs = jingle_get_transportfuncs(xmlns);
+if (transfuncs == NULL) continue;
+description = appfuncs->check(cn, &err);
+if (description == NULL || err != NULL) continue;
+transport = transfuncs->check(cn, &err);
+if (transport == NULL || err != NULL) continue;
+session_add_content_from_jinglecontent(sess, cn,
+JINGLE_SESSION_STATE_PENDING);
+}
+if(g_slist_length(sess->content) == 0) {
+jingle_send_session_terminate(sess, "unsupported-applications");
+session_delete(sess);
+return;
+}
 // Wait that user accept the jingle
 sbuf = g_string_new("");
-g_string_printf(sbuf, "Received an invitation for a jingle session from <%s>", lm_message_get_from(jn->message));
+g_string_printf(sbuf, "Received an invitation for a jingle session from <%s>",
+lm_message_get_from(jn->message));
 scr_WriteIncomingMessage(disp, sbuf->str, 0, HBB_PREFIX_INFO, 0);
 scr_LogPrint(LPRINT_LOGNORM, "%s", sbuf->str);
 {
 const char *id;
-char *desc = g_strdup_printf("<%s> invites you to do a jingle session", lm_message_get_from(jn->message));
+char *desc = g_strdup_printf("<%s> invites you to do a jingle session",
+lm_message_get_from(jn->message));
-id = evs_new(desc, NULL, 0, evscallback_jingle, jn, NULL);
+id = evs_new(desc, NULL, 0, evscallback_jingle, sess, NULL);
 g_free(desc);
 if (id)
 g_string_printf(sbuf, "Please use /event %s accept|reject", id);
 else
 g_string_printf(sbuf, "Unable to create a new event!");
 scr_WriteIncomingMessage(disp, sbuf->str, 0, HBB_PREFIX_INFO, 0);
 scr_LogPrint(LPRINT_LOGNORM, "%s", sbuf->str);
 }
 g_free(disp);
+jingle_free_jinglenode(jn);
 }
 void handle_session_info(JingleNode *jn)
 {
 JingleSession *sess;
 * does not understand the payload, it MUST return a
 * <feature-not-implemented/> error with a Jingle-specific
 * error condition of <unsupported-info/>." */
 jingle_send_iq_error(jn->message, "modify", "feature-not-implemented",
 "unsupported-info");
+jingle_free_jinglenode(jn);
 }
 void handle_session_accept(JingleNode *jn)
 {
 JingleSession *sess;
 sc2->sid = sess->sid;
 sc2->from = (sess->origin == JINGLE_SESSION_INCOMING) ? sess->from : sess->to;
 sc2->name = sc->name;
 sc->appfuncs->start(sc2, 2048);
 }
+jingle_free_jinglenode(jn);
 }
 void handle_session_terminate(JingleNode *jn)
 {
 JingleSession *sess;
 sc->appfuncs->stop(sc->description);
 session_remove_sessioncontent(sess, sc->name);
 }
 session_delete(sess);
 jingle_ack_iq(jn->message);
-}
+jingle_free_jinglenode(jn);
+}

changeset 119	0b9a7b505079
parent 114	813867884159
child 121	3a3c0e16ea00