Add the -g option, causing IPv4 output in verbose mode to be on one line.

This may make it easlier to parse IPv4 output.

From Apple's tcpdump, until they decided to get rid of it for some
unknown reason.

Fix up man page not to split some options between in the SYNOPSIS
section (at least with 80-column output).

Author: guyharris

netdissect.h

@@ -217,6 +217,7 @@ struct netdissect_options {
   int ndo_bflag;		/* print 4 byte ASes in ASDOT notation */
   int ndo_eflag;		/* print ethernet header */
   int ndo_fflag;		/* don't translate "foreign" IP address */
+  int ndo_gflag;		/* don't split IP output into two lines in verbose mode */
   int ndo_Kflag;		/* don't check IP, TCP or UDP checksums */
   int ndo_nflag;		/* leave addresses as numbers */
   int ndo_Nflag;		/* remove domains from printed host names */

print-ip.c

@@ -437,7 +437,10 @@ ip_print(netdissect_options *ndo,
 		}
 	    }
 
-	    ND_PRINT(")\n    ");
+	    if (ndo->ndo_gflag)
+		ND_PRINT(") ");
+	    else
+		ND_PRINT(")\n    ");
 	    if (truncated) {
 		ND_PRINT("%s > %s: ",
 			 GET_IPADDR_STRING(ip->ip_src),

tcpdump.1.in

@@ -27,11 +27,12 @@ tcpdump \- dump traffic on a network
 .na
 .B tcpdump
 [
-.B \-AbdDefhHIJKlLnNOpqStuUvxX#
+.B \-AbdDefghHIJKlLnNOpqStuUvxX#
 ] [
 .B \-B
 .I buffer_size
 ]
+.br
 .ti +8
 [
 .B \-c
@@ -44,11 +45,13 @@ tcpdump \- dump traffic on a network
 .B \-C
 .I file_size
 ]
+.br
 .ti +8
 [
 .B \-E
 .I spi@ipaddr algo:secret,...
 ]
+.br
 .ti +8
 [
 .B \-F
@@ -62,6 +65,7 @@ tcpdump \- dump traffic on a network
 .B \-i
 .I interface
 ]
+.br
 .ti +8
 [
 .B \-\-immediate\-mode
@@ -70,14 +74,14 @@ tcpdump \- dump traffic on a network
 .B \-j
 .I tstamp_type
 ]
-.ti +8
 [
 .BI \-\-lengths
 ]
 [
 .B \-m
 .I module
 ]
+.br
 .ti +8
 [
 .B \-M
@@ -89,11 +93,12 @@ tcpdump \- dump traffic on a network
 [
 .B \-\-print
 ]
-.ti +8
 [
 .B \-\-print\-sampling
 .I nth
 ]
+.br
+.ti +8
 [
 .B \-Q
 .I in|out|inout
@@ -102,7 +107,6 @@ tcpdump \- dump traffic on a network
 .B \-r
 .I file
 ]
-.ti +8
 [
 .B \-s
 .I snaplen
@@ -111,14 +115,15 @@ tcpdump \- dump traffic on a network
 .B \-\-skip
 .I count
 ]
+.br
+.ti +8
 [
 .B \-T
 .I type
 ]
 [
 .B \-\-version
 ]
-.ti +8
 [
 .B \-V
 .I file
@@ -131,11 +136,12 @@ tcpdump \- dump traffic on a network
 .B \-W
 .I filecount
 ]
+.br
+.ti +8
 [
 .B \-y
 .I datalinktype
 ]
-.ti +8
 [
 .B \-z
 .I postrotate-command
@@ -144,17 +150,18 @@ tcpdump \- dump traffic on a network
 .B \-Z
 .I user
 ]
+.br
 .ti +8
 [
 .BI \-\-time\-stamp\-precision= tstamp_precision
 ]
-.ti +8
 [
 .BI \-\-micro
 ]
 [
 .BI \-\-nano
 ]
+.br
 .ti +8
 [
 .I expression
@@ -442,6 +449,13 @@ the interface.
 Use \fIfile\fP as input for the filter expression.
 An additional expression given on the command line is ignored.
 .TP
+.B \-g
+.PD 0
+.TP
+.BI \-\-ip\-oneline
+.PD
+Do not insert a line break after the IP header in verbose mode.
+.TP
 .BI \-G " rotate_seconds"
 If specified, rotates the dump file specified with the
 .B \-w

tcpdump.c

@@ -636,7 +636,7 @@ show_remote_devices_and_exit(void)
 #define M_FLAG_USAGE
 #endif
 
-#define SHORTOPTS "aAbB:c:C:dDe" E_FLAG "fF:G:hHi:I" j_FLAG J_FLAG "KlLm:" M_FLAG "nNOpqQ:r:s:StT:uUvV:w:W:xXy:Y" z_FLAG "Z:#"
+#define SHORTOPTS "aAbB:c:C:dDe" E_FLAG "fF:gG:hHi:I" j_FLAG J_FLAG "KlLm:" M_FLAG "nNOpqQ:r:s:StT:uUvV:w:W:xXy:Y" z_FLAG "Z:#"
 
 /*
  * Long options.
@@ -713,6 +713,7 @@ static const struct option longopts[] = {
 	{ "print-sampling", required_argument, NULL, OPTION_PRINT_SAMPLING },
 	{ "lengths", no_argument, NULL, OPTION_LENGTHS },
 	{ "time-t-size", no_argument, NULL, OPTION_TIME_T_SIZE },
+	{ "ip-oneline", no_argument, NULL, 'g' },
 	{ "skip", required_argument, NULL, OPTION_SKIP },
 	{ "version", no_argument, NULL, OPTION_VERSION },
 	{ NULL, 0, NULL, 0 }
@@ -1801,6 +1802,10 @@ main(int argc, char **argv)
 			infile = optarg;
 			break;
 
+		case 'g':
+			++ndo->ndo_gflag;
+			break;
+
 		case 'G':
 			Gflag = parse_int("number of seconds", optarg, NULL, 0,
 			    INT_MAX, 10);
@@ -3479,7 +3484,7 @@ print_usage(FILE *f)
 {
 	print_version(f);
 	(void)fprintf(f,
-"Usage: %s [-AbdDefhHI" J_FLAG "KlLnNOpqStuUvxX#] [ -B size ] [ -c count ] [--count]\n", program_name);
+"Usage: %s [-AbdDefghHI" J_FLAG "KlLnNOpqStuUvxX#] [ -B size ] [ -c count ] [--count]\n", program_name);
 	(void)fprintf(f,
 "\t\t[ -C file_size ] " E_FLAG_USAGE "[ -F file ] [ -G seconds ]\n");
 	(void)fprintf(f,