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

Comparing ircd-hybrid/branches/8.2.x/src/conf_parser.c (file contents):
Revision 6627 by michael, Sat Oct 24 13:27:43 2015 UTC vs.
Revision 6638 by michael, Sat Oct 24 17:30:17 2015 UTC

# Line 1084 | Line 1084 | static const yytype_uint16 yyrline[] =
1084      2935,  2936,  2937,  2938,  2939,  2940,  2941,  2942,  2944,  2949,
1085      2954,  2959,  2964,  2969,  2974,  2979,  2984,  2989,  2997,  3000,
1086      3000,  3001,  3002,  3003,  3004,  3005,  3006,  3007,  3008,  3009,
1087 <    3010,  3012,  3018,  3024,  3030,  3036,  3045,  3060,  3069,  3075
1087 >    3010,  3012,  3018,  3034,  3043,  3049,  3055,  3061,  3070,  3076
1088   };
1089   #endif
1090  
# Line 1228 | Line 1228 | static const char *const yytname[] =
1228    "channel_max_channels", "channel_max_bans",
1229    "channel_default_join_flood_count", "channel_default_join_flood_time",
1230    "serverhide_entry", "serverhide_items", "serverhide_item",
1231 <  "serverhide_flatten_links", "serverhide_disable_remote_commands",
1231 >  "serverhide_flatten_links", "serverhide_flatten_links_delay",
1232 >  "serverhide_flatten_links_file", "serverhide_disable_remote_commands",
1233    "serverhide_hide_servers", "serverhide_hide_services",
1234 <  "serverhide_hidden_name", "serverhide_flatten_links_delay",
1234 <  "serverhide_flatten_links_file", "serverhide_hidden",
1234 >  "serverhide_hidden_name", "serverhide_hidden",
1235    "serverhide_hide_server_ips", YY_NULLPTR
1236   };
1237   #endif
# Line 1442 | Line 1442 | static const yytype_uint16 yydefact[] =
1442       506,   507,   500,   498,   504,   505,   503,     0,     0,     0,
1443         0,     0,     0,     0,    46,    47,    48,     0,     0,     0,
1444       650,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1445 <       0,   640,   641,   644,   645,   646,   648,   642,   643,   647,
1445 >       0,   640,   641,   642,   643,   644,   645,   646,   648,   647,
1446       649,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1447         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1448        54,    69,    66,    64,    70,    71,    65,    55,    68,    58,
# Line 1518 | Line 1518 | static const yytype_uint16 yydefact[] =
1518         0,     0,     0,     0,   302,     0,     0,   438,     0,     0,
1519         0,   297,   293,   296,   278,    50,    51,     0,     0,   101,
1520         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1521 <     153,     0,     0,     0,   336,   652,   651,   656,   657,   658,
1522 <     655,   659,   653,   654,    86,    81,    89,    80,    87,    88,
1521 >     153,     0,     0,     0,   336,   654,   651,   652,   653,   658,
1522 >     657,   659,   655,   656,    86,    81,    89,    80,    87,    88,
1523        79,    83,    82,    74,    73,    78,    75,    77,    76,    84,
1524        85,     0,     0,   377,   128,     0,     0,     0,   140,     0,
1525       132,   133,   135,   134,     0,     0,     0,     0,   110,   351,
# Line 6464 | Line 6464 | yyreduce:
6464   #line 3019 "conf_parser.y" /* yacc.c:1646  */
6465      {
6466    if (conf_parser_ctx.pass == 2)
6467 <    ConfigServerHide.disable_remote_commands = yylval.number;
6467 >  {
6468 >    if ((yyvsp[-1].number) > 0)
6469 >    {
6470 >      event_write_links_file.when = (yyvsp[-1].number);
6471 >      event_add(&event_write_links_file, NULL);
6472 >    }
6473 >    else
6474 >     event_delete(&event_write_links_file);
6475 >
6476 >    ConfigServerHide.flatten_links_delay = (yyvsp[-1].number);
6477 >  }
6478   }
6479 < #line 6470 "conf_parser.c" /* yacc.c:1646  */
6479 > #line 6480 "conf_parser.c" /* yacc.c:1646  */
6480      break;
6481  
6482    case 653:
6483 < #line 3025 "conf_parser.y" /* yacc.c:1646  */
6483 > #line 3035 "conf_parser.y" /* yacc.c:1646  */
6484      {
6485    if (conf_parser_ctx.pass == 2)
6486 <    ConfigServerHide.hide_servers = yylval.number;
6486 >  {
6487 >    MyFree(ConfigServerHide.flatten_links_file);
6488 >    ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
6489 >  }
6490   }
6491 < #line 6479 "conf_parser.c" /* yacc.c:1646  */
6491 > #line 6492 "conf_parser.c" /* yacc.c:1646  */
6492      break;
6493  
6494    case 654:
6495 < #line 3031 "conf_parser.y" /* yacc.c:1646  */
6495 > #line 3044 "conf_parser.y" /* yacc.c:1646  */
6496      {
6497    if (conf_parser_ctx.pass == 2)
6498 <    ConfigServerHide.hide_services = yylval.number;
6498 >    ConfigServerHide.disable_remote_commands = yylval.number;
6499   }
6500 < #line 6488 "conf_parser.c" /* yacc.c:1646  */
6500 > #line 6501 "conf_parser.c" /* yacc.c:1646  */
6501      break;
6502  
6503    case 655:
6504 < #line 3037 "conf_parser.y" /* yacc.c:1646  */
6504 > #line 3050 "conf_parser.y" /* yacc.c:1646  */
6505      {
6506    if (conf_parser_ctx.pass == 2)
6507 <  {
6495 <    MyFree(ConfigServerHide.hidden_name);
6496 <    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6497 <  }
6507 >    ConfigServerHide.hide_servers = yylval.number;
6508   }
6509 < #line 6500 "conf_parser.c" /* yacc.c:1646  */
6509 > #line 6510 "conf_parser.c" /* yacc.c:1646  */
6510      break;
6511  
6512    case 656:
6513 < #line 3046 "conf_parser.y" /* yacc.c:1646  */
6513 > #line 3056 "conf_parser.y" /* yacc.c:1646  */
6514      {
6515    if (conf_parser_ctx.pass == 2)
6516 <  {
6507 <    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6508 <    {
6509 <      event_write_links_file.when = (yyvsp[-1].number);
6510 <      event_addish(&event_write_links_file, NULL);
6511 <      ConfigServerHide.links_disabled = 0;
6512 <    }
6513 <
6514 <    ConfigServerHide.flatten_links_delay = (yyvsp[-1].number);
6515 <  }
6516 >    ConfigServerHide.hide_services = yylval.number;
6517   }
6518 < #line 6518 "conf_parser.c" /* yacc.c:1646  */
6518 > #line 6519 "conf_parser.c" /* yacc.c:1646  */
6519      break;
6520  
6521    case 657:
6522 < #line 3061 "conf_parser.y" /* yacc.c:1646  */
6522 > #line 3062 "conf_parser.y" /* yacc.c:1646  */
6523      {
6524    if (conf_parser_ctx.pass == 2)
6525    {
6526 <    MyFree(ConfigServerHide.flatten_links_file);
6527 <    ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
6526 >    MyFree(ConfigServerHide.hidden_name);
6527 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6528    }
6529   }
6530 < #line 6530 "conf_parser.c" /* yacc.c:1646  */
6530 > #line 6531 "conf_parser.c" /* yacc.c:1646  */
6531      break;
6532  
6533    case 658:
6534 < #line 3070 "conf_parser.y" /* yacc.c:1646  */
6534 > #line 3071 "conf_parser.y" /* yacc.c:1646  */
6535      {
6536    if (conf_parser_ctx.pass == 2)
6537      ConfigServerHide.hidden = yylval.number;
6538   }
6539 < #line 6539 "conf_parser.c" /* yacc.c:1646  */
6539 > #line 6540 "conf_parser.c" /* yacc.c:1646  */
6540      break;
6541  
6542    case 659:
6543 < #line 3076 "conf_parser.y" /* yacc.c:1646  */
6543 > #line 3077 "conf_parser.y" /* yacc.c:1646  */
6544      {
6545    if (conf_parser_ctx.pass == 2)
6546      ConfigServerHide.hide_server_ips = yylval.number;
6547   }
6548 < #line 6548 "conf_parser.c" /* yacc.c:1646  */
6548 > #line 6549 "conf_parser.c" /* yacc.c:1646  */
6549      break;
6550  
6551  
6552 < #line 6552 "conf_parser.c" /* yacc.c:1646  */
6552 > #line 6553 "conf_parser.c" /* yacc.c:1646  */
6553        default: break;
6554      }
6555    /* User semantic actions sometimes alter yychar, and that requires

Diff Legend

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