diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-09-04 15:27:53 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-09-04 20:05:58 +0900 |
commit | fc7676e31397002a56e96387d031f7691da19ac4 (patch) | |
tree | 95ed7bdf625ade267c3901ff97c54a9006a2de41 /src/shared | |
parent | ca8b62b522e0c5944143c0d90428fa88ea0cb434 (diff) | |
download | systemd-fc7676e31397002a56e96387d031f7691da19ac4.tar.gz |
util: drop unused socket_addr_port_from_string_auto()
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/socket-netlink.c | 27 | ||||
-rw-r--r-- | src/shared/socket-netlink.h | 1 |
2 files changed, 0 insertions, 28 deletions
diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c index dc1b27f165..6c121a4c9a 100644 --- a/src/shared/socket-netlink.c +++ b/src/shared/socket-netlink.c @@ -235,33 +235,6 @@ int socket_address_parse_and_warn(SocketAddress *a, const char *s) { return 0; } -int socket_addr_port_from_string_auto(const char *s, uint16_t default_port, SocketAddress *a) { - union in_addr_union address; - uint16_t port = 0; - int family, r; - - assert(a); - assert(s); - - r = in_addr_port_ifindex_name_from_string_auto(s, &family, &address, &port, NULL, NULL); - if (r < 0) - return r; - - if (family == AF_INET) { - memcpy(&a->sockaddr.in.sin_addr, &address.in.s_addr, sizeof(a->sockaddr.in.sin_addr)); - a->sockaddr.in.sin_family = AF_INET; - a->size = sizeof(struct sockaddr_in); - a->sockaddr.in.sin_port = port ? htobe16(port) : htobe16(default_port); - } else { - memcpy(&a->sockaddr.in6.sin6_addr, &address.in6, sizeof(a->sockaddr.in6.sin6_addr)); - a->sockaddr.in6.sin6_family = AF_INET6; - a->sockaddr.in6.sin6_port = port ? htobe16(port) : htobe16(default_port); - a->size = sizeof(struct sockaddr_in6); - } - - return 0; -} - int socket_address_parse_netlink(SocketAddress *a, const char *s) { _cleanup_free_ char *word = NULL; unsigned group = 0; diff --git a/src/shared/socket-netlink.h b/src/shared/socket-netlink.h index 7fa831a880..d019bb31c6 100644 --- a/src/shared/socket-netlink.h +++ b/src/shared/socket-netlink.h @@ -16,7 +16,6 @@ int make_socket_fd(int log_level, const char* address, int type, int flags); int socket_address_parse(SocketAddress *a, const char *s); int socket_address_parse_and_warn(SocketAddress *a, const char *s); int socket_address_parse_netlink(SocketAddress *a, const char *s); -int socket_addr_port_from_string_auto(const char *s, uint16_t default_port, SocketAddress *a); bool socket_address_is(const SocketAddress *a, const char *s, int type); bool socket_address_is_netlink(const SocketAddress *a, const char *s); |