diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-04-05 20:25:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-04-05 20:25:26 +0000 |
| commit | a98336862ab10332051dcab2daa28b76ab97f12c (patch) | |
| tree | 5190c5d6e238e78142e08bc80eea5103c5a55ea5 /wiretap/eyesdn.c | |
| parent | cbfa8a5de6e12b31b9edeea8abe75046cad2905d (diff) | |
WTAP_ENCAP_MTP2 is for MTP2 *without* a pseudo-header giving direction
or other information; WTAP_ENCAP_MTP2_WITH_PHDR is for MTP2 *with* such
a pseudo-header. Use WTAP_ENCAP_MTP2_WITH_PHDR for the EyeSDN captures,
and don't assume there's a pseudo-header if you have WTAP_ENCAP_MTP2.
svn path=/trunk/; revision=41962
Diffstat (limited to 'wiretap/eyesdn.c')
| -rw-r--r-- | wiretap/eyesdn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 42f44b9889..8df81677b5 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -330,7 +330,7 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh, pseudo_header->mtp2.annex_a_used = MTP2_ANNEX_A_USED_UNKNOWN; pseudo_header->mtp2.link_number = channel; if(wth) { - wth->phdr.pkt_encap = WTAP_ENCAP_MTP2; + wth->phdr.pkt_encap = WTAP_ENCAP_MTP2_WITH_PHDR; } break; @@ -459,7 +459,7 @@ int eyesdn_dump_can_write_encap(int encap) case WTAP_ENCAP_DPNSS: case WTAP_ENCAP_ATM_PDUS_UNTRUNCATED: case WTAP_ENCAP_LAPB: - case WTAP_ENCAP_MTP2: + case WTAP_ENCAP_MTP2_WITH_PHDR: case WTAP_ENCAP_BACNET_MS_TP: case WTAP_ENCAP_PER_PACKET: return 0; @@ -520,7 +520,7 @@ static gboolean eyesdn_dump(wtap_dumper *wdh, protocol=EYESDN_ENCAP_LAPB; break; - case WTAP_ENCAP_MTP2: + case WTAP_ENCAP_MTP2_WITH_PHDR: protocol=EYESDN_ENCAP_MTP2; break; |