#include "bacula.h"
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#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);
IPADDR::IPADDR(const IPADDR &src) : type(src.type)
{
- memcpy(&buf, &src.buf, sizeof(buf));
- saddr = &buf.dontuse;
- saddr4 = &buf.dontuse4;
+ memcpy(&saddrbuf, &src.saddrbuf, sizeof(saddrbuf));
+ saddr = &saddrbuf.dontuse;
+ saddr4 = &saddrbuf.dontuse4;
#ifdef HAVE_IPV6
- saddr6 = &buf.dontuse6;
+ saddr6 = &saddrbuf.dontuse6;
#endif
}
IPADDR::IPADDR(int af) : type(R_EMPTY)
{
+#ifdef HAVE_IPV6
if (!(af == AF_INET6 || af == AF_INET)) {
- Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported(%d)\n"), af);
+ Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported (%d)\n"), af);
}
- saddr = &buf.dontuse;
- saddr4 = &buf.dontuse4;
+#else
+ if (af != AF_INET) {
+ Emsg1(M_ERROR_TERM, 0, _("Only ipv4 is supported (%d)\n"), af);
+ }
+#endif
+ saddr = &saddrbuf.dontuse;
+ saddr4 = &saddrbuf.dontuse4;
#ifdef HAVE_IPV6
- saddr6 = &buf.dontuse6;
+ saddr6 = &saddrbuf.dontuse6;
#endif
saddr->sa_family = af;
if (af == AF_INET) {
saddr->sa_len = sizeof(sockaddr_in);
#endif
#endif
- set_addr_any();
-}
+ set_addr_any();
+}
void IPADDR::set_type(i_type o)
{
int IPADDR::get_family() const
{
return saddr->sa_family;
-}
+}
struct sockaddr *IPADDR::get_sockaddr()
{
saddr6->sin6_addr = src->saddr6->sin6_addr;
}
#endif
-}
+}
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);
}
#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);
}
const char *IPADDR::get_address(char *outputbuf, int outlen)
{
outputbuf[0] = '\0';
-#if defined(HAVE_INET_NTOP) && defined(HAVE_IPV6)
+#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);
+# else
+ inet_ntop(saddr->sa_family, (void*)&(saddr4->sin_addr), outputbuf, outlen);
+# endif
#else
bstrncpy(outputbuf, inet_ntoa(saddr4->sin_addr), outlen);
#endif
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] ",
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()) {
+ if (!addrs || addrs->size() == 0) {
bstrncpy(buf, "", blen);
return buf;
}
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)
{
- return ((IPADDR *)(addrs->first()))->get_port_host_order();
-}
-
-static int skip_to_next_not_eol(LEX * lc)
-{
- int token;
-
- do {
- token = lex_get_token(lc, T_ALL);
- } while (token == T_EOL);
- return token;
+ if (!addrs) {
+ return 0;
+ } else {
+ return ((IPADDR *)(addrs->first()))->get_port_host_order();
+ }
}
-
void init_default_addresses(dlist **out, int port)
{
char *errstr;
} else if (iaddr->get_type() != type) {
*errstr = (char *)malloc(1024);
bsnprintf(*errstr, 1023,
- "the old style addresses could mixed with new style");
+ "the old style addresses cannot be mixed with new style");
return 0;
}
}
if (addrs->size()) {
addr = (IPADDR *)addrs->first();
} else {
- addr = New(IPADDR(family));
+ addr = New(IPADDR(family));
addr->set_type(type);
addr->set_port_net(defaultport);
addr->set_addr_any();
/* for duplicates */
foreach_dlist(jaddr, addrs) {
if (iaddr->get_sockaddr_len() == jaddr->get_sockaddr_len() &&
- !memcmp(iaddr->get_sockaddr(), jaddr->get_sockaddr(),
+ !memcmp(iaddr->get_sockaddr(), jaddr->get_sockaddr(),
iaddr->get_sockaddr_len()))
{
goto skip; /* no price */
}
}
- clone = New(IPADDR(*iaddr));
+ clone = New(IPADDR(*iaddr));
clone->set_type(type);
clone->set_port_net(port);
addrs->append(clone);
return 1;
}
+/*
+ * 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
+ * }
+ * ip = {
+ * addr = 1.2.3.4
+ * }
+ * ip = {
+ * addr = 2001:220:222::2
+ * }
+ * ip = {
+ * addr = bluedot.thun.net
+ ( }
+ * }
+ * negativ
+ * = { ip = { } }
+ * = { ipv4 { addr = doof.nowaytoheavenxyz.uhu; } }
+ * = { ipv4 { port = 4711 } }
+ */
void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass)
{
int token;
char port_str[128];
int family = 0;
-
-
- /*
- * = { [[ip|ipv4|ipv6] = { [[addr|port] = [^ ]+[\n;]+] }]+ }
- * or 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
- * }
- * ip = {
- * addr = 1.2.3.4
- * }
- * ip = {
- * addr = 2001:220:222::2
- * }
- * ip = {
- * addr = bluedot.thun.net
- ( }
- * }
- * negativ
- * = { ip = { } }
- * = { ipv4 { addr = doof.nowaytoheavenxyz.uhu; } }
- * = { ipv4 { port = 4711 } }
- */
-
- token = skip_to_next_not_eol(lc);
+
+ token = lex_get_token(lc, T_SKIP_EOL);
if (token != T_BOB) {
scan_err1(lc, _("Expected a block begin { , got: %s"), lc->str);
}
- token = skip_to_next_not_eol(lc);
+ token = lex_get_token(lc, T_SKIP_EOL);
if (token == T_EOB) {
scan_err0(lc, _("Empty addr block is not allowed"));
}
if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) {
scan_err1(lc, _("Expected a string, got: %s"), lc->str);
}
- if (!strcmp("ip", lc->str) || !strcmp("ipv4", lc->str)) {
+ if (strcasecmp("ip", lc->str) == 0 || strcasecmp("ipv4", lc->str) == 0) {
family = AF_INET;
}
#ifdef HAVE_IPV6
- else if (!strcmp("ipv6", lc->str)) {
+ else if (strcasecmp("ipv6", lc->str) == 0) {
family = AF_INET6;
+ } else {
+ scan_err1(lc, _("Expected a string [ip|ipv4|ipv6], got: %s"), lc->str);
}
-#endif
+#else
else {
- scan_err1(lc, _("Expected a string [ip|ipv4|ipv6], got: %s"), lc->str);
+ scan_err1(lc, _("Expected a string [ip|ipv4], got: %s"), lc->str);
}
- token = skip_to_next_not_eol(lc);
+#endif
+ token = lex_get_token(lc, T_SKIP_EOL);
if (token != T_EQUALS) {
scan_err1(lc, _("Expected a equal =, got: %s"), lc->str);
}
- token = skip_to_next_not_eol(lc);
+ token = lex_get_token(lc, T_SKIP_EOL);
if (token != T_BOB) {
scan_err1(lc, _("Expected a block beginn { , got: %s"), lc->str);
}
- token = skip_to_next_not_eol(lc);
+ token = lex_get_token(lc, T_SKIP_EOL);
exist = EMPTYLINE;
port_str[0] = hostname_str[0] = '\0';
do {
if (token != T_IDENTIFIER) {
scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
}
- if (!strcmp("port", lc->str)) {
+ if (strcasecmp("port", lc->str) == 0) {
next_line = PORTLINE;
if (exist & PORTLINE) {
scan_err0(lc, _("Only one port per address block"));
}
exist |= PORTLINE;
- } else if (!strcmp("addr", lc->str)) {
+ } else if (strcasecmp("addr", lc->str) == 0) {
next_line = ADDRLINE;
if (exist & ADDRLINE) {
scan_err0(lc, _("Only one addr per address block"));
} else {
scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
}
- token = lex_get_token(lc, T_ALL);
+ 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_ALL);
+ token = lex_get_token(lc, T_SKIP_EOL);
switch (next_line) {
case PORTLINE:
if (!
break;
case ADDRLINE:
if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) {
- scan_err1(lc, _("Expected a ipnumber or a hostname, got: %s"),
+ 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:
- scan_err0(lc, _("Statemachine missmatch"));
+ scan_err0(lc, _("State machine missmatch"));
break;
}
- token = skip_to_next_not_eol(lc);
+ 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,
+ if (pass == 1 && !add_address((dlist **)(item->value), IPADDR::R_MULTIPLE,
htons(item->default_value), family, hostname_str, port_str, &errstr)) {
scan_err3(lc, _("Can't add hostname(%s) and port(%s) to addrlist (%s)"),
hostname_str, port_str, errstr);
free(errstr);
}
- token = skip_to_next_not_eol(lc);
+ token = scan_to_next_not_eol(lc);
} while ((token == T_IDENTIFIER || token == T_UNQUOTED_STRING));
if (token != T_EOB) {
scan_err1(lc, _("Expected a end of block }, got: %s"), lc->str);
void store_addresses_address(LEX * lc, RES_ITEM * item, int index, int pass)
{
- int token = lex_get_token(lc, T_ALL);
+ 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 ipnummer, got: %s"), lc->str);
+ scan_err1(lc, _("Expected a hostname or IP nummer, got: %s"), lc->str);
}
char *errstr;
if (pass == 1 && !add_address((dlist **) (item->value), IPADDR::R_SINGLE_ADDR,
void store_addresses_port(LEX * lc, RES_ITEM * item, int index, int pass)
{
- int token = lex_get_token(lc, T_ALL);
+ 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 nummer or string, got: %s"), lc->str);
+ 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,
return -1;
}
-int sockaddr_to_ascii(const struct sockaddr *sa, char *buf, int len)
+int sockaddr_get_port(const struct sockaddr *client_addr)
+{
+ if (client_addr->sa_family == AF_INET) {
+ return ntohs(((struct sockaddr_in *)client_addr)->sin_port);
+ }
+#ifdef HAVE_IPV6
+ else {
+ return ntohs(((struct sockaddr_in6 *)client_addr)->sin6_port);
+ }
+#endif
+ return -1;
+}
+
+
+char *sockaddr_to_ascii(const struct sockaddr *sa, char *buf, int len)
{
#ifdef HAVE_INET_NTOP
/* 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),
- buf,
- sizeof(buf));
+# else
+ (void*)&(((struct sockaddr_in*)sa)->sin_addr),
+# endif /* HAVE_IPV6 */
+ buf, len);
#else
bstrncpy(buf, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), len);
#endif
- return 1;
+ return buf;
}
+
+#ifdef HAVE_OLD_SOCKOPT
+int inet_aton(const char *cp, struct in_addr *inp)
+{
+ struct in_addr inaddr;
+
+ if((inaddr.s_addr = inet_addr(cp)) != INADDR_NONE) {
+ inp->s_addr = inaddr.s_addr;
+ return 1;
+ }
+ return 0;
+}
+#endif
projects / bacula / bacula / blobdiff