pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902?usp=email )
Change subject: diameter: rfc7155: move Framed-* AVP into a separate file ...................................................................... diameter: rfc7155: move Framed-* AVP into a separate file The AVP Frame-IP-Address type information isn't included in diameter_3gpp_ts29_273_swx except when direct inherits. It seems there is still an issue with multiple levels of inherits. Move the Framed-* into a seperate file to workaround collisions of other AVPs defined by SWX. Change-Id: I002b1346f68401f4095cfcd57d74fed7de772e4c --- M dia/diameter_3gpp_ts29_273_swx.dia A dia/diameter_rfc7155.dia M dia/diameter_rfc7155_nasreq.dia 3 files changed, 59 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/dia/diameter_3gpp_ts29_273_swx.dia b/dia/diameter_3gpp_ts29_273_swx.dia index 1e86dee..259e626 100644 --- a/dia/diameter_3gpp_ts29_273_swx.dia +++ b/dia/diameter_3gpp_ts29_273_swx.dia @@ -46,6 +46,7 @@ @inherits diameter_rfc5447 @inherits diameter_rfc5580 @inherits diameter_rfc5778 +@inherits diameter_rfc7155 @inherits diameter_rfc7683 @inherits diameter_rfc7944 @inherits diameter_rfc8583 diff --git a/dia/diameter_rfc7155.dia b/dia/diameter_rfc7155.dia new file mode 100644 index 0000000..dabee98 --- /dev/null +++ b/dia/diameter_rfc7155.dia @@ -0,0 +1,44 @@ + +;; Copyright 2017, Travelping GmbH <[email protected]> + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License +;; as published by the Free Software Foundation; either version +;; 2 of the License, or (at your option) any later version. + +;; +;; RFC 7155, Diameter Network Access Server Application +;; +;; +;; Edits: +;; +;; - Framed-Appletalk-Link -> Framed-AppleTalk-Link +;; - Framed-Appletalk-Network -> Framed-AppleTalk-Network +;; - Framed-Appletalk-Zone -> Framed-AppleTalk-Zone +;; + +@id 1 +@name diameter_rfc7155 +@prefix diameter +@vendor 0 IETF + +@inherits diameter_gen_base_rfc6733 + +@avp_types + + Framed-AppleTalk-Link 37 Unsigned32 M + Framed-AppleTalk-Network 38 Unsigned32 M + Framed-AppleTalk-Zone 39 OctetString M + Framed-Compression 13 Enumerated M + Framed-IP-Address 8 OctetString M + Framed-IP-Netmask 9 OctetString M + Framed-IPX-Network 23 Unsigned32 M + Framed-IPv6-Pool 100 OctetString M + Framed-IPv6-Prefix 97 OctetString M + Framed-IPv6-Route 99 UTF8String M + Framed-Interface-Id 96 Unsigned64 M + Framed-MTU 12 Unsigned32 M + Framed-Pool 88 OctetString M + Framed-Protocol 7 Enumerated M + Framed-Route 22 UTF8String M + Framed-Routing 10 Enumerated M diff --git a/dia/diameter_rfc7155_nasreq.dia b/dia/diameter_rfc7155_nasreq.dia index ddeccae..7f09512 100644 --- a/dia/diameter_rfc7155_nasreq.dia +++ b/dia/diameter_rfc7155_nasreq.dia @@ -22,6 +22,7 @@ @vendor 0 IETF @inherits diameter_gen_base_rfc6733 +@inherits diameter_rfc7155 @avp_types @@ -42,22 +43,6 @@ Calling-Station-Id 31 UTF8String M Connect-Info 77 UTF8String M Filter-Id 11 UTF8String M - Framed-AppleTalk-Link 37 Unsigned32 M - Framed-AppleTalk-Network 38 Unsigned32 M - Framed-AppleTalk-Zone 39 OctetString M - Framed-Compression 13 Enumerated M - Framed-IP-Address 8 OctetString M - Framed-IP-Netmask 9 OctetString M - Framed-IPX-Network 23 Unsigned32 M - Framed-IPv6-Pool 100 OctetString M - Framed-IPv6-Prefix 97 OctetString M - Framed-IPv6-Route 99 UTF8String M - Framed-Interface-Id 96 Unsigned64 M - Framed-MTU 12 Unsigned32 M - Framed-Pool 88 OctetString M - Framed-Protocol 7 Enumerated M - Framed-Route 22 UTF8String M - Framed-Routing 10 Enumerated M Idle-Timeout 28 Unsigned32 M Login-IP-Host 14 OctetString M Login-IPv6-Host 98 OctetString M -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I002b1346f68401f4095cfcd57d74fed7de772e4c Gerrit-Change-Number: 35902 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <[email protected]> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <[email protected]> Gerrit-MessageType: merged
