Wireshark · Ethereal-dev: [Ethereal-dev] eyesdn usb-s0 wiretap support broken by code-cleanup in 0.10.2

[Rolf Fiedler <rolf.fiedler@xxxxxxxxxxxxxx>]

Hi there,

I noticed that in 0.10.2 the wiretap support for EyeSDN traces is 
broken. I used my own copy and did
not check for a while. I attached a trace file that shows the problem 
and a patch to fix it. I do not quite
understand why the original code is not working, it seems 
WTAP_ENCAP_ISDN is not behaving
properly if not set on a per packet basis.

As usual, if there is a problem with this patch please tell me.
Thanks a lot
Rolf

PS: the EyeSDN traces are really small, this one is 781 bytes...

Attachment: eyesdn.trc
Description: Binary data

--- eyesdn.c	Tue Mar  2 21:37:04 2004
+++ eyesdn.c.orig	Tue Mar  2 21:39:12 2004
@@ -182,7 +182,7 @@
 	}
 
 	wth->data_offset = 0;
-	wth->file_encap = WTAP_ENCAP_PER_PACKET; //WTAP_ENCAP_ISDN;
+	wth->file_encap = WTAP_ENCAP_ISDN;
 	wth->file_type = WTAP_FILE_EYESDN;
 	wth->snapshot_length = 0; /* not known */
 	wth->subtype_read = eyesdn_read;
@@ -316,7 +316,6 @@
 		wth->phdr.ts.tv_usec = usecs;
 		wth->phdr.caplen = pkt_len;
 		wth->phdr.len = pkt_len;
-	        wth->phdr.pkt_encap = WTAP_ENCAP_ISDN;
 	}
         pseudo_header->isdn.uton = direction;
         pseudo_header->isdn.channel = channel;