X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-socket-util.c;h=6fb4a40944cfd28de9d92fdfb5b785efc2fd014a;hp=4e90590599a6d0e80e5ee91524746334f652a1ef;hb=203b112fe8f3204a9130047dd8bb91549211660b;hpb=eda8090ba9abc7d00f30e2b4cb34273cde799704

diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index 4e9059059..6fb4a4094 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -140,6 +140,24 @@ static void test_socket_address_get_path(void) {
         assert_se(streq(socket_address_get_path(&a), "/foo/bar"));
 }
 
+static void test_socket_address_is(void) {
+        SocketAddress a;
+
+        assert_se(socket_address_parse(&a, "192.168.1.1:8888") >= 0);
+        assert_se(socket_address_is(&a, "192.168.1.1:8888", SOCK_STREAM));
+        assert_se(!socket_address_is(&a, "route", SOCK_STREAM));
+        assert_se(!socket_address_is(&a, "192.168.1.1:8888", SOCK_RAW));
+}
+
+static void test_socket_address_is_netlink(void) {
+        SocketAddress a;
+
+        assert_se(socket_address_parse_netlink(&a, "route 10") >= 0);
+        assert_se(socket_address_is_netlink(&a, "route 10"));
+        assert_se(!socket_address_is_netlink(&a, "192.168.1.1:8888"));
+        assert_se(!socket_address_is_netlink(&a, "route 1"));
+}
+
 static void test_in_addr_prefix_intersect_one(unsigned f, const char *a, unsigned apl, const char *b, unsigned bpl, int result) {
         union in_addr_union ua, ub;
 
@@ -218,7 +236,7 @@ static void *connect_thread(void *arg) {
         _cleanup_close_ int fd = -1;
 
         fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-        assert(fd >= 0);
+        assert_se(fd >= 0);
 
         assert_se(connect(fd, &sa->sa, sizeof(sa->in)) == 0);
 
@@ -240,12 +258,12 @@ static void test_nameinfo_pretty(void) {
 
         _cleanup_close_ int sfd = -1, cfd = -1;
         r = getnameinfo_pretty(STDIN_FILENO, &stdin_name);
-        log_info("No connection remote: %s", strerror(-r));
+        log_info_errno(r, "No connection remote: %m");
 
         assert_se(r < 0);
 
         sfd = socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0);
-        assert(sfd >= 0);
+        assert_se(sfd >= 0);
 
         assert_se(bind(sfd, &s.sa, sizeof(s.in)) == 0);
 
@@ -258,11 +276,39 @@ static void test_nameinfo_pretty(void) {
 
         log_debug("Accepting new connection on fd:%d", sfd);
         cfd = accept4(sfd, &c.sa, &clen, SOCK_CLOEXEC);
-        assert(cfd >= 0);
+        assert_se(cfd >= 0);
 
         r = getnameinfo_pretty(cfd, &localhost);
         log_info("Connection from %s", localhost);
-        assert(r == 0);
+        assert_se(r == 0);
+}
+
+static void test_sockaddr_equal(void) {
+        union sockaddr_union a = {
+                .in.sin_family = AF_INET,
+                .in.sin_port = 0,
+                .in.sin_addr.s_addr = htonl(INADDR_ANY),
+        };
+        union sockaddr_union b = {
+                .in.sin_family = AF_INET,
+                .in.sin_port = 0,
+                .in.sin_addr.s_addr = htonl(INADDR_ANY),
+        };
+        union sockaddr_union c = {
+                .in.sin_family = AF_INET,
+                .in.sin_port = 0,
+                .in.sin_addr.s_addr = htonl(1234),
+        };
+        union sockaddr_union d = {
+                .in6.sin6_family = AF_INET6,
+                .in6.sin6_port = 0,
+                .in6.sin6_addr = IN6ADDR_ANY_INIT,
+        };
+        assert_se(sockaddr_equal(&a, &a));
+        assert_se(sockaddr_equal(&a, &b));
+        assert_se(sockaddr_equal(&d, &d));
+        assert_se(!sockaddr_equal(&a, &c));
+        assert_se(!sockaddr_equal(&b, &c));
 }
 
 int main(int argc, char *argv[]) {
@@ -273,11 +319,15 @@ int main(int argc, char *argv[]) {
         test_socket_address_parse_netlink();
         test_socket_address_equal();
         test_socket_address_get_path();
+        test_socket_address_is();
+        test_socket_address_is_netlink();
 
         test_in_addr_prefix_intersect();
         test_in_addr_prefix_next();
 
         test_nameinfo_pretty();
 
+        test_sockaddr_equal();
+
         return 0;
 }