Make server blocks default to leaf.

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

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index ca58bf3fc93c807a6f35bde0da0c5fd903c7b8cc..31d3a16ec4842322b6db52bdd34b81523c523a42 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -135,9 +135,7 @@ static void parse_error(char *pattern,...) {
 %token YES
 %token NO
 %token OPER
-%token PORT
 %token VHOST
-%token MASK
 %token HIDDEN
 %token MOTD
 %token JUPE
@@ -297,9 +295,7 @@ generaldesc: DESCRIPTION '=' QSTRING ';'
 
 generalvhost: VHOST '=' QSTRING ';'
 {
-  if (INADDR_NONE ==
-      (localConf.vhost_address.s_addr = inet_addr(yylval.text)))
-    localConf.vhost_address.s_addr = INADDR_ANY;
+  ircd_aton(&localConf.vhost_address, yylval.text);
 };
 
 adminblock: ADMIN '{' adminitems '}'
@@ -391,20 +387,18 @@ connectblock: CONNECT
  port = 0;
 } '{' connectitems '}'
 {
- if (name != NULL && pass != NULL && host != NULL && c_class != NULL && 
-     /*ccount < MAXCONFLINKS &&*/ !strchr(host, '*') &&
-     !strchr(host, '?'))
+ if (name != NULL && pass != NULL && host != NULL && c_class != NULL
+     && !strchr(host, '*') && !strchr(host, '?'))
  {
    aconf = make_conf();
    aconf->status = CONF_SERVER;
    aconf->name = name;
    aconf->passwd = pass;
    aconf->conn_class = c_class;
-   aconf->port = port;
+   aconf->address.port = port;
    aconf->status = CONF_SERVER;
    aconf->host = host;
    aconf->next = GlobalConfList;
-   aconf->ipnum.s_addr = INADDR_NONE;
    lookup_confhost(aconf);
    GlobalConfList = aconf;
  }
@@ -448,6 +442,7 @@ serverblock: SERVER
 {
  aconf = (struct ConfItem*) MyMalloc(sizeof(*aconf));
  memset(aconf, 0, sizeof(*aconf));
+ aconf->status = CONF_LEAF;
 } '{' serveritems '}'
 {
  if (aconf->status == 0)
@@ -770,25 +765,7 @@ killuhost: HOST '=' QSTRING ';'
   }
   DupString(dconf->hostmask, h);
   DupString(dconf->usermask, u);
-  if (strchr(yylval.text, '.'))
-  {
-    int  c_class;
-    char ipname[16];
-    int  ad[4] = { 0 };
-    int  bits2 = 0;
-    dconf->flags |= DENY_FLAGS_IP;
-    c_class = sscanf(dconf->hostmask, "%d.%d.%d.%d/%d",
-                     &ad[0], &ad[1], &ad[2], &ad[3], &bits2);
-    if (c_class != 5) {
-      dconf->bits = c_class * 8;
-    }
-    else {
-      dconf->bits = bits2;
-    }
-    ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1],
-                 ad[2], ad[3]);
-    dconf->address = inet_addr(ipname);
-  }
+  ipmask_parse(dconf->hostmask, &dconf->address, &dconf->bits);
 };
 
 killreal: REAL '=' QSTRING ';'