diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-22 03:25:11 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 06:16:04 +0100 |
| commit | 22481bf76d129d3c41d20b96b6587ef085be485b (patch) | |
| tree | 8c8de852e945dd5422a83bc7e0c37548d2911fe2 /openbsc/src/bssap.c | |
| parent | b973955295b720b8ba7c556d0165750ed9bfb381 (diff) | |
| parent | 61b4232c6363ff9d78ef73b9dbf47ec16c94d610 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to libosmocore
* Move to new debugging architecture
* Register the BTS types
* Has only been compile tested
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/include/openbsc/ipaccess.h
openbsc/include/openbsc/mgcp.h
openbsc/include/openbsc/msgb.h
openbsc/include/openbsc/tlv.h
openbsc/src/Makefile.am
openbsc/src/abis_rsl.c
openbsc/src/bsc_init.c
openbsc/src/bsc_mgcp.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/msgb.c
openbsc/src/rest_octets.c
openbsc/src/sccp/sccp.c
openbsc/src/vty/command.c
openbsc/src/vty_interface.c
openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/src/bssap.c')
| -rw-r--r-- | openbsc/src/bssap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/openbsc/src/bssap.c b/openbsc/src/bssap.c index 002e7ce21..7ded8d1f3 100644 --- a/openbsc/src/bssap.c +++ b/openbsc/src/bssap.c @@ -26,10 +26,11 @@ #include <openbsc/debug.h> #include <openbsc/mgcp.h> #include <openbsc/signal.h> -#include <openbsc/tlv.h> #include <openbsc/paging.h> #include <openbsc/chan_alloc.h> +#include <osmocore/tlv.h> + #include <sccp/sccp.h> #include <arpa/inet.h> @@ -684,9 +685,9 @@ int dtap_rcvmsg(struct gsm_lchan *lchan, struct msgb *msg, unsigned int length) if (gh->msg_type == GSM48_MT_MM_LOC_UPD_ACCEPT) { struct gsm_network *net = gsm48->trx->bts->network; struct gsm48_loc_area_id *lai = (struct gsm48_loc_area_id *) &gh->data[0]; - gsm0408_generate_lai(lai, net->country_code, - net->network_code, - gsm48->trx->bts->location_area_code); + gsm48_generate_lai(lai, net->country_code, + net->network_code, + gsm48->trx->bts->location_area_code); } } } @@ -726,8 +727,8 @@ struct msgb *bssmap_create_layer3(struct msgb *msg_l3) data[2] = CELL_IDENT_WHOLE_GLOBAL; lai = (struct gsm48_loc_area_id *) msgb_put(msg, sizeof(*lai)); - gsm0408_generate_lai(lai, country_code, - network_code, bts->location_area_code); + gsm48_generate_lai(lai, country_code, + network_code, bts->location_area_code); ci = (u_int16_t *) msgb_put(msg, 2); *ci = htons(bts->cell_identity); |