With -T, change the packet's encapsulation type as well.

Bug: 15873
Change-Id: I8d36b0fba42481b5e27e9ad9643d3603486c3645
Reviewed-on: https://code.wireshark.org/review/33745
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 12 insertions, 1 deletions

diff --git a/editcap.c b/editcap.c
index 948bb4ac7d..2842d989f1 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1817,8 +1817,19 @@ main(int argc, char *argv[])
                 }
 
                 /*
+                 * If an encapsulation type was specified, override the
+                 * encapsulation type of the packet.
+                 * Copy and change rather than modify returned rec.
+                 */
+                if (out_frame_type != -2) {
+                    temp_rec = *rec;
+                    temp_rec.rec_header.packet_header.pkt_encap = out_frame_type;
+                    rec = &temp_rec;
+                }
+
+                /*
                  * CHOP
-                 * Copy and change rather than modify returned phdr.
+                 * Copy and change rather than modify returned rec.
                  */
                 temp_rec = *rec;
                 handle_chopping(chop, &temp_rec.rec_header.packet_header,