#include "conf-parser.h"
#include "net-util.h"
-int address_new(Network *network, unsigned section, Address **ret) {
+int address_new_static(Network *network, unsigned section, Address **ret) {
_cleanup_address_free_ Address *address = NULL;
if (section) {
address->network = network;
- LIST_PREPEND(addresses, network->addresses, address);
+ LIST_PREPEND(static_addresses, network->static_addresses, address);
if (section) {
address->section = section;
return 0;
}
+int address_new_dynamic(Address **ret) {
+ _cleanup_address_free_ Address *address = NULL;
+
+ address = new0(Address, 1);
+ if (!address)
+ return -ENOMEM;
+
+ *ret = address;
+ address = NULL;
+
+ return 0;
+}
+
void address_free(Address *address) {
if (!address)
return;
- LIST_REMOVE(addresses, address->network->addresses, address);
+ if (address->network) {
+ LIST_REMOVE(static_addresses, address->network->static_addresses, address);
- if (address->section)
- hashmap_remove(address->network->addresses_by_section,
- &address->section);
+ if (address->section)
+ hashmap_remove(address->network->addresses_by_section,
+ &address->section);
+ }
free(address);
}
return 0;
}
+int config_parse_dns(const char *unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+ Address **dns = data;
+ _cleanup_address_free_ Address *n = NULL;
+ int r;
+
+ assert(filename);
+ assert(section);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ r = address_new_dynamic(&n);
+ if (r < 0)
+ return r;
+
+ r = net_parse_inaddr(rvalue, &n->family, &n->in_addr);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "DNS address is invalid, ignoring assignment: %s", rvalue);
+ return 0;
+ }
+
+ *dns = n;
+ n = NULL;
+
+ return 0;
+}
+
int config_parse_address(const char *unit,
const char *filename,
unsigned line,
section_line = 0;
}
- r = address_new(network, section_line, &n);
+ r = address_new_static(network, section_line, &n);
if (r < 0)
return r;
assert(rvalue);
assert(data);
- r = address_new(network, section_line, &n);
+ r = address_new_static(network, section_line, &n);
if (r < 0)
return r;