Changeset 7f69740 for protocols

Timestamp:

2008-06-15T18:11:47Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d419073

Parents:

5ec4129

Message:

Using a port list instead of a single range for the allowed Jabber port
numbers, adding 80 and 443. Partially closes #265.

Location:

protocols/jabber

Files:

• jabber.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/jabber.c

@@ -37 +37 @@
 GSList *jabber_connections;
 
+/* First enty is the default */
+static const int jabber_port_list[] = {
+        5222,
+        5223,
+        5220,
+        5221,
+        5224,
+        5225,
+        5226,
+        5227,
+        5228,
+        5229,
+        80,
+        443,
+        0
+};
+
 static void jabber_init( account_t *acc )
 {
         set_t *s;
-        
-        s = set_add( &acc->set, "port", JABBER_PORT_DEFAULT, set_eval_int, acc );
+        char str[16];
+        
+        g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
+        s = set_add( &acc->set, "port", str, set_eval_int, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
@@ -72 +91 @@
         struct ns_srv_reply *srv = NULL;
         char *connect_to, *s;
+        int i;
         
         /* For now this is needed in the _connected() handlers if using
@@ -177 +197 @@
         imcb_log( ic, "Connecting" );
         
-        if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN ||
-            set_getint( &acc->set, "port" ) > JABBER_PORT_MAX )
-        {
-                imcb_log( ic, "Incorrect port number, must be in the %d-%d range",
-                               JABBER_PORT_MIN, JABBER_PORT_MAX );
+        for( i = 0; jabber_port_list[i] > 0; i ++ )
+                if( set_getint( &acc->set, "port" ) == jabber_port_list[i] )
+                        break;
+
+        if( jabber_port_list[i] == 0 )
+        {
+                imcb_log( ic, "Illegal port number" );
                 imc_logout( ic, FALSE );
                 return;

protocols/jabber/jabber.h

@@ -134 +134 @@
 
 #define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
-
-#define JABBER_PORT_DEFAULT "5222"
-#define JABBER_PORT_MIN 5220
-#define JABBER_PORT_MAX 5229
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the