Changeset 019c031 for protocols

Timestamp:

2005-12-04T21:55:15Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

568aaf7

Parents:

500a1b6 (diff), d636233 (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 from Wilmer

Location:

protocols

Files:

• jabber/jabber.c (modified) (5 diffs)
• nogaim.c (modified) (3 diffs)
• proxy.c (modified) (2 diffs)
• yahoo/crypt.c (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (1 diff)
• yahoo/yahoo_httplib.c (modified) (1 diff)
• yahoo/yahoo_util.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -22 +22 @@
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifndef _WIN32
 #include <sys/utsname.h>
@@ -59 +55 @@
 #define DEFAULT_PORT 5222
 #define DEFAULT_PORT_SSL 5223
+#define JABBER_PORT_MIN 5220
+#define JABBER_PORT_MAX 5229
 
 #define JABBER_GROUP "Friends"
@@ -541 +539 @@
         gjconn gjc;
         
-        if (!g_slist_find(get_connections(), gc)) {
-                ssl_disconnect(source);
-                return;
-        }
-        
         jd = gc->proto_data;
         gjc = jd->gjc;
@@ -551 +544 @@
         if (source == NULL) {
                 STATE_EVT(JCONN_STATE_OFF)
+                return;
+        }
+        
+        if (!g_slist_find(get_connections(), gc)) {
+                ssl_disconnect(source);
                 return;
         }
@@ -589 +587 @@
         else if (port == -1 && ssl)
                 port = DEFAULT_PORT_SSL;
+        else if (port < JABBER_PORT_MIN || port > JABBER_PORT_MAX) {
+                serv_got_crap(GJ_GC(gjc), "For security reasons, the Jabber port number must be in the %d-%d range.", JABBER_PORT_MIN, JABBER_PORT_MAX);
+                STATE_EVT(JCONN_STATE_OFF)
+                return;
+        }
         
         if (server == NULL)

protocols/nogaim.c

@@ -452 +452 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        serv_got_crap( gc, "Error: %s", msg );
+        if( msg && title )
+                serv_got_crap( gc, "Error: %s: %s", title, msg );
+        else if( msg )
+                serv_got_crap( gc, "Error: %s", msg );
+        else if( title )
+                serv_got_crap( gc, "Error: %s", title );
+        else
+                serv_got_crap( gc, "Error" );
 }
 
@@ -737 +744 @@
                 /* If there's a newline/space in this string, split up there,
                    looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
+                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
                 {
                         msg[425] = tmp;
@@ -769 +776 @@
         
         if( ( u = user_findhandle( gc, handle ) ) )
-                irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
+                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
 }
 

protocols/proxy.c

@@ -114 +114 @@
 }
 
-static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
+static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond)
 {
         struct PHB *phb = data;
@@ -163 +163 @@
         if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
                 if (sockerr_again()) {
-                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
+                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
                         phb->fd = fd;
                 } else {

protocols/yahoo/crypt.c

@@ -22 +22 @@
  * already had. isn't that lovely. people should just use linux or
  * freebsd, crypt works properly on those systems. i hate solaris */
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
 
 #if HAVE_STRING_H

protocols/yahoo/libyahoo2.c

@@ -43 +43 @@
  *
  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #ifndef _WIN32

protocols/yahoo/yahoo_httplib.c

@@ -19 +19 @@
  *
  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #include <stdio.h>

protocols/yahoo/yahoo_util.c

@@ -19 +19 @@
  *
  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #if STDC_HEADERS