mcabber: mcabber/src/jabglue.c comparison

comparison mcabber/src/jabglue.c @ 1014:99c5278bf6b8

Keep the status and status messages when we're disconnected Improve the automatic reconnection after a network failure. - AutoConnection is only set to false when the user disconnects explicitly (i.e. in do_disconnect()). - AutoConnection is set to TRUE after the 1st successful connection. - In jb_setstatus(), update the status message and the "wanted status" even in offline mode. It helps with auto-away.

author	Mikael Berthe <mikael@lilotux.net>
date	Sun, 12 Nov 2006 22:25:14 +0100
parents	f1a9ca2348e5
children	579299b1c9b2

comparison

equal deleted inserted replaced

-:f1a9ca2348e5
+:99c5278bf6b8
 #define JABBERSSLPORT   5223
 #define RECONNECTION_TIMEOUT    60L
 jconn jc;
+guint AutoConnection;
 enum enum_jstate jstate;
 char imstatus2char[imstatus_size+1] = {
 '_', 'o', 'i', 'f', 'd', 'n', 'a', '\0'
 };
-static bool AutoConnection;
 static time_t LastPingTime;
 static unsigned int KeepaliveDelay;
 static enum imstatus mystatus = offline;
+static enum imstatus mywantedstatus = available;
 static gchar *mystatusmsg;
 static unsigned char online;
 static void statehandler(jconn, int);
 static void packethandler(jconn, jpacket);
 jstate = STATE_CONNECTING;
 statehandler(0, -1);
 jab_start(jc);
 }
-if (jc)
-AutoConnection = true;
 return jc;
 }
 void jb_disconnect(void)
 {
 if (online) {
 // Announce it to  everyone else
 jb_setstatus(offline, NULL, "");
 // End the XML flow
 jb_send_raw("</stream:stream>");
+/*
+// Free status message
+g_free(mystatusmsg);
+mystatusmsg = NULL;
+*/
 }
 // Announce it to the user
 statehandler(jc, JCONN_STATE_OFF);
 jab_delete(jc);
 jc = NULL;
-AutoConnection = false;
 }
 inline void jb_reset_keepalive()
 {
 time(&LastPingTime);
 static void check_connection(void)
 {
 static time_t disconnection_timestamp = 0L;
 time_t now;
+// Maybe we're voluntarily offline...
+if (!AutoConnection)
+return;
 // Are we totally disconnected?
 if (jc && jc->state != JCONN_STATE_OFF) {
 disconnection_timestamp = 0L;
 return;
 }
-// Maybe we're voluntarily offline...
-if (!AutoConnection)
-return;
 time(&now);
 if (!disconnection_timestamp) {
 disconnection_timestamp = now;
 return;
 }
 void jb_setstatus(enum imstatus st, const char *recipient, const char *msg)
 {
 xmlnode x;
-if (!online) return;
 if (msg) {
 // The status message has been specified.  We'll use it, unless it is
 // "-" which is a special case (option meaning "no status message").
 if (!strcmp(msg, "-"))
 else
 msg = "";
 }
 }
-x = presnew(st, recipient, (st != invisible ? msg : NULL));
+// Only send the packet if we're online.
-jab_send(jc, x);
+// (But we want to update internal status even when disconnected,
-xmlnode_free(x);
+// in order to avoid some problems during network failures)
+if (online) {
+x = presnew(st, recipient, (st != invisible ? msg : NULL));
+jab_send(jc, x);
+xmlnode_free(x);
+}
 // If we didn't change our _global_ status, we are done
 if (recipient) return;
-// Send presence to chatrooms
+if (online) {
-if (st != invisible) {
+// Send presence to chatrooms
-struct T_presence room_presence;
+if (st != invisible) {
-room_presence.st = st;
+struct T_presence room_presence;
-room_presence.msg = msg;
+room_presence.st = st;
-foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence);
+room_presence.msg = msg;
-}
+foreach_buddy(ROSTER_TYPE_ROOM, &roompresence, &room_presence);
+}
-// We'll need to update the roster if we switch to/from offline because
+}
-// we don't know the presences of buddies when offline...
-if (mystatus == offline || st == offline)
+if (online) {
-update_roster = TRUE;
+// We'll need to update the roster if we switch to/from offline because
+// we don't know the presences of buddies when offline...
-hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
+if (mystatus == offline || st == offline)
-mystatus = st;
+update_roster = TRUE;
+hk_mystatuschange(0, mystatus, st, (st != invisible ? msg : ""));
+mystatus = st;
+}
+if (st)
+mywantedstatus = st;
 if (msg != mystatusmsg) {
 g_free(mystatusmsg);
 if (*msg)
 mystatusmsg = g_strdup(msg);
 else
 mystatusmsg = NULL;
 }
 // Update status line
 scr_UpdateMainStatus(TRUE);
+}
+//  jb_setprevstatus()
+// Set previous status.  This wrapper function is used after a disconnection.
+inline void jb_setprevstatus(void)
+{
+jb_setstatus(mywantedstatus, NULL, mystatusmsg);
 }
 //  new_msgid()
 // Generate a new id string.  The caller should free it.
 static char *new_msgid(void)
 switch(state) {
 case JCONN_STATE_OFF:
 if (previous_state != JCONN_STATE_OFF)
 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Not connected to the server");
+// Sometimes the state isn't correctly updated
+if (jc)
+jc->state = JCONN_STATE_OFF;
 online = FALSE;
 mystatus = offline;
-// Free status message
-g_free(mystatusmsg);
-mystatusmsg = NULL;
 // Free bookmarks
 xmlnode_free(bookmarks);
 bookmarks = NULL;
 // Free roster
 roster_free();
 case JCONN_STATE_ON:
 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Communication with the server "
 "established");
 online = TRUE;
+// We set AutoConnection to true after the 1st successful connection
+AutoConnection = true;
 break;
 case JCONN_STATE_CONNECTING:
 if (previous_state != state)
 scr_LogPrint(LPRINT_LOGNORM, "[Jabber] Connecting to the server");

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/jabglue.c @ 1014:99c5278bf6b8