print_inet_addr: use inet_addr-based output format for IPv4

* sockaddr.c (print_inet_addr): Remove af_name variable.
<AF_INET>: Use inet_addr-based output format.
* tests/netlink_sock_diag.c (test_inet_diag_sockid, test_inet_diag_req,
test_inet_diag_req_v2, test_inet_diag_msg, test_smc_diag_req,
test_smc_diag_msg): Update expected output.
* tests/nlattr_inet_diag_msg.c (print_inet_diag_msg): Likewise.
* tests/nlattr_smc_diag_msg.c (print_smc_diag_msg): Likewise.

diff --git a/sockaddr.c b/sockaddr.c
index b5fa35ca93657979ea6f727d56ab426d6884f08f..1e8fbdc1ff144774f5c7b624b8d1ce8a3fe95d75 100644 (file)
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -89,26 +89,27 @@ print_inet_addr(const int af,
                const unsigned int len,
                const char *const var_name)
 {
-       const char *af_name = NULL;
        char buf[INET6_ADDRSTRLEN];
 
        switch (af) {
        case AF_INET:
-               af_name = "AF_INET";
+               if (inet_ntop(af, addr, buf, sizeof(buf))) {
+                       tprintf("%s=inet_addr(\"%s\")", var_name, buf);
+                       return true;
+               }
                break;
        case AF_INET6:
-               af_name = "AF_INET6";
+               if (inet_ntop(af, addr, buf, sizeof(buf))) {
+                       tprintf("inet_pton(%s, \"%s\", &%s)",
+                               "AF_INET6", buf, var_name);
+                       return true;
+               }
                break;
        }
 
-       if (af_name && inet_ntop(af, addr, buf, sizeof(buf))) {
-               tprintf("inet_pton(%s, \"%s\", &%s)", af_name, buf, var_name);
-               return true;
-       } else {
-               tprintf("%s=", var_name);
-               print_quoted_string(addr, len, 0);
-               return false;
-       }
+       tprintf("%s=", var_name);
+       print_quoted_string(addr, len, 0);
+       return false;
 }
 
 static void

diff --git a/tests/netlink_sock_diag.c b/tests/netlink_sock_diag.c
index c5ed95e848cf48b2c2ecf85a549cc5f9f64809fc..710b4a54e41199eead52d6b9bdc71fde2b94c669 100644 (file)
--- a/tests/netlink_sock_diag.c
+++ b/tests/netlink_sock_diag.c
@@ -939,8 +939,8 @@ test_inet_diag_sockid(const int fd)
               ", {sdiag_family=AF_INET, sdiag_protocol=IPPROTO_TCP"
               ", idiag_ext=1<<(INET_DIAG_CONG-1)"
               ", idiag_states=1<<TCP_CLOSE, id={idiag_sport=htons(%u)"
-              ", idiag_dport=htons(%u), inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst), idiag_if=%u"
+              ", idiag_dport=htons(%u), idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\"), idiag_if=%u"
               ", idiag_cookie=[%u, %u]}}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*req),
               ntohs(0xfacd), ntohs(0xdead), address, address,
@@ -1065,8 +1065,8 @@ test_inet_diag_req(const int fd)
               ", {idiag_family=AF_INET, idiag_src_len=%u"
               ", idiag_dst_len=%u, idiag_ext=1<<(INET_DIAG_TOS-1)"
               ", id={idiag_sport=htons(%u), idiag_dport=htons(%u)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst)"
+              ", idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\")"
               ", idiag_if=%u, idiag_cookie=[%u, %u]}"
               ", idiag_states=1<<TCP_LAST_ACK, idiag_dbs=%u}}"
               ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
@@ -1185,8 +1185,8 @@ test_inet_diag_req_v2(const int fd)
               ", {sdiag_family=AF_INET, sdiag_protocol=IPPROTO_TCP"
               ", idiag_ext=1<<(INET_DIAG_CONG-1)"
               ", idiag_states=1<<TCP_CLOSE, id={idiag_sport=htons(%u)"
-              ", idiag_dport=htons(%u), inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst), idiag_if=%u"
+              ", idiag_dport=htons(%u), idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\"), idiag_if=%u"
               ", idiag_cookie=[%u, %u]}}}, %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*req),
               ntohs(0xfacd), ntohs(0xdead), address, address,
@@ -1307,8 +1307,8 @@ test_inet_diag_msg(const int fd)
               ", {idiag_family=AF_INET, idiag_state=TCP_LISTEN"
               ", idiag_timer=%u, idiag_retrans=%u"
               ", id={idiag_sport=htons(%u), idiag_dport=htons(%u)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst)"
+              ", idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\")"
               ", idiag_if=%u, idiag_cookie=[%u, %u]}"
               ", idiag_expires=%u, idiag_rqueue=%u, idiag_wqueue=%u"
               ", idiag_uid=%u, idiag_inode=%u}}"
@@ -1426,8 +1426,8 @@ test_smc_diag_req(const int fd)
               ", flags=NLM_F_REQUEST, seq=0, pid=0}, {diag_family=AF_SMC"
               ", diag_ext=1<<(SMC_DIAG_CONNINFO-1)"
               ", id={idiag_sport=htons(%u), idiag_dport=htons(%u)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst)"
+              ", idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\")"
               ", idiag_if=%u, idiag_cookie=[%u, %u]}}}"
               ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
               fd, NLMSG_HDRLEN + (unsigned int) sizeof(*req),
@@ -1545,8 +1545,8 @@ test_smc_diag_msg(const int fd)
               ", flags=NLM_F_DUMP, seq=0, pid=0}, {diag_family=AF_SMC"
               ", diag_state=SMC_ACTIVE, diag_fallback=%u, diag_shutdown=%u"
               ", id={idiag_sport=htons(%u), idiag_dport=htons(%u)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst)"
+              ", idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\")"
               ", idiag_if=%u, idiag_cookie=[%u, %u]}"
               ", diag_uid=%u, diag_inode=%u}}, %u"
               ", MSG_DONTWAIT, NULL, 0) = %s\n",

diff --git a/tests/nlattr_inet_diag_msg.c b/tests/nlattr_inet_diag_msg.c
index d9d564c32fddda5ca6db01e0ebf702f132781484..ca1eedd81084bcfe91cc0b2873dcf85349d5a49f 100644 (file)
--- a/tests/nlattr_inet_diag_msg.c
+++ b/tests/nlattr_inet_diag_msg.c
@@ -73,8 +73,8 @@ print_inet_diag_msg(const unsigned int msg_len)
               ", flags=NLM_F_DUMP, seq=0, pid=0}, {idiag_family=AF_INET"
               ", idiag_state=TCP_LISTEN, idiag_timer=0, idiag_retrans=0"
               ", id={idiag_sport=htons(0), idiag_dport=htons(0)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst)"
+              ", idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\")"
               ", idiag_if=if_nametoindex(\"lo\"), idiag_cookie=[0, 0]}"
               ", idiag_expires=0, idiag_rqueue=0, idiag_wqueue=0"
               ", idiag_uid=0, idiag_inode=0}",

diff --git a/tests/nlattr_smc_diag_msg.c b/tests/nlattr_smc_diag_msg.c
index 4397a6560795a6857ec2c4c55a5a2054c08c9119..a06ad624680aad4db6a39ac71a0616457e98f198 100644 (file)
--- a/tests/nlattr_smc_diag_msg.c
+++ b/tests/nlattr_smc_diag_msg.c
@@ -77,8 +77,8 @@ print_smc_diag_msg(const unsigned int msg_len)
               ", {diag_family=AF_SMC, diag_state=SMC_ACTIVE"
               ", diag_fallback=0, diag_shutdown=0"
               ", id={idiag_sport=htons(0), idiag_dport=htons(0)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_src)"
-              ", inet_pton(AF_INET, \"%s\", &idiag_dst)"
+              ", idiag_src=inet_addr(\"%s\")"
+              ", idiag_dst=inet_addr(\"%s\")"
               ", idiag_if=0, idiag_cookie=[0, 0]}"
               ", diag_uid=0, diag_inode=0}",
               msg_len, address, address);