aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/pcap-common.c
diff options
context:
space:
mode:
authorJohn A. Thacker <johnthacker@gmail.com>2016-01-04 11:53:41 -0500
committerAnders Broman <a.broman58@gmail.com>2016-01-05 05:20:13 +0000
commit85fd9df235dcf77117b45ade4494c99e983595ec (patch)
treed2f463df7f0373d302011f9889f2cacf88c3d487 /wiretap/pcap-common.c
parent6f8ca079b48a70a7bd33544b42f0bca7b6ff1ad1 (diff)
GFP: Add support for Generic Framing Procedure (ITU-T G.7041/Y.1303)
Add support for Generic Framing Procedure. Generic Framing Procedure (GFP) is used to map octet-aligned variable length payloads (e.g. Ethernet, MPLS, octet-aligned PPP, IP) into octet-synchronous signals such as SONET/SDH (ITU-T G.707) and OTN (ITU-T G.709). GFP is a telecommunications industry standard defined in ITU-T G.7041/Y.1303. (https://www.itu.int/rec/T-REC-G.7041/) Bug: 11961 Change-Id: Idf5b311e82b051b1ee65bde5149b3de405537b02 Reviewed-on: https://code.wireshark.org/review/13043 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/pcap-common.c')
-rw-r--r--wiretap/pcap-common.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 2ae777e380..02be511875 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -306,10 +306,9 @@ static const struct {
{ 169, WTAP_ENCAP_GPRS_LLC },
- /*
- * 170 and 171 are reserved for ITU-T G.7041/Y.1303 Generic
- * Framing Procedure.
- */
+ /* ITU-T G.7041/Y.1303 Generic Framing Procedure. */
+ { 170, WTAP_ENCAP_GFP_T },
+ { 171, WTAP_ENCAP_GFP_F },
/* Registered by Gcom, Inc. */
{ 172, WTAP_ENCAP_GCOM_TIE1 },