ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/src/conf_parser.y
(Generate patch)

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 1632 by michael, Sun Nov 4 15:37:10 2012 UTC vs.
Revision 1644 by michael, Tue Nov 6 22:20:16 2012 UTC

# Line 222 | Line 222 | free_collect_item(struct CollectItem *it
222   %token  PATH
223   %token  PING_COOKIE
224   %token  PING_TIME
225 – %token  PING_WARNING
225   %token  PORT
226   %token  QSTRING
227   %token  QUIET_ON_BAN
# Line 1309 | Line 1308 | class_items:    class_items class_item |
1308   class_item:     class_name |
1309                  class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1310                  class_ping_time |
1312 –                class_ping_warning |
1311                  class_number_per_cidr |
1312                  class_number_per_ip |
1313                  class_connectfreq |
# Line 1335 | Line 1333 | class_ping_time: PING_TIME '=' timespec
1333      yy_class->ping_freq = $3;
1334   };
1335  
1338 – class_ping_warning: PING_WARNING '=' timespec ';'
1339 – {
1340 –  if (conf_parser_ctx.pass == 1)
1341 –    yy_class->ping_warning = $3;
1342 – };
1343 –
1336   class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1337   {
1338    if (conf_parser_ctx.pass == 1)
# Line 1813 | Line 1805 | shared_entry: T_SHARED
1805    if (conf_parser_ctx.pass == 2)
1806    {
1807      yy_conf = conf_make(CONF_ULINE);
1808 <    yy_conf->action = SHARED_ALL;
1808 >    yy_conf->flags = SHARED_ALL;
1809    }
1810   } '{' shared_items '}' ';'
1811   {
# Line 1860 | Line 1852 | shared_user: USER '=' QSTRING ';'
1852   shared_type: TYPE
1853   {
1854    if (conf_parser_ctx.pass == 2)
1855 <    yy_conf->action = 0;
1855 >    yy_conf->flags = 0;
1856   } '=' shared_types ';' ;
1857  
1858   shared_types: shared_types ',' shared_type_item | shared_type_item;
1859   shared_type_item: KLINE
1860   {
1861    if (conf_parser_ctx.pass == 2)
1862 <    yy_conf->action |= SHARED_KLINE;
1862 >    yy_conf->flags |= SHARED_KLINE;
1863   } | UNKLINE
1864   {
1865    if (conf_parser_ctx.pass == 2)
1866 <    yy_conf->action |= SHARED_UNKLINE;
1866 >    yy_conf->flags |= SHARED_UNKLINE;
1867   } | T_DLINE
1868   {
1869    if (conf_parser_ctx.pass == 2)
1870 <    yy_conf->action |= SHARED_DLINE;
1870 >    yy_conf->flags |= SHARED_DLINE;
1871   } | T_UNDLINE
1872   {
1873    if (conf_parser_ctx.pass == 2)
1874 <    yy_conf->action |= SHARED_UNDLINE;
1874 >    yy_conf->flags |= SHARED_UNDLINE;
1875   } | XLINE
1876   {
1877    if (conf_parser_ctx.pass == 2)
1878 <    yy_conf->action |= SHARED_XLINE;
1878 >    yy_conf->flags |= SHARED_XLINE;
1879   } | T_UNXLINE
1880   {
1881    if (conf_parser_ctx.pass == 2)
1882 <    yy_conf->action |= SHARED_UNXLINE;
1882 >    yy_conf->flags |= SHARED_UNXLINE;
1883   } | RESV
1884   {
1885    if (conf_parser_ctx.pass == 2)
1886 <    yy_conf->action |= SHARED_RESV;
1886 >    yy_conf->flags |= SHARED_RESV;
1887   } | T_UNRESV
1888   {
1889    if (conf_parser_ctx.pass == 2)
1890 <    yy_conf->action |= SHARED_UNRESV;
1890 >    yy_conf->flags |= SHARED_UNRESV;
1891   } | T_LOCOPS
1892   {
1893    if (conf_parser_ctx.pass == 2)
1894 <    yy_conf->action |= SHARED_LOCOPS;
1894 >    yy_conf->flags |= SHARED_LOCOPS;
1895   } | T_ALL
1896   {
1897    if (conf_parser_ctx.pass == 2)
1898 <    yy_conf->action = SHARED_ALL;
1898 >    yy_conf->flags = SHARED_ALL;
1899   };
1900  
1901   /***************************************************************************

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)