diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-04-04 07:33:39 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-04-04 07:33:39 +0000 |
commit | 77b67c7456a174439d61c09038f82d1ad113ae15 (patch) | |
tree | d587f816085435b66d698c33f7dccb15298702b8 /wiretap/eyesdn.c | |
parent | 16a4af2d6755d2ca5af2bb8bd24442b4dd40e933 (diff) |
From Rolf Fiedler:
Patch to add V5.2 tracing capability on E1 links using EyeSDN probes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7027
Removed preference related stufff as it's not needed.
svn path=/trunk/; revision=41915
Diffstat (limited to 'wiretap/eyesdn.c')
-rw-r--r-- | wiretap/eyesdn.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 897e32e329..42f44b9889 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -271,7 +271,7 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh, } } else { /* D channel */ if(wth) { - wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; + wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; } } break; @@ -351,12 +351,20 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh, break; case EYESDN_ENCAP_BACNET: /* BACNET async over HDLC frames */ - /* pseudo_header->isdn.uton = direction & 1; */ - /* pseudo_header->isdn.channel = channel; */ + pseudo_header->isdn.uton = direction & 1; + pseudo_header->isdn.channel = channel; if(wth) { wth->phdr.pkt_encap = WTAP_ENCAP_BACNET_MS_TP; } break; + + case EYESDN_ENCAP_V5_EF: /* V5EF */ + pseudo_header->isdn.uton = direction & 1; + pseudo_header->isdn.channel = channel; + if(wth) { + wth->phdr.pkt_encap = WTAP_ENCAP_V5_EF; + } + break; } if(pkt_len > EYESDN_MAX_PACKET_LEN) { @@ -519,6 +527,10 @@ static gboolean eyesdn_dump(wtap_dumper *wdh, case WTAP_ENCAP_BACNET_MS_TP: protocol=EYESDN_ENCAP_BACNET; break; + + case WTAP_ENCAP_V5_EF: + protocol=EYESDN_ENCAP_V5_EF; + break; default: *err=WTAP_ERR_UNSUPPORTED_ENCAP; |