[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 msn_core.C,1.43,1.44
From: |
Colin Leroy <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 msn_core.C,1.43,1.44 |
Date: |
Sun, 23 Mar 2003 05:53:17 -0500 |
Update of /cvsroot/ayttm/ayttm/modules/msn2/libmsn2
In directory subversions:/tmp/cvs-serv13709/modules/msn2/libmsn2
Modified Files:
msn_core.C
Log Message:
error checking
Index: msn_core.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn_core.C,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- msn_core.C 23 Mar 2003 10:35:32 -0000 1.43
+++ msn_core.C 23 Mar 2003 10:53:15 -0000 1.44
@@ -115,7 +115,7 @@
{
if(errcode != 215 && errcode != 216 && errcode != 219
&& errcode != 224 && errcode != 225) {
- snprintf(buf, 1024, "An error has occurred while communicating with the
MSN Messenger server: %s (code %d)", errors[errcode], errcode);
+ snprintf(buf, 1024, "An error has occurred while communicating with the
MSN Messenger server: \n\n %s (code %d).", errors[errcode], errcode);
ext_show_error(conn, buf);
}
if(errcode == 715)
@@ -839,7 +839,6 @@
content=msn_find_in_mime(mime, "Content-Type");
if(content==NULL) {
- ext_show_error(conn, "MSG with no Content-type set");
printf("mime:%s\n",mime);
printf("body:%s\n",body);
delete msg;
@@ -1809,7 +1808,7 @@
struct stat st_info;
if(stat(path, &st_info)<0)
- { ext_show_error(conn, "Could not open file"); return NULL; }
+ { ext_show_error(conn, "Could not open file."); return NULL; }
invitation_ftp * inv=new invitation_ftp;
@@ -1863,7 +1862,8 @@
authdata_SB * auth=(authdata_SB *)conn->auth;
if(fd == -1 || error)
{
- ext_show_error(conn, "Could not connect to switchboard server");
+ ext_show_error(conn, "Could not connect to switchboard server.");
+ ext_closing_connection(conn);
return;
}
conn->sock=fd;
@@ -1901,7 +1901,8 @@
if(fd==-1 || error)
{
- ext_show_error(conn, "Could not connect to MSN server");
+ ext_show_error(conn, "Could not connect to MSN server.");
+ ext_closing_connection(conn);
return;
}
conn->sock = fd;
@@ -1924,13 +1925,21 @@
if(conn->type==CONN_SB)
{
- ext_async_socket(server, port, msn_connect_cb, conn);
+ if (ext_async_socket(server, port, msn_connect_cb, conn) < 0) {
+ if(DEBUG) printf("immediate connect failure\n");
+ ext_show_error(conn, "Could not connect to MSN server.");
+ ext_closing_connection(conn);
+ }
//conn->sock = ext_connect_socket(server,port);
//msn_connect_cb(conn->sock,0,conn);
return;
}
conn->ready = 0;
- ext_async_socket(server, port, msn_connect_cb2, conn);
+ if (ext_async_socket(server, port, msn_connect_cb2, conn) < 0) {
+ if(DEBUG) printf("immediate connect2 failure\n");
+ ext_show_error(conn, "Could not connect to MSN server.");
+ ext_closing_connection(conn);
+ }
//conn->sock = ext_connect_socket(server,port);
//msn_connect_cb2(conn->sock,0,conn);
@@ -1947,7 +1956,7 @@
if(strcmp(args[0], "VER") || strcmp(args[2], "MSNP7")) // if either
*differs*...
{
- ext_show_error(NULL, "Protocol negotiation failed");
+ ext_show_error(NULL, "MSN Protocol negotiation failed.");
delete info;
ext_unregister_sock(conn->sock);
close(conn->sock);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 msn_core.C,1.43,1.44,
Colin Leroy <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.385,1.386 configure.in,1.379,1.380
- Next by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.386,1.387 configure.in,1.380,1.381
- Previous by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.385,1.386 configure.in,1.379,1.380
- Next by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.386,1.387 configure.in,1.380,1.381
- Index(es):