pidgin: src/protocols/silc/silc.c comparison

comparison src/protocols/silc/silc.c @ 12217:029802981b81

[gaim-migrate @ 14519] SILC IM Image and cipher selection support from Pekka Riikonen. Modified by me so the SILC prpl continues to work with SILC Toolkit < 1.0.1, but without images. Any breakage is my fault. committer: Tailor Script <tailor@pidgin.im>

author	Stu Tomlinson <stu@nosnilmot.com>
date	Thu, 24 Nov 2005 21:07:12 +0000
parents	4d3119205a33
children	01f689cd7b49

comparison

equal deleted inserted replaced

-:4d3119205a33
+:029802981b81
 	SilcGaim sg;
 	SilcClient client;
 	SilcClientParams params;
 	GaimConnection *gc;
 	char pkd[256], prd[256];
+	const char *cipher, *hmac;
+	int i;
 	gc = account->gc;
 	if (!gc)
 		return;
 	gc->proto_data = NULL;
 	}
 	client->hostname = silc_net_localhost();
 	gaim_connection_set_display_name(gc, client->username);
+	/* Register requested cipher and HMAC */
+	cipher = gaim_account_get_string(account, "cipher", SILC_DEFAULT_CIPHER);
+	for (i = 0; silc_default_ciphers[i].name; i++)
+		if (!strcmp(silc_default_ciphers[i].name, cipher)) {
+			silc_cipher_register(&(silc_default_ciphers[i]));
+			break;
+		}
+	hmac = gaim_account_get_string(account, "hmac", SILC_DEFAULT_HMAC);
+	for (i = 0; silc_default_hmacs[i].name; i++)
+		if (!strcmp(silc_default_hmacs[i].name, hmac)) {
+			silc_hmac_register(&(silc_default_hmacs[i]));
+			break;
+		}
 	/* Init SILC client */
 	if (!silc_client_init(client)) {
 		gc->wants_to_die = TRUE;
 		gaim_connection_error(gc, ("Cannot initialize SILC protocol"));
 		return;
 silcgaim_close_final(gpointer *context)
 {
 	SilcGaim sg = (SilcGaim)context;
 	silc_client_stop(sg->client);
 	silc_client_free(sg->client);
+#ifdef HAVE_SILCMIME_H
+	if (sg->mimeass)
+		silc_mime_assembler_free(sg->mimeass);
+#endif
 	silc_free(sg);
 	return 0;
 }
 static void
 	SilcGaim sg = gc->proto_data;
 	SilcGaimIM im = context;
 	GaimConversation *convo;
 	char tmp[256], *nickname = NULL;
 	SilcClientEntry client_entry;
+#ifdef HAVE_SILCMIME_H
+	SilcDList list;
+#endif
 	convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, im->nick,
 							sg->account);
 	if (!convo)
 		return;
 		silc_free(clients);
 	} else {
 		client_entry = clients[0];
 	}
-	/* Send the message */
+#ifdef HAVE_SILCMIME_H
-	silc_client_send_private_message(client, conn, client_entry, im->flags,
+	/* Check for images */
-					 (unsigned char *)im->message, im->message_len, TRUE);
+	list = silcgaim_image_message(im->message, (SilcUInt32 *)&im->flags);
+	if (list) {
+		/* Send one or more MIME message.  If more than one, they
+		   are MIME fragments due to over large message */
+		SilcBuffer buf;
+		silc_dlist_start(list);
+		while ((buf = silc_dlist_get(list)) != SILC_LIST_END)
+			silc_client_send_private_message(client, conn,
+							 client_entry, im->flags,
+							 buf->data, buf->len,
+							 TRUE);
+		silc_mime_partial_free(list);
+	} else
+#endif
+	{
+		/* Send the message */
+		silc_client_send_private_message(client, conn, client_entry, im->flags,
+						 (unsigned char *)im->message, im->message_len, TRUE);
+	}
 	gaim_conv_im_write(GAIM_CONV_IM(convo), conn->local_entry->nickname,
 			   im->message, 0, time(NULL));
 	goto out;
 err:
 	g_snprintf(tmp, sizeof(tmp),
 		   _("User <I>%s</I> is not present in the network"), im->nick);
 	SilcClient client = sg->client;
 	SilcClientConnection conn = sg->conn;
 	SilcClientEntry *clients;
 	SilcUInt32 clients_count, mflags;
 	char *nickname, *msg, *tmp;
-	int ret;
+	int ret = 0;
 	gboolean sign = gaim_account_get_bool(sg->account, "sign-verify", FALSE);
+#ifdef HAVE_SILCMIME_H
+	SilcDList list;
+#endif
 	if (!who || !message)
 		return 0;
 	mflags = SILC_MESSAGE_FLAG_UTF8;
 		if (!im) {
 			g_free(tmp);
 			return 0;
 		}
 		im->nick = g_strdup(who);
-		im->message = g_strdup(msg);
+		im->message = g_strdup(message);
 		im->message_len = strlen(im->message);
 		im->flags = mflags;
 		silc_client_get_clients(client, conn, nickname, NULL,
 					silcgaim_send_im_resolved, im);
 		silc_free(nickname);
 		g_free(tmp);
 		return 0;
 	}
-	/* Send private message directly */
+#ifdef HAVE_SILCMIME_H
-	ret = silc_client_send_private_message(client, conn, clients[0],
+	/* Check for images */
-					       mflags, (unsigned char *)msg,
+	list = silcgaim_image_message(message, &mflags);
-					       strlen(msg), TRUE);
+	if (list) {
+		/* Send one or more MIME message.  If more than one, they
+		   are MIME fragments due to over large message */
+		SilcBuffer buf;
+		silc_dlist_start(list);
+		while ((buf = silc_dlist_get(list)) != SILC_LIST_END)
+			ret =
+			 silc_client_send_private_message(client, conn,
+							  clients[0], mflags,
+							  buf->data, buf->len,
+							  TRUE);
+		silc_mime_partial_free(list);
+	} else
+#endif
+	{
+		/* Send private message directly */
+		ret = silc_client_send_private_message(client, conn, clients[0],
+						       mflags,
+						       (unsigned char *)msg,
+						       strlen(msg), TRUE);
+	}
 	g_free(tmp);
 	silc_free(nickname);
 	silc_free(clients);
 	return ret;
 	silcgaim_wb_clear,
 };
 static GaimPluginProtocolInfo prpl_info =
 {
+#ifdef HAVE_SILCMIME_H
+	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME |
+	OPT_PROTO_PASSWORD_OPTIONAL | OPT_PROTO_IM_IMAGE,
+#else
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME |
 	OPT_PROTO_PASSWORD_OPTIONAL,
+#endif
 	NULL,						/* user_splits */
 	NULL,						/* protocol_options */
 	NO_BUDDY_ICONS,				/* icon_spec */
 	silcgaim_list_icon,			/* list_icon */
 	silcgaim_list_emblems,		/* list_emblems */
 init_plugin(GaimPlugin *plugin)
 {
 	GaimAccountOption *option;
 	GaimAccountUserSplit *split;
 	char tmp[256];
+	int i;
+	GaimKeyValuePair *kvp;
+	GList *list = NULL;
 	silc_plugin = plugin;
 	split = gaim_account_user_split_new(_("Network"), "silcnet.org", '@');
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 	g_snprintf(tmp, sizeof(tmp), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcgaim_silcdir());
 	option = gaim_account_option_string_new(_("Private Key file"),
 						"private-key", tmp);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+	for (i = 0; silc_default_ciphers[i].name; i++) {
+		kvp = silc_calloc(1, sizeof(*kvp));
+		kvp->key = strdup(silc_default_ciphers[i].name);
+		kvp->value = strdup(silc_default_ciphers[i].name);
+		list = g_list_append(list, kvp);
+	}
+	option = gaim_account_option_list_new(_("Cipher"), "cipher", list);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+	list = NULL;
+	for (i = 0; silc_default_hmacs[i].name; i++) {
+		kvp = silc_calloc(1, sizeof(*kvp));
+		kvp->key = strdup(silc_default_hmacs[i].name);
+		kvp->value = strdup(silc_default_hmacs[i].name);
+		list = g_list_append(list, kvp);
+	}
+	option = gaim_account_option_list_new(_("HMAC"), "hmac", list);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 	option = gaim_account_option_bool_new(_("Public key authentication"),
 					      "pubkey-auth", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 	option = gaim_account_option_bool_new(_("Reject watching by other users"),
 					      "reject-watch", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 	option = gaim_account_option_bool_new(_("Block invites"),
 					      "block-invites", FALSE);

Mercurial > pidgin

comparison src/protocols/silc/silc.c @ 12217:029802981b81