chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve: fix CID#1237549 Unchecked return value
[elogind.git]
/
src
/
resolve
/
resolved-dns-server.h
diff --git
a/src/resolve/resolved-dns-server.h
b/src/resolve/resolved-dns-server.h
index adceb868a32576fd6869cd9ae301c2df5384e880..a438a27763b38bc16dc28c5717bd5d54386a9d40 100644
(file)
--- a/
src/resolve/resolved-dns-server.h
+++ b/
src/resolve/resolved-dns-server.h
@@
-21,41
+21,43
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "in-addr-util.h"
+
typedef struct DnsServer DnsServer;
typedef enum DnsServerSource DnsServerSource;
typedef struct DnsServer DnsServer;
typedef enum DnsServerSource DnsServerSource;
-#include "in-addr-util.h"
-#include "resolved.h"
-#include "resolved-link.h"
-#include "resolved-dns-server.h"
-
-enum DnsServerSource {
+typedef enum DnsServerType {
DNS_SERVER_SYSTEM,
DNS_SERVER_SYSTEM,
+ DNS_SERVER_FALLBACK,
DNS_SERVER_LINK,
DNS_SERVER_LINK,
- DNS_SERVER_DHCP,
- _DNS_SERVER_SOURCE_MAX
-};
+} DnsServerType;
+
+#include "resolved-manager.h"
+#include "resolved-link.h"
struct DnsServer {
Manager *manager;
struct DnsServer {
Manager *manager;
- DnsServerSource source;
-
- unsigned char family;
- union in_addr_union address;
-
bool marked
;
+
DnsServerType type
;
Link *link;
Link *link;
+ int family;
+ union in_addr_union address;
+
+ bool marked:1;
+
LIST_FIELDS(DnsServer, servers);
};
int dns_server_new(
Manager *m,
DnsServer **s,
LIST_FIELDS(DnsServer, servers);
};
int dns_server_new(
Manager *m,
DnsServer **s,
- DnsServer
Source sourc
e,
+ DnsServer
Type typ
e,
Link *l,
Link *l,
-
unsigned char
family,
-
union in_addr_union *in_addr
);
+
int
family,
+
const union in_addr_union *address
);
DnsServer* dns_server_free(DnsServer *s);
DnsServer* dns_server_free(DnsServer *s);
+
+extern const struct hash_ops dns_server_hash_ops;