comparison libpurple/protocols/yahoo/yahoo.c @ 22271:cc5b2a145652

Simplified version of the newest patch on #4533 to not try Yahoo protocol version 15 file transfer on Yahoo Japan.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Wed, 06 Feb 2008 18:06:44 +0000
parents 31863f2d7c3c
children d4998f31bc1a
comparison
equal deleted inserted replaced
22270:762174f38807 22271:cc5b2a145652
1469 purple_cipher_context_digest(context, sizeof(digest), digest, NULL); 1469 purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
1470 purple_cipher_context_destroy(context); 1470 purple_cipher_context_destroy(context);
1471 to_y64(result96, digest, 16); 1471 to_y64(result96, digest, 16);
1472 1472
1473 pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, YAHOO_STATUS_AVAILABLE, 0); 1473 pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, YAHOO_STATUS_AVAILABLE, 0);
1474 yahoo_packet_hash(pack, "ssssss", 1474
1475 0, name, 1475 if(yd->jp) {
1476 6, result6, 1476 yahoo_packet_hash(pack, "sssss",
1477 96, result96, 1477 0, name,
1478 1, name, 1478 6, result6,
1479 244, YAHOO_CLIENT_VERSION_ID, 1479 96, result96,
1480 135, YAHOO_CLIENT_VERSION); 1480 1, name,
1481 135, YAHOOJP_CLIENT_VERSION);
1482 } else {
1483 yahoo_packet_hash(pack, "ssssss",
1484 0, name,
1485 6, result6,
1486 96, result96,
1487 1, name,
1488 244, YAHOO_CLIENT_VERSION_ID,
1489 135, YAHOO_CLIENT_VERSION);
1490 }
1491
1481 yahoo_packet_send_and_free(pack, yd); 1492 yahoo_packet_send_and_free(pack, yd);
1482 1493
1483 g_free(hash_string_p); 1494 g_free(hash_string_p);
1484 g_free(hash_string_c); 1495 g_free(hash_string_c);
1485 } 1496 }
1921 sprintf(byte, "%c", delimit_lookup[lookup]); 1932 sprintf(byte, "%c", delimit_lookup[lookup]);
1922 strcat(resp_96, byte); 1933 strcat(resp_96, byte);
1923 } 1934 }
1924 purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status); 1935 purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status);
1925 pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->current_status, 0); 1936 pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->current_status, 0);
1926 yahoo_packet_hash(pack, "ssssss", 1937
1927 0, name, 1938 if(yd->jp) {
1928 6, resp_6, 1939 yahoo_packet_hash(pack, "sssss",
1929 96, resp_96, 1940 0, name,
1930 1, name, 1941 6, resp_6,
1931 244, YAHOO_CLIENT_VERSION_ID, 1942 96, resp_96,
1932 135, YAHOO_CLIENT_VERSION); 1943 1, name,
1944 135, YAHOOJP_CLIENT_VERSION);
1945 } else {
1946 yahoo_packet_hash(pack, "ssssss",
1947 0, name,
1948 6, resp_6,
1949 96, resp_96,
1950 1, name,
1951 244, YAHOO_CLIENT_VERSION_ID,
1952 135, YAHOO_CLIENT_VERSION);
1953 }
1954
1933 if (yd->picture_checksum) 1955 if (yd->picture_checksum)
1934 yahoo_packet_hash_int(pack, 192, yd->picture_checksum); 1956 yahoo_packet_hash_int(pack, 192, yd->picture_checksum);
1935 1957
1936 yahoo_packet_send_and_free(pack, yd); 1958 yahoo_packet_send_and_free(pack, yd);
1937 1959