lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email )
Change subject: epdg_gtpc_s2b: fix encoding of the IP address
......................................................................
epdg_gtpc_s2b: fix encoding of the IP address
Change-Id: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c
---
M src/epdg_gtpc_s2b.erl
M src/gtp_utils.erl
2 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg
refs/changes/19/35219/1
diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl
index a71e71d..daacf08 100644
--- a/src/epdg_gtpc_s2b.erl
+++ b/src/epdg_gtpc_s2b.erl
@@ -318,7 +318,7 @@
instance = 0,
interface_type = 31, %% "S2b-U ePDG GTP-U"
key = Bearer#gtp_bearer.local_data_tei,
- ipv4 = LocalAddr
+ ipv4 = gtp_utils:ip_to_bin(LocalAddr)
}
],
IEs = [#v2_recovery{restart_counter = RCnt},
@@ -328,7 +328,7 @@
instance = Bearer#gtp_bearer.ebi,
interface_type = 30, %% "S2b ePDG GTP-C"
key = LocalCtlTEI,
- ipv4 = LocalAddr
+ ipv4 = gtp_utils:ip_to_bin(LocalAddr)
},
#v2_access_point_name{instance = 0, apn = [Apn]},
#v2_selection_mode{mode = 0},
diff --git a/src/gtp_utils.erl b/src/gtp_utils.erl
index b899530..85f69ef 100644
--- a/src/gtp_utils.erl
+++ b/src/gtp_utils.erl
@@ -35,7 +35,16 @@
-module(gtp_utils).
-author('Alexander Couzens <lyn...@fe80.eu>').
--export([plmn_to_bin/3]).
+-export([ip_to_bin/1, plmn_to_bin/3]).
+
+% ergw_aaa/src/ergw_aaa_3gpp_dict.erl
+% under GPLv2+
+ip_to_bin(IP) when is_binary(IP) ->
+ IP;
+ip_to_bin({A, B, C, D}) ->
+ <<A, B, C, D>>;
+ip_to_bin({A, B, C, D, E, F, G, H}) ->
+ <<A:16, B:16, C:16, D:16, E:16, F:16, G:16, H:16>>.
% ergw/apps/ergw/test/*.erl
% under GPLv2+
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?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: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c
Gerrit-Change-Number: 35219
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lyn...@fe80.eu>
Gerrit-MessageType: newchange
