Changeset b006464 for protocols

Timestamp:

2012-11-17T23:51:21Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5aa96fc8

Parents:

d1356cb (diff), e1d3f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

Location:

protocols

Files:

• jabber/iq.c (modified) (1 diff)
• jabber/jabber.c (modified) (1 diff)
• jabber/jabber.h (modified) (1 diff)
• jabber/message.c (modified) (2 diffs)
• nogaim.h (modified) (2 diffs)
• oscar/oscar.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -128 +128 @@
                                                    XMLNS_MUC,
                                                    XMLNS_PING,
+                                                   XMLNS_RECEIPTS,
                                                    XMLNS_SI,
                                                    XMLNS_BYTESTREAMS,

protocols/jabber/jabber.c

@@ -231 +231 @@
         if( set_getbool( &acc->set, "ssl" ) )
         {
-                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), FALSE, jabber_connected_ssl, ic );
+                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), set_getbool( &acc->set, "tls_verify" ), jabber_connected_ssl, ic );
                 jd->fd = jd->ssl ? ssl_getfd( jd->ssl ) : -1;
         }

protocols/jabber/jabber.h

@@ -227 +227 @@
 #define XMLNS_TIME         "urn:xmpp:time"                                       /* XEP-0202 */
 #define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
+#define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
 #define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
 #define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */

protocols/jabber/message.c

@@ -29 +29 @@
         char *from = xt_find_attr( node, "from" );
         char *type = xt_find_attr( node, "type" );
+        char *id = xt_find_attr( node, "id" );
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
+        struct xt_node *request = xt_find_node( node->children, "request" );
         struct jabber_buddy *bud = NULL;
         char *s, *room = NULL, *reason = NULL;
@@ -35 +37 @@
         if( !from )
                 return XT_HANDLED; /* Consider this packet corrupted. */
+
+        if( request && id )
+        {
+                /* Send a message receipt (XEP-0184), looking like this:
+                 * <message
+                 *  from='kingrichard@royalty.england.lit/throne'
+                 *  id='bi29sg183b4v'
+                 *  to='northumberland@shakespeare.lit/westminster'>
+                 *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
+                 * </message> */
+                struct xt_node *received, *receipt;
+                
+                received = xt_new_node( "received", NULL, NULL );
+                xt_add_attr( received, "xmlns", XMLNS_RECEIPTS );
+                xt_add_attr( received, "id", id );
+                receipt = jabber_make_packet( "message", NULL, from, received );
+
+                jabber_write_packet( ic, receipt );
+                xt_free_node( receipt );
+        }
         
         bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT );

protocols/nogaim.h

@@ -90 +90 @@
         int permdeny;
         
-        char displayname[128];
         char *away;
-        
-        int evil;
         
         /* BitlBee */
@@ -129 +126 @@
         char show[BUDDY_ALIAS_MAXLEN];
         int present;
-        int evil;
         time_t signon;
         time_t idle;

protocols/oscar/oscar.c

@@ -946 +946 @@
                         g_hash_table_insert(od->ips, uin, (gpointer) (long) info->icqinfo.ipaddr);
         }
-
-        if (!aim_sncmp(ic->acc->user, info->sn))
-                g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
 
         tmp = normalize(info->sn);
@@ -1536 +1533 @@
 
 static int gaim_selfinfo(aim_session_t *sess, aim_frame_t *fr, ...) {
-        va_list ap;
-        aim_userinfo_t *info;
-        struct im_connection *ic = sess->aux_data;
-
-        va_start(ap, fr);
-        info = va_arg(ap, aim_userinfo_t *);
-        va_end(ap);
-
-        ic->evil = info->warnlevel/10;
-        /* ic->correction_time = (info->onlinesince - ic->login_time); */
-
         return 1;
 }