diff options
| -rw-r--r-- | protocols/jabber/jabber.c | 11 | ||||
| -rw-r--r-- | protocols/jabber/jabber.h | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index a60cd4aa..fa9c3473 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -36,7 +36,7 @@ static void jabber_acc_init( account_t *acc ) { set_t *s; - s = set_add( &acc->set, "port", "5222", set_eval_int, acc ); + s = set_add( &acc->set, "port", JABBER_PORT_DEFAULT, set_eval_int, acc ); s->flags |= ACC_SET_OFFLINE_ONLY; s = set_add( &acc->set, "priority", "0", set_eval_priority, acc ); @@ -160,6 +160,15 @@ static void jabber_login( account_t *acc ) set_login_progress( gc, 0, "Connecting" ); + if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN || + set_getint( &acc->set, "port" ) > JABBER_PORT_MAX ) + { + serv_got_crap( gc, "Incorrect port number, must be in the %d-%d range", + JABBER_PORT_MIN, JABBER_PORT_MAX ); + signoff( gc ); + return; + } + /* For non-SSL connections we can try to use the port # from the SRV reply, but let's not do that when using SSL, SSL usually runs on non-standard ports... */ diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index 628cb03a..0a0f3c2c 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -51,6 +51,10 @@ typedef enum XEP85 (typing notification shite). */ } jabber_buddy_flags_t; +#define JABBER_PORT_DEFAULT "5222" +#define JABBER_PORT_MIN 5220 +#define JABBER_PORT_MAX 5229 + struct jabber_data { struct gaim_connection *gc; |