pidgin3: comparison libpurple/protocols/jabber/jabber.c

-:1a733d58d74a
+:1255f40458d7
 	js->reinit = FALSE;
 	g_free(open_stream);
 }
 static void
-jabber_session_initialized_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_session_initialized_cb(JabberStream *js, const char *from,
-{
+JabberIqType type, const char *id,
-	const char *type = xmlnode_get_attrib(packet, "type");
+xmlnode *packet, gpointer data)
-	if(type && !strcmp(type, "result")) {
+{
+	if (type == JABBER_IQ_RESULT) {
 		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
 		if(js->unregistration)
 			jabber_unregister_account_cb(js);
 	} else {
 		purple_connection_error_reason (js->gc,
 	xmlnode_set_namespace(session, "urn:ietf:params:xml:ns:xmpp-session");
 	jabber_iq_send(iq);
 }
-static void jabber_bind_result_cb(JabberStream *js, xmlnode *packet,
+static void jabber_bind_result_cb(JabberStream *js, const char *from,
-		gpointer data)
+JabberIqType type, const char *id,
-{
+xmlnode *packet, gpointer data)
-	const char *type = xmlnode_get_attrib(packet, "type");
+{
 	xmlnode *bind;
-	if(type && !strcmp(type, "result") &&
+	if (type == JABBER_IQ_RESULT &&
 			(bind = xmlnode_get_child_with_namespace(packet, "bind", "urn:ietf:params:xml:ns:xmpp-bind"))) {
 		xmlnode *jid;
 		char *full_jid;
 		if((jid = xmlnode_get_child(bind, "jid")) && (full_jid = xmlnode_get_data(jid))) {
 			JabberBuddy *my_jb = NULL;
 	txt = xmlnode_to_str(packet, &len);
 	jabber_send_raw(js, txt, len);
 	g_free(txt);
 }
-static void jabber_pong_cb(JabberStream *js, xmlnode *packet, gpointer unused)
+static gboolean jabber_keepalive_timeout(PurpleConnection *gc)
-{
-	purple_timeout_remove(js->keepalive_timeout);
-	js->keepalive_timeout = -1;
-}
-static gboolean jabber_pong_timeout(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
 	purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 					_("Ping timeout"));
 	js->keepalive_timeout = -1;
 void jabber_keepalive(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
 	if (js->keepalive_timeout == -1) {
-		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_GET);
+		jabber_ping_jid(js, NULL);
+		js->keepalive_timeout = purple_timeout_add_seconds(120,
-		xmlnode *ping = xmlnode_new_child(iq->node, "ping");
+				(GSourceFunc)(jabber_keepalive_timeout), gc);
-		xmlnode_set_namespace(ping, "urn:xmpp:ping");
-		js->keepalive_timeout = purple_timeout_add_seconds(120, (GSourceFunc)(jabber_pong_timeout), gc);
-		jabber_iq_set_callback(iq, jabber_pong_cb, NULL);
-		jabber_iq_send(iq);
 	}
 }
 static void
 jabber_recv_cb_ssl(gpointer data, PurpleSslConnection *gsc,
 {
 	purple_timeout_add(0, conn_close_cb, js);
 }
 static void
-jabber_registration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_registration_result_cb(JabberStream *js, const char *from,
+JabberIqType type, const char *id,
+xmlnode *packet, gpointer data)
 {
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *type = xmlnode_get_attrib(packet, "type");
 	char *buf;
 	char *to = data;
-	if(!strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		if(js->registration) {
 		buf = g_strdup_printf(_("Registration of %s@%s successful"),
 				js->user->node, js->user->domain);
 			if(account->registration_cb)
 				(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
 		if(account->registration_cb)
 			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 	}
 	g_free(to);
 	if(js->registration)
-	jabber_connection_schedule_close(js);
+		jabber_connection_schedule_close(js);
 }
 static void
-jabber_unregistration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+jabber_unregistration_result_cb(JabberStream *js, const char *from,
-{
+JabberIqType type, const char *id,
-	const char *type = xmlnode_get_attrib(packet, "type");
+xmlnode *packet, gpointer data)
+{
 	char *buf;
 	char *to = data;
 	/* This function is never called for unregistering our XMPP account from
 	 * the server, so there should always be a 'to' address. */
 	g_return_if_fail(to != NULL);
-	if(!strcmp(type, "result")) {
+	if (type == JABBER_IQ_RESULT) {
 		buf = g_strdup_printf(_("Registration from %s successfully removed"),
 							  to);
 		purple_notify_info(NULL, _("Unregistration Successful"),
 						   _("Unregistration Successful"), buf);
 		g_free(buf);
 	jabber_iq_set_callback(iq, jabber_registration_result_cb, to);
 	jabber_iq_send(iq);
 }
-void jabber_register_parse(JabberStream *js, xmlnode *packet)
+void jabber_register_parse(JabberStream *js, const char *from, JabberIqType type,
+const char *id, xmlnode *query)
 {
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *type;
-	const char *from;
 	PurpleRequestFields *fields;
 	PurpleRequestFieldGroup *group;
 	PurpleRequestField *field;
-	xmlnode *query, *x, *y;
+	xmlnode *x, *y;
 	char *instructions;
 	JabberRegisterCBData *cbdata;
 	gboolean registered = FALSE;
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result"))
+	if (type != JABBER_IQ_RESULT)
 		return;
-	from = xmlnode_get_attrib(packet, "from");
+	if (!from)
+		from = js->serverFQDN;
+	g_return_if_fail(from != NULL);
 	if(js->registration) {
 		/* get rid of the login thingy */
 		purple_connection_set_state(js->gc, PURPLE_CONNECTED);
 	}
-	query = xmlnode_get_child(packet, "query");
 	if(xmlnode_get_child(query, "registered")) {
 		registered = TRUE;
 		if(js->registration) {
 			                                      js);
 		}
 	}
 }
-static void jabber_unregister_account_iq_cb(JabberStream *js, xmlnode *packet, gpointer data) {
+static void
+jabber_unregister_account_iq_cb(JabberStream *js, const char *from,
+JabberIqType type, const char *id,
+xmlnode *packet, gpointer data)
+{
 	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *type = xmlnode_get_attrib(packet,"type");
-	if(!strcmp(type,"error")) {
+	if (type == JABBER_IQ_ERROR) {
 		char *msg = jabber_parse_error(js, packet, NULL);
 		purple_notify_error(js->gc, _("Error unregistering account"),
 							_("Error unregistering account"), msg);
 		g_free(msg);
 		if(js->unregistration_cb)
 			js->unregistration_cb(account, FALSE, js->unregistration_user_data);
-	} else if(!strcmp(type,"result")) {
+	} else {
 		purple_notify_info(js->gc, _("Account successfully unregistered"),
 						   _("Account successfully unregistered"), NULL);
 		if(js->unregistration_cb)
 			js->unregistration_cb(account, TRUE, js->unregistration_user_data);
 	}
 	JabberStream *js = gc->proto_data;
 	js->idle = idle ? time(NULL) - idle : idle;
 }
-static void jabber_blocklist_parse(JabberStream *js, xmlnode *packet, gpointer data)
+static void jabber_blocklist_parse(JabberStream *js, const char *from,
+JabberIqType type, const char *id,
+xmlnode *packet, gpointer data)
 {
 	xmlnode *blocklist, *item;
 	PurpleAccount *account;
 	blocklist = xmlnode_get_child_with_namespace(packet,
 	return types;
 }
 static void
-jabber_password_change_result_cb(JabberStream *js, xmlnode *packet,
+jabber_password_change_result_cb(JabberStream *js, const char *from,
-		gpointer data)
+JabberIqType type, const char *id,
-{
+xmlnode *packet, gpointer data)
-	const char *type;
+{
+	if (type == JABBER_IQ_RESULT) {
-	type = xmlnode_get_attrib(packet, "type");
-	if(type && !strcmp(type, "result")) {
 		purple_notify_info(js->gc, _("Password Changed"), _("Password Changed"),
 				_("Your password has been changed."));
 		purple_account_set_password(js->gc->account, (char *)data);
 	} else {
 }
 static PurpleCmdRet jabber_cmd_ping(PurpleConversation *conv,
 		const char *cmd, char **args, char **error, void *data)
 {
+	PurpleAccount *account;
+	PurpleConnection *pc;
 	if(!args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
-	if(!jabber_ping_jid(conv, args[0])) {
+	account = purple_conversation_get_account(conv);
+	pc = purple_account_get_connection(account);
+	if(!jabber_ping_jid(purple_connection_get_protocol_data(pc), args[0])) {
 		*error = g_strdup_printf(_("Unable to ping user %s"), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}
 	return PURPLE_CMD_RET_OK;

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/jabber/jabber.c

libpurple/protocols/jabber/jabber.c