Osmocom Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

commit_707510a13607efc9f8d310699546853969840671.txt Added

commit_d185719a0fa7fdb216cdef89ebccd1548a88fdde.txt Deleted

osmo-s1gw_0.1.1.61.d185.dsc -> osmo-s1gw_0.1.1.64.7075.dsc Changed

osmo-s1gw_0.1.1.61.d185.tar.xz/.tarball-version -> osmo-s1gw_0.1.1.64.7075.tar.xz/.tarball-version Changed

osmo-s1gw_0.1.1.61.d185.tar.xz/build_dep.tar.gz -> osmo-s1gw_0.1.1.64.7075.tar.xz/build_dep.tar.gz Changed

osmo-s1gw_0.1.1.61.d185.tar.xz/debian/changelog -> osmo-s1gw_0.1.1.64.7075.tar.xz/debian/changelog Changed

osmo-s1gw_0.1.1.61.d185.tar.xz/src/erab_fsm.erl -> osmo-s1gw_0.1.1.64.7075.tar.xz/src/erab_fsm.erl Changed

@@ -81,6 +81,10 @@
 
 -type erab_state() :: #erab_state{}.
 
+-type iface() :: 'Core' | 'Access'.
+-type pfcp_ie() :: map().
+
+
 %% ------------------------------------------------------------------
 %% public API
 %% ------------------------------------------------------------------
@@ -375,68 +379,78 @@
     logger:set_process_metadata(#{prefix => Prefix}).
 
 
--spec net_inst(atom()) -> undefined | binary().
-net_inst(Param) ->
-    case application:get_env(osmo_s1gw, Param) of
-        {ok, Val} -> Val;
-        undefined -> undefined
-    end.
-
-
 -spec session_establish_req(erab_state()) -> pfcp_peer:pfcp_session_rsp().
 session_establish_req(#erab_state{seid_loc = F_SEID, %% used as F-SEID
                                   u2c = U2C}) ->
-    %% Network Instance IE values for core/access
-    NI_Core = net_inst(pfcp_net_inst_core),
-    NI_Access = net_inst(pfcp_net_inst_access),
     %% Packet Detection Rules
     OHR = #outer_header_removal{header = 'GTP-U/UDP/IPv4'},
     PDRs = #{pdr_id => {pdr_id, 1}, %% -- for Core -> Access
               far_id => {far_id, 1}, %% see FARs below
               precedence => {precedence, 255},
               outer_header_removal => OHR,
-              pdi => #{f_teid => #f_teid{teid = choose,
-                                         ipv4 = choose},
-                       network_instance => NI_Core,
-                       source_interface => {source_interface, 'Core'}}},
+              pdi => pdi('Core')},
             #{pdr_id => {pdr_id, 2}, %% -- for Access -> Core
               far_id => {far_id, 2}, %% see FARs below
               precedence => {precedence, 255},
               outer_header_removal => OHR,
-              pdi => #{f_teid => #f_teid{teid = choose,
-                                         ipv4 = choose},
-                       network_instance => NI_Access,
-                       source_interface => {source_interface, 'Access'}}},
+              pdi => pdi('Access')},
     %% Forwarding Action Rules
+    FPars = #{outer_header_creation => ohc(U2C),
+              destination_interface => {destination_interface, 'Core'}},
+    FParsNI = add_net_inst(FPars, 'Core'), %% optional Network Instance IE
     FARs = #{far_id => {far_id, 1}, %% -- for Core -> Access
               %% We don't know the Access side TEID / GTP-U address yet, so we set
               %% this FAR to DROP and modify it when we get E-RAB SETUP RESPONSE.
               apply_action => #{'DROP' => }},
             #{far_id => {far_id, 2}, %% -- for Access -> Core
               apply_action => #{'FORW' => },
-              forwarding_parameters =>
-                #{outer_header_creation => ohc(U2C),
-                  network_instance => NI_Core,
-                  destination_interface => {destination_interface, 'Core'}}},
+              forwarding_parameters => FParsNI},
     pfcp_peer:session_establish_req(F_SEID, PDRs, FARs).
 
 
 -spec session_modify_req(erab_state()) -> pfcp_peer:pfcp_session_rsp().
 session_modify_req(#erab_state{seid_rem = SEID, %% SEID allocated to us
                                u2a = U2A}) ->
-    %% Network Instance IE value for access
-    NI_Access = net_inst(pfcp_net_inst_access),
     %% Forwarding Action Rules
+    FPars = #{outer_header_creation => ohc(U2A)},
+    FParsNI = add_net_inst(FPars, 'Access'), %% optional Network Instance IE
     FARs = #{far_id => {far_id, 1}, %% -- for Core -> Access
               %% Now we know the Access side TEID / GTP-U address, so we modify
               %% this FAR (which was previously set to DROP) to FORW.
               apply_action => #{'FORW' => },
-              update_forwarding_parameters =>
-                #{outer_header_creation => ohc(U2A),
-                  network_instance => NI_Access}},
+              update_forwarding_parameters => FParsNI},
     pfcp_peer:session_modify_req(SEID, , FARs).
 
 
+%% Network Instance IE env parameter name
+-spec net_inst_param(iface()) -> atom().
+net_inst_param('Core') -> pfcp_net_inst_core;
+net_inst_param('Access') -> pfcp_net_inst_access.
+
+
+%% if configured, add Network Instance IE (optional)
+-spec add_net_inst(pfcp_ie(), iface()) -> pfcp_ie().
+add_net_inst(IE, Iface) ->
+    Param = net_inst_param(Iface),
+    case application:get_env(osmo_s1gw, Param) of
+        {ok, NI} ->
+            IE#{network_instance => NI};
+        undefined ->
+            IE
+    end.
+
+
+%% Packet Detection Information IE generator
+-spec pdi(iface()) -> pfcp_ie().
+pdi(SrcIface) ->
+    IE = #{f_teid => #f_teid{teid = choose,
+                             ipv4 = choose},
+           source_interface => {source_interface, SrcIface}},
+    %% if configured, add Network Instance IE (optional)
+    add_net_inst(IE, SrcIface).
+
+
+%% Outer Header Creation IE generator
 ohc({TEID, Addr}) ->
     OHC = #outer_header_creation{n6 = false,
                                  n19 = false,

osmo-s1gw_0.1.1.61.d185.tar.xz/src/s1ap_proxy.erl -> osmo-s1gw_0.1.1.64.7075.tar.xz/src/s1ap_proxy.erl Changed

@@ -37,6 +37,7 @@
 -export(init/0,
          deinit/1,
          handle_pdu/2,
+         handle_exit/2,
          encode_pdu/1,
          decode_pdu/1).
 
@@ -46,9 +47,17 @@
 -include("S1AP-PDU-Contents.hrl").
 -include("S1AP-Containers.hrl").
 -include("S1AP-Constants.hrl").
+-include("S1AP-IEs.hrl").
 
 
--record(proxy_state, { }).
+-type mme_ue_id() :: 0..16#ffffffff.
+-type enb_ue_id() :: 0..16#ffffff.
+-type erab_id() :: 0..16#ff.
+
+-record(proxy_state, {erabs :: dict:dict(),
+                      mme_ue_id :: undefined | mme_ue_id(),
+                      enb_ue_id :: undefined | enb_ue_id()
+                     }).
 
 -type proxy_state() :: #proxy_state{}.
 
@@ -59,7 +68,7 @@
 %% Initialize per-connection data
 -spec init() -> proxy_state().
 init() ->
-    #proxy_state{}.
+    #proxy_state{erabs = dict:new()}.
 
 
 %% De-initialize per-connection data
@@ -81,6 +90,13 @@
     end.
 
 
+%% Handle an exit event
+-spec handle_exit(pid(), proxy_state()) -> proxy_state().
+handle_exit(Pid, #proxy_state{erabs = ERABs} = S) ->
+    Fun = fun(_Key, Val) -> Val =/= Pid end,
+    S#proxy_state{erabs = dict:filter(Fun, ERABs)}.
+
+
 %% ------------------------------------------------------------------
 %% private API
 %% ------------------------------------------------------------------
@@ -134,6 +150,26 @@
 
 %% TODO: 9.1.3.3 E-RAB MODIFY REQUEST / (Optional) Transport Information
 
+%% 9.1.3.5 E-RAB RELEASE COMMAND
+handle_pdu(Data, {Outcome = initiatingMessage,
+                  #'InitiatingMessage'{procedureCode = ?'id-E-RABRelease',
+                                       value = Content} = Pdu}, S0) ->
+    ?LOG_DEBUG("Processing E-RAB RELEASE COMMAND"),
+    {IEs, S1} = handle_ies(Content#'E-RABReleaseCommand'.protocolIEs,
+                           ?'id-E-RABToBeReleasedList', S0),
+    NewContent = Content#'E-RABReleaseCommand'{protocolIEs = IEs},
+    handle_pdu_new(Data, {Outcome, Pdu#'InitiatingMessage'{value = NewContent}}, S1);
+
+%% 9.1.3.6 E-RAB RELEASE RESPONSE
+handle_pdu(Data, {Outcome = successfulOutcome,
+                  #'SuccessfulOutcome'{procedureCode = ?'id-E-RABRelease',
+                                       value = Content} = Pdu}, S0) ->
+    ?LOG_DEBUG("Processing E-RAB RELEASE RESPONSE"),
+    {IEs, S1} = handle_ies(Content#'E-RABReleaseResponse'.protocolIEs,
+                           ?'id-E-RABReleaseListBearerRelComp', S0),
+    NewContent = Content#'E-RABReleaseResponse'{protocolIEs = IEs},
+    handle_pdu_new(Data, {Outcome, Pdu#'SuccessfulOutcome'{value = NewContent}}, S1);
+
 %% 9.1.3.8 E-RAB MODIFICATION INDICATION
 handle_pdu(Data, {Outcome = initiatingMessage,
                   #'InitiatingMessage'{procedureCode = ?'id-E-RABModificationIndication',
@@ -189,10 +225,16 @@
     handle_ies(Content, ?'id-E-RABToBeSetupItemBearerSUReq', S);
 
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemBearerSUReq',
-                              value = Content}, S) ->
-    %% eNB -> MME direction: we pass our MME facing local address
-    TLA = transp_layer_addr(mme_loc_addr),
-    {Content#'E-RABToBeSetupItemBearerSUReq'{transportLayerAddress = TLA}, S};
+                              value = C0}, S0) ->
+    %% start and register an E-RAB FSM
+    #'E-RABToBeSetupItemBearerSUReq'{'e-RAB-ID' = ERABId,
+                                     'transportLayerAddress' = TLA_In,
+                                     'gTP-TEID' = << TEID_In:32/big >>} = C0,
+    {Pid, S1} = erab_fsm_start_reg(ERABId, S0),
+    {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_req(Pid, {TEID_In, TLA_In}),
+    C1 = C0#'E-RABToBeSetupItemBearerSUReq'{'transportLayerAddress' = TLA_Out,
+                                            'gTP-TEID' = << TEID_Out:32/big >>},
+    {C1, S1};
 
 %% E-RAB SETUP RESPONSE related IEs
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupListBearerSURes',
@@ -201,10 +243,57 @@
     handle_ies(Content, ?'id-E-RABSetupItemBearerSURes', S);
 
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABSetupItemBearerSURes',
-                              value = Content}, S) ->
-    %% MME -> eNB direction: we pass our eNB facing local address
-    TLA = transp_layer_addr(s1gw_bind_addr),
-    {Content#'E-RABSetupItemBearerSURes'{transportLayerAddress = TLA}, S};
+                              value = C0}, S) ->
+    %% poke E-RAB FSM
+    #'E-RABSetupItemBearerSURes'{'e-RAB-ID' = ERABId,
+                                 'transportLayerAddress' = TLA_In,
+                                 'gTP-TEID' = << TEID_In:32/big >>} = C0,
+    C1 = case erab_fsm_find(ERABId, S) of
+        {ok, Pid} ->
+            {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_rsp(Pid, {TEID_In, TLA_In}),
+            C0#'E-RABSetupItemBearerSURes'{'transportLayerAddress' = TLA_Out,
+                                           'gTP-TEID' = << TEID_Out:32/big >>};
+        error ->
+            ?LOG_ERROR("E-RAB-ID ~p is not registered", ERABId),
+            C0 %% XXX: proxy as-is or drop?
+    end,
+    {C1, S};
+
+%% 9.1.3.5 E-RAB RELEASE COMMAND related IEs
+handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeReleasedList',
+                              value = Content}, S) ->
+    %% This IE contains a list of E-RABItem
+    handle_ies(Content, ?'id-E-RABItem', S);
+
+handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABItem',
+                              value = Content}, S) ->
+    %% poke E-RAB FSM
+    #'E-RABItem'{'e-RAB-ID' = ERABId} = Content,
+    case dict:find(ERABId, S#proxy_state.erabs) of
+        {ok, Pid} ->
+            ok = erab_fsm:erab_release_req(Pid);
+        error ->
+            ?LOG_ERROR("E-RAB-ID ~p is not registered", ERABId)
+    end,
+    {Content, S};
+
+%% 9.1.3.6 E-RAB RELEASE RESPONSE related IEs
+handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleaseListBearerRelComp',
+                              value = Content}, S) ->
+    %% This IE contains a list of E-RABReleaseItemBearerRelComp
+    handle_ies(Content, ?'id-E-RABReleaseItemBearerRelComp', S);
+
+handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABReleaseItemBearerRelComp',
+                              value = Content}, S) ->
+    %% poke E-RAB FSM
+    #'E-RABReleaseItemBearerRelComp'{'e-RAB-ID' = ERABId} = Content,
+    case dict:find(ERABId, S#proxy_state.erabs) of
+        {ok, Pid} ->
+            ok = erab_fsm:erab_release_rsp(Pid);
+        error ->
+            ?LOG_ERROR("E-RAB-ID ~p is not registered", ERABId)
+    end,
+    {Content, S};
 
 %% E-RAB MODIFICATION INDICATION related IEs
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedListBearerModInd',
@@ -214,9 +303,8 @@
 
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeModifiedItemBearerModInd',
                               value = Content}, S) ->
-    %% eNB -> MME direction: we pass our MME facing local address
-    TLA = transp_layer_addr(mme_loc_addr),
-    {Content#'E-RABToBeModifiedItemBearerModInd'{transportLayerAddress = TLA}, S};
+    %% TODO: find and poke an E-RAB FSM associated with this E-RAB
+    {Content#'E-RABToBeModifiedItemBearerModInd'{}, S};
 
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABNotToBeModifiedListBearerModInd',
                               value = Content}, S) ->
@@ -225,9 +313,8 @@
 
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABNotToBeModifiedItemBearerModInd',
                               value = Content}, S) ->
-    %% eNB -> MME direction: we pass our MME facing local address
-    TLA = transp_layer_addr(mme_loc_addr),
-    {Content#'E-RABNotToBeModifiedItemBearerModInd'{transportLayerAddress = TLA}, S};
+    %% TODO: find and poke an E-RAB FSM associated with this E-RAB
+    {Content#'E-RABNotToBeModifiedItemBearerModInd'{}, S};
 
 %% INITIAL CONTEXT SETUP REQUEST related IEs
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupListCtxtSUReq',
@@ -236,10 +323,16 @@
     handle_ies(Content, ?'id-E-RABToBeSetupItemCtxtSUReq', S);
 
 handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupItemCtxtSUReq',
-                              value = Content}, S) ->
-    %% eNB -> MME direction: we pass our MME facing local address
-    TLA = transp_layer_addr(mme_loc_addr),
-    {Content#'E-RABToBeSetupItemCtxtSUReq'{transportLayerAddress = TLA}, S};
+                              value = C0}, S0) ->
+    %% start and register an E-RAB FSM
+    #'E-RABToBeSetupItemCtxtSUReq'{'e-RAB-ID' = ERABId,
+                                   'transportLayerAddress' = TLA_In,
+                                   'gTP-TEID' = << TEID_In:32/big >>} = C0,
+    {Pid, S1} = erab_fsm_start_reg(ERABId, S0),
+    {ok, {TEID_Out, TLA_Out}} = erab_fsm:erab_setup_req(Pid, {TEID_In, TLA_In}),
+    C1 = C0#'E-RABToBeSetupItemCtxtSUReq'{'transportLayerAddress' = TLA_Out,

osmo-s1gw_0.1.1.61.d185.tar.xz/src/sctp_proxy.erl -> osmo-s1gw_0.1.1.64.7075.tar.xz/src/sctp_proxy.erl Changed

osmo-s1gw_0.1.1.61.d185.tar.xz/test/s1ap_proxy_test.erl -> osmo-s1gw_0.1.1.64.7075.tar.xz/test/s1ap_proxy_test.erl Changed

@@ -1,9 +1,7 @@
 -module(s1ap_proxy_test).
 
 -include_lib("eunit/include/eunit.hrl").
-
--define(EXP_ADDR_STR, "127.0.0.1").
--define(EXP_ADDR_BIN, << 16#7f, 16#00, 16#00, 16#01 >>).
+-include("pfcp_mock.hrl").
 
 %% ------------------------------------------------------------------
 %% setup functions
@@ -16,10 +14,12 @@
 
 
 start() ->
+    pfcp_mock:mock_all(),
     s1ap_proxy:init().
 
 
 stop(S) ->
+    pfcp_mock:unmock_all(),
     s1ap_proxy:deinit(S).
 
 
@@ -30,22 +30,92 @@
 s1ap_proxy_test_() ->
     {"S1 SETUP REQUEST (unmodified)",
       ?TC(fun test_s1_setup_req/1)},
-     {"E-RAB SETUP REQUEST",
-      ?TC(fun test_e_rab_setup_req/1)},
-     {"E-RAB SETUP RESPONSE",
-      ?TC(fun test_e_rab_setup_rsp/1)},
+     {"E-RAB SETUP REQUEST/RESPONSE",
+      ?TC(fun test_e_rab_setup/1)},
+     {"E-RAB RELEASE COMMAND/RESPONSE",
+      ?TC(fun test_e_rab_release/1)},
      {"E-RAB MODIFICATION INDICATION",
       ?TC(fun test_e_rab_modify_ind/1)},
-     {"INITIAL CONTEXT SETUP REQUEST",
-      ?TC(fun test_initial_context_setup_req/1)},
-     {"INITIAL CONTEXT SETUP RESPONSE",
-      ?TC(fun test_initial_context_setup_rsp/1)}.
+     {"INITIAL CONTEXT SETUP REQUEST/RESPONSE",
+      ?TC(fun test_initial_context_setup/1)}.
 
 
 %% ------------------------------------------------------------------
 %% actual testcases
 %% ------------------------------------------------------------------
 
+test_s1_setup_req(S0) ->
+    SetupReq = s1_setup_req_pdu(),
+    %% Expect the PDU to be proxied unmodified
+    ?_assertEqual({SetupReq, S0}, s1ap_proxy:handle_pdu(SetupReq, S0)).
+
+
+test_e_rab_setup(S0) ->
+    %% eNB <- MME E-RAB SETUP REQUEST
+    SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),
+    SetupReqExp = e_rab_setup_req_pdu(?ADDR_A2U, ?TEID_A2U),
+    {SetupReqOut, S1} = s1ap_proxy:handle_pdu(SetupReqIn, S0),
+
+    %% eNB -> MME E-RAB SETUP RESPONSE
+    SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A),
+    SetupRspExp = e_rab_setup_rsp_pdu(?ADDR_C2U, ?TEID_C2U),
+    {SetupRspOut, _S2} = s1ap_proxy:handle_pdu(SetupRspIn, S1),
+
+    ?_assertEqual(SetupReqExp, SetupReqOut),
+     ?_assertEqual(SetupRspExp, SetupRspOut).
+
+
+test_e_rab_release(S0) ->
+    %% eNB <- MME E-RAB SETUP REQUEST
+    SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),
+    {_, S1} = s1ap_proxy:handle_pdu(SetupReqIn, S0),
+
+    %% eNB -> MME E-RAB SETUP RESPONSE
+    SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A),
+    {_, S2} = s1ap_proxy:handle_pdu(SetupRspIn, S1),
+
+    %% eNB <- MME E-RAB RELEASE COMMAND
+    ReleaseCmd = e_rab_release_cmd_pdu(),
+    {ReleaseCmdOut, S3} = s1ap_proxy:handle_pdu(ReleaseCmd, S2),
+
+    %% eNB -> MME E-RAB RELEASE RESPONSE
+    ReleaseRsp = e_rab_release_rsp_pdu(),
+    {ReleaseRspOut, _S4} = s1ap_proxy:handle_pdu(ReleaseRsp, S3),
+
+    %% TODO: make sure that the E-RAB FSM has been terminated
+
+    ?_assertEqual(ReleaseCmd, ReleaseCmdOut),
+     ?_assertEqual(ReleaseRsp, ReleaseRspOut).
+
+
+test_e_rab_modify_ind(S0) ->
+    %% eNB -> MME E-RAB MODIFICATION INDICATION
+    ModifyIndIn = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A),
+    %% XXX: not implemented, we should actually expect ?ADDR_C2U, ?TEID_C2U
+    ModifyIndExp = e_rab_modify_ind_pdu(?ADDR_U2A, ?TEID_U2A),
+    {ModifyIndOut, _S1} = s1ap_proxy:handle_pdu(ModifyIndIn, S0),
+
+    ?_assertEqual(ModifyIndExp, ModifyIndOut).
+
+test_initial_context_setup(S0) ->
+    %% eNB <- MME INITIAL CONTEXT SETUP REQUEST
+    InitCtxSetupReqIn = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),
+    InitCtxSetupReqExp = initial_context_setup_req_pdu(?ADDR_A2U, ?TEID_A2U),
+    {InitCtxSetupReqOut, S1} = s1ap_proxy:handle_pdu(InitCtxSetupReqIn, S0),
+
+    %% eNB -> MME INITIAL CONTEXT SETUP RESPONSE
+    InitCtxSetupRspIn = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A),
+    InitCtxSetupRspExp = initial_context_setup_rsp_pdu(?ADDR_C2U, ?TEID_C2U),
+    {InitCtxSetupRspOut, _S2} = s1ap_proxy:handle_pdu(InitCtxSetupRspIn, S1),
+
+    ?_assertEqual(InitCtxSetupReqExp, InitCtxSetupReqOut),
+     ?_assertEqual(InitCtxSetupRspExp, InitCtxSetupRspOut).
+
+
+%% ------------------------------------------------------------------
+%% S1AP PDU templates
+%% ------------------------------------------------------------------
+
 %% S1 SETUP REQUEST
 s1_setup_req_pdu() ->
     << 16#00, 16#11, 16#00, 16#1a, 16#00, 16#00, 16#02, 16#00,
@@ -54,22 +124,17 @@
        16#0c, 16#0e, 16#40, 16#00, 16#f1, 16#10
     >>.
 
-test_s1_setup_req(S) ->
-    OrigData = s1_setup_req_pdu(),
-    %% Expect the PDU to be proxied unmodified
-    ?_assertEqual({OrigData, S}, s1ap_proxy:handle_pdu(OrigData, S)).
-
 
 %% eNB <- MME E-RAB SETUP REQUEST
 e_rab_setup_req_pdu(TLA, TEID) when is_binary(TLA),
-                                    is_binary(TEID) ->
+                                    is_integer(TEID) ->
     << 16#00, 16#05, 16#00, 16#80, 16#9b, 16#00, 16#00, 16#03,
        16#00, 16#00, 16#00, 16#02, 16#00, 16#07, 16#00, 16#08,
        16#00, 16#02, 16#00, 16#09, 16#00, 16#10, 16#00, 16#80,
        16#87, 16#00, 16#00, 16#11, 16#00, 16#80, 16#81, 16#0c,
        16#00, 16#05, 16#04, 16#0f, 16#80,
        TLA/bytes, %% transportLayerAddress (IPv4)
-       TEID/bytes, %% GTP-TEID
+       TEID:32/big, %% GTP-TEID
        16#72, 16#27, 16#c8,
        16#1a, 16#bc, 16#ec, 16#11, 16#62, 16#54, 16#c1, 16#01,
        16#05, 16#04, 16#03, 16#69, 16#6d, 16#73, 16#05, 16#01,
@@ -87,70 +152,58 @@
        16#16, 16#00, 16#15, 16#00, 16#10, 16#02, 16#05, 16#78
     >>.
 
-test_e_rab_setup_req(S) ->
-    %% Original input data
-    TEID = << 16#00, 16#00, 16#00, 16#18 >>,
-    OrigTLA = << 16#ac, 16#16, 16#00, 16#06 >>,
-    OrigData = e_rab_setup_req_pdu(OrigTLA, TEID),
-
-    %% Expected output data
-    ExpData = e_rab_setup_req_pdu(?EXP_ADDR_BIN, TEID),
-
-    application:set_env(osmo_s1gw, mme_loc_addr, ?EXP_ADDR_STR),
-    ?_assertMatch({ExpData, _}, s1ap_proxy:handle_pdu(OrigData, S)).
-
 
 %% eNB -> MME E-RAB SETUP RESPONSE
 e_rab_setup_rsp_pdu(TLA, TEID) when is_binary(TLA),
-                                    is_binary(TEID) ->
+                                    is_integer(TEID) ->
     << 16#20, 16#05, 16#00, 16#22, 16#00, 16#00, 16#03, 16#00,
        16#00, 16#40, 16#02, 16#00, 16#07, 16#00, 16#08, 16#40,
        16#02, 16#00, 16#09, 16#00, 16#1c, 16#40, 16#0f, 16#00,
        16#00, 16#27, 16#40, 16#0a, 16#0c, 16#1f,
        TLA/bytes, %% transportLayerAddress (IPv4)
-       TEID/bytes %% GTP-TEID
+       TEID:32/big %% GTP-TEID
     >>.
 
-test_e_rab_setup_rsp(S) ->
-    %% Original input data
-    TEID = << 16#6c, 16#05, 16#bf, 16#56 >>,
-    OrigTLA = << 16#c0, 16#a8, 16#68, 16#a7 >>,
-    OrigData = e_rab_setup_rsp_pdu(OrigTLA, TEID),
 
-    %% Expected output data
-    ExpData = e_rab_setup_rsp_pdu(?EXP_ADDR_BIN, TEID),
+%% eNB <- MME E-RAB RELEASE COMMAND
+%% TODO: make E-RAB IDs configurable
+e_rab_release_cmd_pdu() ->
+    << 16#00, 16#07, 16#00, 16#37, 16#00, 16#00, 16#05, 16#00,
+       16#00, 16#00, 16#02, 16#00, 16#01, 16#00, 16#08, 16#00,
+       16#02, 16#00, 16#00, 16#00, 16#42, 16#00, 16#0a, 16#18,
+       16#3e, 16#80, 16#00, 16#00, 16#60, 16#3e, 16#80, 16#00,
+       16#00, 16#00, 16#21, 16#40, 16#07, 16#00, 16#00, 16#23,
+       16#40, 16#02, 16#0c, 16#40, 16#00, 16#1a, 16#40, 16#0b,
+       16#0a, 16#27, 16#d3, 16#76, 16#43, 16#e7, 16#07, 16#72,
+       16#47, 16#cd, 16#24
+    >>.