use a mnemonic constant in rpl_daoack_print()

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 534721a5848bd873275d9adc13fbd5aa35fd4357..5598ec282f2dff91f000a78075325c85ba319022 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -864,7 +864,7 @@ main(int argc, char **argv)
 
                case 'C':
                        Cflag = atoi(optarg) * 1000000;
-                       if (Cflag < 0)
+                       if (Cflag <= 0)
                                error("invalid file size %s", optarg);
                        break;
 
@@ -1115,6 +1115,8 @@ main(int argc, char **argv)
                                ndo->ndo_packettype = PT_PGM_ZMTP1;
                        else if (ascii_strcasecmp(optarg, "lmp") == 0)
                                ndo->ndo_packettype = PT_LMP;
+                       else if (ascii_strcasecmp(optarg, "resp") == 0)
+                               ndo->ndo_packettype = PT_RESP;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;
@@ -1143,7 +1145,7 @@ main(int argc, char **argv)
 
                case 'W':
                        Wflag = atoi(optarg);
-                       if (Wflag < 0)
+                       if (Wflag <= 0)
                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;
@@ -1840,22 +1842,27 @@ main(int argc, char **argv)
                                         * We're printing the decoded packets;
                                         * switch to the new DLT.
                                         *
-                                        * To do that, we need to recompile
-                                        * the filter, change the printer,
-                                        * and change the DLT name.
+                                        * To do that, we need to change
+                                        * the printer, change the DLT name,
+                                        * and recompile the filter with
+                                        * the new DLT.
                                         */
                                        dlt = new_dlt;
+                                       ndo->ndo_if_printer = get_if_printer(ndo, dlt);
                                        if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
                                                error("%s", pcap_geterr(pd));
-                                       if (pcap_setfilter(pd, &fcode) < 0)
-                                               error("%s", pcap_geterr(pd));
-                                       ndo->ndo_if_printer = get_if_printer(ndo, dlt);
-                                       dlt_name = pcap_datalink_val_to_name(dlt);
                                }
 
+                               /*
+                                * Set the filter on the new file.
+                                */
+                               if (pcap_setfilter(pd, &fcode) < 0)
+                                       error("%s", pcap_geterr(pd));
+
                                /*
                                 * Report the new file.
                                 */
+                               dlt_name = pcap_datalink_val_to_name(dlt);
                                if (dlt_name == NULL) {
                                        fprintf(stderr, "reading from file %s, link-type %u\n",
                                            RFileName, dlt);
@@ -2381,7 +2388,7 @@ print_usage(void)
 #endif
        (void)fprintf(stderr, "[ -T type ] [ --version ] [ -V file ]\n");
        (void)fprintf(stderr,
-"\t\t[ -w file ] [ -W filecount ] [ -y datalinktype ] [ -z command ]\n");
+"\t\t[ -w file ] [ -W filecount ] [ -y datalinktype ] [ -z postrotate-command ]\n");
        (void)fprintf(stderr,
 "\t\t[ -Z user ] [ expression ]\n");
 }