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

Comparing ircd-hybrid-7.3/src/ircd_parser.y (file contents):
Revision 1121 by michael, Sun Jan 9 11:03:03 2011 UTC vs.
Revision 1123 by michael, Sun Feb 6 21:57:50 2011 UTC

# Line 37 | Line 37
37   #include "s_log.h"
38   #include "client.h"     /* for UMODE_ALL only */
39   #include "irc_string.h"
40 #include "irc_getaddrinfo.h"
40   #include "sprintf_irc.h"
41   #include "memory.h"
42   #include "modules.h"
# Line 693 | Line 692 | serverinfo_vhost: VHOST '=' QSTRING ';'
692      hints.ai_socktype = SOCK_STREAM;
693      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
694  
695 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
695 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
696        ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
697      else
698      {
# Line 702 | Line 701 | serverinfo_vhost: VHOST '=' QSTRING ';'
701        memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
702        ServerInfo.ip.ss.ss_family = res->ai_family;
703        ServerInfo.ip.ss_len = res->ai_addrlen;
704 <      irc_freeaddrinfo(res);
704 >      freeaddrinfo(res);
705  
706        ServerInfo.specific_ipv4_vhost = 1;
707      }
# Line 722 | Line 721 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
721      hints.ai_socktype = SOCK_STREAM;
722      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
723  
724 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
724 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
725        ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
726      else
727      {
# Line 731 | Line 730 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
730        memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
731        ServerInfo.ip6.ss.ss_family = res->ai_family;
732        ServerInfo.ip6.ss_len = res->ai_addrlen;
733 <      irc_freeaddrinfo(res);
733 >      freeaddrinfo(res);
734  
735        ServerInfo.specific_ipv6_vhost = 1;
736      }
# Line 2340 | Line 2339 | connect_vhost: VHOST '=' QSTRING ';'
2339      hints.ai_socktype = SOCK_STREAM;
2340      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2341  
2342 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2342 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
2343        ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2344      else
2345      {
# Line 2349 | Line 2348 | connect_vhost: VHOST '=' QSTRING ';'
2348        memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2349        yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2350        yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2351 <      irc_freeaddrinfo(res);
2351 >      freeaddrinfo(res);
2352      }
2353    }
2354   };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines