Improve support for IPv4 vs IPv6 virtual hosts (fixes SF bugs #1087699, #1087668).

[ircu2.10.12-pk.git] / ircd / ircd_parser.y

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 3b4d5375c95d3bb2a7938fb63963b5eb3b270bb4..3514f69f0227862fdaf9d2b5bbb27da8a44b8625 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -69,7 +69,7 @@
   int yylex(void);
   /* Now all the globals we need :/... */
   int tping, tconn, maxlinks, sendq, port, invert, stringno;
-  char *name, *pass, *host, *origin, *hub_limit;
+  char *name, *pass, *host, *ip, *username, *origin, *hub_limit;
   char *stringlist[MAX_STRINGS];
   struct ConnectionClass *c_class;
   struct DenyConf *dconf;
@@ -108,6 +108,8 @@ static void parse_error(char *pattern,...) {
 %token SENDQ
 %token NAME
 %token HOST
+%token IP
+%token USERNAME
 %token PASS
 %token LOCAL
 %token SECONDS
@@ -297,7 +299,13 @@ generaldesc: DESCRIPTION '=' QSTRING ';'
 
 generalvhost: VHOST '=' QSTRING ';'
 {
-  ircd_aton(&VirtualHost.addr, $3);
+  struct irc_in_addr addr;
+  if (!ircd_aton(&addr, $3))
+      parse_error("Invalid virtual host '%s'.", $3);
+  else if (irc_in_addr_is_ipv4(&addr))
+    memcpy(&VirtualHost_v4.addr, &addr, sizeof(addr));
+  else
+    memcpy(&VirtualHost_v6.addr, &addr, sizeof(addr));
 };
 
 adminblock: ADMIN '{' adminitems '}'
@@ -468,7 +476,7 @@ uworldblock: UWORLD '{' uworlditems '}' ';'
  if (name)
  {
   struct ConfItem *aconf = make_conf(CONF_UWORLD);
-  aconf->name = name;
+  aconf->host = name;
  }
  else
  {
@@ -642,28 +650,38 @@ clientblock: CLIENT
 }
 '{' clientitems '}' ';'
 {
-  if (host)
-  {
-    struct ConfItem *aconf = make_conf(CONF_CLIENT);
-    conf_parse_userhost(aconf, host);
-    aconf->conn_class = c_class ? c_class : find_class("default");
-    aconf->maximum = maxlinks;
-  }
+  struct ConfItem *aconf = make_conf(CONF_CLIENT);
+  unsigned char addrbits;
+  aconf->username = username;
+  aconf->host = host;
+  if (ip && ipmask_parse(ip, &aconf->address.addr, &addrbits))
+    aconf->addrbits = addrbits;
   else
-  {
-    MyFree(host);
-    parse_error("Bad client block");
-  }
+    aconf->addrbits = -1;
+  aconf->conn_class = c_class ? c_class : find_class("default");
+  aconf->maximum = maxlinks;
   host = NULL;
+  username = NULL;
   c_class = NULL;
+  MyFree(ip);
 };
 clientitems: clientitem clientitems | clientitem;
-clientitem: clienthost | clientclass | clientpass | clientmaxlinks | error;
+clientitem: clienthost | clientip | clientusername | clientclass | clientpass | clientmaxlinks | error;
 clienthost: HOST '=' QSTRING ';'
 {
   MyFree(host);
   DupString(host, $3);
 };
+clientip: IP '=' QSTRING ';'
+{
+  MyFree(ip);
+  DupString(ip, $3);
+}
+clientusername: USERNAME '=' QSTRING ';'
+{
+  MyFree(username);
+  DupString(username, $3);
+}
 clientclass: CLASS '=' QSTRING ';'
 {
   c_class = find_class($3);