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

-:ff29d1ca455e
+:f0e987f024e0
 /* All messages begin with a \ */
 if (msg[0] != '\\' || msg[1] == 0)
 {
 purple_debug_info("msim", "msim_parse: incomplete/bad msg, "
-"missing initial backslash: <%s>", msg);
+"missing initial backslash: <%s>\n", msg);
 /* XXX: Should we try to recover, and read to first backslash? */
 g_free(msg);
 return NULL;
 }
 g_hash_table_insert(table, g_strdup(key), g_strdup(value));
 } else {
 /* TODO: Some dictionaries have multiple values for the same
 * key. Should append to a GList to handle this case. */
 purple_debug_info("msim", "msim_parse: key %s already exists, "
-"not overwriting or replacing; ignoring new value %s", key,
+"not overwriting or replacing; ignoring new value %s\n", key,
 value);
 }
 } else {
 key = token;
 }
 * @param password User's cleartext password.
 *
 * @return Encoded login challenge response, ready to send to the server. Must be g_free()'d
 *         when finished.
 */
-static gchar* msim_compute_login_response(guchar nonce[2*NONCE_HALF_SIZE], gchar* email, gchar* password)
+static gchar* msim_compute_login_response(guchar nonce[2*NONCE_HALF_SIZE],
+		gchar* email, gchar* password)
 {
 PurpleCipherContext *key_context;
 PurpleCipher *sha1;
 	PurpleCipherContext *rc4;
 guchar hash_pw[HASH_SIZE];
 guchar key[HASH_SIZE];
 gchar* password_utf16le;
 guchar* data;
 	guchar* data_out;
 gchar* response;
-int i;
 	size_t data_len, data_out_len;
+	gsize conv_bytes_read, conv_bytes_written;
+	GError* conv_error;
 //memset(nonce, 0, NONCE_HALF_SIZE);
 //memset(nonce + NONCE_HALF_SIZE, 1, NONCE_HALF_SIZE);
 /* Convert ASCII password to UTF16 little endian */
-/* TODO: use the built-in facility to do this, like Nathan Peterson does. */
+purple_debug_info("msim", "converting password to UTF-16LE\n");
-purple_debug_info("msim", "converting password to utf16le\n");
+	conv_error = NULL;
-//printf("pw=<%s>\n",password);
+	password_utf16le = g_convert(password, -1, "UTF-16LE", "UTF-8",
+			&conv_bytes_read, &conv_bytes_written, &conv_error);
+	g_assert(conv_bytes_read == strlen(password));
+	if (conv_error != NULL)
+	{
+		purple_debug_error("msim",
+				"g_convert password UTF8->UTF16LE failed: %s",
+				conv_error->message);
+		g_error_free(conv_error);
+	}
+#if 0
 password_utf16le = g_new0(gchar, strlen(password) * 2);
 for (i = 0; i < strlen(password) * 2; i += 2)
 {
 password_utf16le[i] = password[i / 2];
 password_utf16le[i + 1] = 0;
 }
+#endif
 /* Compute password hash */
-purple_cipher_digest_region("sha1", (guchar*)password_utf16le, strlen(password) * 2,
+purple_cipher_digest_region("sha1", (guchar*)password_utf16le,
-sizeof(hash_pw), hash_pw, NULL);
+			conv_bytes_written, sizeof(hash_pw), hash_pw, NULL);
+	g_free(password_utf16le);
 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE
 printf("pwhash = ");
 for (i = 0; i < sizeof(hash_pw); i++)
 printf("%.2x ", hash_pw[i]);
 ret = send(session->fd, msg, strlen(msg), 0);
 if (ret != strlen(msg))
 {
-purple_debug_info("msim", "msim_send(%s): strlen=%d, but only wrote %s\n",
+purple_debug_info("msim",
+				"msim_send(%s): strlen=%d, but only wrote %s\n",
 msg, strlen(msg), ret);
 /* TODO: better error */
 }
 }
 elements = g_strsplit(item, "=", 2);
 key = elements[0];
 if (!key)
 {
-purple_debug_info("msim", "msim_parse_body(%s): null key", body_str);
+purple_debug_info("msim", "msim_parse_body(%s): null key\n",
+					body_str);
 g_strfreev(elements);
 break;
 }
 value = elements[1];
 if (!value)
 {
-purple_debug_info("msim", "msim_parse_body(%s): null value", body_str);
+purple_debug_info("msim", "msim_parse_body(%s): null value\n",
+					body_str);
 g_strfreev(elements);
 break;
 }
 //printf("-- %s: %s\n", key, value);
 username = g_hash_table_lookup(body, "UserName");
 if (username)
 {
 g_hash_table_insert(session->user_lookup_cache, g_strdup(username), body);
 } else {
-purple_debug_info("msim", "msim_process_reply: not caching <%s>, no UserName",
+purple_debug_info("msim",
+					"msim_process_reply: not caching <%s>, no UserName\n",
 g_hash_table_lookup(table, "body"));
 }
 /* If a callback is registered for this userid lookup, call it. */
 cb = g_hash_table_lookup(session->user_lookup_cb, GUINT_TO_POINTER(rid));
 data = g_hash_table_lookup(session->user_lookup_cb_data, GUINT_TO_POINTER(rid));
 if (cb)
 {
-purple_debug_info("msim", "msim_process_body: calling callback now\n");
+purple_debug_info("msim",
+					"msim_process_body: calling callback now\n");
 cb(session, table, data);
 g_hash_table_remove(session->user_lookup_cb, GUINT_TO_POINTER(rid));
 g_hash_table_remove(session->user_lookup_cb_data, GUINT_TO_POINTER(rid));
 /* Return 1 to tell caller of msim_process (msim_input_cb) to
 * not destroy 'table'; allow 'cb' to hang on to it and destroy
 * it when it wants. */
 return 1;
 } else {
-purple_debug_info("msim", "msim_process_body: no callback for rid %d\n", rid);
+purple_debug_info("msim",
+					"msim_process_body: no callback for rid %d\n", rid);
 }
 }
 return 0;
 }
 userid = g_hash_table_lookup(table, "f");
 msg = g_hash_table_lookup(table, "msg");
-purple_debug_info("msim", "msim_incoming_im: got msg <%s> from <%s>, resolving username\n",
+purple_debug_info("msim",
+			"msim_incoming_im: got msg <%s> from <%s>, resolving username\n",
 msg, userid);
 msim_lookup_user(session, userid, msim_incoming_im_cb, g_strdup(msg));
 return 0;
 {
 purple_debug_info("msim", "msim_status_cb: no username?!\n");
 return;
 }
-purple_debug_info("msim", "msim_status_cb: updating status for <%s> to <%s>\n", username, status_str);
+purple_debug_info("msim",
+			"msim_status_cb: updating status for <%s> to <%s>\n",
+			username, status_str);
 /* TODO: generic functions to split into a GList */
 status_array = g_strsplit(status_str, "|", 0);
 for (list = NULL, i = 0;
 status_array[i];
 /* Add buddy if not found */
 buddy = purple_find_buddy(session->account, username);
 if (!buddy)
 {
 /* TODO: purple aliases, userids and usernames */
-purple_debug_info("msim", "msim_status: making new buddy for %s\n", username);
+purple_debug_info("msim",
+				"msim_status: making new buddy for %s\n", username);
 buddy = purple_buddy_new(session->account, username, NULL);
 /* TODO: sometimes (when click on it), buddy list disappears. Fix. */
 purple_blist_add_buddy(buddy, NULL, NULL, NULL);
 } else {
 return 0;
 }
 /* TODO: if buddies were identified on buddy list by uid, wouldn't have to lookup
 * before updating the status! Much more efficient. */
-purple_debug_info("msim", "msim_status: got status msg <%s> for <%s>, scheduling lookup\n",
+purple_debug_info("msim",
+			"msim_status: got status msg <%s> for <%s>, scheduling lookup\n",
 status_str, userid);
 /* Actually update status once obtain username */
 msim_lookup_user(session, userid, msim_status_cb, g_strdup(status_str));
 close(source);
 return;
 }
 purple_debug_info("msim", "buffer at %d (max %d), reading up to %d\n",
-session->rxoff, MSIM_READ_BUF_SIZE, MSIM_READ_BUF_SIZE - session->rxoff);
+session->rxoff, MSIM_READ_BUF_SIZE,
+			MSIM_READ_BUF_SIZE - session->rxoff);
 /* Read into buffer. On Win32, need recv() not read(). session->fd also holds
 * the file descriptor, but it sometimes differs from the 'source' parameter.
 */
 n = recv(session->fd, session->rxbuf + session->rxoff, MSIM_READ_BUF_SIZE - session->rxoff, 0);
 /* Check for embedded NULs. I don't handle them, and they shouldn't occur. */
 if (strlen(session->rxbuf + session->rxoff) != n)
 {
 /* Occurs after login, but it is not a null byte. */
 purple_debug_info("msim", "msim_input_cb: strlen=%d, but read %d bytes"
-"--null byte encountered?\n", strlen(session->rxbuf + session->rxoff), n);
+"--null byte encountered?\n",
+				strlen(session->rxbuf + session->rxoff), n);
 //purple_connection_error(gc, "Invalid message - null byte on input");
 return;
 }
 session->rxoff += n;
 //printf("in loop: buf=<%s>\n", session->rxbuf);
 *end = 0;
 table = msim_parse(g_strdup(session->rxbuf));
 if (!table)
 {
-purple_debug_info("msim", "msim_input_cb: couldn't parse <%s>\n", session->rxbuf);
+purple_debug_info("msim", "msim_input_cb: couldn't parse <%s>\n",
+					session->rxbuf);
 purple_connection_error(gc, "Unparseable message");
 }
 else
 {
 /* Process message. Returns 0 to free */
 g_return_if_fail(MSIM_SESSION_VALID(session));
 g_return_if_fail(user != NULL);
 g_return_if_fail(cb != NULL);
-purple_debug_info("msim", "msim_lookup_userid", "asynchronously looking up <%s>\n", user);
+purple_debug_info("msim", "msim_lookup_userid",
+			"asynchronously looking up <%s>\n", user);
 /* TODO: check if this user's info was cached and fresh; if so return immediately */
 #if 0
 /* If already know userid, then call callback immediately */
 cached_userid = g_hash_table_lookup(session->userid_cache, who);
 session = gc->proto_data;
 /* If numeric ID, can send message immediately without userid lookup */
 if (msim_is_userid(who))
 {
-purple_debug_info("msim", "msim_send_im: numeric 'who' detected, sending asap\n");
+purple_debug_info("msim",
+				"msim_send_im: numeric 'who' detected, sending asap\n");
 msim_send_im_by_userid(session, who, message, flags);
 return 1;
 }
 /* Otherwise, add callback to IM when userid of destination is available */

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/myspace/myspace.c

libpurple/protocols/myspace/myspace.c