chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-resolve: rename get_next() and get_n_queries() + cleanup
[elogind.git]
/
src
/
shared
/
socket-util.h
diff --git
a/src/shared/socket-util.h
b/src/shared/socket-util.h
index 13566f96917e614148abb3b7b138e17408ba318c..84ebc302feac10c649d6515c2c04050f85ae4ac7 100644
(file)
--- a/
src/shared/socket-util.h
+++ b/
src/shared/socket-util.h
@@
-27,17
+27,19
@@
#include <net/if.h>
#include <asm/types.h>
#include <linux/netlink.h>
#include <net/if.h>
#include <asm/types.h>
#include <linux/netlink.h>
+#include <linux/if_packet.h>
#include "macro.h"
#include "util.h"
union sockaddr_union {
struct sockaddr sa;
#include "macro.h"
#include "util.h"
union sockaddr_union {
struct sockaddr sa;
- struct sockaddr_in in
4
;
+ struct sockaddr_in in;
struct sockaddr_in6 in6;
struct sockaddr_un un;
struct sockaddr_nl nl;
struct sockaddr_storage storage;
struct sockaddr_in6 in6;
struct sockaddr_un un;
struct sockaddr_nl nl;
struct sockaddr_storage storage;
+ struct sockaddr_ll ll;
};
typedef struct SocketAddress {
};
typedef struct SocketAddress {
@@
-92,12
+94,14
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) _pure_
const char* socket_address_get_path(const SocketAddress *a);
const char* socket_address_get_path(const SocketAddress *a);
+bool socket_ipv6_is_supported(void);
+
+int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, char **ret);
+int getpeername_pretty(int fd, char **ret);
+int getsockname_pretty(int fd, char **ret);
+
const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_;
SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_;
int netlink_family_to_string_alloc(int b, char **s);
const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_;
SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_;
int netlink_family_to_string_alloc(int b, char **s);
-int netlink_family_from_string(const char *s);
-
-bool socket_ipv6_is_supported(void);
-
-int getpeername_pretty(int fd, char **ret);
+int netlink_family_from_string(const char *s) _pure_;