diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-12-07 14:49:18 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-12-08 01:38:58 +0100 |
| commit | 226e663298b95cdd22b11483c24a949a3e7f5f45 (patch) | |
| tree | b2a1ad6e96813f3302a736d06b30da88141191e2 /openbsc | |
| parent | 97ff65d2e26761f30428b176e08fc14f52969e4e (diff) | |
FIXME libmsc serv req + page resp: don't use bts pointer; break LAC
gsm48_rx_mm_serv_req(), gsm48_rx_rr_pag_resp():
don't use bts, use dummy LAC and mark as fixme.
Change-Id: I8ebfcedaf044261c0600b87533b60104a62b992d
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_08.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 2456ebad7..090801cac 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -487,9 +487,9 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb gsm48_decode_lai(&lu->lai, &old_lai.plmn.mcc, &old_lai.plmn.mnc, &old_lai.lac); - new_lai.plmn.mcc = bts->network->country_code; - new_lai.plmn.mnc = bts->network->network_code; - new_lai.lac = bts->location_area_code; + new_lai.plmn.mcc = conn->network->country_code; + new_lai.plmn.mnc = conn->network->network_code; + new_lai.lac = conn->subscr->lac; /* FIXME this is probably incorrect */ conn->lu_fsm = vlr_loc_update(conn->master_fsm, SUB_CON_E_LU_RES, g_vlr, conn, vlr_lu_type, tmsi, @@ -773,9 +773,9 @@ static int gsm48_rx_mm_serv_req(struct gsm_subscriber_connection *conn, struct m struct osmo_location_area_id lai; struct osmo_fsm_inst *proc_arq_fsm; - lai.plmn.mcc = bts->network->country_code; - lai.plmn.mnc = bts->network->network_code; - lai.lac = bts->location_area_code; + lai.plmn.mcc = conn->network->country_code; + lai.plmn.mnc = conn->network->network_code; + lai.lac = 23; /* FIXME -- used to be bts' LAC */ DEBUGP(DMM, "<- CM SERVICE REQUEST "); if (msg->data_len < sizeof(struct gsm48_service_request*)) { @@ -987,9 +987,9 @@ static int gsm48_rx_rr_pag_resp(struct gsm_subscriber_connection *conn, struct m struct osmo_location_area_id lai; struct osmo_fsm_inst *proc_arq_fsm; - lai.plmn.mcc = bts->network->country_code; - lai.plmn.mnc = bts->network->network_code; - lai.lac = bts->location_area_code; + lai.plmn.mcc = conn->network->country_code; + lai.plmn.mnc = conn->network->network_code; + lai.lac = 23; /* FIXME bts->location_area_code; */ resp = (struct gsm48_pag_resp *) &gh->data[0]; gsm48_paging_extract_mi(resp, msgb_l3len(msg) - sizeof(*gh), |