Continue to cleanup s1ap_ctx_managment.

srsepc/src/mme/s1ap_ctx_mngmt_proc.cc

@@ -120,10 +120,8 @@ s1ap_ctx_mngmt_proc::send_initial_context_setup_request(emm_ctx_t *emm_ctx,
 
   //Set E-RAB S-GW F-TEID
   erab_ctx_req->transportLayerAddress.n_bits = 32; //IPv4
-  uint32_t sgw_s1u_ip = htonl(erab_ctx->sgw_s1u_fteid.ipv4);
+  uint32_t sgw_s1u_ip = htonl(esm_ctx->sgw_s1u_fteid.ipv4);
-  //uint32_t sgw_s1u_ip = cs_resp->eps_bearer_context_created.s1_u_sgw_f_teid.ipv4;
+  liblte_value_2_bits(sgw_s1u_ip, (uint8_t**) &erab_ctx_req->transportLayerAddress.buffer, 32);
-  uint8_t *tmp_ptr =  erab_ctx_req->transportLayerAddress.buffer;
-  liblte_value_2_bits(sgw_s1u_ip, &tmp_ptr, 32);//FIXME consider ipv6
 
   uint32_t sgw_s1u_teid = esm_ctx->sgw_s1u_fteid.teid;
   memcpy(erab_ctx_req->gTP_TEID.buffer, &sgw_s1u_teid, sizeof(uint32_t));