aim:

	fixed version constant's to allow to connect
	changed login host to correct one
	todo: find out which encryption is used now (old ssl does not work anymore, i suppouse it's tls, but need to be checked)

git-svn-id: http://svn.miranda-ng.org/main/trunk@16557 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 10 insertions, 8 deletions

diff --git a/protocols/AimOscar/src/client.cpp b/protocols/AimOscar/src/client.cpp
index 1718f23ef5..656b3b541c 100644..100755
--- a/protocols/AimOscar/src/client.cpp
+++ b/protocols/AimOscar/src/client.cpp
@@ -63,11 +63,13 @@ int CAimProto::aim_auth_request(HANDLE hServerConn, unsigned short &seqno, const
 	aim_writetlv(0x25, MD5_HASH_LENGTH, (char*)auth_hash, offset, buf);

 	aim_writetlv(0x4C, 0, 0, offset, buf);//signifies new password hash instead of old method

 	aim_writetlv(0x03, (unsigned short)client_id_len, client_id, offset, buf);

+

+	aim_writetlvshort(0x16, AIM_CLIENT_ID_NUMBER, offset, buf); //in pidgin it's first

 	aim_writetlvshort(0x17, AIM_CLIENT_MAJOR_VERSION, offset, buf);

 	aim_writetlvshort(0x18, AIM_CLIENT_MINOR_VERSION, offset, buf);

 	aim_writetlvshort(0x19, AIM_CLIENT_LESSER_VERSION, offset, buf);

 	aim_writetlvshort(0x1A, AIM_CLIENT_BUILD_NUMBER, offset, buf);

-	aim_writetlvshort(0x16, AIM_CLIENT_ID_NUMBER, offset, buf);

+	//aim_writetlvshort(0x16, AIM_CLIENT_ID_NUMBER, offset, buf);

 	aim_writetlvlong(0x14, AIM_CLIENT_DISTRIBUTION_NUMBER, offset, buf);

 	aim_writetlv(0x0F, (unsigned short)mir_strlen(language), language, offset, buf);

 	aim_writetlv(0x0E, (unsigned short)mir_strlen(country), country, offset, buf);

diff --git a/protocols/AimOscar/src/stdafx.h b/protocols/AimOscar/src/stdafx.h
index dfb105bd1c..8441113ea4 100644..100755
--- a/protocols/AimOscar/src/stdafx.h
+++ b/protocols/AimOscar/src/stdafx.h
@@ -162,10 +162,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define AIM_KEY_NIL                 "IsNotInList"

 

 #define AIM_DEFAULT_SERVER          "slogin.oscar.aol.com"

-#define AIM_DEFAULT_SERVER_NS       "login.oscar.aol.com"

+#define AIM_DEFAULT_SERVER_NS       "slogin.oscar.aol.com"

 #define AIM_PROXY_SERVER            "ars.oscar.aol.com"

 #define AIM_DEFAULT_PORT            5190

-#define AIM_DEFAULT_SSL_PORT        443

+#define AIM_DEFAULT_SSL_PORT        5190

 

 //Some Defaults for various things

 #define DEFAULT_KEEPALIVE_TIMER     39 // secs

@@ -178,12 +178,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define MD5_HASH_LENGTH             16

 

 //Aim Version Stuff

-#define AIM_CLIENT_MAJOR_VERSION    5

-#define AIM_CLIENT_MINOR_VERSION    9

-#define AIM_CLIENT_LESSER_VERSION   0

-#define AIM_CLIENT_BUILD_NUMBER     0x1772

+#define AIM_CLIENT_MAJOR_VERSION    0x0005

+#define AIM_CLIENT_MINOR_VERSION    0x0001

+#define AIM_CLIENT_LESSER_VERSION   0x0000

+#define AIM_CLIENT_BUILD_NUMBER     0x0bdc

 #define AIM_CLIENT_ID_NUMBER        0x0109

-#define AIM_CLIENT_DISTRIBUTION_NUMBER 0x0150

+#define AIM_CLIENT_DISTRIBUTION_NUMBER 0x0611

 

 #define AIM_LANGUAGE "en"

 #define AIM_COUNTRY "us"