Osmocom Open Build Service

osmo-diameter2gsup_0.1.3.dsc -> osmo-diameter2gsup_0.2.0.dsc Changed

@@ -2,15 +2,15 @@
 Source: osmo-diameter2gsup
 Binary: osmo-diameter2gsup
 Architecture: any
-Version: 0.1.3
-Maintainer: Osmocom Community <openbsc@lists.osmocom.org>
+Version: 0.2.0
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Standards-Version: 4.5.0
-Build-Depends: erlang-nox, libpcap-dev, rebar3, debhelper
+Build-Depends: erlang-nox, libpcap-dev, rebar3, debhelper (>= 10)
 Package-List:
  osmo-diameter2gsup deb net optional arch=any
 Checksums-Sha1:
- 3b447bd92d2f43893b6973b14f8fc3e42f2125be 8161884 osmo-diameter2gsup_0.1.3.tar.xz
+ 68ca9f96471e45d89fe85940e26381834d8fae50 8277012 osmo-diameter2gsup_0.2.0.tar.xz
 Checksums-Sha256:
- baebec3f21199ee55bcce07102ce52282337f72644ceff6670d44be69631f6ab 8161884 osmo-diameter2gsup_0.1.3.tar.xz
+ 9bd58e7cd1bd2ef76ed79fb892f411452a18560d27eeb059a93b67413c3817d7 8277012 osmo-diameter2gsup_0.2.0.tar.xz
 Files:
- aaf0c7087a60c4c3db6ef8ea637cc0b7 8161884 osmo-diameter2gsup_0.1.3.tar.xz
+ 24539d18ac0f21deb41e3013b75a7d04 8277012 osmo-diameter2gsup_0.2.0.tar.xz

osmo-diameter2gsup_0.1.3.tar.xz/.tarball-version -> osmo-diameter2gsup_0.2.0.tar.xz/.tarball-version Changed

osmo-diameter2gsup_0.1.3.tar.xz/README.md -> osmo-diameter2gsup_0.2.0.tar.xz/README.md Changed

@@ -1,27 +1,51 @@
-= Osmocom DIAMETER -> GSUP translator =
+# Osmocom DIAMETER -> GSUP translator
 
 This project implements a proxy translating Diameter into GSUP, hence allowing
 Diameter clients connecting to GSUP server. This allows, for instance, using
 OsmoHLR as an HSS used by 4G/5G nodes.
 
-== Building ==
+## Building
 
 Install erlang and rebar3 packages (not "rebar", that's version 2! You may need
 to compile it from source in some distros).
 
+```
 $ rebar3 compile
 $ rebar3 escriptize
+```
 
-== Testing ==
+## Testing
 
 Unit tests can be run this way:
+```
 $ rebar3 eunit
+```
 
-== Running ==
+## Running
 
-Once osmo_dia2gsup is built, you can start it this way:
+Once osmo\_dia2gsup is built, you can start it this way:
 
+```
 $ rebar3 shell
+1> osmo_dia2gsup:start().
+```
+
+Passing a config file:
 
-In the erlang shell:
+```
+$ rebar3 shell --config ./examples/sys.config
 1> osmo_dia2gsup:start().
+```
+
+Running it with one shell command:
+
+```
+$ rebar3 shell --config ./examples/sys.config --eval "osmo_dia2gsup:start()."
+```
+
+Running it as an escript:
+
+```
+$ rebar3 escriptize
+$ ERL_FLAGS='-config ./examples/sys.config' _build/default/bin/osmo-dia2gsup
+```

osmo-diameter2gsup_0.1.3.tar.xz/build_dep.tar.gz -> osmo-diameter2gsup_0.2.0.tar.xz/build_dep.tar.gz Changed

osmo-diameter2gsup_0.1.3.tar.xz/contrib/generate_build_dep.sh -> osmo-diameter2gsup_0.2.0.tar.xz/contrib/generate_build_dep.sh Changed

osmo-diameter2gsup_0.1.3.tar.xz/debian/changelog -> osmo-diameter2gsup_0.2.0.tar.xz/debian/changelog Changed

@@ -1,8 +1,38 @@
-osmo-diameter2gsup (0.1.3) unstable; urgency=medium
+osmo-diameter2gsup (0.2.0) unstable; urgency=medium
 
+   Alexander Couzens 
+  * contrib/generate_build_dep.sh: remove erlang bytecode from checkouts
+  * docs: add a simple example to use configuration file
+
+   Oliver Smith 
+  * debian: set compat level to 10
   * systemd: depend on networking-online.target
 
- -- Oliver Smith <osmith@sysmocom.de>  Fri, 26 May 2023 14:51:44 +0200
+   Alexander Couzens 
+  * Use GSUP APN as Service-Selection field
+
+   Pau Espin Pedrol 
+  * rebar3.lock: Update epcap dep to v1.1.1 to fix compilation error
+  * README.md: Document how to run escript with config file
+
+   Oliver Smith 
+  * README.md: update
+
+   Pau Espin Pedrol 
+  * cosmetic: Fix typo in comment
+  * gsup: Log connect failures
+  * gsup: Attempt reconnecting if connect fails
+  * Add GMM error cause present in osmo-hlr's gsm48_gmm_cause_vty_names
+  * Translate GSUP Auth Info Answer error Cause in Diamater AIA
+
+   Alexander Couzens 
+  * server_cb: use a define for the VENDOR_3GPP code
+  * gsup: convert all unknown causes into diameter UNABLE_TO_COMPLY
+
+   Oliver Smith 
+  * debian/rules: extract build_dep.tar.gz first
+
+ -- Oliver Smith <osmith@sysmocom.de>  Tue, 31 Oct 2023 12:59:24 +0100
 
 osmo-diameter2gsup (0.1.2) unstable; urgency=medium

osmo-diameter2gsup_0.1.3.tar.xz/debian/control -> osmo-diameter2gsup_0.2.0.tar.xz/debian/control Changed

osmo-diameter2gsup_0.1.3.tar.xz/debian/rules -> osmo-diameter2gsup_0.2.0.tar.xz/debian/rules Changed

osmo-diameter2gsup_0.2.0.tar.xz/examples Added

osmo-diameter2gsup_0.2.0.tar.xz/examples/sys.config Added

osmo-diameter2gsup_0.1.3.tar.xz/rebar.lock -> osmo-diameter2gsup_0.2.0.tar.xz/rebar.lock Changed

osmo-diameter2gsup_0.2.0.tar.xz/src/decode_apn.erl Added

@@ -0,0 +1,51 @@
+
+-module(decode_apn).
+
+% decode APN Name Encoded Format
+% TS 23.003 APN
+-export(decode_apn/1, encode_apn/1).
+
+decode_apn(ApnEnc) ->
+	decode_apn("", ApnEnc, 0).
+
+decode_apn(Result, , 0) ->
+	Result;
+
+decode_apn(Result, << >>, 0) ->
+	Result;
+
+decode_apn("", ApnEnc, 0) ->
+	<< NewElemLen:8, RemainEnc/bytes >> = ApnEnc,
+	case NewElemLen of
+		0 -> "";
+		_ -> decode_apn("", RemainEnc, NewElemLen)
+	end;
+
+decode_apn(Result, ApnEnc, 0) ->
+	<< NewElemLen:8, RemainEnc/bytes >> = ApnEnc,
+	case NewElemLen of
+		0 -> Result;
+		_ -> decode_apn(Result ++ ".", RemainEnc, NewElemLen)
+	end;
+
+decode_apn(Result, ApnEnc, RemainLen) when RemainLen > 0 ->
+	<< Char:8, RemainEnc/bytes >> = ApnEnc,
+	decode_apn(Result ++ Char, RemainEnc, RemainLen - 1).
+
+encode_apn(ApnStr) ->
+	encode_apn(<<>>, ApnStr, "", 0).
+
+encode_apn(ApnEnc, "", "", 0) ->
+	ApnEnc;
+
+encode_apn(ApnEnc, "", CurStr, Len) ->
+	CurBin = binary:list_to_bin(CurStr),
+	Result = << ApnEnc/binary, Len, CurBin/binary >>,
+	Result;
+
+encode_apn(ApnEnc,  Char | RemainStr , CurStr, Len) ->
+	case Char of
+		46 -> CurBin = binary:list_to_bin(CurStr),
+		       encode_apn(<<ApnEnc/binary, Len,  CurBin/binary >>, RemainStr, "", 0);
+		_ -> encode_apn(ApnEnc, RemainStr, CurStr ++ Char, Len + 1)
+	end.

osmo-diameter2gsup_0.1.3.tar.xz/src/gsup_client.erl -> osmo-diameter2gsup_0.2.0.tar.xz/src/gsup_client.erl Changed

@@ -63,19 +63,22 @@
 
 init(Address, Port, Options) ->
 	ipa_proto:init(),
-	% register the GSUP codec with the IPA core; ignore result as we mgiht be doing this multiple times
+	% register the GSUP codec with the IPA core; ignore result as we might be doing this multiple times
 	ipa_proto:register_codec(?IPAC_PROTO_EXT_GSUP, fun gsup_protocol:encode/1, fun gsup_protocol:decode/1),
+	connect(Address, Port, Options).
+
+connect(Address, Port, Options) ->
 	lager:info("Connecting to GSUP HLR on IP ~s port ~p~n", Address, Port),
-        CcmOptions = #ipa_ccm_options{
-                serial_number="HSS-00-00-00-00-00-00",
-                unit_id="0/0/0",
-                mac_address="00:00:00:00:00:00",
-                location="00:00:00:00:00:00",
-                unit_type="00:00:00:00:00:00",
-                equipment_version="00:00:00:00:00:00",
-                sw_version="00:00:00:00:00:00",
-                unit_name="HSS-00-00-00-00-00-00"
-                },
+	CcmOptions = #ipa_ccm_options{
+		serial_number="HSS-00-00-00-00-00-00",
+		unit_id="0/0/0",
+		mac_address="00:00:00:00:00:00",
+		location="00:00:00:00:00:00",
+		unit_type="00:00:00:00:00:00",
+		equipment_version="00:00:00:00:00:00",
+		sw_version="00:00:00:00:00:00",
+		unit_name="HSS-00-00-00-00-00-00"
+		},
 	case ipa_proto:connect(Address, Port, Options) of
 		{ok, {Socket, IpaPid}} ->
 			ipa_proto:set_ccm_options(Socket, CcmOptions),
@@ -83,12 +86,13 @@
 			true = ipa_proto:register_stream(Socket, ?IPAC_PROTO_EXT_GSUP, {process_id, self()}),
 			ipa_proto:unblock(Socket),
 			{ok, #gsupc_state{socket=Socket, ipa_pid=IpaPid}};
-		{error, econnrefused} ->
+		{error, Reason} ->
+			lager:error("Connecting to GSUP HLR on IP ~s port ~p failed: ~p~n", Address, Port, Reason),
+			lager:info("Reconnecting to GSUP HLR in 5s...~n", ),
 			timer:sleep(5000),
-			{stop, connrefused}
+			connect(Address, Port, Options)
 	end.
 
-
 % send a given GSUP message and synchronously wait for message type ExpRes or ExpErr
 handle_call({transceive_gsup, GsupMsgTx, ExpRes, ExpErr}, _From, State) ->
 	Socket = State#gsupc_state.socket,

osmo-diameter2gsup_0.1.3.tar.xz/src/server_cb.erl -> osmo-diameter2gsup_0.2.0.tar.xz/src/server_cb.erl Changed

@@ -6,6 +6,7 @@
 -include_lib("diameter_3gpp_ts29_272.hrl").
 -include_lib("osmo_gsup/include/gsup_protocol.hrl").
 
+-define(DIA_VENDOR_3GPP, 10415).
 
 %% diameter callbacks
 -export(peer_up/3, peer_down/3, pick_peer/4, prepare_request/3, prepare_retransmit/3,
@@ -123,7 +124,7 @@
 gsup_pdp2dia(GsupPdpInfo) ->
 	#'PDP-Context'{'PDP-Type' = maps:get(pdp_type, GsupPdpInfo, ?PDP_TYPE_DEFAULT),
 		       'Context-Identifier' = maps:get(pdp_context_id, GsupPdpInfo),
-		       'Service-Selection' = maps:get(access_point_name, GsupPdpInfo),
+		       'Service-Selection' = decode_apn:decode_apn(maps:get(access_point_name, GsupPdpInfo)),
 		       'QoS-Subscribed' = maps:get(quality_of_service, GsupPdpInfo, ?PDP_QOS_DEFAULT)
 		      }.
 
@@ -149,7 +150,7 @@
 					      'Max-Requested-Bandwidth-DL' = 100000000},
 			     % The default APN Configuration shall not contain the Wildcard APN (see 3GPP TS
 			     % 23.003 3, clause 9.2); the default APN shall always contain an explicit APN
-			     'Service-Selection' = "internet"%maps:get(access_point_name, GsupPdpInfo)
+			     'Service-Selection' = decode_apn:decode_apn(maps:get(access_point_name, GsupPdpInfo))
 			    }.
 
 % transient (only in Experimental-Result-Code)
@@ -157,7 +158,10 @@
 -define(DIAMETER_ERROR_CAMEL_SUBSCRIPTION_PRESENT,	4182).
 % permanent (only in Experimental-Result-Code)
 -define(DIAMETER_ERROR_USER_UNKNOWN,			5001).
+-define(DIAMETER_AUTHORIZATION_REJECTED,		5003).
 -define(DIAMETER_ERROR_ROAMING_NOT_ALLOWED,		5004).
+-define(DIAMETER_MISSING_AVP,				5005).
+-define(DIAMETER_UNABLE_TO_COMPLY,			5012).
 -define(DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION,	5420).
 -define(DIAMETER_ERROR_RAT_NOT_ALLOWED,			5421).
 -define(DIAMETER_ERROR_EQUIPMENT_UNKNOWN,		5422).
@@ -165,23 +169,36 @@
 
 % 10.5.5.14
 -define(GMM_CAUSE_IMSI_UNKNOWN,		16#02).
--define(GMM_CAUSE_PLMN_NOTALLOWED,	16#0b).
+-define(GMM_CAUSE_ILLEGAL_MS,		16#03).
 -define(GMM_CAUSE_GPRS_NOTALLOWED,	16#07).
--define(GMM_CAUSE_INV_MAND_INFO,	16#60).
+-define(GMM_CAUSE_PLMN_NOTALLOWED,	16#0b).
+-define(GMM_CAUSE_LA_NOTALLOWED,	16#0c).
+-define(GMM_CAUSE_ROAMING_NOTALLOWED,	16#0d).
+-define(GMM_CAUSE_NO_SUIT_CELL_IN_LA,	16#0f).
 -define(GMM_CAUSE_NET_FAIL,		16#11).
-% TODO: more values
+-define(GMM_CAUSE_CONGESTION,		16#16).
+-define(GMM_CAUSE_GSM_AUTH_UNACCEPT,	16#17).
+-define(GMM_CAUSE_INV_MAND_INFO,	16#60).
+-define(GMM_CAUSE_PROTO_ERR_UNSPEC,	16#6f).
 
--define(EXP_RES(Foo),	#'Experimental-Result'{'Vendor-Id'=fixme, 'Experimental-Result-Code'=Foo}).
+-define(EXP_RES(Exp),	#'Experimental-Result'{'Vendor-Id'=?DIA_VENDOR_3GPP, 'Experimental-Result-Code'=Exp}).
 
+%% see 29.272 Annex A/B
 -type empty_or_intl() ::  | integer().
 -spec gsup_cause2dia(integer()) -> {empty_or_intl(), empty_or_intl()}.
 gsup_cause2dia(?GMM_CAUSE_IMSI_UNKNOWN) -> {, ?EXP_RES(?DIAMETER_ERROR_USER_UNKNOWN)};
-gsup_cause2dia(?GMM_CAUSE_PLMN_NOTALLOWED) -> {, ?DIAMETER_ERROR_ROAMING_NOT_ALLOWED};
-gsup_cause2dia(?GMM_CAUSE_GPRS_NOTALLOWED) -> {, ?DIAMETER_ERROR_RAT_NOT_ALLOWED};
-%gsup_cause2dia(?GMM_CAUSE_INV_MAND_INFO) ->
-%gsup_cause2dia(?GMM_CAUSE_NET_FAIL) -> 
-% TODO: more values
-gsup_cause2dia(_) -> {fixme, }.
+gsup_cause2dia(?GMM_CAUSE_ILLEGAL_MS) -> {, ?EXP_RES(?DIAMETER_ERROR_USER_UNKNOWN)};
+gsup_cause2dia(?GMM_CAUSE_PLMN_NOTALLOWED) -> {, ?EXP_RES(?DIAMETER_ERROR_ROAMING_NOT_ALLOWED)};
+gsup_cause2dia(?GMM_CAUSE_GPRS_NOTALLOWED) -> {, ?EXP_RES(?DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION)};
+
+gsup_cause2dia(?GMM_CAUSE_LA_NOTALLOWED) -> {?DIAMETER_AUTHORIZATION_REJECTED, };
+gsup_cause2dia(?GMM_CAUSE_ROAMING_NOTALLOWED) -> {, ?EXP_RES(?DIAMETER_ERROR_ROAMING_NOT_ALLOWED)};
+gsup_cause2dia(?GMM_CAUSE_NO_SUIT_CELL_IN_LA) -> {, ?EXP_RES(?DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION)};
+gsup_cause2dia(?GMM_CAUSE_NET_FAIL) -> {?DIAMETER_UNABLE_TO_COMPLY, };
+gsup_cause2dia(?GMM_CAUSE_CONGESTION) -> {?DIAMETER_UNABLE_TO_COMPLY, };
+gsup_cause2dia(?GMM_CAUSE_INV_MAND_INFO) -> {?DIAMETER_MISSING_AVP, };
+gsup_cause2dia(?GMM_CAUSE_PROTO_ERR_UNSPEC) -> {?DIAMETER_UNABLE_TO_COMPLY, };
+gsup_cause2dia(_) -> {?DIAMETER_UNABLE_TO_COMPLY, }.
 
 % get the value for a tiven key in Map1. If not found, try same key in Map2. If not found, return Default
 -spec twomap_get(atom(), map(), map(), any()) -> any().
@@ -223,9 +240,11 @@
 			Resp = #'AIA'{'Session-Id'=SessionId, 'Origin-Host'=OH, 'Origin-Realm'=OR,
 				      'Result-Code'=2001, 'Auth-Session-State'=1,
 				      'Authentication-Info'=AuthInfo};
-		#{message_type := send_auth_info_err} ->
+		#{message_type := send_auth_info_err, cause:=Cause} ->
+			{Res, ExpRes} = gsup_cause2dia(Cause),
 			Resp = #'AIA'{'Session-Id'=SessionId, 'Origin-Host'=OH, 'Origin-Realm'=OR,
-				      'Result-Code'=?DIAMETER_ERROR_USER_UNKNOWN,
+				      'Result-Code'=Res,
+				      'Experimental-Result'=ExpRes,
 				      'Auth-Session-State'=1};
 		timeout ->
 			Resp = #'AIA'{'Session-Id'=SessionId, 'Origin-Host'=OH, 'Origin-Realm'=OR,

Changes of Revision 4