Changeset eded1f7 for protocols/jabber

Timestamp:

2007-12-18T23:59:35Z (17 years ago)

Author:

kenobi <kenobi@…>

Branches:

master

Children:

2379566

Parents:

dc0ba9c

Message:

Merged in 280..288 from upstream (e.g. PING)

Location:

protocols/jabber

Files:

• conference.c (modified) (1 diff)
• io.c (modified) (2 diffs)
• iq.c (modified) (3 diffs)
• jabber.c (modified) (2 diffs)
• jabber.h (modified) (2 diffs)

protocols/jabber/conference.c

@@ -174 +174 @@
         
         return 1;
+}
+
+void jabber_chat_invite( struct groupchat *c, char *who, char *message )
+{
+        struct xt_node *node;
+        struct im_connection *ic = c->ic;
+        struct jabber_chat *jc = c->data;
+
+        node = xt_new_node( "reason", message, NULL ); 
+
+        node = xt_new_node( "invite", NULL, node );
+        xt_add_attr( node, "to", who ); 
+
+        node = xt_new_node( "x", NULL, node ); 
+        xt_add_attr( node, "xmlns", XMLNS_MUC_USER ); 
+        
+        node = jabber_make_packet( "message", NULL, jc->name, node ); 
+
+        jabber_write_packet( ic, node ); 
+
+        xt_free_node( node );
 }
 

protocols/jabber/io.c

@@ -120 +120 @@
                 return TRUE;
         }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
         {
                 /* Set fd to -1 to make sure we won't write to it anymore. */
@@ -231 +231 @@
                 }
         }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
         {
                 closesocket( jd->fd );

protocols/jabber/iq.c

@@ -50 +50 @@
         else if( strcmp( type, "get" ) == 0 )
         {
-                if( !( c = xt_find_node( node->children, "query" ) ) ||
+                if( !( ( c = xt_find_node( node->children, "query" ) ) ||
+                       ( c = xt_find_node( node->children, "ping" ) ) ) || /* O_o WHAT is wrong with just <query/> ????? */
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
@@ -81 +82 @@
                         xt_add_child( reply, xt_new_node( "tz", buf, NULL ) );
                 }
+                else if( strcmp( s, XMLNS_PING ) == 0 )
+                {
+                        xt_free_node( reply );
+                        reply = jabber_make_packet( "iq", "result", xt_find_attr( node, "from" ), NULL );
+                        if( ( s = xt_find_attr( node, "id" ) ) )
+                                xt_add_attr( reply, "id", s );
+                        pack = 0;
+                }
                 else if( strcmp( s, XMLNS_DISCO_INFO ) == 0 )
                 {
@@ -87 +96 @@
                                                    XMLNS_CHATSTATES,
                                                    XMLNS_MUC,
+                                                   XMLNS_PING,
                                                    XMLNS_SI,
                                                    XMLNS_BYTESTREAMS,

protocols/jabber/jabber.c

@@ -423 +423 @@
 }
 
+static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
+{
+        struct jabber_chat *jc = c->data;
+        gchar *msg_alt = NULL;
+
+        if( msg == NULL )
+                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
+        
+        if( c && who )
+                jabber_chat_invite( c, who, msg ? msg : msg_alt );
+        
+        g_free( msg_alt );
+}
+
 static void jabber_keepalive( struct im_connection *ic )
 {
@@ -494 +508 @@
         ret->chat_msg = jabber_chat_msg_;
         ret->chat_topic = jabber_chat_topic_;
-//      ret->chat_invite = jabber_chat_invite;
+        ret->chat_invite = jabber_chat_invite_;
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;

protocols/jabber/jabber.h

@@ -189 +189 @@
 #define XMLNS_VERSION      "jabber:iq:version"                                   /* XEP-0092 */
 #define XMLNS_TIME         "jabber:iq:time"                                      /* XEP-0090 */
+#define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
 #define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
 #define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
@@ -293 +294 @@
 void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
 void jabber_chat_pkt_message( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
+void jabber_chat_invite( struct groupchat *c, char *who, char *message );
 
 #endif