* Removed 'realname' code for servers

svn: 2119

src/mod/server.mod/cmdsserv.c

@@ -18,11 +18,6 @@ static void cmd_servers(int idx, char *par)
     dprintf(idx, "Server list:\n");
     i = 0;
     for (; x; x = x->next) {
-      if (x->realname)
-	simple_snprintf(s, sizeof s, "  %s:%d (%s) %s", x->name,
-                     x->port ? x->port : default_port, x->realname,
-                     (i == curserv) ? "<- I am here" : "");
-      else 
         simple_snprintf(s, sizeof s, "  %s:%d %s", x->name, 
 		     x->port ? x->port : default_port, 
 		     (i == curserv) ? "<- I am here" : "");

src/mod/server.mod/server.c

@@ -59,7 +59,7 @@ static time_t server_timeout = 15;	/* server timeout for connecting */
 struct server_list *serverlist = NULL;	/* old-style queue, still used by
 					   server list */
 time_t cycle_time;			/* cycle time till next server connect */
-port_t default_port;		/* default IRC port */
+port_t default_port = 6667;		/* default IRC port */
 bool trigger_on_ignore;	/* trigger bindings if user is ignored ? */
 int answer_ctcp = 1;		/* answer how many stacked ctcp's ? */
 static bool check_mode_r;	/* check for IRCNET +r modes */
@@ -637,7 +637,6 @@ void add_server(char *ss)
     x = (struct server_list *) my_calloc(1, sizeof(struct server_list));
 
     x->next = 0;
-    x->realname = 0;
     x->port = 0;
     if (z)
       z->next = x;
@@ -695,8 +694,6 @@ void clearq(struct server_list *xx)
       free(xx->name);
     if (xx->pass)
       free(xx->pass);
-    if (xx->realname)
-      free(xx->realname);
     free(xx);
     xx = x;
   }
@@ -722,10 +719,6 @@ static void next_server(int *ptr, char *servname, port_t *port, char *pass)
 	if (!egg_strcasecmp(x->name, servname)) {
 	  *ptr = i;
 	  return;
-	} else if (x->realname && !egg_strcasecmp(x->realname, servname)) {
-	  *ptr = i;
-	  strlcpy(servname, x->realname, sizeof servname);
-	  return;
 	}
       }
       i++;
@@ -734,7 +727,6 @@ static void next_server(int *ptr, char *servname, port_t *port, char *pass)
     x = (struct server_list *) my_calloc(1, sizeof(struct server_list));
 
     x->next = 0;
-    x->realname = 0;
     x->name = strdup(servname);
     x->port = *port ? *port : default_port;
     if (pass && pass[0]) {

src/mod/server.mod/server.h

@@ -28,7 +28,6 @@ struct server_list {
   struct server_list	*next;
   char			*name;
   char			*pass;
-  char			*realname;
   port_t		 port;
 };
 
@@ -50,7 +49,7 @@ extern bool		quiet_reject, trigger_on_ignore, floodless;
 extern int 		servidx, ctcp_mode, flud_thr, flud_ctcp_thr, answer_ctcp, serv;
 extern port_t		default_port, newserverport;
 extern time_t		server_online, cycle_time, flud_time, flud_ctcp_time;
-extern char		cursrvname[], botrealname[], botuserhost[], ctcp_reply[],
+extern char		cursrvname[], botrealname[121], botuserhost[], ctcp_reply[],
 			newserver[], newserverpass[], curnetwork[], botuserip[];
 extern struct server_list *serverlist;
 extern struct dcc_table SERVER_SOCKET;

src/mod/server.mod/servmsg.c

@@ -196,9 +196,6 @@ static int got001(char *from, char *msg)
       putlog(LOG_MISC, "*", "Invalid server list!");
       return 0;
     }
-    if (x->realname) 
-      free(x->realname);
-    x->realname = strdup(from);
   }
 #endif
   return 0;
@@ -279,7 +276,7 @@ static int got442(char *from, char *msg)
 
   for (x = serverlist, i = 0; x; x = x->next, i++)
     if (i == curserv) {
-      if (egg_strcasecmp(from, x->realname ? x->realname : x->name))
+      if (egg_strcasecmp(from, x->name))
 	return 0;
       break;
     }
@@ -1064,13 +1061,8 @@ static int whoispenalty(char *from, char *msg)
 
     for (; x; x = x->next) {
       if (i == curserv) {
-        if (!x->realname) {
-          if (strcmp(x->name, from))
-            ii = 1;
-        } else {
-          if (strcmp(x->realname, from))
-            ii = 1;
-        }
+        if (strcmp(x->name, from))
+          ii = 1;
       }
       i++;
     }