SOME/IP: Remove empty lines in output

There is a newline in pretty_print_packet().

Update the output of some tests accordingly.

diff --git a/print-someip.c b/print-someip.c
index d21219aeadfba0e87e6bf07fc92b51feb616e5d6..4a5df3c36798d2b5ec9eb72452cb6446b0b9f99f 100644 (file)
--- a/print-someip.c
+++ b/print-someip.c
@@ -129,7 +129,7 @@ someip_print(netdissect_options *ndo, const u_char *bp, const u_int len)
 
     return_code = GET_U_1(bp);
     bp += 1;
-    ND_PRINT(", retcode %s\n",
+    ND_PRINT(", retcode %s",
             tok2str(return_code_values, "Unknown", return_code));
 
     return;

diff --git a/tests/someip1.out b/tests/someip1.out
index b50907e99e52261dae4d8bfae02414d68a8cdd59..bfe3eff8b7850c16c7fb64d24a49b766a0990f5f 100644 (file)
--- a/tests/someip1.out
+++ b/tests/someip1.out
@@ -1,6 +1,3 @@
     1  2020-02-01 17:47:06.889447 IP 192.168.88.8.30490 > 192.168.88.8.31490: SOMEIP, service 65535, event 256, len 64, client 0, session 0, pver 1, iver 1, msgtype NOTIFICATION, retcode E_OK
-
     2  2020-02-01 17:47:08.944638 IP 192.168.88.8.31490 > 192.168.88.8.30490: SOMEIP, service 65535, event 256, len 48, client 0, session 0, pver 1, iver 1, msgtype NOTIFICATION, retcode E_OK
-
     3  2020-02-01 17:47:10.935734 IP 192.168.88.8.30490 > 192.168.88.8.31490: SOMEIP, service 65535, event 256, len 48, client 0, session 0, pver 1, iver 1, msgtype NOTIFICATION, retcode E_OK
-

diff --git a/tests/someip2.out b/tests/someip2.out
index 528dbba2a92dbf6e7b035802ab0cda46d817efef..5d0b1d533912e9372e4d571d1ef1bebedccfb78d 100644 (file)
--- a/tests/someip2.out
+++ b/tests/someip2.out
@@ -1,2 +1 @@
     1  2020-02-16 18:44:34.812094 IP 192.168.88.8.56001 > 192.168.88.8.30490: SOMEIP, service 1, method 2, len 8, client 8, session 5, pver 1, iver 1, msgtype REQUEST_NO_RETURN, retcode E_OK
-