* Add 'server-port-ssl'

doc/help.txt

@@ -1616,6 +1616,7 @@ See also: reload, backup
                           after the alias is expanded. 
                           $bAliases may not reference other aliases.$b
 [N]  $bserver-port$b     Default port to use for server connections.
+[N]  $bserver-port-ssl$b Default port to use for SSL server connections.
 [B]  $bauth-chan$b       If set, auth cmds will work in channels as well as in msg, otherwise 
                           only in msg.
 [S]  $bauth-key$b        The authkey used during authing. Give to users if they need to auth. 

src/cmds.c

@@ -4313,7 +4313,7 @@ static void rcmd_jump(char * frombot, char * fromhand, char * fromidx, char * pa
       }
 
       if (!port)
-        port = default_port;
+        port = (ssl_use ? default_port_ssl : default_port);
       strlcpy(newserver, other, 120); 
       newserverport = port; 
       strlcpy(newserverpass, par, 120); 

src/mod/server.mod/cmdsserv.c

@@ -39,7 +39,7 @@ static void cmd_servers(int idx, char *par)
     i = 0;
     for (; x; x = x->next) {
         simple_snprintf(s, sizeof s, "  %s:%d %s", x->name, 
-		     x->port ? x->port : default_port, 
+		     x->port ? x->port : (ssl_use ? default_port_ssl : default_port),
 		     (i == curserv) ? "<- I am here" : "");
       dprintf(idx, "%s\n", s);
       i++;
@@ -93,7 +93,7 @@ static void cmd_jump(int idx, char *par)
         port = atoi(p);
     }
     if (!port)
-      port = default_port;
+      port = (ssl_use ? default_port_ssl : default_port);
     putlog(LOG_CMDS, "*", "#%s# jump %s %d %s", dcc[idx].nick, other, port, par);
     strlcpy(newserver, other, sizeof newserver);
     newserverport = port;

src/mod/server.mod/server.c

@@ -87,6 +87,7 @@ struct server_list *serverlist = NULL;	/* old-style queue, still used by
 					   server list */
 interval_t cycle_time;			/* cycle time till next server connect */
 port_t default_port = 6667;		/* default IRC port */
+port_t default_port_ssl = 6697;		/* default IRC SSL port */
 bool trigger_on_ignore;	/* trigger bindings if user is ignored ? */
 int answer_ctcp = 1;		/* answer how many stacked ctcp's ? */
 static bool resolvserv;		/* in the process of resolving a server host */
@@ -820,7 +821,7 @@ void next_server(int *ptr, char *servname, port_t *port, char *pass)
 
     x->next = 0;
     x->name = strdup(servname);
-    x->port = *port ? *port : default_port;
+    x->port = *port ? *port : (ssl_use ? default_port_ssl : default_port);
     if (pass && pass[0]) {
       x->pass = strdup(pass);
     } else
@@ -844,7 +845,7 @@ void next_server(int *ptr, char *servname, port_t *port, char *pass)
     *ptr = 0;
   }				/* Start over at the beginning */
   strcpy(servname, x->name);
-  *port = x->port ? x->port : default_port;
+  *port = x->port ? x->port : (ssl_use ? default_port_ssl : default_port);
   if (x->pass)
     strcpy(pass, x->pass);
   else

src/mod/server.mod/server.h

@@ -50,7 +50,7 @@ extern size_t		nick_len;
 extern bool		trigger_on_ignore, floodless, keepnick, in_deaf, in_callerid, have_cprivmsg, have_cnotice;
 extern int 		servidx, ctcp_mode, answer_ctcp, serv, curserv, default_alines, flood_count, burst;
 extern unsigned int     rolls;
-extern port_t		default_port, newserverport, curservport;
+extern port_t		default_port, default_port_ssl, newserverport, curservport;
 extern time_t		server_online, tried_jupenick, tried_nick, release_time, connect_bursting;
 extern interval_t	cycle_time;
 extern char		cursrvname[], botrealname[121], botuserhost[], ctcp_reply[1024],

src/set.c

@@ -122,6 +122,7 @@ static variable_t vars[] = {
  VAR("rbl-servers",	rbl_servers,		VAR_STRING|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB,	0, 0, DEFAULT_RBL),
  VAR("realname",	botrealname,		VAR_STRING|VAR_NOLHUB,				0, 0, "* I'm too lame to read BitchX.doc *"),
  VAR("server-port",	&default_port,		VAR_INT|VAR_SHORT|VAR_NOLHUB,			0, 65535, "6667"),
+ VAR("server-port-ssl",	&default_port_ssl,	VAR_INT|VAR_SHORT|VAR_NOLHUB,			0, 65535, "6697"),
  VAR("servers",		&serverlist,		VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,	0, 0, DEFAULT_SERVERS),
  VAR("servers6",	&serverlist,		VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB|VAR_NOLDEF,	0, 0, DEFAULT_SERVERS6),
  VAR("trace",		&trace,			VAR_INT|VAR_DETECTED,				0, 4, "die"),
@@ -460,7 +461,7 @@ const char *var_string(variable_t *var)
       char list[2048] = "", buf[101] = "";
 
       for (n = (*(struct server_list **)var->mem); n; n = n->next) {
-        if (n->port && n->port != default_port)
+        if (n->port && n->port != (ssl_use ? default_port_ssl : default_port))
           simple_snprintf(buf, sizeof(buf), "%s:%d", n->name, n->port);
         else
           strlcat(buf, n->name, sizeof(buf));