X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2Faddress_conf.c;h=5932e89bd393611e38c28e23e4d46730697cd513;hb=a84ce1aa4c55f255e02a1c5f76c1e0284459c3b1;hp=9e655f380e6b7001ea799c4754546df6c574edd5;hpb=b25ef9f2850d93e5b8fd8f18878126b8336f7e3b;p=bacula%2Fbacula diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c index 9e655f380e..5932e89bd3 100644 --- a/bacula/src/lib/address_conf.c +++ b/bacula/src/lib/address_conf.c @@ -1,28 +1,36 @@ /* - * Configuration file parser for IP-Addresse ipv4 and ipv6 - * - * Written by Meno Abels, June MMIIII - * - * Version $Id$ - */ -/* - Copyright (C) 2004 Kern Sibbald and John Walker + Bacula® - The Network Backup Solution + + Copyright (C) 2004-2008 Free Software Foundation Europe e.V. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation and included + in the file LICENSE. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + Bacula® is a registered trademark ofJohn Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ +/* + * Configuration file parser for IP-Addresse ipv4 and ipv6 + * + * Written by Meno Abels, June MMIV + * + * Version $Id$ */ @@ -35,14 +43,14 @@ #endif static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultport, int family, - const char *hostname_str, const char *port_str, char **errstr); + const char *hostname_str, const char *port_str, char *buf, int buflen); IPADDR::IPADDR(const IPADDR &src) : type(src.type) { memcpy(&saddrbuf, &src.saddrbuf, sizeof(saddrbuf)); saddr = &saddrbuf.dontuse; - saddr4 = &saddrbuf.dontuse4; + saddr4 = &saddrbuf.dontuse4; #ifdef HAVE_IPV6 saddr6 = &saddrbuf.dontuse6; #endif @@ -51,7 +59,7 @@ IPADDR::IPADDR(const IPADDR &src) : type(src.type) IPADDR::IPADDR(int af) : type(R_EMPTY) { #ifdef HAVE_IPV6 - if (!(af == AF_INET6 || af == AF_INET)) { + if (!(af == AF_INET6 || af == AF_INET)) { Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported (%d)\n"), af); } #else @@ -59,8 +67,9 @@ IPADDR::IPADDR(int af) : type(R_EMPTY) Emsg1(M_ERROR_TERM, 0, _("Only ipv4 is supported (%d)\n"), af); } #endif + memset(&saddrbuf, 0, sizeof(saddrbuf)); saddr = &saddrbuf.dontuse; - saddr4 = &saddrbuf.dontuse4; + saddr4 = &saddrbuf.dontuse4; #ifdef HAVE_IPV6 saddr6 = &saddrbuf.dontuse6; #endif @@ -80,8 +89,8 @@ IPADDR::IPADDR(int af) : type(R_EMPTY) saddr->sa_len = sizeof(sockaddr_in); #endif #endif - set_addr_any(); -} + set_addr_any(); +} void IPADDR::set_type(i_type o) { @@ -122,7 +131,7 @@ void IPADDR::set_port_net(unsigned short port) int IPADDR::get_family() const { return saddr->sa_family; -} +} struct sockaddr *IPADDR::get_sockaddr() { @@ -147,7 +156,7 @@ void IPADDR::copy_addr(IPADDR *src) saddr6->sin6_addr = src->saddr6->sin6_addr; } #endif -} +} void IPADDR::set_addr_any() { @@ -162,7 +171,7 @@ void IPADDR::set_addr_any() } void IPADDR::set_addr4(struct in_addr *ip4) -{ +{ if (saddr->sa_family != AF_INET) { Emsg1(M_ERROR_TERM, 0, _("It was tried to assign a ipv6 address to a ipv4(%d)\n"), saddr->sa_family); } @@ -171,7 +180,7 @@ void IPADDR::set_addr4(struct in_addr *ip4) #ifdef HAVE_IPV6 void IPADDR::set_addr6(struct in6_addr *ip6) -{ +{ if (saddr->sa_family != AF_INET6) { Emsg1(M_ERROR_TERM, 0, _("It was tried to assign a ipv4 address to a ipv6(%d)\n"), saddr->sa_family); } @@ -185,8 +194,8 @@ const char *IPADDR::get_address(char *outputbuf, int outlen) #ifdef HAVE_INET_NTOP # ifdef HAVE_IPV6 inet_ntop(saddr->sa_family, saddr->sa_family == AF_INET ? - (void*)&(saddr4->sin_addr) : (void*)&(saddr6->sin6_addr), - outputbuf, outlen); + (void*)&(saddr4->sin_addr) : (void*)&(saddr6->sin6_addr), + outputbuf, outlen); # else inet_ntop(saddr->sa_family, (void*)&(saddr4->sin_addr), outputbuf, outlen); # endif @@ -196,18 +205,18 @@ const char *IPADDR::get_address(char *outputbuf, int outlen) return outputbuf; } -const char *IPADDR::build_address_str(char *buf, int blen) +const char *IPADDR::build_address_str(char *buf, int blen) { char tmp[1024]; bsnprintf(buf, blen, "host[%s:%s:%hu] ", get_family() == AF_INET ? "ipv4" : "ipv6", - get_address(tmp, sizeof(tmp) - 1), get_port_host_order()); + get_address(tmp, sizeof(tmp) - 1), get_port_host_order()); return buf; } -const char *build_addresses_str(dlist *addrs, char *buf, int blen) +const char *build_addresses_str(dlist *addrs, char *buf, int blen) { - if (addrs->size() == 0) { + if (!addrs || addrs->size() == 0) { bstrncpy(buf, "", blen); return buf; } @@ -217,40 +226,47 @@ const char *build_addresses_str(dlist *addrs, char *buf, int blen) char tmp[1024]; int len = bsnprintf(work, blen, "%s", p->build_address_str(tmp, sizeof(tmp))); if (len < 0) - break; + break; work += len; blen -= len; } return buf; } -const char *get_first_address(dlist * addrs, char *outputbuf, int outlen) +const char *get_first_address(dlist *addrs, char *outputbuf, int outlen) { return ((IPADDR *)(addrs->first()))->get_address(outputbuf, outlen); } -int get_first_port_net_order(dlist * addrs) +int get_first_port_net_order(dlist *addrs) { - return ((IPADDR *)(addrs->first()))->get_port_net_order(); + if (!addrs) { + return 0; + } else { + return ((IPADDR *)(addrs->first()))->get_port_net_order(); + } } -int get_first_port_host_order(dlist * addrs) +int get_first_port_host_order(dlist *addrs) { - return ((IPADDR *)(addrs->first()))->get_port_host_order(); + if (!addrs) { + return 0; + } else { + return ((IPADDR *)(addrs->first()))->get_port_host_order(); + } } void init_default_addresses(dlist **out, int port) { - char *errstr; + char buf[1024]; unsigned short sport = port; - if (!add_address(out, IPADDR::R_DEFAULT, htons(sport), AF_INET, 0, 0, &errstr)) { - Emsg1(M_ERROR_TERM, 0, _("Can't add default address (%s)\n"), errstr); - free(errstr); + if (!add_address(out, IPADDR::R_DEFAULT, htons(sport), AF_INET, 0, 0, buf, sizeof(buf))) { + Emsg1(M_ERROR_TERM, 0, _("Can't add default address (%s)\n"), buf); } } static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultport, int family, - const char *hostname_str, const char *port_str, char **errstr) + const char *hostname_str, const char *port_str, char *buf, int buflen) { IPADDR *iaddr; IPADDR *jaddr; @@ -258,6 +274,7 @@ static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultp unsigned short port; IPADDR::i_type intype = type; + buf[0] = 0; dlist *addrs = (dlist *)(*(out)); if (!addrs) { IPADDR *tmp = 0; @@ -265,88 +282,84 @@ static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultp } type = (type == IPADDR::R_SINGLE_PORT - || type == IPADDR::R_SINGLE_ADDR) ? IPADDR::R_SINGLE : type; + || type == IPADDR::R_SINGLE_ADDR) ? IPADDR::R_SINGLE : type; if (type != IPADDR::R_DEFAULT) { IPADDR *def = 0; foreach_dlist(iaddr, addrs) { - if (iaddr->get_type() == IPADDR::R_DEFAULT) { - def = iaddr; - } else if (iaddr->get_type() != type) { - *errstr = (char *)malloc(1024); - bsnprintf(*errstr, 1023, - "the old style addresses cannot be mixed with new style"); - return 0; - } + if (iaddr->get_type() == IPADDR::R_DEFAULT) { + def = iaddr; + } else if (iaddr->get_type() != type) { + bsnprintf(buf, buflen, + _("the old style addresses cannot be mixed with new style")); + return 0; + } } if (def) { - addrs->remove(def); - delete def; + addrs->remove(def); + delete def; } } - if (!port_str || port_str[0] == '\0') { port = defaultport; } else { int pnum = atol(port_str); if (0 < pnum && pnum < 0xffff) { - port = htons(pnum); + port = htons(pnum); } else { struct servent *s = getservbyname(port_str, "tcp"); - if (s) { - port = s->s_port; - } else { - *errstr = (char *)malloc(1024); - bsnprintf(*errstr, 1023, "can't resolve service(%s)", port_str); - return 0; - } + if (s) { + port = s->s_port; + } else { + bsnprintf(buf, buflen, _("can't resolve service(%s)"), port_str); + return 0; + } } } const char *myerrstr; hostaddrs = bnet_host2ipaddrs(hostname_str, family, &myerrstr); if (!hostaddrs) { - *errstr = (char *)malloc(1024); - bsnprintf(*errstr, 1023, "can't resolve hostname(%s) %s", hostname_str, - myerrstr); + bsnprintf(buf, buflen, _("can't resolve hostname(%s) %s"), hostname_str, + myerrstr); return 0; } if (intype == IPADDR::R_SINGLE_PORT || intype == IPADDR::R_SINGLE_ADDR) { IPADDR *addr; if (addrs->size()) { - addr = (IPADDR *)addrs->first(); + addr = (IPADDR *)addrs->first(); } else { - addr = New(IPADDR(family)); - addr->set_type(type); - addr->set_port_net(defaultport); - addr->set_addr_any(); - addrs->append(addr); + addr = New(IPADDR(family)); + addr->set_type(type); + addr->set_port_net(defaultport); + addr->set_addr_any(); + addrs->append(addr); } if (intype == IPADDR::R_SINGLE_PORT) { - addr->set_port_net(port); + addr->set_port_net(port); } if (intype == IPADDR::R_SINGLE_ADDR) { - addr->copy_addr((IPADDR *) (hostaddrs->first())); + addr->copy_addr((IPADDR *)(hostaddrs->first())); } } else { foreach_dlist(iaddr, hostaddrs) { - IPADDR *clone; - /* for duplicates */ - foreach_dlist(jaddr, addrs) { - if (iaddr->get_sockaddr_len() == jaddr->get_sockaddr_len() && - !memcmp(iaddr->get_sockaddr(), jaddr->get_sockaddr(), - iaddr->get_sockaddr_len())) - { - goto skip; /* no price */ - } - } - clone = New(IPADDR(*iaddr)); - clone->set_type(type); - clone->set_port_net(port); - addrs->append(clone); + IPADDR *clone; + /* for duplicates */ + foreach_dlist(jaddr, addrs) { + if (iaddr->get_sockaddr_len() == jaddr->get_sockaddr_len() && + !memcmp(iaddr->get_sockaddr(), jaddr->get_sockaddr(), + iaddr->get_sockaddr_len())) + { + goto skip; /* no price */ + } + } + clone = New(IPADDR(*iaddr)); + clone->set_type(type); + clone->set_port_net(port); + addrs->append(clone); skip: - continue; + continue; } } free_addresses(hostaddrs); @@ -357,27 +370,27 @@ static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultp * my tests * positiv * = { ip = { addr = 1.2.3.4; port = 1205; } ipv4 = { addr = 1.2.3.4; port = http; } } - * = { ip = { - * addr = 1.2.3.4; port = 1205; } - * ipv4 = { - * addr = 1.2.3.4; port = http; } - * ipv6 = { - * addr = 1.2.3.4; - * port = 1205; - * } + * = { ip = { + * addr = 1.2.3.4; port = 1205; } + * ipv4 = { + * addr = 1.2.3.4; port = http; } + * ipv6 = { + * addr = 1.2.3.4; + * port = 1205; + * } * ip = { - * addr = 1.2.3.4 - * port = 1205 - * } + * addr = 1.2.3.4 + * port = 1205 + * } * ip = { - * addr = 1.2.3.4 - * } + * addr = 1.2.3.4 + * } * ip = { - * addr = 2001:220:222::2 - * } + * addr = 2001:220:222::2 + * } * ip = { - * addr = bluedot.thun.net - ( } + * addr = bluedot.thun.net + ( } * } * negativ * = { ip = { } } @@ -392,6 +405,7 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass) char hostname_str[1024]; char port_str[128]; int family = 0; + char errmsg[1024]; token = lex_get_token(lc, T_SKIP_EOL); @@ -408,11 +422,11 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass) scan_err1(lc, _("Expected a string, got: %s"), lc->str); } if (strcasecmp("ip", lc->str) == 0 || strcasecmp("ipv4", lc->str) == 0) { - family = AF_INET; + family = AF_INET; } #ifdef HAVE_IPV6 else if (strcasecmp("ipv6", lc->str) == 0) { - family = AF_INET6; + family = AF_INET6; } else { scan_err1(lc, _("Expected a string [ip|ipv4|ipv6], got: %s"), lc->str); } @@ -427,68 +441,67 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass) } token = lex_get_token(lc, T_SKIP_EOL); if (token != T_BOB) { - scan_err1(lc, _("Expected a block beginn { , got: %s"), lc->str); + scan_err1(lc, _("Expected a block begin { , got: %s"), lc->str); } token = lex_get_token(lc, T_SKIP_EOL); exist = EMPTYLINE; port_str[0] = hostname_str[0] = '\0'; do { - if (token != T_IDENTIFIER) { + if (token != T_IDENTIFIER) { scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str); - } + } if (strcasecmp("port", lc->str) == 0) { - next_line = PORTLINE; - if (exist & PORTLINE) { + next_line = PORTLINE; + if (exist & PORTLINE) { scan_err0(lc, _("Only one port per address block")); - } - exist |= PORTLINE; + } + exist |= PORTLINE; } else if (strcasecmp("addr", lc->str) == 0) { - next_line = ADDRLINE; - if (exist & ADDRLINE) { + next_line = ADDRLINE; + if (exist & ADDRLINE) { scan_err0(lc, _("Only one addr per address block")); - } - exist |= ADDRLINE; - } else { + } + exist |= ADDRLINE; + } else { scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str); - } - token = lex_get_token(lc, T_SKIP_EOL); - if (token != T_EQUALS) { + } + token = lex_get_token(lc, T_SKIP_EOL); + if (token != T_EQUALS) { scan_err1(lc, _("Expected a equal =, got: %s"), lc->str); - } - token = lex_get_token(lc, T_SKIP_EOL); - switch (next_line) { - case PORTLINE: - if (! - (token == T_UNQUOTED_STRING || token == T_NUMBER - || token == T_IDENTIFIER)) { + } + token = lex_get_token(lc, T_SKIP_EOL); + switch (next_line) { + case PORTLINE: + if (! + (token == T_UNQUOTED_STRING || token == T_NUMBER + || token == T_IDENTIFIER)) { scan_err1(lc, _("Expected a number or a string, got: %s"), lc->str); - } - bstrncpy(port_str, lc->str, sizeof(port_str)); - break; - case ADDRLINE: - if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) { + } + bstrncpy(port_str, lc->str, sizeof(port_str)); + break; + case ADDRLINE: + if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) { scan_err1(lc, _("Expected an IP number or a hostname, got: %s"), - lc->str); - } - bstrncpy(hostname_str, lc->str, sizeof(hostname_str)); - break; - case EMPTYLINE: + lc->str); + } + bstrncpy(hostname_str, lc->str, sizeof(hostname_str)); + break; + case EMPTYLINE: scan_err0(lc, _("State machine missmatch")); - break; - } - token = lex_get_token(lc, T_SKIP_EOL); + break; + } + token = lex_get_token(lc, T_SKIP_EOL); } while (token == T_IDENTIFIER); if (token != T_EOB) { scan_err1(lc, _("Expected a end of block }, got: %s"), lc->str); } - char *errstr; - if (pass == 1 && !add_address((dlist **)(item->value), IPADDR::R_MULTIPLE, - htons(item->default_value), family, hostname_str, port_str, &errstr)) { + if (pass == 1 && !add_address((dlist **)(item->value), IPADDR::R_MULTIPLE, + htons(item->default_value), family, hostname_str, port_str, + errmsg, sizeof(errmsg))) { scan_err3(lc, _("Can't add hostname(%s) and port(%s) to addrlist (%s)"), - hostname_str, port_str, errstr); - free(errstr); - } + hostname_str, port_str, errmsg); + } token = scan_to_next_not_eol(lc); } while ((token == T_IDENTIFIER || token == T_UNQUOTED_STRING)); if (token != T_EOB) { @@ -498,30 +511,29 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass) void store_addresses_address(LEX * lc, RES_ITEM * item, int index, int pass) { - + char errmsg[1024]; int token = lex_get_token(lc, T_SKIP_EOL); if (!(token == T_UNQUOTED_STRING || token == T_NUMBER || token == T_IDENTIFIER)) { - scan_err1(lc, _("Expected a hostname or IP nummer, got: %s"), lc->str); + scan_err1(lc, _("Expected an IP number or a hostname, got: %s"), lc->str); } - char *errstr; - if (pass == 1 && !add_address((dlist **) (item->value), IPADDR::R_SINGLE_ADDR, - htons(item->default_value), AF_INET, lc->str, 0, &errstr)) { - scan_err2(lc, _("can't add port (%s) to (%s)"), lc->str, errstr); - free(errstr); + if (pass == 1 && !add_address((dlist **)(item->value), IPADDR::R_SINGLE_ADDR, + htons(item->default_value), AF_INET, lc->str, 0, + errmsg, sizeof(errmsg))) { + scan_err2(lc, _("can't add port (%s) to (%s)"), lc->str, errmsg); } } void store_addresses_port(LEX * lc, RES_ITEM * item, int index, int pass) { + char errmsg[1024]; int token = lex_get_token(lc, T_SKIP_EOL); if (!(token == T_UNQUOTED_STRING || token == T_NUMBER || token == T_IDENTIFIER)) { scan_err1(lc, _("Expected a port number or string, got: %s"), lc->str); } - char *errstr; if (pass == 1 && !add_address((dlist **)(item->value), IPADDR::R_SINGLE_PORT, - htons(item->default_value), AF_INET, 0, lc->str, &errstr)) { - scan_err2(lc, _("can't add port (%s) to (%s)"), lc->str, errstr); - free(errstr); + htons(item->default_value), AF_INET, 0, lc->str, + errmsg, sizeof(errmsg))) { + scan_err2(lc, _("can't add port (%s) to (%s)"), lc->str, errmsg); } } @@ -568,13 +580,13 @@ char *sockaddr_to_ascii(const struct sockaddr *sa, char *buf, int len) /* MA Bug 5 the problem was that i mixed up sockaddr and in_addr */ inet_ntop(sa->sa_family, # ifdef HAVE_IPV6 - sa->sa_family == AF_INET ? - (void*)&(((struct sockaddr_in*)sa)->sin_addr) : - (void*)&(((struct sockaddr_in6*)sa)->sin6_addr), + sa->sa_family == AF_INET ? + (void*)&(((struct sockaddr_in*)sa)->sin_addr) : + (void*)&(((struct sockaddr_in6*)sa)->sin6_addr), # else - (void*)&(((struct sockaddr_in*)sa)->sin_addr) : + (void*)&(((struct sockaddr_in*)sa)->sin_addr), # endif /* HAVE_IPV6 */ - buf, len); + buf, len); #else bstrncpy(buf, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), len); #endif