pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35904?usp=email )
Change subject: Keep gtp2c specificities in its module file
......................................................................
Keep gtp2c specificities in its module file
Change-Id: I03cfe86723e881013a3a745eb81f6d0d8b9cfe94
---
A include/conv.hrl
M src/conv.erl
M src/epdg_gtpc_s2b.erl
M src/epdg_ue_fsm.erl
M src/gsup_server.erl
5 files changed, 83 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/04/35904/1
diff --git a/include/conv.hrl b/include/conv.hrl
new file mode 100644
index 0000000..1284d3b
--- /dev/null
+++ b/include/conv.hrl
@@ -0,0 +1,39 @@
+% (C) 2023 by sysmocom
+%
+% All Rights Reserved
+%
+% This program is free software; you can redistribute it and/or modify
+% it under the terms of the GNU Affero General Public License as
+% published by the Free Software Foundation; either version 3 of the
+% License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU Affero General Public License
+% along with this program. If not, see <http://www.gnu.org/licenses/>.
+%
+% Additional Permission under GNU AGPL version 3 section 7:
+%
+% If you modify this Program, or any covered work, by linking or
+% combining it with runtime libraries of Erlang/OTP as released by
+% Ericsson on http://www.erlang.org (or a modified version of these
+% libraries), containing parts covered by the terms of the Erlang Public
+% License (http://www.erlang.org/EPLICENSE), the licensors of this
+% Program grant you additional permission to convey the resulting work
+% without the need to license the runtime libraries of Erlang/OTP under
+% the GNU Affero General Public License. Corresponding Source for a
+% non-source form of such a combination shall include the source code
+% for the parts of the runtime libraries of Erlang/OTP used as well as
+% that of the covered work.
+%
+-hrl_name('conv.hrl').
+
+-record(epdg_eua, {
+ type_nr :: non_neg_integer(),
+ ipv4 :: binary(),
+ ipv6 :: binary()
+}).
+
diff --git a/src/conv.erl b/src/conv.erl
index 30365cc..a041847 100644
--- a/src/conv.erl
+++ b/src/conv.erl
@@ -34,9 +34,11 @@
-author('Pau Espin Pedrol <pespin(a)sysmocom.de>').
-include_lib("osmo_gsup/include/gsup_protocol.hrl").
+-include_lib("gtplib/include/gtp_packet.hrl").
-include_lib("gtp_utils.hrl").
+-include_lib("conv.hrl").
--export([cause_gtp2gsup/1]).
+-export([cause_gtp2gsup/1, gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1]).
-spec cause_gtp2gsup(integer()) -> integer().
@@ -51,3 +53,23 @@
cause_gtp2gsup(?GTP2_CAUSE_MANDATORY_IE_INCORRECT) -> ?GSUP_CAUSE_INV_MAND_INFO;
cause_gtp2gsup(?GTP2_CAUSE_MANDATORY_IE_MISSING) -> ?GSUP_CAUSE_INV_MAND_INFO;
cause_gtp2gsup(_) -> ?GSUP_CAUSE_PROTO_ERR_UNSPEC.
+
+
+gtp2_paa_to_epdg_eua(#v2_pdn_address_allocation{type = ipv4, address = Addr}) ->
+ #epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4,
+ ipv4 = Addr};
+gtp2_paa_to_epdg_eua(#v2_pdn_address_allocation{type = ipv6, address = Addr}) ->
+ #epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv6,
+ ipv6 = Addr}.
+%TODO: IPv4v6
+
+epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, ipv4 = Addr}) ->
+ #{pdp_type_org => 1,
+ pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4,
+ address => #{ ipv4 => Addr}};
+
+epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv6, ipv6 = Addr}) ->
+#{pdp_type_org => 1,
+ pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv6,
+ address => #{ ipv6 => Addr}}.
+%TODO: IPv4v6
diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl
index bc1a076..b1c0627 100644
--- a/src/epdg_gtpc_s2b.erl
+++ b/src/epdg_gtpc_s2b.erl
@@ -316,7 +316,12 @@
Sess1 = update_gtp_session_from_create_session_response(Resp, Sess0),
lager:info("s2b: Updated Session after create_session_response: ~p~n", [Sess1]),
State1 = update_gtp_session(Sess0, Sess1, State0),
- epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, Resp}),
+ % Do GTP specific msg parsing here, pass only relevant fields:
+ #{{v2_pdn_address_allocation,0} := Paa} = Resp#gtp.ie,
+ ResInfo = #{
+ eua => conv:gtp2_paa_to_epdg_eua(Paa)
+ },
+ epdg_ue_fsm:received_gtpc_create_session_response(Sess0#gtp_session.pid, {ok, ResInfo}),
{noreply, State1}
end;
diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl
index 9221c79..fa780e8 100644
--- a/src/epdg_ue_fsm.erl
+++ b/src/epdg_ue_fsm.erl
@@ -132,10 +132,10 @@
{error, Err}
end.
-received_gtpc_create_session_response(Pid, Msg) ->
- lager:info("ue_fsm received_gtpc_create_session_response ~p~n", [Msg]),
+received_gtpc_create_session_response(Pid, Result) ->
+ lager:info("ue_fsm received_gtpc_create_session_response ~p~n", [Result]),
try
- gen_statem:call(Pid, {received_gtpc_create_session_response, Msg})
+ gen_statem:call(Pid, {received_gtpc_create_session_response, Result})
catch
exit:Err ->
{error, Err}
diff --git a/src/gsup_server.erl b/src/gsup_server.erl
index 229f5db..065abb4 100644
--- a/src/gsup_server.erl
+++ b/src/gsup_server.erl
@@ -39,8 +39,8 @@
-include_lib("diameter_3gpp_ts29_273_swx.hrl").
-include_lib("osmo_ss7/include/ipa.hrl").
-include_lib("osmo_gsup/include/gsup_protocol.hrl").
--include_lib("gtplib/include/gtp_packet.hrl").
-include("gtp_utils.hrl").
+-include("conv.hrl").
-define(SERVER, ?MODULE).
@@ -156,16 +156,9 @@
lager:info("tunnel_response for ~p: ~p~n", [Imsi, Result]),
Socket = State#gsups_state.socket,
case Result of
- {ok, #gtp{version = v2, type = create_session_response}} ->
- {ok, CreateSessResp} = Result,
- IEs = CreateSessResp#gtp.ie,
- %%#{{v2_bearer_context,0} := BearerMap} = IEs,
- #{{v2_pdn_address_allocation,0} := Paa} = IEs,
- PdpAddress = #{pdp_type_org => 1,
- pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4,
- address => #{ ipv4 => Paa#v2_pdn_address_allocation.address}},
+ {ok, #{eua := Eua}} ->
PdpInfo = #{pdp_context_id => 0,
- pdp_address => PdpAddress,
+ pdp_address => conv:epdg_eua_to_gsup_pdp_address(Eua),
access_point_name => "foobar.apn",
quality_of_service => <<0, 0, 0>>,
pdp_charging => 0},
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35904?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: I03cfe86723e881013a3a745eb81f6d0d8b9cfe94
Gerrit-Change-Number: 35904
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, lynxis lazus.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email )
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Patch Set 3:
(2 comments)
Patchset:
PS2:
> Related to https://gerrit.osmocom. […]
Thanks, works after merging this patch!
File src/aaa_diameter_swx.erl:
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901/comment/ca1e89df_47cc…
PS1, Line 192: %16#21 ->
> Also I think we need to add an additional inherit. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?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: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Thu, 08 Feb 2024 15:18:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
Hello Jenkins Builder, laforge, lynxis lazus,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
Change-Id: I3f29b00f57f433f8623b9f0a5048c83985e5cced
---
M src/aaa_diameter_swm.erl
M src/aaa_diameter_swx.erl
M src/aaa_ue_fsm.erl
M src/epdg_diameter_swm.erl
M src/epdg_ue_fsm.erl
M src/gsup_server.erl
6 files changed, 75 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/01/35901/3
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?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: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
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 <info(a)travelping.com>
+
+;; 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 <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: lynxis lazus.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902?usp=email )
Change subject: diameter: rfc7155: move Framed-* AVP into a separate file
......................................................................
Patch Set 2: Code-Review+2
--
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 <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Thu, 08 Feb 2024 14:58:27 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: lynxis lazus, pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
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(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/02/35902/2
--
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 <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email )
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
Related to https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35902
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?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: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Feb 2024 14:16:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
lynxis lazus has uploaded this change for review. ( 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
M dia/diameter_rfc7155_nasreq.dia
2 files changed, 15 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/02/35902/1
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_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: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?usp=email )
Change subject: Make PDP-Type and APN from GSUP AuthInfoReq available through all layers
......................................................................
Patch Set 2:
(1 comment)
File src/aaa_diameter_swx.erl:
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901/comment/63d4ef26_7e58…
PS1, Line 192: %16#21 ->
> Do you tried to encode the ipv4 with ip_to_bin()? like we do in src/epdg_gtpc_s2b. […]
Also I think we need to add an additional inherit.
I can't find an avp_name(x, x) type definition for it.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35901?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: I3f29b00f57f433f8623b9f0a5048c83985e5cced
Gerrit-Change-Number: 35901
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Feb 2024 14:05:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: comment