Changeset 019c031 for protocols/jabber/jabber.c

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

File:

• protocols/jabber/jabber.c (modified) (5 diffs)

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)