diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-12-03 15:27:39 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-12-03 15:27:39 +0000 |
| commit | e592902393a7fbd63ce0bd135b51ef0181168252 (patch) | |
| tree | 29f8b56386a377b142f0528f3a24586c55988fe0 /wiretap/wtap.c | |
| parent | 39f0b9efde36d57693479071eb0413a6fce593f4 (diff) | |
From Petr Sumbera via bug 4284:
Added support for Solaris IPNET layer
From me:
Some code cleanup in packet-ipnet.c
Added packet-ipnet.c to CMakeFiles.txt
Added WTAP_ENCAP_IPNET to encap_table_base[]
svn path=/trunk/; revision=31159
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 1231c4b95a..0735c7eb78 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -454,7 +454,10 @@ static struct encap_type_info encap_table_base[] = { { "Fibre Channel FC-2 With Frame Delimiter", "fc2sof"}, /* WTAP_ENCAP_JPEG_JFIF */ - { "JPEG/JFIF", "jfif" } + { "JPEG/JFIF", "jfif" }, + + /* WTAP_ENCAP_IPNET */ + { "Solaris IPNET", "ipnet" } }; |